diff options
Diffstat (limited to 'sw')
401 files changed, 24680 insertions, 17370 deletions
diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx index 0fefac552bd8..2db608ed9fd7 100644 --- a/sw/inc/SwStyleNameMapper.hxx +++ b/sw/inc/SwStyleNameMapper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: SwStyleNameMapper.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mtg $ $Date: 2001-08-16 12:07:45 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:38:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -251,6 +251,14 @@ public: // Get the Pool ID from the programmatic name static sal_uInt16 GetPoolIdFromProgName( const String& rName, SwGetPoolIdFromName ); + // used to convert the 4 special ExtraProg/UINames for + // RES_POOLCOLL_LABEL_DRAWING, RES_POOLCOLL_LABEL_ABB, + // RES_POOLCOLL_LABEL_TABLE, RES_POOLCOLL_LABEL_FRAME + // forth and back. + // Non-matching names remain unchanged. + static const String GetSpecialExtraProgName( const String& rExtraUIName ); + static const String GetSpecialExtraUIName( const String& rExtraProgName ); + static const SvStringsDtor& GetTextUINameArray(); static const SvStringsDtor& GetListsUINameArray(); static const SvStringsDtor& GetExtraUINameArray(); diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx index 31c031eb68ce..9d15d762b5dd 100644 --- a/sw/inc/accmap.hxx +++ b/sw/inc/accmap.hxx @@ -2,9 +2,9 @@ * * $RCSfile: accmap.hxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: fs $ $Date: 2002-09-23 09:27:14 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:38:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -113,6 +113,10 @@ class SwRect; class ViewShell; class SwFrmOrObj; class SwAccPreviewData; +// OD 14.01.2003 #103492# +#ifndef _PREVWPAGE_HXX +#include <prevwpage.hxx> +#endif // real states for events #define ACC_STATE_EDITABLE 0x01 @@ -176,11 +180,14 @@ public: ::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessible> GetDocumentView(); + // OD 15.01.2003 #103492# - complete re-factoring of method due to new + // page/print preview functionality. ::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessible> GetDocumentPreview( - sal_uInt8 nRow, sal_uInt8 nColumn, sal_Int16 nStartPage, - const Size& rPageSize, const Point& rFreePoint, - const Fraction& rScale, sal_uInt16 nSelectedPage ); + const std::vector<PrevwPage*>& _rPrevwPages, + const Fraction& _rScale, + const SwPageFrm* _pSelectedPageFrm, + const Size& _rPrevwWinSize ); ::vos::ORef < SwAccessibleContext > GetContextImpl( const SwFrm *pFrm, @@ -202,7 +209,21 @@ public: ViewShell *GetShell() const { return mpVSh; } inline const SwRect& GetVisArea() const; - inline const Size& GetPreViewPageSize() const; + + /** get size of a dedicated preview page + + OD 15.01.2003 #103492# + complete re-factoring of previous method due to new page/print preview + functionality. + + @author OD + + @param _nPrevwPageNum + input parameter - physical page number of page visible in the page preview + + @return an object of class <Size> + */ + Size GetPreViewPageSize( sal_uInt16 _nPrevwPageNum ) const; void RemoveContext( const SwFrm *pFrm ); void RemoveContext( const SdrObject *pObj ); @@ -229,10 +250,13 @@ public: void InvalidateRelationSet( const SwFrm* pMaster, const SwFrm* pFollow ); // update preview data (and fire events if necessary) - void UpdatePreview( sal_uInt8 nRow, sal_uInt8 nColumn, - sal_Int16 nStartPage, - const Size& rPageSize, const Point& rFreePoint, - const Fraction& rScale, sal_uInt16 nSelectedPage ); + // OD 15.01.2003 #103492# - complete re-factoring of method due to new + // page/print preview functionality. + void UpdatePreview( const std::vector<PrevwPage*>& _rPrevwPages, + const Fraction& _rScale, + const SwPageFrm* _pSelectedPageFrm, + const Size& _rPrevwWinSize ); + void InvalidatePreViewSelection( sal_uInt16 nSelPage ); sal_Bool IsPageSelected( const SwPageFrm *pPageFrm ) const; @@ -258,13 +282,33 @@ public: // additional Core/Pixel conversions for internal use; also works // for preview - Point CoreToPixel (const Point& rPoint) const; Point PixelToCore (const Point& rPoint) const; Rectangle CoreToPixel (const Rectangle& rRect) const; Rectangle PixelToCore (const Rectangle& rRect) const; private: - inline void PreviewAdjust(const Point& rPoint, sal_Bool bFromPreview) const; + /** get mapping mode for LogicToPixel and PixelToLogic conversions + + OD 15.01.2003 #103492# + Replacement method <PreviewAdjust(..)> by new method <GetMapMode>. + Method returns mapping mode of current output device and adjusts it, + if the shell is in page/print preview. + Necessary, because <PreviewAdjust(..)> changes mapping mode at current + output device for mapping logic document positions to page preview window + positions and vice versa and doesn't take care to recover its changes. + + @author OD + + @param _rPoint + input parameter - constant reference to point to determine the mapping + mode adjustments for page/print preview. + + @param _orMapMode + output parameter - reference to the mapping mode, which is determined + by the method + */ + void GetMapMode( const Point& _rPoint, + MapMode& _orMapMode ) const; }; @@ -278,30 +322,47 @@ class SwAccPreviewData SwRect maVisArea; Fraction maScale; - Size maPageSize; - const SwPageFrm *mpStartPage; const SwPageFrm *mpSelPage; - sal_uInt16 mnStartPage; + /** adjust logic page retangle to its visible part + + OD 17.01.2003 #103492# + + @author OD + + @param _iorLogicPgSwRect + input/output parameter - reference to the logic page rectangle, which + has to be adjusted. + + @param _rPrevwPgSwRect + input parameter - constant reference to the corresponding preview page + rectangle; needed to determine the visible part of the logic page rectangle. + + @param _rPrevwWinSize + input paramter - constant reference to the preview window size in TWIP; + needed to determine the visible part of the logic page rectangle + */ + void AdjustLogicPgRectToVisibleArea( SwRect& _iorLogicPgSwRect, + const SwRect& _rPrevwPgSwRect, + const Size& _rPrevwWinSize ); public: SwAccPreviewData(); ~SwAccPreviewData(); - void Update( sal_uInt8 nRow, // # rows in preview - sal_uInt8 nCol, // # columns in preview - sal_uInt16 nStartPage, // start page (0 is before first page) - const Size& rPageSize, // size of an empty page - const Point& rFreePoint, // free space between pages (x,y) - const Fraction& rScale,// scale factor for preview - ViewShell* pShell, - sal_uInt16 nSelPage ); - void InvalidateSelection( sal_uInt16 nSelPage ); + // OD 14.01.2003 #103492# - complete re-factoring of method due to new + // page/print preview functionality. + void Update( const std::vector<PrevwPage*>& _rPrevwPages, + const Fraction& _rScale, + const SwPageFrm* _pSelectedPageFrm, + const Size& _rPrevwWinSize ); + + // OD 14.01.2003 #103492# - complete re-factoring of method due to new + // page/print preview functionality. + void InvalidateSelection( const SwPageFrm* _pSelectedPageFrm ); const SwRect& GetVisArea() const; - Point PreviewToLogic(const Point& rPoint) const; - Point LogicToPreview(const Point& rPoint) const; MapMode GetMapModeForPreview( ) const; @@ -309,15 +370,13 @@ public: * proper position. rPoint identifies the page for which the * MapMode should be adjusted. If bFromPreview is true, rPoint is * a preview coordinate; else it's a document coordinate. */ + // OD 17.01.2003 #103492# - delete unused 3rd parameter. void AdjustMapMode( MapMode& rMapMode, - const Point& rPoint, - sal_Bool bFromPreview ) const; + const Point& rPoint ) const; - void AdjustMapMode( MapMode& rMapMode ) const; + inline const SwPageFrm *GetSelPage() const { return mpSelPage; } - const SwPageFrm *GetSelPage() const { return mpSelPage; } void DisposePage(const SwPageFrm *pPageFrm ); - const Size& GetPageSize() const { return maPageSize; } }; @@ -328,12 +387,4 @@ inline const SwRect& SwAccessibleMap::GetVisArea() const "preview without preview data?" ); return mpVSh->IsPreView() ? mpPreview->GetVisArea() : mpVSh->VisArea(); } - -inline const Size& SwAccessibleMap::GetPreViewPageSize() const -{ - DBG_ASSERT( mpPreview != NULL, - "preview without preview data?" ); - return mpPreview->GetPageSize(); -} - #endif diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx index f6834e79b5b7..5191b3b4ff3f 100644 --- a/sw/inc/calc.hxx +++ b/sw/inc/calc.hxx @@ -2,9 +2,9 @@ * * $RCSfile: calc.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: jp $ $Date: 2001-02-13 20:31:57 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:38:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -159,9 +159,10 @@ public: SwSbxValue( const SwSbxValue& rVal ) : SbxValue( rVal ) {} virtual ~SwSbxValue(); + // Strings sonderbehandeln BOOL GetBool() const; - // Strings sonderbehandeln + // Strings sonderbehandeln BOOLs sonderbehandeln double GetDouble() const; SwSbxValue& MakeDouble(); }; diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index 5c1038762718..7eebb32d30fd 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -2,9 +2,9 @@ * * $RCSfile: cmdid.h,v $ * - * $Revision: 1.43 $ + * $Revision: 1.44 $ * - * last change: $Author: os $ $Date: 2002-12-06 13:57:25 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:38:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -378,7 +378,7 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr #define FN_INSERT_INDEX (FN_INSERT + 16) /* Stichworteintrag */ #define FN_INSERT_INDEX_DLG (FN_INSERT + 17) /* Stichworteintrag */ #define FN_INSERT_LINEBREAK (FN_INSERT + 18) /* Zeilenumbruch */ - +#define FN_INSERT_FIELD_DATA_ONLY (FN_INSERT + 19) /* field dialog for mail merge*/ #define FN_INSERT_OBJECT (FN_INSERT + 21) /* Object */ #define FN_INSERT_OBJECT_DLG (FN_INSERT + 22) /* Object */ #define FN_INSERT_PAGEBREAK (FN_INSERT + 23) /* Seitenumbruch */ @@ -886,6 +886,7 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr #define FN_UNO_HEADER_EAT_SPACING (FN_EXTRA2 + 92) #define FN_UNO_FOOTER_EAT_SPACING (FN_EXTRA2 + 93) +#define FN_UNO_CHARFMT_SEQUENCE (FN_EXTRA2 + 94) /*-------------------------------------------------------------------- Bereich: Hilfe diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 4f072622a5a1..dfb84e9022d5 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: crsrsh.hxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: hbrinkm $ $Date: 2002-12-03 14:17:21 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:38:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -292,6 +292,8 @@ private: BOOL bBasicHideCrsr : 1; // TRUE -> HideCrsr vom Basic BOOL bSetCrsrInReadOnly : 1;// TRUE -> Cursor darf in ReadOnly-Bereiche BOOL bOverwriteCrsr : 1; // TRUE -> show Overwrite Crsr + // OD 11.02.2003 #100556# - flag to allow/avoid execution of marcos (default: true) + bool mbMacroExecAllowed : 1; void UpdateCrsr( USHORT eFlags =SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE, @@ -835,6 +837,16 @@ public: // remove all invalid cursors void ClearUpCrsrs(); + + // OD 11.02.2003 #100556# - set/get flag to allow/avoid execution of macros + inline void SetMacroExecAllowed( const bool _bMacroExecAllowed ) + { + mbMacroExecAllowed = _bMacroExecAllowed; + } + inline bool IsMacroExecAllowed() + { + return mbMacroExecAllowed; + } }; diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx index bda9db05192c..d821ecd5c083 100644 --- a/sw/inc/crstate.hxx +++ b/sw/inc/crstate.hxx @@ -2,9 +2,9 @@ * * $RCSfile: crstate.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: fme $ $Date: 2002-12-02 10:20:05 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:38:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -107,6 +107,7 @@ struct Sw2LinesPos { SwRect aLine; // Position and size of the line SwRect aPortion; // Position and size of the multi portion + SwRect aPortion2; // needed for nested multi portions BYTE nMultiType; // Multiportion type }; diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index 162bccc7ebe2..4e7feceb0d35 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -2,9 +2,9 @@ * * $RCSfile: dbmgr.hxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: os $ $Date: 2002-12-09 13:58:20 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:38:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -129,6 +129,7 @@ class Button; class SvNumberFormatter; class SwMailMergeDlg; class SwDbtoolsClient; +class SwXMailMerge; // ----------------------------------------------------------------------- @@ -207,8 +208,10 @@ friend class SwConnectionDisposedListener_Impl; BOOL bCancel : 1; // Serienbrief-Save abgebrochen BOOL bInMerge : 1; //merge process active + BOOL bMergeSilent : 1; // suppress display of dialogs/boxes (used when called over API) SwDSParamArr aDataSourceParams; SwNewDBMgr_Impl* pImpl; + const SwXMailMerge* pMergeEvtSrc; // != 0 if mail merge events are to be send SwDSParam* pMergeData; SwMailMergeDlg* pMergeDialog; @@ -239,6 +242,13 @@ public: inline USHORT GetMergeType() const { return nMergeType; } inline void SetMergeType( USHORT nTyp ) { nMergeType = nTyp; } + // MailMergeEvent source + const SwXMailMerge * GetMailMergeEvtSrc() const { return pMergeEvtSrc; } + void SetMailMergeEvtSrc( const SwXMailMerge *pSrc ) { pMergeEvtSrc = pSrc; } + + inline BOOL IsMergeSilent() const { return bMergeSilent != 0; } + inline void SetMergeSilent( BOOL bVal ) { bMergeSilent = bVal; } + // Mischen von Datensaetzen in Felder BOOL MergeNew(USHORT nOpt, SwWrtShell& rSh, const ::svx::ODataAccessDescriptor& _rDescriptor); diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 40cbbdeeb0ae..43c7063fb063 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: docsh.hxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: tl $ $Date: 2002-11-11 13:43:04 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:38:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,6 +81,7 @@ #endif class SwDoc; +class Sw3Io; class SfxDocumentInfoDialog; class SfxStyleSheetBasePool; class FontList; @@ -100,6 +101,7 @@ class SwDocShell: public SfxObjectShell, public SfxInPlaceObject, public SfxListener { SwDoc* pDoc; // Document + Sw3Io* pIo; // Reader / Writer SfxStyleSheetBasePool* pBasePool; // Durchreiche fuer Formate FontList* pFontList; // aktuelle FontListe @@ -130,6 +132,7 @@ class SwDocShell: public SfxObjectShell, public SfxInPlaceObject, virtual BOOL Load(SvStorage* pStor); virtual BOOL LoadFrom(SvStorage* pStor); virtual BOOL ConvertFrom( SfxMedium &rMedium ); + virtual void HandsOff(); virtual BOOL SaveAs(SvStorage * pNewStor ); virtual BOOL ConvertTo(SfxMedium &rMedium ); virtual BOOL SaveCompleted(SvStorage * pNewStor ); @@ -253,6 +256,10 @@ public: Reader* StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr, SwCrsrShell* pCrsrSh = 0, SwPaM* pPaM = 0); + // Anforderung der pIo-Struktur fuer den Zugriff auf Substorages + // und Streams + Sw3Io* GetIoSystem() { return pIo; } + virtual long DdeGetData( const String& rItem, const String& rMimeType, ::com::sun::star::uno::Any & rValue ); virtual long DdeSetData( const String& rItem, const String& rMimeType, diff --git a/sw/inc/dpage.hxx b/sw/inc/dpage.hxx index c5bea91f1b2e..250b61e2e863 100644 --- a/sw/inc/dpage.hxx +++ b/sw/inc/dpage.hxx @@ -2,9 +2,9 @@ * * $RCSfile: dpage.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: os $ $Date: 2000-11-27 07:48:38 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:38:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,7 +82,9 @@ public: SwDPage(SwDrawDocument& rNewModel, BOOL bMasterPage=FALSE); ~SwDPage(); - virtual Point GetOffset() const; + // #i3694# + // This GetOffset() method is not needed anymore, it even leads to errors. + // virtual Point GetOffset() const; virtual SdrObject* ReplaceObject( SdrObject* pNewObj, ULONG nObjNum ); virtual void RequestBasic(); diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 358998cde73f..f30567709d1b 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: editsh.hxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: os $ $Date: 2002-11-29 12:00:22 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:38:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -844,8 +844,13 @@ public: // if more than one in the selection return the count USHORT GetFullSelectedSectionCount() const; - BOOL AppendNodeInSection(); - int CanInsertNodeAtEndOfSection() const; + // special insert: Insert a new text node just before or after a section or + // table, if the cursor is positioned at the start/end of said + // section/table. The purpose of the method is to allow users to inert text + // at certain 'impossible' position, e.g. before a table at the document + // start or between to sections. + bool DoSpecialInsert(); + bool CanSpecialInsert() const; // Optimierung UI void SetNewDoc(BOOL bNew = TRUE); diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index 33e40b15e6a3..bc586edfae82 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fesh.hxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: od $ $Date: 2002-12-10 14:07:37 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:38:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -275,6 +275,12 @@ public: int IsObjSelectable( const Point& rPt ); int IsInsideSelectedObj( const Point& rPt ); + // #107513# + // Test if there is a draw object at that position and if it should be selected. + // The 'should' is aimed at Writer text fly frames which may be in front of + // the draw object. + sal_Bool ShouldObjectBeSelected(const Point& rPt); + sal_Bool MoveAnchor( USHORT nDir ); //Returnwerte siehe oben FrmType. @@ -672,6 +678,7 @@ public: USHORT GetCurMouseTabColNum( const Point &rPt ) const; USHORT GetCurOutColNum( SwGetCurColNumPara* pPara = 0 ) const; // aktuelle aeussere Spalte BOOL IsTableRightToLeft()const; + BOOL IsLastCellInRow() const; BOOL IsMouseTableRightToLeft(const Point &rPt) const; // Die Breite des aktuellen Bereichs fuer Spaltendialog long GetSectionWidth( SwFmt& rFmt ) const; @@ -711,6 +718,8 @@ public: page, the selected drawing object is on, is right-to-left. */ const bool IsShapeDefaultHoriTextDirR2L() const; + + void ParkCursorInTab(); }; #endif diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h index aeac03c46f10..d70237f9fb3d 100644 --- a/sw/inc/helpid.h +++ b/sw/inc/helpid.h @@ -2,9 +2,9 @@ * * $RCSfile: helpid.h,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: os $ $Date: 2002-11-29 12:00:22 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:38:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -910,6 +910,7 @@ #define HID_PRINT_AS_MERGE (HID_BASE + 2181 ) #define HID_MERGE_SOURCE_UNAVAILABLE (HID_BASE + 2182 ) #define HID_DATA_SOURCES_UNAVAILABLE (HID_BASE + 2183 ) +#define HID_MODULE_TOOLBOX (HID_BASE + 2184 ) diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index 291c7e74495f..3f6f46b7cdd0 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ndgrf.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: hr $ $Date: 2002-08-23 14:04:27 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:38:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -98,6 +98,7 @@ class SwGrfNode: public SwNoTxtNode BOOL bInSwapIn :1; BOOL bGrafikArrived :1; BOOL bChgTwipSize :1; + BOOL bChgTwipSizeFromPixel :1; BOOL bLoadLowResGrf :1; BOOL bFrameInPaint :1; //Um Start-/EndActions im Paint (ueber //SwapIn zu verhindern. @@ -144,7 +145,8 @@ public: inline BOOL IsAnimated() const { return aGrfObj.IsAnimated(); } inline BOOL IsChgTwipSize() const { return bChgTwipSize; } - inline void SetChgTwipSize( BOOL b ) { bChgTwipSize = b; } + inline BOOL IsChgTwipSizeFromPixel() const { return bChgTwipSizeFromPixel; } + inline void SetChgTwipSize( BOOL b, BOOL bFromPx=FALSE ) { bChgTwipSize = b; bChgTwipSizeFromPixel = bFromPx; } inline BOOL IsGrafikArrived() const { return bGrafikArrived; } inline void SetGrafikArrived( BOOL b ) { bGrafikArrived = b; } diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index a77dbd5c8ec8..0475d0d864e4 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ndtxt.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: hr $ $Date: 2002-08-23 14:20:57 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:38:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -305,7 +305,7 @@ public: const BOOL bWithNum = FALSE ) const; BOOL GetExpandTxt( SwTxtNode& rDestNd, const SwIndex* pDestIdx = 0, xub_StrLen nIdx = 0, xub_StrLen nLen = STRING_LEN, - BOOL bWithNum = FALSE ) const; + BOOL bWithNum = FALSE, BOOL bWithFtn = TRUE ) const; XubString GetRedlineTxt( xub_StrLen nIdx = 0, xub_StrLen nLen = STRING_LEN, BOOL bExpandFlds = FALSE, diff --git a/sw/inc/pagepreviewlayout.hxx b/sw/inc/pagepreviewlayout.hxx new file mode 100644 index 000000000000..eedd3b06e4d8 --- /dev/null +++ b/sw/inc/pagepreviewlayout.hxx @@ -0,0 +1,594 @@ +#ifndef _PAGEPREVIEWLAYOUT_HXX +#define _PAGEPREVIEWLAYOUT_HXX + +// template class <std::vector> +#include <vector> +// datatypes sal_xyz +#ifndef _SAL_TYPES_H_ +#include <sal/types.h> +#endif +// classes <Point>, <Size> and <Rectangle> +#ifndef _GEN_HXX +#include <tools/gen.hxx> +#endif +// datatype <SwTwips> +#ifndef _SWTYPES_HXX +#include <swtypes.hxx> +#endif + +class ViewShell; +class OutputDevice; +class SwRootFrm; +class SwPageFrm; +class Fraction; +struct PrevwPage; + +// ============================================================================= +/** page preview functionality in the writer + + OD 11.12.2002 #103492# - class <SwPagePreviewLayout> + + @author OD +*/ +class SwPagePreviewLayout +{ +private: + friend class ViewShell; + + const SwTwips mnXFree; + const SwTwips mnYFree; + + ViewShell& mrParentViewShell; + const SwRootFrm& mrLayoutRootFrm; + + bool mbLayoutInfoValid; + bool mbLayoutSizesValid; + bool mbPaintInfoValid; + + Size maWinSize; + sal_uInt16 mnCols; + sal_uInt16 mnRows; + sal_uInt16 mnPages; + // OD 19.02.2003 #107369# - new flag for leaving blank left-top-corner + bool mbLeaveLeftTopBlank; + + Size maMaxPageSize; + Rectangle maPreviewDocRect; + SwTwips mnColWidth; + SwTwips mnRowHeight; + SwTwips mnPrevwLayoutWidth; + SwTwips mnPrevwLayoutHeight; + bool mbDoesLayoutColsFitIntoWindow; + bool mbDoesLayoutRowsFitIntoWindow; + + sal_uInt16 mnPaintPhyStartPageNum; + sal_uInt16 mnPaintStartCol; + sal_uInt16 mnPaintStartRow; + bool mbNoPageVisible; + Point maPaintStartPageOffset; + Point maPaintPreviewDocOffset; + Point maAdditionalPaintOffset; + Rectangle maPaintedPrevwDocRect; + sal_uInt16 mnSelectedPageNum; + const SwPageFrm* mpSelectedPageFrm; + + std::vector<PrevwPage*> maPrevwPages; + + /** clear internal data about current page preview + + OD 11.12.2002 #103492# + + @author OD + */ + void _Clear(); + + /** helper method to clear preview page layout sizes + + OD 18.12.2002 #103492# + + @author OD + */ + void _ClearPrevwLayoutSizes(); + + /** helper method to clear data in preview page vectors + + OD 13.12.2002 #103492# + + @author OD + */ + void _ClearPrevwPageData(); + + /** calculate page preview layout sizes + + OD 18.12.2002 #103492# + + @author OD + */ + void _CalcPrevwLayoutSizes(); + + /** apply new zoom at given view shell + + OD 11.12.2002 #103492# + + @author OD + + @param _aNewZoom + input parameter - new zoom percentage + */ + void _ApplyNewZoomAtViewShell( sal_uInt8 _aNewZoom ); + + /** calculate additional paint offset + + OD 12.12.2002 #103492# + helper method called by <Prepare> in order to calculate an additional + paint offset to center output in given window size. + The booleans <mbDoesLayoutRowsFitIntoWindow> and <mbDoesLayoutColsFitIntoWindow> + are also determined. + preconditions: + (1) preview layout is given (number of rows and columns). + (2) window size is given. + (3) height of row and width of column are calculated. + (4) paint offset of start page is calculated. + + @author OD + */ + void _CalcAdditionalPaintOffset(); + + /** calculate painted preview document rectangle + + OD 12.12.2002 #103492# + helper method called by <Prepare> in order to calculate the rectangle, + which will be painted for the document arranged by the given preview + layout. + preconditions: + (1) paint offset of document preview is calculated. + (2) size of document preview is calculated. + (3) additional paint offset is calculated - see <_CalcAdditionalPaintOffset>. + + @author OD + */ + void _CalcDocPrevwPaintRect(); + + /** determines preview data for a given page and a given preview offset + + OD 13.12.2002 #103492# + + @author OD + + @param _rPage + input parameter - constant reference to page frame, for which the + preview data will be calculated. + + @param _rPrevwOffset + input parameter - constant reference to the offset the given page has + in the current preview window. + Note: Offset can be negative. + + @param _opPrevwPage + output parameter - calculated preview data. + + @return boolean, indicating, if calculation was successful. + */ + bool _CalcPreviewDataForPage( const SwPageFrm& _rPage, + const Point& _rPrevwOffset, + PrevwPage* _opPrevwPage ); + + /** calculate preview pages + + OD 12.12.2002 #103492# + helper method called by <Prepare> in order to determine which pages + will be visible in the current preview and calculate the data needed + to paint these pages. Also the accessible pages with its needed data + are determined. + + @author OD + */ + void _CalcPreviewPages(); + + /** get preview page by physical page number + + OD 17.12.2002 #103492# + + @author OD + + @param _nPageNum + input parameter - physical page number of page, for which the preview + page will be returned. + + @return pointer to preview page of current preview pages. If page doesn't + belongs to current preview pages, <0> is returned. + */ + const PrevwPage* _GetPrevwPageByPageNum( const sal_uInt16 _nPageNum ) const; + + /** paint selection mark at page + + OD 17.12.2002 #103492# + + @author OD + */ + const void _PaintSelectMarkAtPage( const PrevwPage* _aSelectedPrevwPage ) const; + +public: + /** constructor of <SwPagePreviewLayout> + + OD 11.12.2002 #103492# + + @author OD + + @param _rParentViewShell + input parameter - reference to the view shell the page preview + layout belongs to. Reference will be hold as member <mrParentViewShell>. + Adjustments/Changes at this view shell: + (1) Adjustment of the mapping mode at the output device. + (2) Change of the zoom at the view options. + (3) Preparations for paint of the page preview. + + @param _rLayoutRootFrm + input parameter - constant reference to the root frame of the layout. + Reference will be hold as member <mrLayoutRootFrm> in order to get + access to the page frames. + */ + SwPagePreviewLayout( ViewShell& _rParentViewShell, + const SwRootFrm& _rLayoutRootFrm ); + + /** destructor of <SwPagePreviewLayout> + + OD 17.12.2002 #103492# + + @author + */ + inline ~SwPagePreviewLayout() + { + _ClearPrevwPageData(); + } + + /** init page preview layout + + OD 11.12.2002 #103492# + initialize the page preview settings for a given layout. + side effects: + (1) If parameter <_bCalcScale> is true, mapping mode with calculated + scaling is set at the output device and the zoom at the view options of + the given view shell is set with the calculated scaling. + + @author OD + + @param _nCols + input parameter - initial number of page columns in the preview. + + @param _nRows + input parameter - initial number of page rows in the preview. + + @param _rPxWinSize + input parameter - window size in which the preview will be displayed and + for which the scaling will be calculated. + + @param _orMaxPageSize + output parameter - maximal size in width and height of all pages + + @param _orPreviewDocSize + output parameter - size of the document in the proposed preview layout + included the spacing between the pages. + + @param _bCalcScale + input parameter - control, if method should calculate the needed + scaling for the proposed preview layout for the given window size + and sets the scaling at the output device and the view options. + + @return boolean, indicating, if preview layout is successful initialized. + */ + bool Init( const sal_uInt16 _nCols, + const sal_uInt16 _nRows, + const Size& _rPxWinSize, + const bool _bCalcScale + ); + + /** method to adjust page preview layout to document changes + + OD 18.12.2002 #103492# + + @author OD + + @return boolean, indicating, if preview layout is successful initialized. + */ + bool ReInit(); + + /** prepare paint of page preview + + OD 12.12.2002 #103492# + With the valid preview layout settings - calculated and set by method + <Init(..)> - the paint of a specific part of the virtual preview + document is prepared. The corresponding part is given by either + a start page (parameter <_nProposedStartPageNum>) or a absolute position + (parameter <_aProposedStartPoint>). + The accessibility preview will also be updated via a corresponding + method call. + + @author OD + + @param _nProposedStartPageNum [0..<number of document pages>] + input parameter - proposed number of page, which should be painted in + the left-top-corner in the current output device. input parameter + <_bStartWithPageAtFirstCol> influences, if proposed page is actual + painted in the left-top-corner. + + @param _nProposedStartPos [(0,0)..<PreviewDocumentSize>] + input parameter - proposed absolute position in the virtual preview + document, which should be painted in the left-top-corner in the current + output device. + + @param _rPxWinSize + input parameter - pixel size of window the preview will be painted in. + + @param _onStartPageNum + output parameter - physical number of page, which will be painted in the + left-top-corner in the current output device. + + @param _onStartPageVirtNum + output parameter - virtual number of page, which will be painted in the + left-top-corner in the current output device. + + @param _orDocPreviewPaintRect + output parameter - rectangle of preview document, which will be painted. + + @param _bStartWithPageAtFirstCol + input parameter with default value "true" - controls, if start page + is set to page in first column the proposed start page is located. + + @return boolean, indicating, if prepare of preview paint was successful. + */ + bool Prepare( const sal_uInt16 _nProposedStartPageNum, + const Point _aProposedStartPos, + const Size& _rPxWinSize, + sal_uInt16& _onStartPageNum, + sal_uInt16& _onStartPageVirtNum, + Rectangle& _orDocPreviewPaintRect, + const bool _bStartWithPageAtFirstCol = true + ); + + /** get selected page number + + OD 13.12.2002 #103492# + + @author OD + */ + inline sal_uInt16 SelectedPage() + { + return mnSelectedPageNum; + } + + /** set selected page number + + OD 14.01.2003 #103492# + + @author OD + */ + inline void SetSelectedPage( sal_uInt16 _nSelectedPageNum ) + { + mnSelectedPageNum = _nSelectedPageNum; + } + + /** paint prepared preview + + OD 12.12.2002 #103492# + + @author OD + + @param _aOutRect + input parameter - Twip rectangle of window, which should be painted. + + @return boolean, indicating, if paint of preview was performed + */ + bool Paint( const Rectangle _aOutRect ) const; + + /** repaint pages on page preview + + OD 18.12.2002 #103492# + method to invalidate visible pages due to changes in a different + view shell. + + @author OD + */ + void Repaint( const Rectangle _aInvalidCoreRect ) const; + + /** paint to mark new selected page + + OD 17.12.2002 #103492# + Perform paint for current selected page in order to unmark it. + Set new selected page and perform paint to mark this page. + + @author OD + + @param _nNewSelectedPage + input parameter - physical number of page, which will be marked as selected. + */ + void MarkNewSelectedPage( const sal_uInt16 _nSelectedPage ); + + /** calculate start position for new scale + + OD 12.12.2002 #103492# + calculate new start position for a new scale. Calculation bases on the + current visible part of the document arranged in the given preview layout. + preconditions: + (1) new scaling is already set at the given output device. + + @author OD + + @return Point, start position for new scale + */ + Point GetPreviewStartPosForNewScale( const Fraction& _aNewScale, + const Fraction& _aOldScale, + const Size& _aNewWinSize ) const; + + /** determines, if page with given page number is visible in preview + + OD 12.12.2002 #103492# + + @author OD + + @param _nPageNum + input parameter - physical number of page, for which it will be + determined, if it is visible. + + @return boolean, indicating, if page with given page number is visible + in preview. + */ + bool IsPageVisible( const sal_uInt16 _nPageNum ) const; + + /** calculate data to bring new selected page into view. + + OD 12.12.2002 #103492# + + @author OD + + @param _nHoriMove + input parameter - positive/negative number of columns the current + selected page have to be moved. + + @param _nVertMove + input parameter - positive/negative number of rows the current + selected page have to be moved. + + @param _orNewSelectedPage + output parameter - number of new selected page + + @param _orNewStartPage + output parameter - number of new start page + + @param _orNewStartPos + output parameter - new start position in document preview + + @return boolean - indicating, that move was sucessful. + */ + bool CalcStartValuesForSelectedPageMove( const sal_Int16 _nHoriMove, + const sal_Int16 _nVertMove, + sal_uInt16& _orNewSelectedPage, + sal_uInt16& _orNewStartPage, + Point& _orNewStartPos ) const; + + /** checks, if given position is inside a shown document page + + OD 17.12.2002 #103492# + + @author OD + + @param _aPrevwPos + input parameter - position inside the visible preview window. + + @param _orDocPos + output parameter - corresponding position in the document, if given + preview position is inside a shown document page, not an empty page. + If not, it's value is <Point( 0, 0 )>. + + @param _obPosInEmptyPage + output parameter - indicates, that given preview position lays inside + an shown empty page. + + @param _onPageNum + output parameter - corresponding physical number of page, if given + preview position is inside a shown document page, considers also empty + pages. If not, it's value is <0>. + + @return boolean - indicating, that given preview position lays inside + a shown document preview page, not an empty page. + */ + bool IsPrevwPosInDocPrevwPage( const Point _aPrevwPos, + Point& _orDocPos, + bool& _obPosInEmptyPage, + sal_uInt16& _onPageNum ) const; + + inline bool DoesPreviewLayoutRowsFitIntoWindow() const + { + return mbDoesLayoutRowsFitIntoWindow; + } + + inline bool DoesPreviewLayoutColsFitIntoWindow() const + { + return mbDoesLayoutColsFitIntoWindow; + } + + inline bool PreviewLayoutValid() const + { + return mbLayoutInfoValid && mbLayoutSizesValid && mbPaintInfoValid; + } + + /** determine preview window page scroll amount + + OD 17.12.2002 #103492# + + @author OD + + @param _nWinPagesToScroll + input parameter - number of preview window pages the scroll amount has + to be calculated for. Negative values for preview window page up + scrolling, positive values for preview window page down scrolling. + + @return scroll amount in SwTwips + */ + SwTwips GetWinPagesScrollAmount( const sal_Int16 _nWinPagesToScroll ) const; + + /** determine window preview page the page with the given number is on. + + OD 17.01.2003 #103492# + + @author OD + + @param _nPageNum + input parameter - physical page number of page, for which the preview + window page number has to be calculated. + + @return number of preview window page the page with the given physical + page number is on + */ + sal_uInt16 GetWinPageNumOfPage( sal_uInt16 _nPageNum ) const; + + /** determine row the page with the given number is in + + OD 17.01.2003 #103492# + + @author OD + + @param _nPageNum + input parameter - physical page number of page, for which the row in + preview layout has to be calculated. + + @return number of row the page with the given physical page number is in + */ + sal_uInt16 GetRowOfPage( sal_uInt16 _nPageNum ) const; + + /** determine column the page with the given number is in + + OD 17.01.2003 #103492# + + @author OD + + @param _nPageNum + input parameter - physical page number of page, for which the column in + preview layout has to be calculated. + + @return number of column the page with the given physical page number is in + */ + sal_uInt16 GetColOfPage( sal_uInt16 _nPageNum ) const; + + // OD 18.12.2002 #103492# + Size GetMaxPageSize() const; + + // OD 18.12.2002 #103492# + Size GetPrevwDocSize() const; + + /** get size of a preview page by its physical page number + + OD 15.01.2003 #103492# + + @author OD + + @param _nPageNum + input parameter - pysical page number of preview page, for which the + page size has to be returned. + + @return an object of class <Size> + */ + Size GetPrevwPageSizeByPageNum( sal_uInt16 _nPageNum ) const; +}; + +#endif // _PAGEPREVIEWLAYOUT_HXX diff --git a/sw/inc/poolfmt.hxx b/sw/inc/poolfmt.hxx index 9d53c0850027..313dc420f8bd 100644 --- a/sw/inc/poolfmt.hxx +++ b/sw/inc/poolfmt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: poolfmt.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: os $ $Date: 2002-06-05 12:24:54 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:38:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,6 +67,10 @@ #include <tools/solar.h> #endif +#ifndef _SVX_FRMDIR_HXX +#include <svx/frmdir.hxx> +#endif + // POOLCOLL-IDs: // +----+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ // !User! Bereich ! 0 ! Offset ! @@ -460,6 +464,8 @@ RES_POOLCOLL_HTML_END // sonst -> den Parent USHORT GetPoolParent( USHORT nId ); +SvxFrameDirection GetDefaultFrameDirection(ULONG nLanguage); + inline BOOL IsConditionalByPoolId(USHORT nId) { return RES_POOLCOLL_TEXT == nId; diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index 976680d674df..079709840aad 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -2,9 +2,9 @@ * * $RCSfile: shellio.hxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: dvo $ $Date: 2002-12-02 11:51:28 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:38:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -360,9 +360,14 @@ public: class Sw3Reader : public StgReader { + Sw3Io* pIO; virtual ULONG Read( SwDoc &,SwPaM &,const String &); public: - Sw3Reader() {} + Sw3Reader() : pIO( 0 ) {} + + Sw3Io* GetSw3Io() { return pIO; } + const Sw3Io* GetSw3Io() const { return pIO; } + void SetSw3Io( Sw3Io* pIo ) { pIO = pIo; } // read the sections of the document, which is equal to the medium. // returns the count of it @@ -594,10 +599,19 @@ public: class Sw3Writer : public StgWriter { + Sw3Io* pIO; + BOOL bSaveAs : 1; + virtual ULONG WriteStorage(); public: - Sw3Writer() {} + Sw3Writer() : pIO( 0 ), bSaveAs( FALSE ) {} + + Sw3Io* GetSw3Io() { return pIO; } + const Sw3Io* GetSw3Io() const { return pIO; } + void SetSw3Io( Sw3Io* pIo, BOOL bSvAs = FALSE ) + { pIO = pIo; bSaveAs = bSvAs; } + virtual BOOL IsSw3Writer() const; }; @@ -672,11 +686,11 @@ public: static FASTBOOL IsValidStgFilter( SvStorage& , const SfxFilter& ); - static bool IsDetectableText(const sal_Char* pBuf, ULONG &rLen, + static bool IsDetectableText(const sal_Char* pBuf, ULONG &rLen, CharSet *pCharSet=0, bool *pSwap=0, LineEnd *pLineEnd=0); + static bool IsDetectableW4W(const String& rFileName); static const SfxFilter* GetTextFilter(const sal_Char* pBuf, ULONG nLen); - // gebe einen bestimmten Reader zurueck static Reader* GetReader( const String& rFltName ); // gebe einen bestimmten Writer zurueck diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx index 1f6e1c368e12..94e06d255aa3 100644 --- a/sw/inc/swcrsr.hxx +++ b/sw/inc/swcrsr.hxx @@ -2,9 +2,9 @@ * * $RCSfile: swcrsr.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: fme $ $Date: 2002-12-02 10:20:15 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:38:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -110,7 +110,7 @@ class SwCursor : public SwPaM friend class SwCrsrSaveState; _SwCursor_SavePos* pSavePos; - BYTE nCursorBidiLevel; + BYTE nCursorBidiLevel; // bidi level of the cursor ULONG FindAll( SwFindParas& , SwDocPositions, SwDocPositions, FindRanges, BOOL& bCancel ); @@ -186,7 +186,8 @@ public: FASTBOOL GoNextSentence(){return GoSentence(NEXT_SENT);} FASTBOOL GoPrevSentence(){return GoSentence(PREV_SENT);} - FASTBOOL LeftRight( BOOL bLeft, USHORT nCnt, USHORT nMode, BOOL bAllowVisual ); + FASTBOOL LeftRight( BOOL bLeft, USHORT nCnt, USHORT nMode, BOOL bAllowVisual, + BOOL bInsertCrsr ); FASTBOOL UpDown( BOOL bUp, USHORT nCnt = 1, Point* pPt = 0, long nUpDownX = 0 ); FASTBOOL LeftRightMargin( BOOL bLeftMargin, BOOL bAPI = FALSE ); @@ -195,9 +196,9 @@ public: FASTBOOL GoPrevNextCell( BOOL bNext, USHORT nCnt ); FASTBOOL Left( USHORT nCnt, USHORT nMode, BOOL bAllowVisual = FALSE ) - { return LeftRight( TRUE, nCnt, nMode, bAllowVisual ); } + { return LeftRight( TRUE, nCnt, nMode, bAllowVisual, FALSE ); } FASTBOOL Right( USHORT nCnt, USHORT nMode, BOOL bAllowVisual = FALSE ) - { return LeftRight( FALSE, nCnt, nMode, bAllowVisual ); } + { return LeftRight( FALSE, nCnt, nMode, bAllowVisual, FALSE ); } FASTBOOL Up( USHORT nCnt = 1 ) { return UpDown( TRUE, nCnt ); } FASTBOOL Down( USHORT nCnt = 1 ) { return UpDown( FALSE, nCnt ); } FASTBOOL LeftMargin() { return LeftRightMargin( TRUE ); } diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx index f1204f9c8774..a0be14095c0b 100644 --- a/sw/inc/swmodule.hxx +++ b/sw/inc/swmodule.hxx @@ -2,9 +2,9 @@ * * $RCSfile: swmodule.hxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: os $ $Date: 2002-11-29 12:00:22 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:38:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -106,7 +106,7 @@ class SwNavigationConfig; class SwTransferable; class SwToolbarConfigItem; class SwAttrPool; -namespace svx{ class ColorConfig;} +namespace svtools{ class ColorConfig;} class SvtAccessibilityOptions; struct SwDBData; @@ -135,7 +135,7 @@ class SwModule: public SwModuleDummy , public SfxListener SwToolbarConfigItem*pToolbarConfig; //fuer gestackte Toolbars, welche SwToolbarConfigItem*pWebToolbarConfig; //war sichtbar? SwDBConfig* pDBConfig; - svx::ColorConfig* pColorConfig; + svtools::ColorConfig* pColorConfig; SvtAccessibilityOptions* pAccessibilityOptions; SfxErrorHandler* pErrorHdl; @@ -164,8 +164,6 @@ class SwModule: public SwModuleDummy , public SfxListener // Hint abfangen fuer DocInfo virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - // form letter execution - void GenerateFormLetter(BOOL bUseCurrentDocument); protected: // Briefumschlaege, Etiketten @@ -205,7 +203,6 @@ public: void ExecOther(SfxRequest &); // Felder, Formel .. void ExecViewOptions(SfxRequest &); void ExecWizzard(SfxRequest &); - void ExecDB(SfxRequest &); // DBManager // Benutzereinstellungen modifizieren const SwMasterUsrPref *GetUsrPref(sal_Bool bWeb) const; @@ -226,7 +223,7 @@ public: SwToolbarConfigItem*GetToolbarConfig() { return pToolbarConfig; } SwToolbarConfigItem*GetWebToolbarConfig() { return pWebToolbarConfig; } SwDBConfig* GetDBConfig(); - svx::ColorConfig& GetColorConfig(); + svtools::ColorConfig& GetColorConfig(); SvtAccessibilityOptions& GetAccessibilityOptions(); // Ueber Sichten iterieren diff --git a/sw/inc/swunohelper.hxx b/sw/inc/swunohelper.hxx index 570fdf7d1539..d5476761dc7a 100644 --- a/sw/inc/swunohelper.hxx +++ b/sw/inc/swunohelper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: swunohelper.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: jp $ $Date: 2001-10-18 11:39:48 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:38:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -103,6 +103,12 @@ BOOL UCB_IsReadOnlyFileName( const String& rURL ); BOOL UCB_GetFileListOfFolder( const String& rURL, SvStrings& rList, const String* pExtension = 0, SvPtrarr* pDateTimeList = 0 ); + + // is the URL an existing file? +BOOL UCB_IsFile( const String& rURL ); + + // is the URL a existing directory? +BOOL UCB_IsDirectory( const String& rURL ); } #endif diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx index 8db60a499baa..c5901e1cbc27 100644 --- a/sw/inc/tblsel.hxx +++ b/sw/inc/tblsel.hxx @@ -2,9 +2,9 @@ * * $RCSfile: tblsel.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: jp $ $Date: 2002-03-21 12:57:09 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:38:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -206,22 +206,10 @@ class _FndBox SwTableLine *pLineBefore; //Zum Loeschen/Restaurieren des Layouts. SwTableLine *pLineBehind; - static void AddToFndBox( _FndBox*& rpParent, const SwTableBox& rBox ); - static void AppendLine( _FndBox& rBox, const SwTableLine& rLine ); - static void AppendBox( _FndLine& rLine, const SwTableBox& rBox ); - static void AddSelLine( _FndBox& rBox, const SwTableLine& rLine, - SwSelBoxes& rBoxes ); - static void AddSelBox( _FndLine& rLine, const SwTableBox& rBox, - SwSelBoxes& rBoxes ); public: _FndBox( SwTableBox* pB, _FndLine* pFL ) : pBox(pB), pUpper(pFL), pLineBefore( 0 ), pLineBehind( 0 ) {} - // fill with the structure from the selection (the selboxes) - _FndBox( const SwSelBoxes& rBoxes ); - // fill with the structure from the TableLine - _FndBox( const SwTableLine& rLine ); - const _FndLines& GetLines() const { return aLines; } _FndLines& GetLines() { return aLines; } const SwTableBox* GetBox() const { return pBox; } @@ -262,4 +250,22 @@ public: }; +struct _FndPara +{ + _FndBox* pFndBox; + _FndLine* pFndLine; + const SwSelBoxes& rBoxes; + + _FndPara( const SwSelBoxes& rBxs, _FndBox* pFB ) + : rBoxes( rBxs ), pFndBox( pFB ) {} + _FndPara( const _FndPara& rPara, _FndBox* pFB ) + : rBoxes(rPara.rBoxes), pFndLine(rPara.pFndLine), pFndBox(pFB) {} + _FndPara( const _FndPara& rPara, _FndLine* pFL ) + : rBoxes(rPara.rBoxes), pFndLine(pFL), pFndBox(rPara.pFndBox) {} +}; + +BOOL _FndBoxCopyCol( const SwTableBox*& rpBox, void* pPara ); +BOOL _FndLineCopyCol( const SwTableLine*& rpLine, void* pPara ); + + #endif // _TBLSEL_HXX diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx index e3a1979b68ac..8312cf8ac38c 100644 --- a/sw/inc/unoframe.hxx +++ b/sw/inc/unoframe.hxx @@ -2,9 +2,9 @@ * * $RCSfile: unoframe.hxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: mib $ $Date: 2002-11-26 12:35:55 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:38:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -371,14 +371,12 @@ class SwXOLEListener : public cppu::WeakImplHelper1 >, public SwClient { - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xOLEModel; -// SfxObjectShell* GetObjShell( const SwFmt& rFmt, -// SwOLENode** ppNd = 0 ) const; - SwFmt* GetFmt() const { return (SwFmt*)GetRegisteredIn(); } + SvPtrarr aFmts; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetModel( const SwFmt& rFmt, SwOLENode** ppNd = 0 ) const; + SfxObjectShell* GetObjShell( const SwFmt& rFmt, + SwOLENode** ppNd = 0 ) const; + sal_uInt16 FindEntry( const ::com::sun::star::lang::EventObject& Source, SwOLENode** ppNd = 0 ); public: - SwXOLEListener(SwFmt& rOLEFmt, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xOLE); - ~SwXOLEListener(); - TYPEINFO(); // ::com::sun::star::lang::XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); @@ -386,6 +384,7 @@ public: // ::com::sun::star::util::XModifyListener virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); + sal_Bool AddOLEFmt( SwFrmFmt& rFmt ); void Modify( SfxPoolItem*, SfxPoolItem* ); }; diff --git a/sw/inc/unomailmerge.hxx b/sw/inc/unomailmerge.hxx new file mode 100644 index 000000000000..aca74d4d9266 --- /dev/null +++ b/sw/inc/unomailmerge.hxx @@ -0,0 +1,233 @@ +/************************************************************************* + * + * $RCSfile: unomailmerge.hxx,v $ + * + * $Revision: 1.2 $ + * + * last change: $Author: hr $ $Date: 2003-03-27 15:38:44 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ + +#ifndef _UNOMAILMERGE_HXX_ +#define _UNOMAILMERGE_HXX_ + +#ifndef _CPPUHELPER_IMPLBASE5_HXX_ +#include <cppuhelper/implbase5.hxx> // WeakImplHelper4 +#endif +#ifndef _CPPUHELPER_INTERFACECONTAINER_HXX_ +#include <cppuhelper/interfacecontainer.hxx> // OMultiTypeInterfaceContainerHelperVar +#endif +#ifndef _UTL_CONFIGITEM_HXX_ +#include <unotools/configitem.hxx> // !! needed for OMultiTypeInterfaceContainerHelperVar !! +#endif + + +#ifndef _COM_SUN_STAR_TASK_XJOB_HPP_ +#include <com/sun/star/task/XJob.hpp> +#endif +#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ +#include <com/sun/star/beans/XPropertySet.hpp> +#endif +#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HPP_ +#include <com/sun/star/lang/XComponent.hpp> +#endif +#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ +#include <com/sun/star/lang/XServiceInfo.hpp> +#endif +#ifndef _COM_SUN_STAR_BEANS_PROPERTYCHANGEEVENT_HPP_ +#include <com/sun/star/beans/PropertyChangeEvent.hpp> +#endif +#ifndef _COM_SUN_STAR_TEXT_XMAILMERGEBROADCASTER_HPP_ +#include <com/sun/star/text/XMailMergeBroadcaster.hpp> +#endif + +#ifndef _SFX_ITEMPROP_HXX +#include <svtools/itemprop.hxx> +#endif +#ifndef _SFX_OBJSH_HXX +#include <sfx2/objsh.hxx> // SfxObjectShellRef +#endif + +namespace com { namespace sun { namespace star { namespace sdbc { + class XResultSet; + class XConnection; +}}}} + +namespace com { namespace sun { namespace star { namespace frame { + class XModel; +}}}} + +namespace com { namespace sun { namespace star { namespace lang { + class XMultiServiceFactory; +}}}} + +namespace com { namespace sun { namespace star { namespace text { + class XMailMergeListener; + struct MailMergeEvent; +}}}} + +namespace rtl { + class OUString; +} + +/////////////////////////////////////////////////////////////////////////// + +// uses templates from <cppuhelper/interfacecontainer.h> +// and <unotools/configitem.hxx> + +// helper function call class +struct PropHashType_Impl +{ + size_t operator()(const INT32 &s) const { return s; } +}; + +typedef cppu::OMultiTypeInterfaceContainerHelperVar + < + INT32, + PropHashType_Impl, + std::equal_to< INT32 > + > OPropertyListenerContainerHelper; + +//////////////////////////////////////////////////////////// + +class SwXMailMerge : + public cppu::WeakImplHelper5 + < + com::sun::star::task::XJob, + com::sun::star::beans::XPropertySet, + com::sun::star::text::XMailMergeBroadcaster, + com::sun::star::lang::XComponent, + com::sun::star::lang::XServiceInfo + > +{ + cppu::OInterfaceContainerHelper aEvtListeners; + cppu::OInterfaceContainerHelper aMergeListeners; + OPropertyListenerContainerHelper aPropListeners; + + //SfxItemPropertySet aPropSet; + const SfxItemPropertyMap* pMap; + + SfxObjectShellRef xDocSh; // the document + + String aTmpFileName; + + // properties of mail merge service + com::sun::star::uno::Sequence< com::sun::star::uno::Any > aSelection; + com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSet > xResultSet; + com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection > xConnection; + com::sun::star::uno::Reference< com::sun::star::frame::XModel > xModel; + rtl::OUString aDataSourceName; + rtl::OUString aDataCommand; + rtl::OUString aFilter; + rtl::OUString aDocumentURL; + rtl::OUString aOutputURL; + rtl::OUString aFileNamePrefix; + sal_Int32 nDataCommandType; + sal_Int16 nOutputType; + sal_Bool bEscapeProcessing; + sal_Bool bSinglePrintJobs; + sal_Bool bFileNameFromColumn; + + sal_Bool bDisposing; + + + void launchEvent( const com::sun::star::beans::PropertyChangeEvent &rEvt ) const; + + // disallow use of copy-constructor and assignment-operator for now + SwXMailMerge( const SwXMailMerge & ); + SwXMailMerge & operator = ( const SwXMailMerge & ); + +public: + SwXMailMerge(); + virtual ~SwXMailMerge(); + + void LaunchMailMergeEvent( const com::sun::star::text::MailMergeEvent &rData ) const; + + // XJob + virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + + // XPropertySet + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + + // XMailMergeBroadcaster + virtual void SAL_CALL addMailMergeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XMailMergeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeMailMergeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XMailMergeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + + // XComponent + virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + + // XServiceInfo + virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); +}; + + +extern com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL SwXMailMerge_getSupportedServiceNames() throw(); +extern rtl::OUString SAL_CALL SwXMailMerge_getImplementationName() throw(); +extern com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL SwXMailMerge_createInstance(const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( com::sun::star::uno::Exception ); + +//////////////////////////////////////////////////////////// + +#endif + + diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx index e4af696920f9..d40a1bac6686 100644 --- a/sw/inc/unomap.hxx +++ b/sw/inc/unomap.hxx @@ -2,9 +2,9 @@ * * $RCSfile: unomap.hxx,v $ * - * $Revision: 1.42 $ + * $Revision: 1.43 $ * - * last change: $Author: tl $ $Date: 2002-10-08 14:34:29 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:38:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -106,6 +106,7 @@ #define PROPERTY_MAP_EMBEDDED_OBJECT 38 #define PROPERTY_MAP_REDLINE 39 #define PROPERTY_MAP_TEXT_DEFAULT 40 + #define PROPERTY_MAP_FLDTYP_DATETIME 41 #define PROPERTY_MAP_FLDTYP_USER 42 #define PROPERTY_MAP_FLDTYP_SET_EXP 43 @@ -152,9 +153,10 @@ #define PROPERTY_MAP_FLDMSTR_DUMMY0 84 #define PROPERTY_MAP_FLDTYP_BIBLIOGRAPHY 85 #define PROPERTY_MAP_FLDMSTR_BIBLIOGRAPHY 86 -#define PROPERTY_MAP_REDLINE_PORTION 87 -#define PROPERTY_MAP_TEXT 88 -#define PROPERTY_MAP_END 89 +#define PROPERTY_MAP_TEXT 87 +#define PROPERTY_MAP_REDLINE_PORTION 88 +#define PROPERTY_MAP_MAILMERGE 89 +#define PROPERTY_MAP_END 90 #define PROPERTY_SET_CHAR_STYLE 1 #define PROPERTY_SET_PARA_STYLE 2 @@ -251,6 +253,7 @@ #define WID_IDX_LOCALE 1055 #define WID_IDX_SORT_ALGORITHM 1056 #define WID_IDX_NAME 1057 + #define WID_TEXT_READING 1058 #define WID_PRIMARY_KEY_READING 1059 #define WID_SECONDARY_KEY_READING 1060 @@ -272,6 +275,22 @@ #define WID_DOC_APPLY_FORM_DESIGN_MODE 1013 #define WID_DOC_BASIC_LIBRARIES 1014 +//MailMerge +#define WID_SELECTION 1071 +#define WID_RESULT_SET 1072 +#define WID_CONNECTION 1073 +#define WID_MODEL 1074 +#define WID_DATA_SOURCE_NAME 1075 +#define WID_DATA_COMMAND 1076 +#define WID_FILTER 1077 +#define WID_DOCUMENT_URL 1078 +#define WID_OUTPUT_URL 1079 +#define WID_DATA_COMMAND_TYPE 1080 +#define WID_OUTPUT_TYPE 1081 +#define WID_ESCAPE_PROCESSING 1082 +#define WID_SINGLE_PRINT_JOBS 1083 +#define WID_FILE_NAME_FROM_COLUMN 1084 +#define WID_FILE_NAME_PREFIX 1085 //AutoText #define WID_GROUP_PATH 0 diff --git a/sw/inc/unoobj.hxx b/sw/inc/unoobj.hxx index 98290dc3705c..33e674c06769 100644 --- a/sw/inc/unoobj.hxx +++ b/sw/inc/unoobj.hxx @@ -2,9 +2,9 @@ * * $RCSfile: unoobj.hxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: os $ $Date: 2002-03-19 16:05:50 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:38:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -397,6 +397,8 @@ enum SwGetPropertyStatesCaller SW_PROPERTY_STATE_CALLER_SWX_TEXT_PORTION, SW_PROPERTY_STATE_CALLER_SINGLE_VALUE_ONLY }; +#define CRSR_ATTR_MODE_TABLE 1 //attributes should be applied to a table selection +#define CRSR_ATTR_MODE_DONTREPLACE 2 //attributes should be added, not replaced class SwXTextCursor : public cppu::WeakImplHelper12 < @@ -539,7 +541,7 @@ public: SwUnoCrsr* GetCrsr(){return (SwUnoCrsr*)GetRegisteredIn();} const SwUnoCrsr* GetCrsr()const{return (SwUnoCrsr*)GetRegisteredIn();} - static void SetCrsrAttr(SwPaM& rPam, const SfxItemSet& rSet, BOOL bTableMode = sal_False); + static void SetCrsrAttr(SwPaM& rPam, const SfxItemSet& rSet, USHORT nAttrMode ); static void GetCrsrAttr(SwPaM& rPam, SfxItemSet& rSet, BOOL bCurrentAttrOnly = FALSE); static void getTextFromPam(SwPaM& aCrsr, rtl::OUString& rBuffer); static SwFmtColl* GetCurTxtFmtColl(SwPaM& rPam, BOOL bConditional); diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx index 77eddb65b7c7..ccaadb4878bf 100644 --- a/sw/inc/unoprnms.hxx +++ b/sw/inc/unoprnms.hxx @@ -2,9 +2,9 @@ * * $RCSfile: unoprnms.hxx,v $ * - * $Revision: 1.80 $ + * $Revision: 1.81 $ * - * last change: $Author: os $ $Date: 2002-11-15 11:08:21 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:38:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -716,8 +716,23 @@ enum SwPropNameIds /* 0636 */ UNO_NAME_FOOTER_DYNAMIC_SPACING, /* 0637 */ UNO_NAME_BASIC_LIBRARIES, /* 0638 */ UNO_NAME_IS_FIXED_LANGUAGE, +/* 0639 */ UNO_NAME_SELECTION, +/* 0640 */ UNO_NAME_RESULT_SET, +/* 0641 */ UNO_NAME_CONNECTION, +/* 0642 */ UNO_NAME_MODEL, +/* 0643 */ UNO_NAME_DATA_SOURCE_NAME, +/* 0644 */ UNO_NAME_DATA_COMMAND, +/* 0645 */ UNO_NAME_FILTER, +/* 0646 */ UNO_NAME_DOCUMENT_URL, +/* 0647 */ UNO_NAME_OUTPUT_URL, +/* 0648 */ UNO_NAME_OUTPUT_TYPE, +/* 0649 */ UNO_NAME_ESCAPE_PROCESSING, +/* 0650 */ UNO_NAME_SINGLE_PRINT_JOBS, +/* 0651 */ UNO_NAME_FILE_NAME_FROM_COLUMN, +/* 0652 */ UNO_NAME_FILE_NAME_PREFIX, +/* 0653 */ UNO_NAME_CHAR_STYLE_NAMES, +/* 0654 */ SW_PROPNAME_END -/* 0639 */ SW_PROPNAME_END }; diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index 7f9f47a4d9c4..53e579651a39 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: viewopt.hxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: fme $ $Date: 2002-12-05 10:02:03 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:38:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,7 +77,7 @@ class Window; class OutputDevice; class ViewShell; class SwDocShell; -namespace svx{ class ColorConfig;} +namespace svtools{ class ColorConfig;} #define VIEWOPT_1_IDLE 0x00000001L #define VIEWOPT_1_TAB 0x00000002L @@ -608,7 +608,7 @@ public: void SetDocBoundaries(BOOL bSet) {SetAppearanceFlag(VIEWOPT_DOC_BOUNDARIES, bSet);} - static void ApplyColorConfigValues(const svx::ColorConfig& rConfig); + static void ApplyColorConfigValues(const svtools::ColorConfig& rConfig); }; diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index 05b33fdce283..8bce0bb854fd 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -2,9 +2,9 @@ * * $RCSfile: viewsh.hxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: od $ $Date: 2002-12-06 16:12:04 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:38:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -109,6 +109,8 @@ struct SwPrintData; class SvtAccessibilityOptions; class Fraction; class SvEmbeddedObjectRef; +// OD 12.12.2002 #103492# +class SwPagePreviewLayout; struct SwAccessibilityOptions; @@ -128,6 +130,9 @@ class ViewShell : public Ring friend class SwViewImp; friend class SwLayIdle; + // OD 12.12.2002 #103492# - for setting visible area for page preview paint + friend class SwPagePreviewLayout; + //Umsetzen der SwVisArea, damit vor dem Drucken sauber formatiert //werden kann. friend void SetSwVisArea( ViewShell *pSh, const SwRect &, BOOL bPDFExport = FALSE ); @@ -196,14 +201,6 @@ class ViewShell : public Ring void ImplApplyViewOptions( const SwViewOption &rOpt ); - /** calculate visible pages and further needed data for current preview settings - - OD 04.12.2002 #103492# - - @author OD - */ - void _CalcVisiblePagesForPreview(); - protected: static ShellResource* pShellRes; // Resourcen fuer die Shell static Window* pCareWindow; // diesem Fenster ausweichen @@ -321,7 +318,7 @@ public: sal_Bool Prt( SwPrtOptions& rOptions, SfxProgress& rProgress, OutputDevice *pPDFOut = NULL ); //"Drucken" fuer OLE 2.0 - static void PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, + static void PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, SwPrtOptions& rOptions, OutputDevice* pOleOut, const Rectangle& rRect ); // creates temporary doc with selected text for PDF export @@ -374,210 +371,26 @@ public: // Selektion der Draw ::com::sun::star::script::Engine geaendert virtual void DrawSelChanged(SdrView*); - // SS fuer Seitenvorschau anzeigen - void PreViewPage( const Rectangle& rRect, sal_uInt16 nRowCol, - sal_uInt16 nSttPage, const Size& rPageSize, - sal_uInt16 nSelectedPage ); - void RepaintCoreRect( const SwRect& rRect, sal_uInt16 nRowCol, - sal_uInt16 nSttPage, const Size& rPageSize ); - // und jetzt mal auf den Drucker - void PrintPreViewPage( SwPrtOptions& rOptions, sal_uInt16 nRowCol, - SfxProgress& rProgress, - const SwPagePreViewPrtData* = 0 ); - Size GetPagePreViewPrtMaxSize() const; - // errechnen & MapMode setzen - sal_uInt16 CalcPreViewPage( const Size& rWinWidth, sal_uInt16& nRowCol, - sal_uInt16 nSttPage, Size& rPageSize, - sal_uInt16& rVirtPageNo, sal_uInt16 nAccSelPage ); - sal_Bool IsPreViewDocPos( Point& rDocPt, sal_uInt16 nRowCol, sal_uInt16 nSttPage, - const Size& rMaxSize ); - /** init page preview layout - new method, replacing <CalcPreViewPage> - - OD 27.11.2002 #103492# - initialize the page preview settings for a given layout. - side effects: - (1) data struture for current preview settings are initialized and set. - (2) if parameter <_bCalcScale> is true, mapping mode with calculated - scaling is set at the output device and the zoom at the view options is - set with the calculated scaling. - - @author OD - - @param _nCols - input parameter - initial number of page columns in the preview. - - @param _nRows - input parameter - initial number of page rows in the preview. - - @param _orMaxPageSize - output parameter - maximal size in width and height of all pages - - @param _orPreviewDocSize - output parameter - size of the document in the proposed preview layout - included the spacing between the pages. - - @param _bCalcScale - input parameter - control, if method should calculate the needed - scaling for the proposed preview layout for the given window size - and sets the scaling at the output device and the view options. - - @param _pPxWinSize - input parameter - window size in which the preview will be displayed and - for which the scaling will be calculated. - - @return boolean, indicating, if preview layout is successful initialized. - */ - bool InitPreviewLayout( const sal_uInt16 _nCols, - const sal_uInt16 _nRows, - Size& _orMaxPageSize, - Size& _orPreviewDocSize, - const bool _bCalcScale, - const Size* _pPxWinSize = NULL - ); - - /** prepare paint of page preview - - OD 28.11.2002 #103492# - With the valid preview layout settings - calculated and set by method - <InitPreviewLayout> - the paint of a specific part of the virtual - preview document is prepared. The corresponding part is given by either - a start page (parameter <_nProposedStartPageNum>) or a absolute position - (parameter <_aProposedStartPoint>). - The accessibility preview will also be updated via a corresponding - method call. - - @author OD - - @param _nProposedStartPageNum [0..<number of document pages>] - input parameter - proposed number of page, which should be painted in - the left-top-corner in the current output device. - - @param _nProposedStartPos [(0,0)..<PreviewDocumentSize>] - input parameter - proposed absolute position in the virtual preview - document, which should be painted in the left-top-corner in the current - output device. - - @param _pPxWinSize - input parameter - pixel size of window the preview will be painted in. - - @param _onStartPageNum - output parameter - physical number of page, which will be painted in the - left-top-corner in the current output device. - - @param _onStartPageVirtNum - output parameter - virtual number of page, which will be painted in the - left-top-corner in the current output device. - - @param _orDocPreviewPaintRect - output parameter - rectangle of preview document, which will be painted. - - @param _bPaintPageAtFirstCol - input parameter with default value "true" - controls, if start page - is set to page in first column the proposed start page is located. - - @return boolean, indicating, if prepare of preview paint was successful. - */ - bool PreparePreviewPaint( const sal_uInt16 _nProposedStartPageNum, - const Point _aProposedStartPos, - const Size* _pPxWinSize, - sal_uInt16& _onStartPageNum, - sal_uInt16& _onStartPageVirtNum, - Rectangle& _orDocPreviewPaintRect, - const bool _bPaintPageAtFirstCol = true - ); - - /** paint prepared preview - - OD 28.11.2002 #103492# + // OD 12.12.2002 #103492# + SwPagePreviewLayout* PagePreviewLayout(); - @author OD + /** adjust view options for page preview - @param _nSelectedPageNum - input parameter - physical number of page, which should be painted as - selected by am extra border in color COL_LIGHTBLUE. + OD 09.01.2003 #i6467# + Because page preview should show the document as it is printed - + page preview is print preview -, the view options are adjusted to the + same as for printing. - @param _aOutRect - input parameter - Twip rectangle of window, which should be painted. - - @return boolean, indicating, if paint of preview was performed - */ - bool PaintPreview( const sal_uInt16 _nSelectedPageNum, - const Rectangle _aOutRect - ); - - /** property <DoesPreviewLayoutRowsFitIntoWin> of current preview layout - - OD 03.12.2002 #103492# - - @author OD - - @return boolean, indicating that the rows of the current preview layout - fit into the current window size. + @param _rPrintOptions + input parameter - constant reference to print options, to which the + view option will be adjusted. */ - bool DoesPreviewLayoutRowsFitIntoWindow(); - - /** property <DoesPreviewLayoutColsFitIntoWin> of current preview layout - - OD 03.12.2002 #103492# - - @author OD - - @return boolean, indicating that the columns of the current preview layout - fit into the current window size. - */ - bool DoesPreviewLayoutColsFitIntoWindow(); - - /** calculate start position for new scaling + void AdjustOptionsForPagePreview( const SwPrtOptions &_rPrintOptions ); - OD 04.12.2002 #103492# - - @author OD - - @return Point, start position for new scale - */ - Point GetPreviewStartPosForNewScale( const Fraction& _aNewScale, - const Fraction& _aOldScale, - const Size& _aNewWinSize ); - - /** determines, if page with given page number is visible in preview - - OD 05.12.2002 #103492# - - @author OD - - @return boolean, indicating, if page with given page number is visible - in preview - */ - bool IsPageVisibleInCurrPreview( const sal_uInt16 _nPageNum ); - - /** prepares re-paint of preview to bring new selected page into view. - - OD 06.12.2002 #103492# - - @author OD - - @param _nCurrSelectedPage - input parameter - number of current selected page. - - @param _nHoriMove - input parameter - positive/negative number of columns the current - selected page have to be moved. - - @param _nVertMove - input parameter - positive/negative number of rows the current - selected page have to be moved. - - @param _orNewSelectedPage - output parameter - number of new selected page - - @return boolean - indicating, that move was sucessful. - */ - bool MovePreviewSelectedPage( const sal_uInt16 _nCurrSelectedPage, - const sal_Int16 _nHoriMove, - const sal_Int16 _nVertMove, - sal_uInt16& _orNewSelectedPage, - sal_uInt16& _orNewStartPage, - Point& _orNewStartPos ); + // print page/print preview + void PrintPreViewPage( SwPrtOptions& rOptions, sal_uInt16 nRowCol, + SfxProgress& rProgress, + const SwPagePreViewPrtData* = 0 ); // Prospekt-Format drucken void PrintProspect( SwPrtOptions&, SfxProgress& ); @@ -629,24 +442,16 @@ public: const Size& GetBrowseBorder() const{ return aBrowseBorder; } void SetBrowseBorder( const Size& rNew ); -#ifdef ACCESSIBLE_LAYOUT ::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessible > CreateAccessible(); + // OD 15.01.2003 #103492# - change method signature due to new page preview + // functionality. ::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessible > - CreateAccessiblePreview( sal_uInt8 nRow, - sal_uInt8 nColumn, - sal_uInt16 nStartPage, - const Size& rPageSize, - const Point& rFreePoint, - const Fraction& rScale, - sal_uInt16 nSelectedPage ); - - Point GetPreviewFreePix() const; + CreateAccessiblePreview(); void ShowPreViewSelection( sal_uInt16 nSelPage ); void InvalidateAccessibleFocus(); -#endif //apply Accessiblity options void ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOptions); diff --git a/sw/prj/build.lst b/sw/prj/build.lst index 72db0f670863..11a7d8447d66 100644 --- a/sw/prj/build.lst +++ b/sw/prj/build.lst @@ -38,7 +38,6 @@ sw sw\source\ui\utlui nmake - all sw_utlui NULL sw sw\source\ui\web nmake - all sw_web sw_sdi NULL sw sw\source\ui\wizard nmake - all sw_wiz NULL sw sw\source\ui\wrtsh nmake - all sw_wrtsh NULL -sw sw\source\core\access nmake - all sw_access NULL sw sw\source\core\attr nmake - all sw_attr NULL sw sw\source\core\crsr nmake - all sw_crsr NULL sw sw\source\core\doc nmake - all sw_doc NULL @@ -76,6 +75,6 @@ sw sw\source\filter\ww1 nmake - all sw_ww1 NULL sw sw\source\filter\ww8 nmake - all sw_ww8 NULL sw sw\source\filter\xml nmake - all sw_xml NULL sw sw\source\ui nmake - all sw_ui sw_app sw_cctrl sw_chrdl sw_conf sw_dbui sw_dchdl sw_dcvw sw_dlg sw_envlp sw_fldui sw_fmtui sw_frmdl sw_globd sw_index sw_ling sw_misc sw_rbbar sw_shell sw_table sw_uiuno sw_uivw sw_utlui sw_web sw_wiz sw_wrtsh NULL -sw sw\source\core nmake - all sw_core sw_access sw_attr sw_crsr sw_dcnd sw_doc sw_draw sw_edit sw_excpt sw_fld sw_frmed sw_grph sw_layo sw_ole sw_para sw_sw3io sw_swg sw_text sw_tox sw_txtnd sw_uco sw_undo sw_view NULL +sw sw\source\core nmake - all sw_core sw_attr sw_bast sw_crsr sw_dcnd sw_doc sw_draw sw_edit sw_excpt sw_fld sw_frmed sw_grph sw_layo sw_ole sw_para sw_sw3io sw_swg sw_text sw_tox sw_txtnd sw_uco sw_undo sw_view NULL sw sw\source\filter nmake - all sw_flt sw_ascii sw_bsflt sw_dbugu.u sw_dbugw.w sw_excel sw_html sw_lotus sw_rtf sw_sw6 sw_w4w sw_wrtr sw_ww1 sw_ww8 sw_xml NULL sw sw\util nmake - all sw_util sw_core sw_flt sw_sdi sw_ui NULL diff --git a/sw/prj/d.lst b/sw/prj/d.lst index ef85c5d21cc5..e9b0b2a8c186 100644 --- a/sw/prj/d.lst +++ b/sw/prj/d.lst @@ -1,16 +1,13 @@ ..\inc\sw.lst %_DEST%\inc%_EXT%\sw.lst -mkdir: %_DEST%\inc\%_EXT%\sw -mkdir: %_DEST%\inc\%_EXT%\uno -mkdir: %_DEST%\inc\%_EXT%\uno\one -mkdir: %_DEST%\ucr\sw +mkdir: %_DEST%\inc%_EXT%\sw +mkdir: %_DEST%\inc%_EXT%\uno +mkdir: %_DEST%\inc%_EXT%\uno\one ..\inc\swinter.h %_DEST%\ODK\inc%_EXT%\swinter.h ..\inc\orntenum.hxx %_DEST%\inc%_EXT%\sw\orntenum.hxx ..\inc\horiornt.hxx %_DEST%\inc%_EXT%\sw\horiornt.hxx -..\%__SRC%\inc\swinter.h %_DEST%\ODK\inc%_EXT%\swinter.h -..\%__SRC%\misc\swinter.c %_DEST%\ODK\src%_EXT%\swinter.c ..\%__SRC%\bin\sweb.res %_DEST%\bin%_EXT%\sweb.res ..\%__SRC%\bin\*.ex$ %_DEST%\bin%_EXT% -..\xml\*.xml %_DEST%\xml\*.xml +..\xml\*.xml %_DEST%\xml%_EXT%\*.xml touch: ..\%__SRC%\misc\sw.hid %_DEST%\bin%_EXT%\sw.hid ..\%__SRC%\bin\soffice.pdb %_DEST%\bin%_EXT%\soffice.pdb ..\%__SRC%\bin\swslots.tlb %_DEST%\bin%_EXT%\swslots.tlb @@ -19,7 +16,6 @@ touch: ..\%__SRC%\misc\sw.hid %_DEST%\bin%_EXT%\sw.hid ..\%__SRC%\bin\sw?????.res %_DEST%\bin%_EXT%\sw?????.res ..\%__SRC%\bin\sw?????.res %_DEST%\bin%_EXT%\sw?????.res ..\%__SRC%\lib\swinter.lib %_DEST%\lib%_EXT%\swinter.lib -..\%__SRC%\lib\swinter.lib %_DEST%\ODK\lib%_EXT%\swinter.lib ..\%__SRC%\misc\sw.csv %_DEST%\inc%_EXT%\sw.csv ..\%__SRC%\lib\swlib.lib %_DEST%\lib%_EXT%\swlib.lib ..\%__SRC%\slb\lib*.* %_DEST%\lib%_EXT%\lib*.* @@ -50,8 +46,6 @@ hedabu: ..\%__SRC%\inc\sw\swtxview.h %_DEST%\inc%_EXT%\uno\one\swtxview.h hedabu: ..\%__SRC%\inc\sw\swservc.h %_DEST%\inc%_EXT%\uno\one\swservc.h hedabu: ..\%__SRC%\inc\sw\swmod.h %_DEST%\inc%_EXT%\uno\one\swmod.h -..\%__SRC%\ucr\*.ucr %_DEST%\ucr%_EXT%\sw\*.ucr - ..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib ..\%__SRC%\misc\*staticdatamembers.cxx %_DEST%\inc%_EXT%\*staticdatamembers.cxx diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi index a4fb0c2bc64c..5a036daffd0b 100644 --- a/sw/sdi/_viewsh.sdi +++ b/sw/sdi/_viewsh.sdi @@ -2,9 +2,9 @@ * * $RCSfile: _viewsh.sdi,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: mba $ $Date: 2002-08-29 14:06:49 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -539,6 +539,16 @@ interface BaseTextEditView : View [ StateMethod = GetState ; ] + FN_INSERT_FIELD_DATA_ONLY // status(final|play) + [ + ExecMethod = Execute ; + StateMethod = GetState ; + ] + FN_QRY_MERGE // status() + [ + ExecMethod = Execute ; + DisableFlags="SW_DISABLE_ON_MAILBOX_EDITOR"; + ] } interface GlobalContents : Collection diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi index 40b21dc5fb74..509efb27b845 100644 --- a/sw/sdi/swriter.sdi +++ b/sw/sdi/swriter.sdi @@ -9561,4 +9561,30 @@ SfxBoolItem JumpToPrevCell FN_GOTO_PREV_CELL GroupId = GID_NAVIGATOR; ] +//-------------------------------------------------------------------------- +SfxBoolItem InsertFieldDataOnly FN_INSERT_FIELD_DATA_ONLY() +[ + /* flags: */ + AutoUpdate = TRUE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + ImageRotation = TRUE; + ImageReflection = TRUE; + + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = GID_INSERT; +] diff --git a/sw/sdi/swslots.src b/sw/sdi/swslots.src index cc35437c1730..f22ffb2077be 100644 --- a/sw/sdi/swslots.src +++ b/sw/sdi/swslots.src @@ -2,9 +2,9 @@ * * $RCSfile: swslots.src,v $ * - * $Revision: 1.103 $ + * $Revision: 1.104 $ * - * last change: $Author: kz $ $Date: 2002-12-09 11:43:19 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,7 +71,7 @@ SfxSlotInfo FN_ABSTRACT_NEWDOC SlotName[ russian ] = "念牦戾眚 桤 噌耱疣牝眍泐 镳邃耱噔脲龛"; SlotName[ dutch ] = "Document van samenvatting"; SlotName[ french ] = "Document d'apr鑣 synth鑣e"; - SlotName[ spanish ] = "Documento desde extracto"; + SlotName[ spanish ] = "Documento desde resumen"; SlotName[ italian ] = "Crea documento dal sunto"; SlotName[ danish ] = "Dokument fra abstract"; SlotName[ swedish ] = "Dokument fr錸 utdrag"; @@ -84,7 +84,7 @@ SfxSlotInfo FN_ABSTRACT_NEWDOC SlotName[ dutch ] = "Document van samenvatting"; SlotName[ chinese_simplified ] = "鏂囨。鏉ヨ嚜鎽樿"; SlotName[ greek ] = "搞泷狯 狃 Abstract"; - SlotName[ korean ] = "鞛愲彊 鞖旍暯鞙茧攵韯办潣 氍胳劀"; + SlotName[ korean ] = "氍胳劀毳 鞖旍暯鞙茧攵韯"; SlotName[ turkish ] = "Belge 鰖eti 琮kar"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Document a partir del resum"; @@ -100,7 +100,7 @@ SfxSlotInfo FN_ABSTRACT_STARIMPRESS SlotName[ russian ] = "橡彗屙蜞鲨 桤 噌耱疣牝眍泐 镳邃耱噔脲龛"; SlotName[ dutch ] = "Presentatie uit samenvatting"; SlotName[ french ] = "Pr閟entation d'apr鑣 synth鑣e"; - SlotName[ spanish ] = "Presentaci髇 desde extracto"; + SlotName[ spanish ] = "Presentaci髇 desde resumen"; SlotName[ italian ] = "Presentazione dal sunto"; SlotName[ danish ] = "Pr鎠entation fra abstract"; SlotName[ swedish ] = "Presentation fr錸 utdrag"; @@ -113,7 +113,7 @@ SfxSlotInfo FN_ABSTRACT_STARIMPRESS SlotName[ dutch ] = "Presentatie uit samenvatting"; SlotName[ chinese_simplified ] = "婕旂ず鏂囩ǹ鏉ヨ嚜鎽樿"; SlotName[ greek ] = "嗅耧躞哚箸 狃 Abstract"; - SlotName[ korean ] = "鞛愲彊 鞖旍暯鞙茧攵韯办潣 頂勲爤鞝犿厡鞚挫厴"; + SlotName[ korean ] = "頂勲爤鞝犿厡鞚挫厴鞚 鞖旍暯鞙茧攵韯"; SlotName[ turkish ] = "Sunu 鰖eti 琮kar"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Presentaci a partir del resum"; @@ -142,7 +142,7 @@ SfxSlotInfo FN_ADD_UNKNOWN SlotName[ dutch ] = "Onbekende woorden opnemen"; SlotName[ chinese_simplified ] = "鍔犲叆涓嶆槑鐨勫瓧"; SlotName[ greek ] = "旭桢箸 茔睐篝 胼铄"; - SlotName[ korean ] = "鞎岆牑鞝 鞛堨 鞎婌潃 雼柎 於旉皜"; + SlotName[ korean ] = "鞎 靾 鞐嗠姅 雼柎 於旉皜"; SlotName[ turkish ] = "Bilinmeyen s鰖c黭ler ekle"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Afegeix paraules desconegudes"; @@ -158,7 +158,7 @@ SfxSlotInfo FN_AUTO_CORRECT SlotName[ russian ] = "棱蝾玎戾磬"; SlotName[ dutch ] = "AutoCorrectie"; SlotName[ french ] = "AutoCorrection"; - SlotName[ spanish ] = "AutoCorrecci髇"; + SlotName[ spanish ] = "Correcci髇 autom醫ica"; SlotName[ italian ] = "Correzione automatica"; SlotName[ danish ] = "AutoKorrektur"; SlotName[ swedish ] = "AutoKorrigering"; @@ -171,7 +171,7 @@ SfxSlotInfo FN_AUTO_CORRECT SlotName[ dutch ] = "AutoCorrectie"; SlotName[ chinese_simplified ] = "鑷姩鏇存"; SlotName[ greek ] = "刘麸拈棂箸"; - SlotName[ korean ] = "鞛愲彊 靾橃爼/鞛愲彊 靹滌嫕 "; + SlotName[ korean ] = "鞛愲彊 靾橃爼"; SlotName[ turkish ] = "Otomatik d鼁eltme"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Correcci autom鄑ica"; @@ -187,7 +187,7 @@ SfxSlotInfo FN_AUTOFORMAT_APPLY SlotName[ russian ] = "橡桁屙栩 镟疣戾蝠 噔蝾纛痨囹"; SlotName[ dutch ] = "AutoOpmaak-opties toepassen"; SlotName[ french ] = "Utiliser les options de l'AutoFormat"; - SlotName[ spanish ] = "Aplicar opciones AutoFormato"; + SlotName[ spanish ] = "Aplicar opciones del Formateado autom醫ico"; SlotName[ italian ] = "Applica le opzioni di AutoFormat"; SlotName[ danish ] = "Anvend AutoFormat-indstillinger"; SlotName[ swedish ] = "Anv鋘d autoformat"; @@ -217,7 +217,7 @@ SfxSlotInfo FN_AUTOFORMAT_AUTO SlotName[ greek ] = "刘麸田聆"; SlotName[ dutch ] = "AutoOpmaak bij invoer"; SlotName[ french ] = "AutoFormat pour la saisie"; - SlotName[ spanish ] = "AutoFormato durante la entrada"; + SlotName[ spanish ] = "Formateado autom醫ico durante la entrada"; SlotName[ finnish ] = "Automaattinen muotoilu kirjoitettaessa"; SlotName[ italian ] = "Foramttazione automatica durante la digitazione"; SlotName[ danish ] = "AutoFormat ved indtastning"; @@ -241,7 +241,7 @@ SfxSlotInfo FN_AUTOFORMAT_REDLINE_APPLY SlotName[ russian ] = "橡桁屙栩 镟疣戾蝠 噔蝾纛痨囹 镱潋忮痄栩 桤戾礤龛"; SlotName[ dutch ] = "AutoOpmaak-opties toepassen en wijzigingen bevestigen"; SlotName[ french ] = "Utiliser les options d'AutoFormat et confirmer les modifications"; - SlotName[ spanish ] = "AutoFormato-Aplicar opciones y confirmar modificaciones"; + SlotName[ spanish ] = "Aplicar opciones del Formateado autom醫ico y confirmar modificaciones"; SlotName[ italian ] = "Applica le opzioni della Formattazione automatica e conferma le modifiche"; SlotName[ danish ] = "Anvend AutoFormat-indstillinger og bekr鎓t 鎛dringer"; SlotName[ swedish ] = "Anv鋘d autoformat-alternativ och bekr鋐ta 鋘dringar"; @@ -267,10 +267,10 @@ SfxSlotInfo FN_BACKSPACE SlotName [ english ] = "R點kschritt"; SlotName[ english_us ] = "Backspace"; SlotName[ portuguese ] = "Retroceder"; - SlotName[ russian ] = "Backspace"; + SlotName[ russian ] = "孰噔桫 Backspace"; SlotName[ dutch ] = "Backspace"; SlotName[ french ] = "RetArr"; - SlotName[ spanish ] = "Retroceder"; + SlotName[ spanish ] = "Retroceso"; SlotName[ italian ] = "Backspace"; SlotName[ danish ] = "Tilbage"; SlotName[ swedish ] = "Backsteg"; @@ -370,7 +370,7 @@ SfxSlotInfo FN_CHANGE_DBFIELD SlotName[ dutch ] = "Database wijzigen"; SlotName[ chinese_simplified ] = "鏇存敼鏁版嵁搴"; SlotName[ greek ] = "岭脶戕 廛箸 溴滹戾睨"; - SlotName[ korean ] = "雿办澊韯半矤鞚挫姢 靾橃爼"; + SlotName[ korean ] = "雿办澊韯半矤鞚挫姢 氤瓴"; SlotName[ turkish ] = "Veritaban齨 d鼁enle"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Canvia la base de dades"; @@ -443,7 +443,7 @@ SfxSlotInfo FN_CHAR_LEFT_SEL SlotName[ portuguese ] = "Seleccionar car醕ter esquerda"; SlotName[ russian ] = "蔓溴腓螯 耔焘铍 耠邂"; SlotName[ dutch ] = "Tekens links selecteren"; - SlotName[ french ] = "S閘ect. carat鑢e gauche"; + SlotName[ french ] = "S閘ectionner le caract鑢e gauche"; SlotName[ spanish ] = "Seleccionar car醕ter a la izquierda"; SlotName[ italian ] = "Seleziona carattere sinistro"; SlotName[ danish ] = "Marker tegn til venstre"; @@ -501,7 +501,7 @@ SfxSlotInfo FN_CHAR_RIGHT_SEL SlotName[ portuguese ] = "Seleccionar car醕ter direita"; SlotName[ russian ] = "蔓溴腓螯 耔焘铍 耧疣忄"; SlotName[ dutch ] = "Teken rechts selecteren"; - SlotName[ french ] = "S閘ect. caract鑢e droite"; + SlotName[ french ] = "S閘ectionner le caract鑢e droite"; SlotName[ spanish ] = "Seleccionar car醕ter a la derecha"; SlotName[ italian ] = "Seleziona carattere destro"; SlotName[ danish ] = "Marker tegn til h鴍re"; @@ -573,7 +573,7 @@ SfxSlotInfo FN_CONVERT_TEXT_TABLE SlotName[ dutch ] = "Converteer tabel/tekst"; SlotName[ chinese_simplified ] = "杞崲 琛ㄦ牸/鏂囨湰"; SlotName[ greek ] = "体翎赳镳 疬磲赆/赍哽屙"; - SlotName[ korean ] = "響/韰嶌姢韸 氤頇"; + SlotName[ korean ] = "響滌檧 韰嶌姢韸 氤頇"; SlotName[ turkish ] = "Tablo/metin d鰊t黵"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Converteix la taula/el text"; @@ -602,7 +602,7 @@ SfxSlotInfo FN_DEC_INDENT_OFFSET SlotName[ dutch ] = "Inspringing om getal verkleinen"; SlotName[ chinese_simplified ] = "鍑忓皯缂╄繘鍊"; SlotName[ greek ] = "体啭箸 弩秣掾 赆糗 翮 糸燹"; - SlotName[ korean ] = "霌れ棳鞊瓣赴, 臧掚韥 欷勳瀯"; + SlotName[ korean ] = "霌れ棳鞊瓣赴 臧 欷勳瀯"; SlotName[ turkish ] = "Girintiyi k黮t"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Disminueix el valor del sagnat"; @@ -618,7 +618,7 @@ SfxSlotInfo FN_DELETE_BACK_LINE SlotName[ russian ] = "蔓溴腓螯 漕 磬鬣豚 耱痤觇"; SlotName[ dutch ] = "Tot aan begin regel wissen"; SlotName[ french ] = "Supprimer jusq'au d閎ut de la ligne"; - SlotName[ spanish ] = "Eliminar hasta el comienzo de la l韓ea"; + SlotName[ spanish ] = "Borrar hasta el comienzo de la l韓ea"; SlotName[ italian ] = "Cancella fino all'inzio della riga"; SlotName[ danish ] = "Slet til begyndelsen af r鎘ken"; SlotName[ swedish ] = "Radera till b鰎jan av rad"; @@ -631,7 +631,7 @@ SfxSlotInfo FN_DELETE_BACK_LINE SlotName[ dutch ] = "Tot aan begin regel wissen"; SlotName[ chinese_simplified ] = "鍒犻櫎鑷宠棣"; SlotName[ greek ] = "拈徙襻鲛 甍 翮 狁鬓 翮 泷犰燹"; - SlotName[ korean ] = "頄 鞁滌瀾 攵攵勱箤歆 靷牅"; + SlotName[ korean ] = "欷 鞁滌瀾旯岇 靷牅"; SlotName[ turkish ] = "Sat齬 bana kadar sil"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Suprimeix fins a l'inici de la l韓ia"; @@ -647,7 +647,7 @@ SfxSlotInfo FN_DELETE_BACK_PARA SlotName[ russian ] = "愉嚯栩 漕 磬鬣豚 噌玎鲟"; SlotName[ dutch ] = "Tot aan begin alinea wissen"; SlotName[ french ] = "Supprimer jusqu'au d閎ut du paragraphe"; - SlotName[ spanish ] = "Eliminar hasta el comienzo del p醨rafo"; + SlotName[ spanish ] = "Borrar hasta el comienzo del p醨rafo"; SlotName[ italian ] = "Cancella fino alla fine del paragrafo"; SlotName[ danish ] = "Slet til begyndelsen af afsnittet"; SlotName[ swedish ] = "Radera till b鰎jan av stycke"; @@ -660,7 +660,7 @@ SfxSlotInfo FN_DELETE_BACK_PARA SlotName[ dutch ] = "Tot aan begin alinea wissen"; SlotName[ chinese_simplified ] = "鍒犻櫎鑷虫钀界殑璧峰浣嶇疆"; SlotName[ greek ] = "拈徙襻鲛 甍 翮 狁鬓 翮 疳襻泷荟秕"; - SlotName[ korean ] = "雼澖 鞁滌瀾 攵攵勱箤歆 靷牅"; + SlotName[ korean ] = "雼澖 鞁滌瀾旯岇 靷牅"; SlotName[ turkish ] = "Paragraf bana kadar sil"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Suprimeix fins a l'inici del par鄃raf"; @@ -675,8 +675,8 @@ SfxSlotInfo FN_DELETE_BACK_SENT SlotName[ portuguese ] = "Eliminar at ao in韈io da frase"; SlotName[ russian ] = "愉嚯栩 漕 磬鬣豚 镳邃腩驽龛"; SlotName[ dutch ] = "Tot aan begin zin wissen"; - SlotName[ french ] = "Suppr. jusqu'au d閎ut de la page"; - SlotName[ spanish ] = "Eliminar hasta el comienzo de la frase"; + SlotName[ french ] = "Supprimer jusqu'au d閎ut de la page"; + SlotName[ spanish ] = "Borrar hasta el comienzo de la frase"; SlotName[ italian ] = "Cancella fino all'inizio della frase"; SlotName[ danish ] = "Slet til begyndelsen af s鎡ningen"; SlotName[ swedish ] = "Radera till b鰎jan av meningen"; @@ -689,7 +689,7 @@ SfxSlotInfo FN_DELETE_BACK_SENT SlotName[ dutch ] = "Tot aan begin zin wissen"; SlotName[ chinese_simplified ] = "鍒犻櫎鑷冲彞棣"; SlotName[ greek ] = "拈徙襻鲛 甍 翮 狁鬓 翮 瘃狍珧"; - SlotName[ korean ] = "氍胳灔 鞁滌瀾 攵攵勱箤歆 靷牅"; + SlotName[ korean ] = "氍胳灔 鞁滌瀾旯岇 靷牅"; SlotName[ turkish ] = "C黰le bana kadar sil"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Suprimeix fins a l'inici de la frase"; @@ -705,7 +705,7 @@ SfxSlotInfo FN_DELETE_BACK_WORD SlotName[ russian ] = "愉嚯栩 漕 磬鬣豚 耠钼"; SlotName[ dutch ] = "Tot aan begin woord wissen"; SlotName[ french ] = "Supprimer jusqu'au d閎ut du mot"; - SlotName[ spanish ] = "Eliminar hasta el comienzo de la palabra"; + SlotName[ spanish ] = "Borrar hasta el comienzo de la palabra"; SlotName[ italian ] = "Cancella fino all'inizio della parola"; SlotName[ danish ] = "Slet til begyndelsen af ordet"; SlotName[ swedish ] = "Radera till b鰎jan av ord"; @@ -718,7 +718,7 @@ SfxSlotInfo FN_DELETE_BACK_WORD SlotName[ dutch ] = "Tot aan begin woord wissen"; SlotName[ chinese_simplified ] = "鍒犻櫎鑷冲瓧棣"; SlotName[ greek ] = "拈徙襻鲛 甍 翮 狁鬓 翮 胼铉"; - SlotName[ korean ] = "雼柎 鞁滌瀾 攵攵勱箤歆 靷牅"; + SlotName[ korean ] = "鞏措憪旯岇 靷牅"; SlotName[ turkish ] = "S鰖c黭 bana kadar sil"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Suprimeix fins a l'inici de la paraula"; @@ -733,8 +733,8 @@ SfxSlotInfo FN_DELETE_LINE SlotName[ portuguese ] = "Eliminar at ao fim da linha"; SlotName[ russian ] = "愉嚯栩 漕 觐眦 耱痤觇"; SlotName[ dutch ] = "Tot aan einde regel wissen"; - SlotName[ french ] = "Suppr. jusqu' la fin de la ligne"; - SlotName[ spanish ] = "Eliminar hasta el final de la l韓ea"; + SlotName[ french ] = "Supprimer jusqu' la fin de la ligne"; + SlotName[ spanish ] = "Borrar hasta el final de la l韓ea"; SlotName[ italian ] = "Cancella fino a fine riga"; SlotName[ danish ] = "Slet til slutningen af r鎘ken"; SlotName[ swedish ] = "Radera till radslut"; @@ -747,7 +747,7 @@ SfxSlotInfo FN_DELETE_LINE SlotName[ dutch ] = "Tot aan einde regel wissen"; SlotName[ chinese_simplified ] = "鍒犻櫎鑷宠鏈"; SlotName[ greek ] = "拈徙襻鲛 甍 麸 糨腼 翮 泷犰燹"; - SlotName[ korean ] = "頄 雭濌箤歆 靷牅"; + SlotName[ korean ] = "欷 雭濌箤歆 靷牅"; SlotName[ turkish ] = "Sat齬 sonuna kadar sil"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Suprimeix fins al final de la l韓ia"; @@ -762,8 +762,8 @@ SfxSlotInfo FN_DELETE_PARA SlotName[ portuguese ] = "Eliminar at ao fim do par醙rafo"; SlotName[ russian ] = "愉嚯栩 漕 觐眦 噌玎鲟"; SlotName[ dutch ] = "Tot aan einde alinea wissen"; - SlotName[ french ] = "Suppr. jusqu' la fin du paragraphe"; - SlotName[ spanish ] = "Eliminar hasta el final del p醨rafo"; + SlotName[ french ] = "Supprimer jusqu' la fin du paragraphe"; + SlotName[ spanish ] = "Borrar hasta el final del p醨rafo"; SlotName[ italian ] = "Cancella fino alla fine del paragrafo"; SlotName[ danish ] = "Slet til slutningen af afsnittet"; SlotName[ swedish ] = "Radera till slutet av stycket"; @@ -792,7 +792,7 @@ SfxSlotInfo FN_DELETE_SENT SlotName[ russian ] = "愉嚯栩 漕 觐眦 镳邃腩驽龛"; SlotName[ dutch ] = "Tot aan einde zin wissen"; SlotName[ french ] = "Supprimer jusqu' la fin de la phrase"; - SlotName[ spanish ] = "Eliminar hasta el final de la frase"; + SlotName[ spanish ] = "Borrar hasta el final de la frase"; SlotName[ italian ] = "Cancella fino alla fine della riga"; SlotName[ danish ] = "Slet til slutningen af s鎡ningen"; SlotName[ swedish ] = "Radera till slutet av mening"; @@ -821,7 +821,7 @@ SfxSlotInfo FN_DELETE_WHOLE_LINE SlotName[ russian ] = "愉嚯栩 耱痤牦"; SlotName[ dutch ] = "Rij wissen"; SlotName[ french ] = "Supprimer la ligne"; - SlotName[ spanish ] = "Eliminar l韓ea"; + SlotName[ spanish ] = "Borrar fila"; SlotName[ italian ] = "Elimina riga"; SlotName[ danish ] = "Slet r鎘ken"; SlotName[ swedish ] = "Radera rad"; @@ -850,7 +850,7 @@ SfxSlotInfo FN_DELETE_WORD SlotName[ russian ] = "愉嚯栩 漕 觐眦 耠钼"; SlotName[ dutch ] = "Tot aan einde woord wissen"; SlotName[ french ] = "Supprimer jusqu' la fin du mot"; - SlotName[ spanish ] = "Eliminar hasta el final de la palabra"; + SlotName[ spanish ] = "Borrar hasta el final de la palabra"; SlotName[ italian ] = "Cancella fino alla fine della pagina"; SlotName[ danish ] = "Slet til slutningen af ordet"; SlotName[ swedish ] = "Radera till slutet av ord"; @@ -863,7 +863,7 @@ SfxSlotInfo FN_DELETE_WORD SlotName[ dutch ] = "Tot aan einde woord wissen"; SlotName[ chinese_simplified ] = "鍒犻櫎鑷冲瓧鏈"; SlotName[ greek ] = "拈徙襻鲛 甍 麸 糨腼 翮 胼铄"; - SlotName[ korean ] = "雼柎 雭濌箤歆 靷牅"; + SlotName[ korean ] = "鞏措旯岇 靷牅"; SlotName[ turkish ] = "S鰖c黭 sonuna kadar sil"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Suprimeix fins al final de la paraula"; @@ -950,7 +950,7 @@ SfxSlotInfo FN_EDIT_FIELD SlotName[ dutch ] = "Veldopdracht"; SlotName[ chinese_simplified ] = "瀛楁鎸囦护"; SlotName[ greek ] = "彭麸朕 疱溥秕"; - SlotName[ korean ] = "頃勲摐氇呺牴"; + SlotName[ korean ] = "頃勲摐"; SlotName[ turkish ] = "Alan 鲳esi"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Camps"; @@ -1063,7 +1063,7 @@ SfxSlotInfo FN_EDIT_LINK_DLG SlotName[ chinese_simplified ] = "閾炬帴"; SlotName[ language_user1 ] = " "; SlotName[ greek ] = "吁礓蒹彘"; - SlotName[ korean ] = "鞐瓣舶"; + SlotName[ korean ] = "毵來伂"; SlotName[ turkish ] = "Ba餷ant齦ar"; SlotName[ catalan ] = "Enlla鏾s"; SlotName[ finnish ] = "Linkit"; @@ -1078,7 +1078,7 @@ SfxSlotInfo FN_EDIT_REGION SlotName[ russian ] = "朽玟咫"; SlotName[ dutch ] = "Bereiken"; SlotName[ french ] = "Sections"; - SlotName[ spanish ] = "羠eas"; + SlotName[ spanish ] = "Secciones"; SlotName[ italian ] = "Sezioni"; SlotName[ danish ] = "Omr錮er"; SlotName[ swedish ] = "Omr錮en"; @@ -1091,7 +1091,7 @@ SfxSlotInfo FN_EDIT_REGION SlotName[ dutch ] = "Bereiken"; SlotName[ chinese_simplified ] = "鍖哄煙"; SlotName[ greek ] = "彭玺弪"; - SlotName[ korean ] = "氩旍渼"; + SlotName[ korean ] = "甑棴"; SlotName[ turkish ] = "B鰈黰"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Seccions"; @@ -1121,7 +1121,7 @@ SfxSlotInfo FN_END_DOC_DIRECT SlotName[ chinese_simplified ] = "鐩存帴杞埌鏂囨。鐨勭粨鏉熶綅缃"; SlotName[ language_user1 ] = " "; SlotName[ greek ] = "琉 艴桢哚 瘃矧 麸 糨腼 麸 邈泷荟秕"; - SlotName[ korean ] = "氍胳劀雭濎棎 氚旊"; + SlotName[ korean ] = "氍胳劀 雭濎棎 歆侅爲"; SlotName[ turkish ] = "Do餽udan belge sonuna"; SlotName[ catalan ] = "Directament al final del document"; SlotName[ finnish ] = "Suoraan asiakirjan loppuun"; @@ -1222,7 +1222,7 @@ SfxSlotInfo FN_END_OF_LINE SlotName[ portuguese ] = "Ir para fim da linha"; SlotName[ russian ] = "念 觐眦 耱痤觇"; SlotName[ dutch ] = "Naar einde regel"; - SlotName[ french ] = "A la fin de la ligne"; + SlotName[ french ] = " la fin de la ligne"; SlotName[ spanish ] = "Ir al final de la l韓ea"; SlotName[ italian ] = "Alla fine della riga"; SlotName[ danish ] = "Til r鎘kens slutning"; @@ -1251,7 +1251,7 @@ SfxSlotInfo FN_END_OF_LINE_SEL SlotName[ portuguese ] = "Seleccionar at fim da linha"; SlotName[ russian ] = "蔓溴腓螯 漕 觐眦 耱痤觇"; SlotName[ dutch ] = "Tot aan einde regel selecteren"; - SlotName[ french ] = "S閘ect. jusqu' la fin de la ligne"; + SlotName[ french ] = "S閘ectionner jusqu' la fin de la ligne"; SlotName[ spanish ] = "Seleccionar hasta el final de la l韓ea"; SlotName[ italian ] = "Seleziona fino alla fine della linea"; SlotName[ danish ] = "Marker til r鎘kens slutning"; @@ -1265,7 +1265,7 @@ SfxSlotInfo FN_END_OF_LINE_SEL SlotName[ dutch ] = "Tot aan einde regel selecteren"; SlotName[ chinese_simplified ] = "閫夋嫨鑷宠鏈"; SlotName[ greek ] = "硼殡镢 甍 麸 糨腼 翮 泷犰燹"; - SlotName[ korean ] = "頄 雭濌箤歆 靹犿儩"; + SlotName[ korean ] = "欷 雭濌箤歆 靹犿儩"; SlotName[ turkish ] = "Sat齬 sonuna kadara se"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Selecciona fins al final de la l韓ia"; @@ -1280,7 +1280,7 @@ SfxSlotInfo FN_END_OF_NEXT_COLUMN SlotName[ portuguese ] = "Ir para fim da coluna seguinte"; SlotName[ russian ] = "念 觐眦 耠邃簋泐 耱铍狯"; SlotName[ dutch ] = "Naar einde volgende kolom"; - SlotName[ french ] = "A la fin de la colonne suivante"; + SlotName[ french ] = " la fin de la colonne suivante"; SlotName[ spanish ] = "Ir al final de la columna siguiente"; SlotName[ italian ] = "Alla fine della colonna successiva"; SlotName[ danish ] = "TIl n鎠te kolonnes slutning"; @@ -1338,7 +1338,7 @@ SfxSlotInfo FN_END_OF_NEXT_PAGE_SEL SlotName[ portuguese ] = "Seleccionar at fim da p醙ina seguinte"; SlotName[ russian ] = "蔓溴腓螯 漕 觐眦 耠邃簋 耱疣龛鳆"; SlotName[ dutch ] = "Tot aan einde volgende pagina selecteren"; - SlotName[ french ] = "S閘ect. jusqu' la fin de la page suivante"; + SlotName[ french ] = "S閘ectionner jusqu' la fin de la page suivante"; SlotName[ spanish ] = "Seleccionar hasta el final de la p醙ina siguiente"; SlotName[ italian ] = "Seleziona fino alla fine della pagina successiva"; SlotName[ danish ] = "Marker til n鎠te sides slutning"; @@ -1396,7 +1396,7 @@ SfxSlotInfo FN_END_OF_PAGE_SEL SlotName[ portuguese ] = "Seleccionar at fim da p醙ina"; SlotName[ russian ] = "蔓溴腓螯 漕 觐眦 耱疣龛鳆"; SlotName[ dutch ] = "Tot aan einde pagina selecteren"; - SlotName[ french ] = "S閘ect. jusqu' la fin de la page"; + SlotName[ french ] = "S閘ectionner jusqu' la fin de la page"; SlotName[ spanish ] = "Seleccionar hasta el final de la p醙ina"; SlotName[ italian ] = "Seleziona fino alla fine della pagina"; SlotName[ danish ] = "Marker til sidens slutning"; @@ -1454,7 +1454,7 @@ SfxSlotInfo FN_END_OF_PARA_SEL SlotName[ portuguese ] = "Seleccionar at fim do par醙rafo"; SlotName[ russian ] = "蔓溴腓螯 漕 觐眦 噌玎鲟"; SlotName[ dutch ] = "Tot aan einde alinea selecteren"; - SlotName[ french ] = "S閘ect. jusqu' la fin du paragraphe"; + SlotName[ french ] = "S閘ectionner jusqu' la fin du paragraphe"; SlotName[ spanish ] = "Seleccionar hasta final del p醨rafo"; SlotName[ italian ] = "Seleziona fino alla fine del paragrafo"; SlotName[ danish ] = "Marker til afsnittets slutning"; @@ -1541,7 +1541,7 @@ SfxSlotInfo FN_END_OF_PREV_PAGE_SEL SlotName[ portuguese ] = "Seleccionar at fim da p醙ina anterior"; SlotName[ russian ] = "蔓溴腓螯 漕 觐眦 镳邃簌彘 耱疣龛鳆"; SlotName[ dutch ] = "Tot aan einde vorige pagina selecteren"; - SlotName[ french ] = "S閘ect. jusqu' la fin de la page pr閏閐ente"; + SlotName[ french ] = "S閘ectionner jusqu' la fin de la page pr閏閐ente"; SlotName[ spanish ] = "Seleccionar hasta el final de la p醙ina anterior"; SlotName[ italian ] = "Fino alla fine della pagina precedente"; SlotName[ danish ] = "Marker til forrige sides slutning"; @@ -1613,7 +1613,7 @@ SfxSlotInfo FN_ENVELOP SlotName[ dutch ] = "Envelop invoegen"; SlotName[ chinese_simplified ] = "鎻掑叆淇″皝"; SlotName[ greek ] = "砰筢泫戕 鲠贻腼"; - SlotName[ korean ] = "韼胳 氪夗埇 靷届瀰"; + SlotName[ korean ] = "韼胳氪夗埇 靷届瀰"; SlotName[ turkish ] = "Zarf ekle"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Insereix un sobre"; @@ -1687,7 +1687,7 @@ SfxSlotInfo FN_EXPAND_GLOSSARY SlotName[ russian ] = "蔓镱腠栩 玎镨顸 噔蝾蝈犟蜞"; SlotName[ dutch ] = "AutoTekst-item uitvoeren"; SlotName[ french ] = "Ex閏uter entr閑 AutoTexte"; - SlotName[ spanish ] = "Ejecutar entrada AutoTexto"; + SlotName[ spanish ] = "Ejecutar entrada Texto autom醫ico"; SlotName[ italian ] = "Esegui digitazione testo automatico"; SlotName[ danish ] = "Udf鴕 Autoekst-element"; SlotName[ swedish ] = "Utf鰎 AutoText-post"; @@ -1700,7 +1700,7 @@ SfxSlotInfo FN_EXPAND_GLOSSARY SlotName[ dutch ] = "AutoTekst-item uitvoeren"; SlotName[ chinese_simplified ] = "鎵ц鑷姩鍥炬枃闆嗘潯鐩"; SlotName[ greek ] = "抨糨脲箸 赆翎齄耖箸 刘麸叔殪蓓秕"; - SlotName[ korean ] = "鞛愲彊 韰嶌姢韸革紞鞛呺牓 鞁ろ枆"; + SlotName[ korean ] = "鞛愲彊 韰嶌姢韸 頃 鞁ろ枆"; SlotName[ turkish ] = "Otomatik metin giri㱮ni uygula"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Executa l'entrada de text autom鄑ic"; @@ -1771,7 +1771,7 @@ SfxSlotInfo FN_FOOTNOTE_TO_ANCHOR SlotName [ english ] = "Zu Fu遪ote/Anker"; SlotName[ english_us ] = "To Footnote Anchor"; SlotName[ portuguese ] = "Ir para nota de rodap/鈔cora"; - SlotName[ russian ] = " 耥铖赍/觐瘙"; + SlotName[ russian ] = " 觐瘙 耥铖觇"; SlotName[ dutch ] = "Naar voetnoot/anker"; SlotName[ french ] = " la note d.b.d. page/l'appel de note"; SlotName[ spanish ] = "Ir a la nota al pie/Ancla"; @@ -1787,7 +1787,7 @@ SfxSlotInfo FN_FOOTNOTE_TO_ANCHOR SlotName[ dutch ] = "Naar voetnoot/anker"; SlotName[ chinese_simplified ] = "杞埌娉ㄨ剼/鏍囪"; SlotName[ greek ] = "旭矧 震矬珈暹/零挲聩箸"; - SlotName[ korean ] = "臧侅＜/瓿犾爼"; + SlotName[ korean ] = "臧侅＜ 旮办 鞙勳箻搿"; SlotName[ turkish ] = "Dipnot/sabitleyici"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "A la nota al peu/纍cora"; @@ -1832,7 +1832,7 @@ SfxSlotInfo FN_FORMAT_BORDER_DLG SlotName[ russian ] = "吾疣祀屙桢"; SlotName[ dutch ] = "Omranding"; SlotName[ french ] = "Bordure"; - SlotName[ spanish ] = "Borde"; + SlotName[ spanish ] = "Bordes"; SlotName[ italian ] = "Bordo"; SlotName[ danish ] = "Ramme"; SlotName[ swedish ] = "Inramning"; @@ -1845,7 +1845,7 @@ SfxSlotInfo FN_FORMAT_BORDER_DLG SlotName[ dutch ] = "Omranding"; SlotName[ chinese_simplified ] = "杈规"; SlotName[ greek ] = "绣襁泷犰灬"; - SlotName[ korean ] = "鞕戈辰靹"; + SlotName[ korean ] = "韰岆憪毽"; SlotName[ turkish ] = "Kenarl齥"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Vores"; @@ -1932,7 +1932,7 @@ SfxSlotInfo FN_FORMAT_FRAME_DLG SlotName[ dutch ] = "Kadereigenschappen"; SlotName[ chinese_simplified ] = "鏂囨湰妗嗗睘鎬"; SlotName[ greek ] = "射辄翮翦 痣衢筮秕"; - SlotName[ korean ] = "頂勲爤鞛 霌彪鞝曤炒"; + SlotName[ korean ] = "頂勲爤鞛 霌彪 鞝曤炒"; SlotName[ turkish ] = "莈r鏴ve 鰖ellikleri"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Propietats del marc"; @@ -1961,7 +1961,7 @@ SfxSlotInfo FN_FORMAT_GRAFIC_DLG SlotName[ dutch ] = "Afbeelding bewerken"; SlotName[ chinese_simplified ] = "缂栬緫鍥惧舰"; SlotName[ greek ] = "硼孱羼汜筮 泷狯殛稞"; - SlotName[ korean ] = "攴鸽灅頂 韼胳"; + SlotName[ korean ] = "攴鸽 韼胳"; SlotName[ turkish ] = "Grafik d鼁enle"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Edita el gr鄁ic"; @@ -2035,7 +2035,7 @@ SfxSlotInfo FN_FORMAT_RESET SlotName[ russian ] = "骂耨蜞眍忤螯 囹痂狍螓 梏蜞"; SlotName[ dutch ] = "Tekenattributen herstellen"; SlotName[ french ] = "Restaurer les attributs de caract鑢es"; - SlotName[ spanish ] = "Restablecer fuentes"; + SlotName[ spanish ] = "Restablecer atributos de caracteres"; SlotName[ italian ] = "Ripristina attributi carattere"; SlotName[ danish ] = "Nulstil tegnattributter"; SlotName[ swedish ] = "舤erst鋖l teckenattribut"; @@ -2123,7 +2123,7 @@ SfxSlotInfo FN_FRAME_ALIGN_HORZ_LEFT SlotName[ dutch ] = "Links positioneren"; SlotName[ french ] = "Aligner gauche"; SlotName[ spanish ] = "Alinear a la izquierda"; - SlotName[ italian ] = "Disponi a sinistra"; + SlotName[ italian ] = "Allinea a sinistra"; SlotName[ danish ] = "Placer til venstre"; SlotName[ swedish ] = "Placera till v鋘ster"; SlotName[ polish ] = "Wyr體naj do lewej"; @@ -2193,7 +2193,7 @@ SfxSlotInfo FN_FRAME_ALIGN_VERT_BOTTOM SlotName[ dutch ] = "Beneden positioneren"; SlotName[ chinese_simplified ] = "鍚戜笅瀵归綈"; SlotName[ greek ] = "郁镞鏖箸 贶豉"; - SlotName[ korean ] = "鞎勲灅 毵烄钉"; + SlotName[ korean ] = "鞎勲灅飒 毵烄钉"; SlotName[ turkish ] = "A瘕 hizala"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Alinea a la part inferior"; @@ -2251,7 +2251,7 @@ SfxSlotInfo FN_FRAME_ALIGN_VERT_CHAR_BOTTOM SlotName[ dutch ] = "Onder aan teken positioneren"; SlotName[ chinese_simplified ] = "鍚戜笅鍜屽瓧绗﹀榻"; SlotName[ greek ] = "郁镞鏖箸 瘃矧 麽襻牯揆 贶豉"; - SlotName[ korean ] = "氍胳瀽鞐愳劀 鞎勲灅 毵烄钉"; + SlotName[ korean ] = "氍胳瀽鞚 鞎勲灅飒届溂搿 毵烄钉"; SlotName[ turkish ] = "Karakterin alt kenar ile hizala"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Alinea a la part inferior del car郼ter"; @@ -2309,7 +2309,7 @@ SfxSlotInfo FN_FRAME_ALIGN_VERT_CHAR_TOP SlotName[ dutch ] = "Boven aan teken positioneren"; SlotName[ chinese_simplified ] = "鍚戜笂鍜屽瓧绗﹀榻"; SlotName[ greek ] = "郁镞鏖箸 瘃矧 麽襻牯揆 茼"; - SlotName[ korean ] = "氍胳瀽鞐愳劀 鞙 毵烄钉"; + SlotName[ korean ] = "氍胳瀽鞚 鞙勲 毵烄钉"; SlotName[ turkish ] = "Karakterin 黶t kenar ile hizala"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Alinea a la part superior del car郼ter"; @@ -2338,7 +2338,7 @@ SfxSlotInfo FN_FRAME_ALIGN_VERT_ROW_BOTTOM SlotName[ dutch ] = "Onder aan regel positioneren"; SlotName[ chinese_simplified ] = "鍜岃涓嬫柟瀵归綈"; SlotName[ greek ] = "郁镞鏖箸 瘃矧 泷犰燹 贶豉"; - SlotName[ korean ] = "頄夓棎靹 鞎勲灅 毵烄钉"; + SlotName[ korean ] = "欷 鞎勲灅搿 毵烄钉"; SlotName[ turkish ] = "Sat齬齨 alt kenar ile hizala"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Alinea a la part inferior de la l韓ia"; @@ -2367,7 +2367,7 @@ SfxSlotInfo FN_FRAME_ALIGN_VERT_ROW_CENTER SlotName[ dutch ] = "Verticaal gecentreerd positioneren aan regel"; SlotName[ chinese_simplified ] = "鍨傜洿灞呬腑鍜岃瀵归綈"; SlotName[ greek ] = "梳翎挈聃鲧 赍眙襻耖箪蓓 篝镞鏖箸 瘃矧 泷犰燹"; - SlotName[ korean ] = "頄夓棎靹 靾橃鞙茧 臧鞖措嵃 毵烄钉"; + SlotName[ korean ] = "欷勳棎靹 靾橃鞙茧 臧鞖措嵃 毵烄钉"; SlotName[ turkish ] = "Sat齬a g鰎e dikey ortalayarak hizala"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Alinea al centre vertical de la l韓ia"; @@ -2396,7 +2396,7 @@ SfxSlotInfo FN_FRAME_ALIGN_VERT_ROW_TOP SlotName[ dutch ] = "Boven aan regel positioneren"; SlotName[ chinese_simplified ] = "鍜岃鐨勪笂鏂瑰榻"; SlotName[ greek ] = "郁镞鏖箸 瘃矧 泷犰燹 茼"; - SlotName[ korean ] = "頄夓棎靹 鞙 毵烄钉"; + SlotName[ korean ] = "欷 鞙勲 毵烄钉"; SlotName[ turkish ] = "Sat齬齨 黶t kenar ile hizala"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Alinea a la part superior de la l韓ia"; @@ -2425,7 +2425,7 @@ SfxSlotInfo FN_FRAME_ALIGN_VERT_TOP SlotName[ dutch ] = "Boven positioneren"; SlotName[ chinese_simplified ] = "鍚戜笂瀵归綈"; SlotName[ greek ] = "郁镞鏖箸 疖睐"; - SlotName[ korean ] = "鞙 毵烄钉"; + SlotName[ korean ] = "鞙勳棎 毵烄钉"; SlotName[ turkish ] = "Yukar hizala"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Alinea a la part superior"; @@ -2454,7 +2454,7 @@ SfxSlotInfo FN_FRAME_CHAIN SlotName[ dutch ] = "Koppelen"; SlotName[ chinese_simplified ] = "杩炴帴"; SlotName[ greek ] = "育礓弩"; - SlotName[ korean ] = "鞐瓣舶"; + SlotName[ korean ] = "毵來伂 頂勲爤鞛"; SlotName[ turkish ] = "Ba餷a"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Enlla鏰 els marcs"; @@ -2483,7 +2483,7 @@ SfxSlotInfo FN_FRAME_DOWN SlotName[ dutch ] = "Naar achteren"; SlotName[ chinese_simplified ] = "鍚戝悗"; SlotName[ greek ] = "羞簌"; - SlotName[ korean ] = "霋る"; + SlotName[ korean ] = "霋る 氤措偞旮"; SlotName[ turkish ] = "Geriye g鰊der"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Envia cap enrere"; @@ -2541,7 +2541,7 @@ SfxSlotInfo FN_FRAME_NOWRAP SlotName[ dutch ] = "Omloop uit"; SlotName[ chinese_simplified ] = "涓嶄娇鐢ㄧ幆缁"; SlotName[ greek ] = "琉屙羼泔痫哏箸 犴徜唣膣箸"; - SlotName[ korean ] = "氍胳瀽鞐 氚办箻, 頃挫牅"; + SlotName[ korean ] = "氍胳灔 氚办箻 頃挫牅"; SlotName[ turkish ] = "Metin da瘕l齧 kapal"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Desactiva l'ajustament"; @@ -2556,7 +2556,7 @@ SfxSlotInfo FN_FRAME_TO_ANCHOR SlotName[ portuguese ] = "Colocar cursor sobre a 鈔cora"; SlotName[ russian ] = "玉蜞眍忤螯 牦瘃铕 觐瘙"; SlotName[ dutch ] = "Zet cursor op anker"; - SlotName[ french ] = "Positionne curseur sur l'ancre"; + SlotName[ french ] = "Curseur sur l'ancre"; SlotName[ spanish ] = "Colocar cursor sobre ancla"; SlotName[ italian ] = "Porta cursore all'ancoraggio"; SlotName[ danish ] = "S鎡 mark鴕 p anker"; @@ -2570,7 +2570,7 @@ SfxSlotInfo FN_FRAME_TO_ANCHOR SlotName[ dutch ] = "Zet cursor op anker"; SlotName[ chinese_simplified ] = "缃厜鏍囦簬鏍囪澶"; SlotName[ greek ] = "燥痫栎翮箸 溴哧翮 箦 徙挲聩箸"; - SlotName[ korean ] = "旎れ劀 瓿犾爼 靹れ爼"; + SlotName[ korean ] = "旎れ劀 旮办 鞙勳箻 靹れ爼"; SlotName[ turkish ] = "輒leci, sabitleyici 鼁erine yerle⺶ir"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Situa el cursor sobre l'鄋cora"; @@ -2586,7 +2586,7 @@ SfxSlotInfo FN_FRAME_UNCHAIN SlotName[ russian ] = "朽珙疴囹 疋琰 怵彗铌"; SlotName[ dutch ] = "Koppeling verwijderen"; SlotName[ french ] = "Annuler l'encha頽ement"; - SlotName[ spanish ] = "Eliminar v韓culo"; + SlotName[ spanish ] = "Suprimir encadenamiento"; SlotName[ italian ] = "Annulla concatenazione"; SlotName[ danish ] = "Oph鎣 k鎑er"; SlotName[ swedish ] = "L鰏 upp l鋘kning"; @@ -2599,7 +2599,7 @@ SfxSlotInfo FN_FRAME_UNCHAIN SlotName[ dutch ] = "Koppeling verwijderen"; SlotName[ chinese_simplified ] = "瑙ｅ紑杩炴帴"; SlotName[ greek ] = "梳糗胥珞 簖礓弩珧"; - SlotName[ korean ] = "鞐瓣舶 欷戨嫧"; + SlotName[ korean ] = "頂勲爤鞛 鞐瓣舶 頃挫牅"; SlotName[ turkish ] = "Ba餷amay 琏z"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Desenlla鏰 els marcs"; @@ -2657,7 +2657,7 @@ SfxSlotInfo FN_FRAME_WRAP SlotName[ dutch ] = "Omloop in"; SlotName[ chinese_simplified ] = "浣跨敤鐜粫"; SlotName[ greek ] = "彭羼泔痫哏箸 犴徜唣膣箸"; - SlotName[ korean ] = "氍胳瀽鞐 氚办箻, 鞝侅毄"; + SlotName[ korean ] = "氍胳灔 氚办箻 鞝侅毄"; SlotName[ turkish ] = "Metin da瘕l齧 a琮k"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Activa l'ajustament"; @@ -2670,7 +2670,7 @@ SfxSlotInfo FN_FRAME_WRAP_CONTOUR SlotName [ english ] = "Konturumlauf ein"; SlotName[ english_us ] = "Wrap Contour On"; SlotName[ portuguese ] = "Activar contornos"; - SlotName[ russian ] = "玛. 钺蝈赅龛 镱 觐眚箴"; + SlotName[ russian ] = "吾蝈赅龛 镱 觐眚箴"; SlotName[ dutch ] = "Contouromloop aan"; SlotName[ french ] = "Mode Contour"; SlotName[ spanish ] = "Contorno"; @@ -2686,7 +2686,7 @@ SfxSlotInfo FN_FRAME_WRAP_CONTOUR SlotName[ dutch ] = "Contouromloop aan"; SlotName[ chinese_simplified ] = "鏄剧ず杞粨鐜粫"; SlotName[ greek ] = "体 犴徜唣膣箸 疱耖泷莒灬麸"; - SlotName[ korean ] = "鞙り辰 靾滍櫂 鞝侅毄"; + SlotName[ korean ] = "鞙り辰 氚办箻 鞝侅毄"; SlotName[ turkish ] = "Kontur a琮k"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Activa el contorn"; @@ -2699,7 +2699,7 @@ SfxSlotInfo FN_FRAME_WRAP_IDEAL SlotName [ english ] = "Umlauf dynamisch"; SlotName[ english_us ] = "Wrap Optimal"; SlotName[ portuguese ] = "Ajuste din鈓ico"; - SlotName[ russian ] = "吾蝈赅龛 铒蜩爨朦眍"; + SlotName[ russian ] = "物蜩爨朦眍 钺蝈赅龛"; SlotName[ dutch ] = "Omloop dynamisch"; SlotName[ french ] = "Adaptation dynamique"; SlotName[ spanish ] = "Ajuste din醡ico"; @@ -2716,7 +2716,7 @@ SfxSlotInfo FN_FRAME_WRAP_IDEAL SlotName[ chinese_simplified ] = "鏈浣崇幆缁"; SlotName[ language_user1 ] = " "; SlotName[ greek ] = "孽磲扉贽 犴徜唣膣箸"; - SlotName[ korean ] = "靾滍櫂, 斓滌爜"; + SlotName[ korean ] = "斓滌爜鞙茧 氍胳灔 氚办箻"; SlotName[ turkish ] = "Dinamik metin da瘕l齧"; SlotName[ catalan ] = "Ajustament 騪tim"; SlotName[ finnish ] = "Optimaalinen rivitys"; @@ -2744,7 +2744,7 @@ SfxSlotInfo FN_FRAME_WRAP_LEFT SlotName[ dutch ] = "Omloop links"; SlotName[ chinese_simplified ] = "宸﹀悜鐜粫"; SlotName[ greek ] = "另徜唣膣箸 狁轶翦褴"; - SlotName[ korean ] = "靾滍櫂, 鞕检"; + SlotName[ korean ] = "氍胳灔 氚办箻 鞕检"; SlotName[ turkish ] = "Sol metin da瘕l齧"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Ajusta a l'esquerra"; @@ -2773,7 +2773,7 @@ SfxSlotInfo FN_FRAME_WRAP_RIGHT SlotName[ dutch ] = "Omloop rechts"; SlotName[ chinese_simplified ] = "鍙冲悜鐜粫"; SlotName[ greek ] = "另徜唣膣箸 溴铋"; - SlotName[ korean ] = "靾滍櫂, 鞓るジ飒"; + SlotName[ korean ] = "氍胳灔 氚办箻 鞓るジ飒"; SlotName[ turkish ] = "Sa metin da瘕l齧"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Ajusta a la dreta"; @@ -2802,7 +2802,7 @@ SfxSlotInfo FN_FRAME_WRAPTHRU SlotName[ dutch ] = "Doorloop"; SlotName[ chinese_simplified ] = "璐┛"; SlotName[ greek ] = "拈 燧箫"; - SlotName[ korean ] = "氍胳灔頋愲ゴ旮"; + SlotName[ korean ] = "氚办箻 鞐嗢潓"; SlotName[ turkish ] = "Metin arkas齨a g鰊der"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Ajustament a trav閟 de"; @@ -2821,7 +2821,7 @@ SfxSlotInfo FN_FRAME_WRAPTHRU_TRANSP SlotName[ spanish ] = "Continuo transparente"; SlotName[ italian ] = "Attraversa trasparente"; SlotName[ danish ] = "Transparent gennemg錯nde"; - SlotName[ swedish ] = "Tranparent textgenomfl鰀e"; + SlotName[ swedish ] = "Transparent textgenomfl鰀e"; SlotName[ polish ] = "Prze焤oczysty przep硑w tekstu"; SlotName[ portuguese_brazilian ] = "FrameWrapThroughTransparent"; SlotName[ japanese ] = "鑳屾櫙銇ㄣ仐銇"; @@ -2831,7 +2831,7 @@ SfxSlotInfo FN_FRAME_WRAPTHRU_TRANSP SlotName[ dutch ] = "Doorloop transparant"; SlotName[ chinese_simplified ] = "閫忔槑璐┛"; SlotName[ greek ] = "另徜唣膣箸 溟狯犴蒡"; - SlotName[ korean ] = "氍胳灔頋愲ゴ旮, 韴獏"; + SlotName[ korean ] = "氚瓣步鞙茧"; SlotName[ turkish ] = "Metin arkas齨a g鰊der (saydam)"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Ajustament transparent"; @@ -2847,7 +2847,7 @@ SfxSlotInfo FN_GLOSSARY_DLG SlotName[ russian ] = "棱蝾蝈犟"; SlotName[ dutch ] = "AutoTekst bewerken"; SlotName[ french ] = "蒬iter l'AutoTexte"; - SlotName[ spanish ] = "Editar AutoTexto"; + SlotName[ spanish ] = "Editar Texto autom醫ico"; SlotName[ italian ] = "Modifica testo automatico"; SlotName[ danish ] = "Rediger AutoTekst"; SlotName[ swedish ] = "Redigera AutoText"; @@ -2860,7 +2860,7 @@ SfxSlotInfo FN_GLOSSARY_DLG SlotName[ dutch ] = "AutoTekst bewerken"; SlotName[ chinese_simplified ] = "缂栬緫鑷姩鍥炬枃闆"; SlotName[ greek ] = "硼孱羼汜筮 刘麸叔哽屙"; - SlotName[ korean ] = "鞛愲彊韰嶌姢韸 韼胳"; + SlotName[ korean ] = "鞛愲彊 韰嶌姢韸 韼胳"; SlotName[ turkish ] = "Otomatik metni d鼁enle"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Edita el text autom鄑ic"; @@ -2889,7 +2889,7 @@ SfxSlotInfo FN_GOTO_NEXT_INPUTFLD SlotName[ dutch ] = "Naar volgend invoerveld"; SlotName[ chinese_simplified ] = "杞埌涓嬩竴涓緭鍏ュ瓧娈"; SlotName[ greek ] = "旭矧 麸 屦屙 疱溥 彘筢泫戕"; - SlotName[ korean ] = "雼れ潓 鞛呺牓頃勲摐搿"; + SlotName[ korean ] = "雼れ潓 鞛呺牓 頃勲摐搿"; SlotName[ turkish ] = "Sonraki giri alan"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Al camp d'entrada seg黣nt"; @@ -2918,7 +2918,7 @@ SfxSlotInfo FN_GOTO_NEXT_MARK SlotName[ dutch ] = "Naar volgende plaatsvervanger"; SlotName[ chinese_simplified ] = "杞埌涓嬩竴涓氶厤绗"; SlotName[ greek ] = "旭矧 麸 屦屙 簖焘镫 犟荇珞珧 栎箸"; - SlotName[ korean ] = "雼れ潓 鞕鞚茧摐旃措摐搿"; + SlotName[ korean ] = "雼れ潓 頂岆爤鞚挫姢頇雿旊"; SlotName[ turkish ] = "Sonraki genel arama karakteri"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Al marcador seg黣nt"; @@ -2963,7 +2963,7 @@ SfxSlotInfo FN_GOTO_NEXT_REGION SlotName[ russian ] = "念 耠邃簋泐 疣玟咫"; SlotName[ dutch ] = "Naar volgend bereik"; SlotName[ french ] = " la section suivante"; - SlotName[ spanish ] = "Al 醨ea siguiente"; + SlotName[ spanish ] = "Ir a la secci髇 siguiente"; SlotName[ italian ] = "All'area successiva"; SlotName[ danish ] = "Til n鎠te omr錮e"; SlotName[ swedish ] = "Till n鋝ta omr錮e"; @@ -2976,7 +2976,7 @@ SfxSlotInfo FN_GOTO_NEXT_REGION SlotName[ dutch ] = "Naar volgend bereik"; SlotName[ chinese_simplified ] = "杞埌涓嬩竴鍖哄煙"; SlotName[ greek ] = "硼屙 屙玺"; - SlotName[ korean ] = "雼れ潓 鞓侅棴鞙茧"; + SlotName[ korean ] = "雼れ潓 甑棴鞙茧"; SlotName[ turkish ] = "Sonraki b鰈黰"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "A la secci seg黣nt"; @@ -3005,7 +3005,7 @@ SfxSlotInfo FN_GOTO_PREV_INPUTFLD SlotName[ dutch ] = "Naar vorig invoerveld"; SlotName[ chinese_simplified ] = "杞埌涓婁竴涓緭鍏ュ瓧娈"; SlotName[ greek ] = "旭矧 麸 瘃镧泔屙 疱溥 彘筢泫戕"; - SlotName[ korean ] = "鞚挫爠 鞛呺牓頃勲摐搿"; + SlotName[ korean ] = "鞚挫爠 鞛呺牓 頃勲摐搿"; SlotName[ turkish ] = "謓ceki giri alan"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Al camp d'entrada anterior"; @@ -3034,7 +3034,7 @@ SfxSlotInfo FN_GOTO_PREV_MARK SlotName[ dutch ] = "Naar vorige plaatsvervanger"; SlotName[ chinese_simplified ] = "杞埌涓婁竴涓氶厤绗"; SlotName[ greek ] = "旭矧 麸 瘃镧泔屙 簖焘镫 犟荇珞珧 栎箸"; - SlotName[ korean ] = "鞚挫爠 頂岆爤鞚挫姢頇雿旊"; + SlotName[ korean ] = "鞚挫爠 頂岆爤鞚挫姢頇雿旊"; SlotName[ turkish ] = "謓ceki genel arama karakteri"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Al marcador anterior"; @@ -3079,7 +3079,7 @@ SfxSlotInfo FN_GOTO_PREV_REGION SlotName[ russian ] = "念 镳邃簌邈 疣玟咫"; SlotName[ dutch ] = "Naar vorige bereik"; SlotName[ french ] = " la section pr閏閐ente"; - SlotName[ spanish ] = "Ir al 醨ea anterior"; + SlotName[ spanish ] = "Ir a la secci髇 anterior"; SlotName[ italian ] = "All'area precedente"; SlotName[ danish ] = "Til forrige omr錮e"; SlotName[ swedish ] = "Till f鰎eg錯nde omr錮e"; @@ -3092,7 +3092,7 @@ SfxSlotInfo FN_GOTO_PREV_REGION SlotName[ dutch ] = "Naar vorige bereik"; SlotName[ chinese_simplified ] = "杞埌涓婁竴涓尯鍩"; SlotName[ greek ] = "旭镧泔屙 屙玺"; - SlotName[ korean ] = "鞚挫爠 鞓侅棴鞙茧"; + SlotName[ korean ] = "鞚挫爠 甑棴鞙茧"; SlotName[ turkish ] = "謓ceki alan"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "A la secci anterior"; @@ -3151,7 +3151,7 @@ SfxSlotInfo FN_GRAPHIC_MIRROR_ON_EVEN_PAGES SlotName[ chinese_simplified ] = "鍥惧舰缈昏浆鍒板伓鏁伴〉闈"; SlotName[ language_user1 ] = " "; SlotName[ greek ] = "另狍赳秭 泷狯殛稞 篝轵 荞糸弪 箦脒溴"; - SlotName[ korean ] = "歆濎垬 韼橃澊歆靸侅潣 攴鸽灅頂 雽旃"; + SlotName[ korean ] = "攴鸽鞚 歆濎垬 韼橃澊歆鞐 氚橃爠"; SlotName[ turkish ] = "Grafi餴 鏸ft say齦 sayfalarda yans齮"; SlotName[ catalan ] = "Inverteix els gr鄁ics de les p鄃ines parells"; SlotName[ finnish ] = "K滗nn grafiikka parillisilla sivuilla"; @@ -3237,7 +3237,7 @@ SfxSlotInfo FN_HYPHENATE_OPT_DLG SlotName[ dutch ] = "Woordafbreking"; SlotName[ chinese_simplified ] = "杩炲瓧绗"; SlotName[ greek ] = "吁腚徕轶禳"; - SlotName[ korean ] = "頃橃澊頂"; + SlotName[ korean ] = "頃橃澊頂 雱ｊ赴"; SlotName[ turkish ] = "Heceleme"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Partici de mots"; @@ -3527,7 +3527,7 @@ SfxSlotInfo FN_INSERT_FIELD SlotName[ dutch ] = "Dialoogvenster voor veldopdrachten"; SlotName[ chinese_simplified ] = "瀛楁鎸囦护瀵硅瘽妗"; SlotName[ greek ] = "砰筢泫戕 屙麸朕 疱溥秕"; - SlotName[ korean ] = "頃勲摐 氇呺牴鞏 雽頇旍儊鞛"; + SlotName[ korean ] = "頃勲摐 雽頇旍儊鞛"; SlotName[ turkish ] = "Alan 鲳esi ekle"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Di鄉eg Camps"; @@ -3556,7 +3556,7 @@ SfxSlotInfo FN_INSERT_FIELD_CTRL SlotName[ dutch ] = "Veldopdrachten invoegen"; SlotName[ chinese_simplified ] = "鎻掑叆瀛楁鎸囦护"; SlotName[ greek ] = "砰筢泫戕 屙麸朕 疱溥秕"; - SlotName[ korean ] = "頃勲摐氇呺牴 靷届瀰"; + SlotName[ korean ] = "頃勲摐 靷届瀰"; SlotName[ turkish ] = "Alan 鲳eleri ekle"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Insereix camps"; @@ -3572,7 +3572,7 @@ SfxSlotInfo FN_INSERT_FLD_AUTHOR SlotName[ russian ] = "埋蜞忤螯 镱脲 噔蝾疣"; SlotName[ dutch ] = "Auteursveld invoegen"; SlotName[ french ] = "Ins閞er un champ d'auteur"; - SlotName[ spanish ] = "Insertar campo para autor"; + SlotName[ spanish ] = "Insertar campo del autor"; SlotName[ italian ] = "Inserisci campo autore"; SlotName[ danish ] = "Inds鎡 forfatterfelt"; SlotName[ swedish ] = "Infoga f鰎fattarf鋖t"; @@ -3585,7 +3585,7 @@ SfxSlotInfo FN_INSERT_FLD_AUTHOR SlotName[ dutch ] = "Auteursveld invoegen"; SlotName[ chinese_simplified ] = "鎻掑叆浣滆呭瓧娈"; SlotName[ greek ] = "砰筢泫戕 疱溥 篚沣襻鲚"; - SlotName[ korean ] = "毵岆摖鞚 頃勲摐 靷届瀰"; + SlotName[ korean ] = "鞛戩劚鞛 頃勲摐 靷届瀰"; SlotName[ turkish ] = "Yazan ad alan ekle"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Insereix el camp Autor"; @@ -3746,7 +3746,7 @@ SfxSlotInfo FN_INSERT_FLD_TOPIC SlotName[ russian ] = "埋蜞忤螯 蝈祗"; SlotName[ dutch ] = "Onderwerp invoegen"; SlotName[ french ] = "Ins閞er l'objet"; - SlotName[ spanish ] = "Insertar tema"; + SlotName[ spanish ] = "Insertar el asunto"; SlotName[ italian ] = "Inserisci argomento"; SlotName[ danish ] = "Inds鎡 emne"; SlotName[ swedish ] = "Infoga 鋗ne"; @@ -3899,7 +3899,7 @@ SfxSlotInfo FN_INSERT_FRAME_INTERACT_NOCOL SlotName[ polish ] = "Wstaw r阠znie ramk z jedn kolumn"; SlotName[ portuguese_brazilian ] = "Insert single column frame manually"; SlotName[ japanese ] = "1娈点伄鏋犮倰鎵嬪嫊鎸垮叆"; - SlotName[ korean ] = "1鞐 頂勲爤鞛 靾橂彊鞙茧 靷届瀰"; + SlotName[ korean ] = "頃 雼潣 頂勲爤鞛勳潉 靾橂彊鞙茧 靷届瀰"; SlotName[ chinese_simplified ] = "鎵嬪伐鎻掑叆鍗曟爮寮忔"; SlotName[ chinese_traditional ] = "鎵嬪嫊鎻掑叆鍠瑒鏂囧瓧妗嗐"; SlotName[ turkish ] = "Insert single column frame manually"; @@ -3930,7 +3930,7 @@ SfxSlotInfo FN_INSERT_FRAME_INTERACT SlotName[ dutch ] = "Kader handmatig invoegen"; SlotName[ chinese_simplified ] = "鎵嬪伐鎻掑叆妗"; SlotName[ greek ] = "族轳镪唔玺 彘筢泫戕 痣衢筮秕"; - SlotName[ korean ] = "頂勲爤鞛 靾橂彊 靷届瀰"; + SlotName[ korean ] = "頂勲爤鞛勳潉 靾橂彊鞙茧 靷届瀰"; SlotName[ turkish ] = "莈r鏴veyi manuel olarak ekle"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Insereix un marc manualment"; @@ -3959,7 +3959,7 @@ SfxSlotInfo FN_INSERT_HARD_SPACE SlotName[ dutch ] = "Harde spatie invoegen"; SlotName[ chinese_simplified ] = "鎻掑叆淇濇姢鐨勭┖鏍煎瓧绗"; SlotName[ greek ] = "旭矬柁赙 瘃矬翎翦觞戾盹 赍盹"; - SlotName[ korean ] = "氤错樃霅 瓿惦氨 靷届瀰"; + SlotName[ korean ] = "欷 氚旉繄頃橃 鞎婋姅 瓿惦氨 靷届瀰"; SlotName[ turkish ] = "B鰈黱emez bouk ekle"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Insereix un espai no separable"; @@ -3988,7 +3988,7 @@ SfxSlotInfo FN_INSERT_HARDHYPHEN SlotName[ dutch ] = "Vast scheidingsteken invoegen"; SlotName[ chinese_simplified ] = "鎻掑叆杩炲瓧绗"; SlotName[ greek ] = "旭矬柁赙 蓓麸盹 溟狩轶糸觑"; - SlotName[ korean ] = "瓿犾爼 頃橃澊頂 靷届瀰"; + SlotName[ korean ] = "欷 氚旉繄頃橃 鞎婋姅 頃橃澊頂 靷届瀰"; SlotName[ turkish ] = "B鰈黱emez tire ekle"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Insereix un guionet no separable"; @@ -4033,7 +4033,7 @@ SfxSlotInfo FN_INSERT_HRULER SlotName[ russian ] = "埋蜞忤螯 泐痂珙眚嚯簋 腓礤殛"; SlotName[ dutch ] = "Horizontale lijn invoegen"; SlotName[ french ] = "Ins閞er une ligne horizontale"; - SlotName[ spanish ] = "Insertar l韓eas horizontales"; + SlotName[ spanish ] = "Insertar regla horizontal"; SlotName[ italian ] = "Inserisci linea orizzontale"; SlotName[ danish ] = "Inds鎡 vandret linje"; SlotName[ swedish ] = "Infoga horisontell linje"; @@ -4046,7 +4046,7 @@ SfxSlotInfo FN_INSERT_HRULER SlotName[ dutch ] = "Horizontale lijn invoegen"; SlotName[ chinese_simplified ] = "鎻掑叆姘村钩绾"; SlotName[ greek ] = "砰筢泫戕 锺殒糸狎 泷犰燹"; - SlotName[ korean ] = "靾橅弶 靹 靷届瀰"; + SlotName[ korean ] = "臧搿 雸堦笀鞛 靷届瀰"; SlotName[ turkish ] = "Yatay ay齬ma 鏸zgisi ekle"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Insereix una l韓ia horitzontal"; @@ -4087,7 +4087,7 @@ SfxSlotInfo FN_INSERT_IDX_ENTRY_DLG SlotName [ english ] = "Indexmarkierung einf黦en"; SlotName[ english_us ] = "Insert Index Marker"; SlotName[ portuguese ] = "Inserir marcador do 韓dice"; - SlotName[ russian ] = "埋蜞忤螯 戾蜿 箨噻囹咫"; + SlotName[ russian ] = "埋蜞忤螯 屐屙 箨噻囹咫"; SlotName[ dutch ] = "Indexmarkering invoegen"; SlotName[ french ] = "Ins閞er une marque d'index"; SlotName[ spanish ] = "Insertar marca en el 韓dice"; @@ -4103,7 +4103,7 @@ SfxSlotInfo FN_INSERT_IDX_ENTRY_DLG SlotName[ dutch ] = "Indexmarkering invoegen"; SlotName[ chinese_simplified ] = "鎻掑叆绱㈠紩鏍囪"; SlotName[ greek ] = "砰筢泫戕 箸灬溟稞 艴皴翮襁秕"; - SlotName[ korean ] = "靸夓澑 毵堩伂 靷届瀰"; + SlotName[ korean ] = "靸夓澑 響滌嫓鞛 靷届瀰"; SlotName[ turkish ] = "Dizin belirteci ekle"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Insereix un marcador de l'韓dex"; @@ -4132,7 +4132,7 @@ SfxSlotInfo FN_INSERT_LINEBREAK SlotName[ dutch ] = "Handmatig regeleinde invoegen"; SlotName[ chinese_simplified ] = "鎵嬪伐鎻掑叆鎹㈣绗"; SlotName[ greek ] = "砰筢泫戕 麇轳镪唔玺珧 犭脶戕 泷犰燹"; - SlotName[ korean ] = "靾橂彊鞙茧 欷 雮橂垊旮 靷届瀰"; + SlotName[ korean ] = "靾橂彊鞙茧 頄 雮橂垊旮 靷届瀰"; SlotName[ turkish ] = "Man黣l sat齬 sonu ekle"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Insereix un salt de l韓ia manual"; @@ -4290,7 +4290,7 @@ SfxSlotInfo FN_INSERT_REF_FIELD SlotName[ russian ] = "埋蜞忤螯 镥疱牮羼蝽簋 耨牦"; SlotName[ dutch ] = "Kruisverwijzing invoegen"; SlotName[ french ] = "Ins閞er un renvoi"; - SlotName[ spanish ] = "Insertar campo referencia"; + SlotName[ spanish ] = "Insertar referencia"; SlotName[ italian ] = "Inserisci riferimento incrociato"; SlotName[ danish ] = "Inds鎡 krydshenvisning"; SlotName[ swedish ] = "Infoga korsh鋘visning"; @@ -4303,7 +4303,7 @@ SfxSlotInfo FN_INSERT_REF_FIELD SlotName[ dutch ] = "Kruisverwijzing invoegen"; SlotName[ chinese_simplified ] = "鎻掑叆鍙傜収"; SlotName[ greek ] = "砰筢泫戕 疳襻痫祓掾"; - SlotName[ korean ] = "靸來樃彀胳“ 靷届瀰"; + SlotName[ korean ] = "靸來樃 彀胳“ 靷届瀰"; SlotName[ turkish ] = "莂praz bauru alan ekle"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Insereix la refer鑞cia del camp"; @@ -4319,7 +4319,7 @@ SfxSlotInfo FN_INSERT_REGION SlotName[ russian ] = "埋蜞忤螯 疣玟咫"; SlotName[ dutch ] = "Bereik invoegen"; SlotName[ french ] = "Ins閞er une section"; - SlotName[ spanish ] = "Insertar 醨ea"; + SlotName[ spanish ] = "Insertar una secci髇"; SlotName[ italian ] = "Inserisci area"; SlotName[ danish ] = "Inds鎡 omr錮e"; SlotName[ swedish ] = "Infoga omr錮e"; @@ -4332,7 +4332,7 @@ SfxSlotInfo FN_INSERT_REGION SlotName[ dutch ] = "Bereik invoegen"; SlotName[ chinese_simplified ] = "鎻掑叆鍖哄煙"; SlotName[ greek ] = "砰筢泫戕 屙玺狎"; - SlotName[ korean ] = "鞓侅棴 靷届瀰"; + SlotName[ korean ] = "甑棴 靷届瀰"; SlotName[ turkish ] = "B鰈黰 ekle"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Insereix una secci"; @@ -4348,7 +4348,7 @@ SfxSlotInfo FN_INSERT_SMA SlotName[ russian ] = "埋蜞忤螯 钺牝 %PRODUCTNAME Math"; SlotName[ dutch ] = "%PRODUCTNAME Math Object invoegen"; SlotName[ french ] = "Ins閞er un objet %PRODUCTNAME Math"; - SlotName[ spanish ] = "Insertar objeto %PRODUCTNAME Math"; + SlotName[ spanish ] = "Insertar objeto de %PRODUCTNAME Math"; SlotName[ italian ] = "Inserisci oggetto %PRODUCTNAME Math"; SlotName[ danish ] = "Inds鎡 %PRODUCTNAME Math-objekt"; SlotName[ swedish ] = "Infoga %PRODUCTNAME Math-objekt"; @@ -4448,7 +4448,7 @@ SfxSlotInfo FN_INSERT_TABLE SlotName[ dutch ] = "Tabel invoegen"; SlotName[ chinese_simplified ] = "鎻掑叆琛ㄦ牸"; SlotName[ greek ] = "砰筢泫戕 疬磲赆"; - SlotName[ korean ] = "鞁滍姼 靷届瀰"; + SlotName[ korean ] = "響 靷届瀰"; SlotName[ turkish ] = "Tablo ekle"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Insereix una taula"; @@ -4490,7 +4490,7 @@ SfxSlotInfo FN_LABEL SlotName [ english ] = "Etiketten einf黦en"; SlotName[ english_us ] = "Insert Labels"; SlotName[ portuguese ] = "Inserir r髏ulos"; - SlotName[ russian ] = "埋蜞忤螯 镱滹桉"; + SlotName[ russian ] = "埋蜞忤螯 桕弪觇"; SlotName[ dutch ] = "Etiketten invoegen"; SlotName[ french ] = "Ins閞er des 閠iquettes"; SlotName[ spanish ] = "Insertar etiquetas"; @@ -4506,7 +4506,7 @@ SfxSlotInfo FN_LABEL SlotName[ dutch ] = "Etiketten invoegen"; SlotName[ chinese_simplified ] = "鎻掑叆鏍囩"; SlotName[ greek ] = "砰筢泫戕 弭殛蒴狎"; - SlotName[ korean ] = "霛茧波 靷届瀰"; + SlotName[ korean ] = "霠堨澊敫 靷届瀰"; SlotName[ turkish ] = "Etiket ekle"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Insereix etiquetes"; @@ -4577,7 +4577,7 @@ SfxSlotInfo FN_LINE_DOWN_SEL SlotName[ portuguese ] = "Seleccionar at linha inferior"; SlotName[ russian ] = "蔓溴腓螯 漕 龛骓彘 耱痤觇"; SlotName[ dutch ] = "Tot aan regel beneden selecteren"; - SlotName[ french ] = "S閘ect. vers le bas"; + SlotName[ french ] = "S閘ectionner jusqu' la ligne inf閞ieure"; SlotName[ spanish ] = "Seleccionar hasta la l韓ea de abajo"; SlotName[ italian ] = "Seleziona fino alla riga in basso"; SlotName[ danish ] = "Marker til r鎘ke forneden"; @@ -4591,7 +4591,7 @@ SfxSlotInfo FN_LINE_DOWN_SEL SlotName[ dutch ] = "Tot aan regel beneden selecteren"; SlotName[ chinese_simplified ] = "閫夋嫨鑷宠涓嬫柟"; SlotName[ greek ] = "硼殡镢 甍 翮 泷犰燹 贶豉"; - SlotName[ korean ] = "鞎勲灅 頄夑箤歆 靹犿儩"; + SlotName[ korean ] = "欷 鞎勲灅旯岇 靹犿儩"; SlotName[ turkish ] = "Alttaki sat齬a kadar se"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Selecciona cap avall"; @@ -4620,7 +4620,7 @@ SfxSlotInfo FN_LINE_NUMBERING_DLG SlotName[ dutch ] = "Regelnummering instellen"; SlotName[ chinese_simplified ] = "璁惧畾琛岀紪鍙"; SlotName[ greek ] = "梳栾耖箪 狁哞扃箸 泷犰忐"; - SlotName[ korean ] = "頄 氩堩樃 毵り赴旮 靹れ爼"; + SlotName[ korean ] = "欷 氩堩樃 毵り赴旮 靹れ爼"; SlotName[ turkish ] = "Sat齬 numaralar齨 ayarla"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Defineix la numeraci de l韓ies"; @@ -4649,7 +4649,7 @@ SfxSlotInfo FN_LINE_UP SlotName[ dutch ] = "Naar regel boven"; SlotName[ chinese_simplified ] = "杞埌琛屼笂鏂"; SlotName[ greek ] = "旭矧 翮 泷犰燹 茼"; - SlotName[ korean ] = "鞙 頄夓溂搿"; + SlotName[ korean ] = "鞙 欷勲"; SlotName[ turkish ] = "躶ttteki sat齬"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "A la l韓ia superior"; @@ -4664,7 +4664,7 @@ SfxSlotInfo FN_LINE_UP_SEL SlotName[ portuguese ] = "Seleccionar at linha superior"; SlotName[ russian ] = "蔓溴腓螯 漕 忮瘐礤 耱痤觇"; SlotName[ dutch ] = "Tot aan bovenste regel selecteren"; - SlotName[ french ] = "S閘ect. jusqu' la ligne sup閞ieure"; + SlotName[ french ] = "S閘ectionner jusqu' la ligne sup閞ieure"; SlotName[ spanish ] = "Seleccionar hasta l韓ea de arriba"; SlotName[ italian ] = "Seleziona fino alla riga superiore"; SlotName[ danish ] = "Marker til r鎘ke foroven"; @@ -4678,7 +4678,7 @@ SfxSlotInfo FN_LINE_UP_SEL SlotName[ dutch ] = "Tot aan bovenste regel selecteren"; SlotName[ chinese_simplified ] = "閫夋嫨鑷宠鐨勪笂鏂"; SlotName[ greek ] = "硼殡镢 甍 翮 泷犰燹 茼"; - SlotName[ korean ] = "鞙 頄夑箤歆 靹犿儩"; + SlotName[ korean ] = "欷 鞙勱箤歆 靹犿儩"; SlotName[ turkish ] = "躶tteki sat齬a kadar ekle"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Selecciona fins a la l韓ia superior"; @@ -4722,7 +4722,7 @@ SfxSlotInfo FN_NEW_GLOBAL_DOC SlotName[ portuguese ] = "Criar documento-mestre"; SlotName[ russian ] = "杨玟囹 耦耱噔眍 漕牦戾眚"; SlotName[ dutch ] = "Masterdocument maken"; - SlotName[ french ] = "Cr閑r document ma顃re"; + SlotName[ french ] = "Cr閑r un document ma顃re"; SlotName[ spanish ] = "Crear un documento maestro"; SlotName[ italian ] = "Crea documento master"; SlotName[ danish ] = "Opret hoveddokument"; @@ -4749,7 +4749,7 @@ SfxSlotInfo FN_NEW_HTML_DOC SlotName [ english ] = "HTML Dokument erzeugen"; SlotName[ english_us ] = "Create HTML Document"; SlotName[ portuguese ] = "Criar documento HTML"; - SlotName[ russian ] = "杨玟囹 HTML-漕牦戾眚"; + SlotName[ russian ] = "杨玟囹 洛-耱疣龛鲶"; SlotName[ dutch ] = "HTML-document maken"; SlotName[ french ] = "Cr閑r un document HTML"; SlotName[ spanish ] = "Crear documento HTML"; @@ -4896,7 +4896,7 @@ SfxSlotInfo FN_NEXT_SENT_SEL SlotName[ portuguese ] = "Seleccionar at frase seguinte"; SlotName[ russian ] = "蔓溴腓螯 漕 耠邃簋泐 镳邃腩驽龛"; SlotName[ dutch ] = "Tot aan volgende zin selecteren"; - SlotName[ french ] = "S閘ect. jusqu' la phrase suivante"; + SlotName[ french ] = "S閘ectionner jusqu' la phrase suivante"; SlotName[ spanish ] = "Seleccionar hasta frase siguiente"; SlotName[ italian ] = "Seleziona fino alla frase successiva"; SlotName[ danish ] = "Marker til n鎠te s鎡ning"; @@ -4997,7 +4997,7 @@ SfxSlotInfo FN_NEXT_TBLFML_ERR SlotName[ dutch ] = "Naar volgende foutieve tabelformule"; SlotName[ chinese_simplified ] = "杞埌涓嬩竴涓湁閿欒鐨勫伐浣滆〃鍏紡"; SlotName[ greek ] = "旭矧 麸 屦屙 脶龛狍燧盹 酏痫 麸 疬磲赆"; - SlotName[ korean ] = "雼れ潓 韹毽 響 靾橃嫕鞙茧"; + SlotName[ korean ] = "雼れ潓 鞛橂霅 響 靾橃嫕鞙茧"; SlotName[ turkish ] = "Sonraki hatal tablo formul"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "V閟 a la f髍mula defectuosa seg黣nt de la taula"; @@ -5070,7 +5070,7 @@ SfxSlotInfo FN_NEXT_WORD_SEL SlotName[ portuguese ] = "Seleccionar at ao final da palavra"; SlotName[ russian ] = "蔓溴腓螯 漕 耠钼 耧疣忄"; SlotName[ dutch ] = "Tot aan woord rechts selecteren"; - SlotName[ french ] = "S閘ect. jusqu'au mot droite"; + SlotName[ french ] = "S閘ectionner jusqu'au mot droite"; SlotName[ spanish ] = "Seleccionar hasta el final de la palabra"; SlotName[ italian ] = "Seleziona fino alla parola destra"; SlotName[ danish ] = "Marker til ordet til h鴍re"; @@ -5084,7 +5084,7 @@ SfxSlotInfo FN_NEXT_WORD_SEL SlotName[ dutch ] = "Tot aan woord rechts selecteren"; SlotName[ chinese_simplified ] = "閫夋嫨鑷冲瓧鐨勫彸鏂"; SlotName[ greek ] = "硼殡镢 甍 翮 胼铉 溴铋"; - SlotName[ korean ] = "鞓るジ飒 雼柎旯岇 靹犿儩"; + SlotName[ korean ] = "雼柎鞚 鞓るジ飒疥箤歆 靹犿儩"; SlotName[ turkish ] = "Sa餯aki s鰖ce kadar se"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Selecciona fins al final de la paraula"; @@ -5142,7 +5142,7 @@ SfxSlotInfo FN_NUM_BULLET_MOVEDOWN SlotName[ dutch ] = "Naar beneden verplaatsen"; SlotName[ chinese_simplified ] = "鍚戜笅绉诲姩"; SlotName[ greek ] = "体翎赀礴箸 瘃矧 翎 贶豉"; - SlotName[ korean ] = "鞎勲灅搿 鞚措彊"; + SlotName[ korean ] = "鞎勲灅搿"; SlotName[ turkish ] = "A瘕 ta"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Mou cap avall"; @@ -5287,7 +5287,7 @@ SfxSlotInfo FN_NUM_BULLET_OUTLINE_DOWN SlotName[ dutch ] = "Met subniveaus naar beneden"; SlotName[ chinese_simplified ] = "杩炲悓鍒嗙骇鍚戜笅"; SlotName[ greek ] = "体翎赀礴箸 贶豉 灬孢 戾 翎 躔矬珈暹"; - SlotName[ korean ] = "鞎勲灅搿, 鞎勲灅鞝 韽暔"; + SlotName[ korean ] = "頃橃渼 靾橃 韽暔 鞎勲灅搿 鞚措彊"; SlotName[ turkish ] = "Alt noktalar ile a瘕 ta"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Despla鏰 cap avall amb els subpunts"; @@ -5316,7 +5316,7 @@ SfxSlotInfo FN_NUM_BULLET_OUTLINE_MOVEDOWN SlotName[ dutch ] = "Met subniveaus naar beneden verplaatsen"; SlotName[ chinese_simplified ] = "杩炲悓鍒嗙骇鍚戜笅绉诲姩"; SlotName[ greek ] = "体翎赀礴箸 贶豉 灬孢 戾 翎 躔矬珈暹"; - SlotName[ korean ] = "鞎勲灅搿 鞚措彊, 鞎勲灅鞝 韽暔"; + SlotName[ korean ] = "頃橃渼 靾橃 韽暔 鞎勲灅搿 鞚措彊"; SlotName[ turkish ] = "Alt noktalar ile a瘕 ta"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Mou cap avall amb els subpunts"; @@ -5345,7 +5345,7 @@ SfxSlotInfo FN_NUM_BULLET_OUTLINE_MOVEUP SlotName[ dutch ] = "Met subniveaus naar boven verplaatsen"; SlotName[ chinese_simplified ] = "杩炲悓鍒嗙骇鍚戜笂绉诲姩"; SlotName[ greek ] = "体翎赀礴箸 茼 灬孢 戾 翎 躔矬珈暹"; - SlotName[ korean ] = "鞙勲 鞚措彊, 鞎勲灅鞝 韽暔"; + SlotName[ korean ] = "頃橃渼 靾橃 韽暔 鞙勲 鞚措彊"; SlotName[ turkish ] = "Alt noktalar ile yukar齳a ta"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Mou cap amunt amb els subpunts"; @@ -5374,7 +5374,7 @@ SfxSlotInfo FN_NUM_BULLET_OUTLINE_UP SlotName[ dutch ] = "Met subniveaus naar boven"; SlotName[ chinese_simplified ] = "杩炲悓鍒嗙骇鍚戜笂"; SlotName[ greek ] = "体翎赀礴箸 茼 灬孢 戾 翎 躔矬珈暹"; - SlotName[ korean ] = "鞙勲, 鞎勲灅鞝 韽暔"; + SlotName[ korean ] = "頃橃渼 靾橃 韽暔 鞙勲 鞚措彊"; SlotName[ turkish ] = "Alt noktalar ile yukar齳a ta"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Despla鏰 cap amunt amb els subpunts"; @@ -5447,7 +5447,7 @@ SfxSlotInfo FN_NUM_FORMAT_TABLE_DLG SlotName[ portuguese ] = "Editar formato num閞ico"; SlotName[ russian ] = "橡噔赅 麒耠钼钽 纛痨囹"; SlotName[ dutch ] = "Getalnotatie bewerken"; - SlotName[ french ] = "Modifier le format num閞ique"; + SlotName[ french ] = "蒬iter le format num閞ique"; SlotName[ spanish ] = "Editar formato de n鷐eros"; SlotName[ italian ] = "Modifica formato numero"; SlotName[ danish ] = "Rediger talformat"; @@ -5461,7 +5461,7 @@ SfxSlotInfo FN_NUM_FORMAT_TABLE_DLG SlotName[ dutch ] = "Getalnotatie bewerken"; SlotName[ chinese_simplified ] = "缂栬緫鏁板瓧鏍煎紡"; SlotName[ greek ] = "硼孱羼汜筮 祜聆掾 狁殍忐"; - SlotName[ korean ] = "靾瀽 順曥嫕 韼胳"; + SlotName[ korean ] = "靾瀽 響滉赴 順曥嫕 韼胳"; SlotName[ turkish ] = "Say format齨 d鼁enle"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Edita el format del n鷐ero"; @@ -5490,7 +5490,7 @@ SfxSlotInfo FN_NUM_OR_NONUM SlotName[ dutch ] = "Nummering aan/uit"; SlotName[ chinese_simplified ] = "鏄剧ず/闅愬叆缂栧彿"; SlotName[ greek ] = "榴哞扃箸 歪/槛"; - SlotName[ korean ] = "氩堩樃 毵り赴旮 鞝侅毄/鞝侅毄 鞎堩暔"; + SlotName[ korean ] = "氩堩樃 毵り赴旮 鞝侅毄/頃挫牅"; SlotName[ turkish ] = "Numaralama a琮k/kapal"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Numeraci activada/desactivada"; @@ -5548,7 +5548,7 @@ SfxSlotInfo FN_NUMBER_CURRENCY SlotName[ dutch ] = "Getalnotatie: valuta"; SlotName[ chinese_simplified ] = "鏁板瓧鏍煎紡锛氳揣甯"; SlotName[ greek ] = "田聆 狁殍祜: 惋扉箪狒殛"; - SlotName[ korean ] = "靾瀽 順曥嫕: 韱淀檾"; + SlotName[ korean ] = "靾瀽 響滉赴 順曥嫕: 韱淀檾"; SlotName[ turkish ] = "Say format: Para birimi"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Format num鑢ic: moneda"; @@ -5577,7 +5577,7 @@ SfxSlotInfo FN_NUMBER_DATE SlotName[ dutch ] = "Getalnotatie: datum"; SlotName[ chinese_simplified ] = "鏁板瓧鏍煎紡锛氭棩鏈"; SlotName[ greek ] = "田聆 狁殍祜: 庆羼镬珥哚"; - SlotName[ korean ] = "靾瀽 順曥嫕: 雮犾"; + SlotName[ korean ] = "靾瀽 響滉赴 順曥嫕: 雮犾"; SlotName[ turkish ] = "Say format: Tarih"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Format num鑢ic : data"; @@ -5635,7 +5635,7 @@ SfxSlotInfo FN_NUMBER_PERCENT SlotName[ dutch ] = "Getalnotatie: procent"; SlotName[ chinese_simplified ] = "鏁板瓧鏍煎紡锛氱櫨鍒嗘瘮"; SlotName[ greek ] = "田聆 狁殍祜: 酗箫篝"; - SlotName[ korean ] = "靾瀽 順曥嫕: 氚彪秳鞙"; + SlotName[ korean ] = "靾瀽 響滉赴 順曥嫕: 氚彪秳鞙"; SlotName[ turkish ] = "Say format: Y鼁de"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Format num鑢ic: percentatge"; @@ -5664,7 +5664,7 @@ SfxSlotInfo FN_NUMBER_SCIENTIFIC SlotName[ dutch ] = "Getalnotatie: exponentieel"; SlotName[ chinese_simplified ] = "鏁板瓧鏍煎紡锛氭寚鏁"; SlotName[ greek ] = "田聆 狁殍祜: 抨桢糸贽"; - SlotName[ korean ] = "靾瀽 順曥嫕: 歆靾"; + SlotName[ korean ] = "靾瀽 響滉赴 順曥嫕: 歆靾"; SlotName[ turkish ] = "Say format: 躶tel"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Format num鑢ic: exponencial"; @@ -5681,7 +5681,7 @@ SfxSlotInfo FN_NUMBER_STANDARD SlotName[ russian ] = "阻耠钼铋 纛痨囹: 耱囗溧痱"; SlotName[ dutch ] = "Getalnotatie: standaard"; SlotName[ french ] = "Format num閞ique : standard"; - SlotName[ spanish ] = "Formato num閞ico: Predeterminado"; + SlotName[ spanish ] = "Formato num閞ico: predeterminado"; SlotName[ italian ] = "Formato numero: standard"; SlotName[ danish ] = "Talformat: standard"; SlotName[ swedish ] = "Talformat: standard"; @@ -5694,7 +5694,7 @@ SfxSlotInfo FN_NUMBER_STANDARD SlotName[ dutch ] = "Getalnotatie: standaard"; SlotName[ chinese_simplified ] = "鏁板瓧鏍煎紡锛氭爣鍑"; SlotName[ greek ] = "田聆 狁殍祜: 缅黹贽"; - SlotName[ korean ] = "靾瀽 順曥嫕: 響滌"; + SlotName[ korean ] = "靾瀽 響滉赴 順曥嫕: 響滌"; SlotName[ turkish ] = "Say format: Standart"; SlotName[ catalan ] = "Format num鑢ic: est鄋dard"; SlotName[ finnish ] = "Lukumuoto: Vakio"; @@ -5722,7 +5722,7 @@ SfxSlotInfo FN_NUMBER_TIME SlotName[ dutch ] = "Getalnotatie: tijd"; SlotName[ chinese_simplified ] = "鏁板瓧鏍煎紡锛氭椂闂"; SlotName[ greek ] = "田聆 狁殍祜: 狂"; - SlotName[ korean ] = "靾瀽 順曥嫕: 鞁滉皠"; + SlotName[ korean ] = "靾瀽 響滉赴 順曥嫕: 鞁滉皠"; SlotName[ turkish ] = "Say format: Saat"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Format num鑢ic: hora"; @@ -5737,7 +5737,7 @@ SfxSlotInfo FN_NUMBER_TWODEC SlotName[ portuguese ] = "Formato num閞ico: decimal"; SlotName[ russian ] = "阻耠钼铋 纛痨囹: 溴蜩黜"; SlotName[ dutch ] = "Getalnotatie: decimaal"; - SlotName[ french ] = "Format num閞ique : d閏imal"; + SlotName[ french ] = "Format num閞ique : d閏imale"; SlotName[ spanish ] = "Formato num閞ico: Decimal"; SlotName[ italian ] = "Formato numero: decimale"; SlotName[ danish ] = "Talformat: decimal"; @@ -5752,7 +5752,7 @@ SfxSlotInfo FN_NUMBER_TWODEC SlotName[ chinese_simplified ] = "鏁板瓧鏍煎紡锛氬崄杩涘埗"; SlotName[ language_user1 ] = " "; SlotName[ greek ] = "田聆 狁殍祜: 腻赆溟贽"; - SlotName[ korean ] = "靾瀽 順曥嫕: 靻岇垬"; + SlotName[ korean ] = "靾瀽 響滉赴 順曥嫕: 靻岇垬"; SlotName[ turkish ] = "Say format: Ondal齥"; SlotName[ catalan ] = "Format num鑢ic: decimal"; SlotName[ finnish ] = "Lukumuoto: Desimaali"; @@ -5796,7 +5796,7 @@ SfxSlotInfo FN_OPTIMIZE_TABLE SlotName[ russian ] = "物蜩扈玷痤忄螯"; SlotName[ dutch ] = "Optimaliseren"; SlotName[ french ] = "Optimiser"; - SlotName[ spanish ] = "Optimar"; + SlotName[ spanish ] = "Optimizar"; SlotName[ italian ] = "Ottimizza"; SlotName[ danish ] = "Optimer"; SlotName[ swedish ] = "Optimera"; @@ -5822,18 +5822,18 @@ SfxSlotInfo FN_OUTLINE_TO_CLIPBOARD SlotName [ english ] = "Gliederung zum Clipboard"; SlotName[ english_us ] = "Outline to Clipboard"; SlotName[ portuguese ] = "Esquema em 醨ea de transfer阯cia"; - SlotName[ russian ] = "羊痼牝箴 狍翦 钺戾磬"; + SlotName[ russian ] = "羊痼牝箴 狍翦 钺戾磬"; SlotName[ dutch ] = "Overzicht naar Klembord"; SlotName[ french ] = "Plan vers le presse-papiers"; SlotName[ spanish ] = "Esquema al portapapeles"; - SlotName[ italian ] = "Struttura negli appunti"; + SlotName[ italian ] = "Struttura negli Appunti"; SlotName[ danish ] = "Disposition til udklipsbakke"; SlotName[ swedish ] = "Disposition till urklippet"; SlotName[ polish ] = "Konspekt do kosza"; SlotName[ portuguese_brazilian ] = "SendOutlineToClipboard"; SlotName[ japanese ] = "銈儶銉冦儣銉溿兗銉夈伄銈€偊銉堛儵銈ゃ兂"; SlotName[ chinese_simplified ] = "澶х翰閫佽嚦鍓创鏉"; - SlotName[ chinese_traditional ] = "澶х侗閫佺郸鍓布绨"; + SlotName[ chinese_traditional ] = "澶х侗閫佸埌鍓布绨"; SlotName[ arabic ] = "轻兽禹 裴 轻颓葙"; SlotName[ dutch ] = "Overzicht naar Klembord"; SlotName[ chinese_simplified ] = "澶х翰閫佽嚦鍓创鏉"; @@ -5867,7 +5867,7 @@ SfxSlotInfo FN_OUTLINE_TO_IMPRESS SlotName[ dutch ] = "Overzicht naar presentatie"; SlotName[ chinese_simplified ] = "澶х翰閫佸埌婕旂ず鏂囩ǹ"; SlotName[ greek ] = "拈荞桉 瘃矧 疳耧躞哚箸"; - SlotName[ korean ] = "頂勲爤鞝犿厡鞚挫厴 臧滌殧"; + SlotName[ korean ] = "頂勲爤鞝犿厡鞚挫厴鞚 臧滌殧"; SlotName[ turkish ] = "Anahatlar sunuya aktar"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Contorn a la presentaci"; @@ -5883,7 +5883,7 @@ SfxSlotInfo FN_PAGE_STYLE_SET_COLS SlotName[ russian ] = "羊桦 耱疣龛鳆: 耱铍狯"; SlotName[ dutch ] = "Pagina-opmaakprofiel: kolommen"; SlotName[ french ] = "Style de page : colonnes"; - SlotName[ spanish ] = "Estilo de p醙ina: Columnas"; + SlotName[ spanish ] = "Estilo de p醙ina: columnas"; SlotName[ italian ] = "Modello di pagina: colonne"; SlotName[ danish ] = "Sidetypografi: kolonner"; SlotName[ swedish ] = "Sidformatmall: Kolumner"; @@ -5940,7 +5940,7 @@ SfxSlotInfo FN_PAGEDOWN_SEL SlotName[ portuguese ] = "Seleccionar at p醙ina seguinte"; SlotName[ russian ] = "蔓溴腓螯 漕 耠邃簋 耱疣龛鳆"; SlotName[ dutch ] = "Tot aan volgende pagina selecteren"; - SlotName[ french ] = "S閘ect. jusqu' la page suivante"; + SlotName[ french ] = "S閘ectionner jusqu' la page suivante"; SlotName[ spanish ] = "Seleccionar hasta la p醙ina siguiente"; SlotName[ italian ] = "Seleziona fino alla pagina successiva"; SlotName[ danish ] = "Marker til n鎠te side"; @@ -5998,7 +5998,7 @@ SfxSlotInfo FN_PAGEUP_SEL SlotName[ portuguese ] = "Seleccionar at p醙ina anterior"; SlotName[ russian ] = "蔓溴腓螯 漕 镳邃簌彘 耱疣龛鳆"; SlotName[ dutch ] = "Tot aan vorige pagina selecteren"; - SlotName[ french ] = "S閘ect. jusqu' la page pr閏閐ente"; + SlotName[ french ] = "S閘ectionner jusqu' la page pr閏閐ente"; SlotName[ spanish ] = "Seleccionar hasta la p醙ina anterior"; SlotName[ italian ] = "Seleziona fino alla pagina precedente"; SlotName[ danish ] = "Marker til forrige side"; @@ -6201,7 +6201,7 @@ SfxSlotInfo FN_PREV_SENT_SEL SlotName[ portuguese ] = "Seleccionar at frase anterior"; SlotName[ russian ] = "蔓溴腓螯 漕 镳邃簌邈 镳邃腩驽龛"; SlotName[ dutch ] = "Tot aan vorige zin selecteren"; - SlotName[ french ] = "S閘ect. jusqu' la phrase pr閏閐ente"; + SlotName[ french ] = "S閘ectionner jusqu' la phrase pr閏閐ente"; SlotName[ spanish ] = "Seleccionar hasta la oraci髇 anterior"; SlotName[ italian ] = "Seleziona fino alla frase precedente"; SlotName[ danish ] = "Marker til forrige s鎡ning"; @@ -6273,7 +6273,7 @@ SfxSlotInfo FN_PREV_TBLFML SlotName[ dutch ] = "Naar vorige werkbladformule"; SlotName[ chinese_simplified ] = "杞埌涓婁竴涓伐浣滆〃鍏紡"; SlotName[ greek ] = "旭矧 麸 瘃镧泔屙 酏痫 麸 疬磲赆"; - SlotName[ korean ] = "鞚挫爠 響 鞏戩嫕鞙茧"; + SlotName[ korean ] = "鞚挫爠 響 靾橃嫕鞙茧"; SlotName[ turkish ] = "謓ceki tablo formul"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "V閟 a la f髍mula anterior de la taula"; @@ -6302,7 +6302,7 @@ SfxSlotInfo FN_PREV_TBLFML_ERR SlotName[ dutch ] = "Naar vorige foutieve tabelformule"; SlotName[ chinese_simplified ] = "杞埌涓婁竴涓湁閿欒鐨勫伐浣滆〃鍏紡"; SlotName[ greek ] = "旭矧 麸 瘃镧泔屙 脶龛狍燧盹 酏痫 麸 疬磲赆"; - SlotName[ korean ] = "韹毽 鞚挫爠 響 鞏戩嫕鞙茧"; + SlotName[ korean ] = "鞛橂霅 鞚挫爠 響 靾橃嫕鞙茧"; SlotName[ turkish ] = "謓ceki hatal tablo formul"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "V閟 a la f髍mula defectuosa anterior de la taula"; @@ -6375,7 +6375,7 @@ SfxSlotInfo FN_PREV_WORD_SEL SlotName[ portuguese ] = "Seleccionar at ao in韈io da palavra"; SlotName[ russian ] = "蔓溴腓螯 漕 磬鬣 耠钼"; SlotName[ dutch ] = "Tot aan woord links selecteren"; - SlotName[ french ] = "S閘ect. mot gauche"; + SlotName[ french ] = "S閘ectionner jusqu'au mot gauche"; SlotName[ spanish ] = "Seleccionar hasta el comienzo de la palabra"; SlotName[ italian ] = "Seleziona fino alla parola di sinistra"; SlotName[ danish ] = "Marker til ord til venstre"; @@ -6419,7 +6419,7 @@ SfxSlotInfo FN_PREVIEW_PRINT_OPTIONS SlotName[ dutch ] = "Printopties afdrukvoorbeeld"; SlotName[ chinese_simplified ] = "鎵撳嵃閫夐」 椤甸潰瑙嗗浘"; SlotName[ greek ] = "硼殡镢蒡 尻酏瘗箸/旭镥痖箨珞 箦脒溽"; - SlotName[ korean ] = "鞚胳噭 鞓奠厴, 韼橃澊歆 氤搓赴"; + SlotName[ korean ] = "韼橃澊歆 氤搓赴 鞚胳噭 鞓奠厴"; SlotName[ turkish ] = "Sayfa g鰎黱黰 yazd齬ma se鏴nekleri"; SlotName[ catalan ] = "Visualitzaci pr鑦ia de les opcions d'impressi"; SlotName[ finnish ] = "Tulostusasetusten n鋕ym"; @@ -6442,7 +6442,7 @@ SfxSlotInfo FN_PREVIEW_ZOOM SlotName[ polish ] = "Skala widoku strony"; SlotName[ portuguese_brazilian ] = "Scale"; SlotName[ japanese ] = "銉椼儸銉撱儱銉笺伄銈恒兗銉"; - SlotName[ korean ] = "頇曤寑/於曥唽 氙鸽Μ氤搓赴"; + SlotName[ korean ] = "於曥唽/頇曤寑 氙鸽Μ 氤搓赴"; SlotName[ chinese_simplified ] = "椤甸潰瑙嗗浘姣斾緥"; SlotName[ chinese_traditional ] = "椤ず姣斾緥 闋侀潰瑕栧湒"; SlotName[ turkish ] = "Yak齨la⺶齬"; @@ -6473,7 +6473,7 @@ SfxSlotInfo FN_PRINT_LAYOUT SlotName[ dutch ] = "Afdruklay-out aan/uit"; SlotName[ chinese_simplified ] = "鏄剧ず/闅愬叆鎵撳嵃鐗堝紡"; SlotName[ greek ] = "拈荇犷 尻酏瘗箸 歪/槛"; - SlotName[ korean ] = "鞚胳噭 霠堨澊鞎勳泝 鞝侅毄/鞝侅毄 鞎堩暔"; + SlotName[ korean ] = "鞚胳噭 氇枒 鞝侅毄/頃挫牅"; SlotName[ turkish ] = "Yazd齬ma d鼁eni a琮k/kapal"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Disseny de la impressi activat/desactivat"; @@ -6502,7 +6502,7 @@ SfxSlotInfo FN_PRINT_PAGEPREVIEW SlotName[ dutch ] = "Afdrukvoorbeeld drukken"; SlotName[ chinese_simplified ] = "鎵撳嵃椤甸潰瑙嗗浘"; SlotName[ greek ] = "抨酏瘗箸 瘃镥痖箨珞珧 箦脒溽"; - SlotName[ korean ] = "韼橃澊歆 氤搓赴, 鞚胳噭"; + SlotName[ korean ] = "韼橃澊歆 氤搓赴 鞚胳噭"; SlotName[ turkish ] = "Sayfa g鰎黱黰黱 yazd齬"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Imprimeix la visualitzaci pr鑦ia"; @@ -6515,9 +6515,9 @@ SfxSlotInfo FN_QRY_MERGE SlotName [ english ] = "Seriendruck vorbereiten"; SlotName[ english_us ] = "Prepare Mail Merge"; SlotName[ portuguese ] = "Preparar impress鉶 em s閞ie"; - SlotName[ russian ] = "项溷铗钼赅 沐礤疣鲨 镨顸爨"; + SlotName[ russian ] = "项溷铗钼赅 疣耨觇 镨皴"; SlotName[ dutch ] = "Afdrukken standaardbrief voorbereiden"; - SlotName[ french ] = "Pr閜arer Impression en s閞ie"; + SlotName[ french ] = "Pr閜arer un mailing"; SlotName[ spanish ] = "Preparar impresi髇 en serie"; SlotName[ italian ] = "Prepara stampa in serie"; SlotName[ danish ] = "Forbered brevfletning"; @@ -6531,7 +6531,7 @@ SfxSlotInfo FN_QRY_MERGE SlotName[ dutch ] = "Afdrukken standaardbrief voorbereiden"; SlotName[ chinese_simplified ] = "鍑嗗閭欢鍚堝苟"; SlotName[ greek ] = "旭镥麸殪狍哚 汩 尻酏瘗箸 灬骈贽 犭腌腼泷狯哚"; - SlotName[ korean ] = "氅旍澕 氤戫暕 欷牍"; + SlotName[ korean ] = "韼胳 氤戫暕 欷牍"; SlotName[ turkish ] = "Standart mektup yazd齬may haz齬la"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Prepara la impressi en s鑢ie"; @@ -6703,7 +6703,7 @@ SfxSlotInfo FN_REFRESH_VIEW SlotName[ dutch ] = "Beeld herstellen"; SlotName[ chinese_simplified ] = "鎭㈠瑙嗗浘"; SlotName[ greek ] = "硼犴狯锺 瘃镡镫掾"; - SlotName[ korean ] = "氤店惮 氤搓赴"; + SlotName[ korean ] = "氤搓赴 氤店惮"; SlotName[ turkish ] = "G鰎黱黰 geri getir"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Restaura la visualitzaci"; @@ -6732,7 +6732,7 @@ SfxSlotInfo FN_REPAGINATE SlotName[ dutch ] = "Nieuwe opmaak"; SlotName[ chinese_simplified ] = "閲嶆柊鍒朵綔鏍煎紡"; SlotName[ greek ] = "硼犴茈瑛 祜聆镳镞珞珧"; - SlotName[ korean ] = "雼れ嫓 靹滌嫕 歆鞝"; + SlotName[ korean ] = "雼れ嫓 靹滌嫕 靹れ爼"; SlotName[ turkish ] = "Yeniden formatla"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Torna a formatar"; @@ -6761,7 +6761,7 @@ SfxSlotInfo FN_REPEAT_SEARCH SlotName[ dutch ] = "Zoeken herhalen"; SlotName[ chinese_simplified ] = "閲嶅鎼滃"; SlotName[ greek ] = "硼犴茈瑛 犴徭摁珞珧"; - SlotName[ korean ] = "彀娟赴 氚橂车"; + SlotName[ korean ] = "雼れ嫓 瓴靸"; SlotName[ turkish ] = "Yeniden bul"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Repeteix la cerca"; @@ -6893,7 +6893,7 @@ SfxSlotInfo FN_SET_EXT_MODE SlotName[ russian ] = "玛. 疣聒桊屙眍 恹溴脲龛"; SlotName[ dutch ] = "Uitgebreide selectie activeren"; SlotName[ french ] = "S閘ection 閠endue"; - SlotName[ spanish ] = "Activar Selecci髇 Extendida"; + SlotName[ spanish ] = "Selecci髇 ampliada"; SlotName[ italian ] = "Attiva selezione ampliata"; SlotName[ danish ] = "Aktiver udvidet markering"; SlotName[ swedish ] = "Ut鰇ad markering p"; @@ -6921,7 +6921,7 @@ SfxSlotInfo FN_SET_PAGE_STYLE SlotName[ portuguese ] = "Aplicar estilo de p醙ina"; SlotName[ russian ] = "橡桁屙栩 耱桦 耱疣龛鳆"; SlotName[ dutch ] = "Pagina-opmaakprofiel toewijzen"; - SlotName[ french ] = "Assigner le style de page"; + SlotName[ french ] = "Appliquer le style de page"; SlotName[ spanish ] = "Aplicar estilo de p醙ina"; SlotName[ italian ] = "Assegna modello di pagina"; SlotName[ danish ] = "Tildel sidetypografi"; @@ -6993,7 +6993,7 @@ SfxSlotInfo FN_SET_SUPER_SCRIPT SlotName[ dutch ] = "Superscript"; SlotName[ chinese_simplified ] = "涓婃爣"; SlotName[ greek ] = "抨栎翮"; - SlotName[ korean ] = "鞙 觳瀽"; + SlotName[ korean ] = "鞙 觳瀽"; SlotName[ turkish ] = "躶t simge"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Super韓dex"; @@ -7035,7 +7035,7 @@ SfxSlotInfo FN_SHIFT_BACKSPACE SlotName [ english ] = "R點kschritt"; SlotName[ english_us ] = "Backspace"; SlotName[ portuguese ] = "Retrocesso"; - SlotName[ russian ] = "Backspace"; + SlotName[ russian ] = "孰噔桫 Backspace"; SlotName[ dutch ] = "Backspace"; SlotName[ french ] = "RetArr"; SlotName[ spanish ] = "Retroceso"; @@ -7061,7 +7061,26 @@ SfxSlotInfo FN_SHIFT_BACKSPACE SfxSlotInfo FN_SHOW_MULTIPLE_PAGES { SlotName = "Seitenansicht: mehrere Seiten"; - SlotName[ english_us ] = "Page Preview: Multiple pages"; + SlotName[ english_us ] = "Page Preview: Multiple Pages"; + SlotName[ portuguese ] = "Page Preview: Multiple pages"; + SlotName[ russian ] = "Page Preview: Multiple pages"; + SlotName[ greek ] = "Page Preview: Multiple pages"; + SlotName[ dutch ] = "Page Preview: Multiple pages"; + SlotName[ french ] = "Aper鐄 : plusieurs pages"; + SlotName[ spanish ] = "Vista preliminar: varias p醙inas"; + SlotName[ finnish ] = "Page Preview: Multiple pages"; + SlotName[ italian ] = "Anteprima di pagina: pi pagine"; + SlotName[ danish ] = "Page Preview: Multiple pages"; + SlotName[ swedish ] = "F鰎handsgranskning: flera sidor"; + SlotName[ polish ] = "Page Preview: Multiple pages"; + SlotName[ japanese ] = "銉氥兗銈搞儣銉償銉ャ兗: 瑜囨暟銇儦銉笺偢"; + SlotName[ korean ] = "韼橃澊歆 氙鸽Μ 氤搓赴: 雼れ 韼橃澊歆"; + SlotName[ chinese_simplified ] = "椤甸潰瑙嗗浘锛氬椤"; + SlotName[ chinese_traditional ] = "闋侀潰妾㈣锛氬洓闋"; + SlotName[ turkish ] = "Page Preview: Multiple pages"; + SlotName[ arabic ] = "Page Preview: Multiple pages"; + SlotName[ catalan ] = "Page Preview: Multiple pages"; + SlotName[ thai ] = "Page Preview: Multiple pages"; }; SfxSlotInfo FN_SHOW_TWO_PAGES { @@ -7157,21 +7176,21 @@ SfxSlotInfo FN_SPELLING_DLG SlotName[ portuguese ] = "Ortografia"; SlotName[ russian ] = "橡钼屦赅 铕纛沭圄梃"; SlotName[ dutch ] = "Spelling"; - SlotName[ french ] = "Orthographe"; + SlotName[ french ] = "V閞ification orthographique"; SlotName[ spanish ] = "Revisi髇 ortogr醘ica"; - SlotName[ italian ] = "Controllo ortografico "; + SlotName[ italian ] = "Controllo ortografico"; SlotName[ danish ] = "Stavekontrol"; SlotName[ swedish ] = "R鋞tstavning"; SlotName[ polish ] = "Pisownia"; SlotName[ portuguese_brazilian ] = "Spelling"; - SlotName[ japanese ] = "鏂囩珷鏍℃"; + SlotName[ japanese ] = "鏂囨浉鏍℃"; SlotName[ chinese_simplified ] = "鎷煎啓妫鏌"; SlotName[ chinese_traditional ] = "鎷煎妾㈡煡"; SlotName[ arabic ] = "氏揄 陪崆祈"; SlotName[ dutch ] = "Spelling"; SlotName[ chinese_simplified ] = "鎷煎啓妫鏌"; SlotName[ greek ] = "像栾泷狯哚"; - SlotName[ korean ] = "毵烄钉氩"; + SlotName[ korean ] = "毵烄钉氩 瓴靷"; SlotName[ turkish ] = "Yaz齧"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Verificaci ortogr鄁ica"; @@ -7287,7 +7306,7 @@ SfxSlotInfo FN_START_OF_DOCUMENT_SEL SlotName[ dutch ] = "Tot aan begin document selecteren"; SlotName[ chinese_simplified ] = "閫変腑鑷虫枃妗ｇ殑璧峰浣嶇疆"; SlotName[ greek ] = "硼殡镢 甍 翮 狁鬓 麸 邈泷荟秕"; - SlotName[ korean ] = "氍胳劀 鞁滌瀾 攵攵勱箤歆 靹犿儩"; + SlotName[ korean ] = "氍胳劀 鞁滌瀾旯岇 靹犿儩"; SlotName[ turkish ] = "Belgenin baang齝齨a kadar se"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Selecciona fins a l'inici del document"; @@ -7316,7 +7335,7 @@ SfxSlotInfo FN_START_OF_LINE SlotName[ dutch ] = "Naar regelbegin"; SlotName[ chinese_simplified ] = "杞埌琛岄"; SlotName[ greek ] = "旭矧 翮 狁鬓 翮 泷犰燹"; - SlotName[ korean ] = "頄 鞁滌瀾攵攵勳溂搿"; + SlotName[ korean ] = "欷 鞁滌瀾 攵攵勳溂搿"; SlotName[ turkish ] = "Sat齬 ba"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Al comen鏰ment de la l韓ia"; @@ -7331,7 +7350,7 @@ SfxSlotInfo FN_START_OF_LINE_SEL SlotName[ portuguese ] = "Seleccionar at in韈io da linha"; SlotName[ russian ] = "蔓溴腓螯 漕 磬鬣豚 耱痤觇"; SlotName[ dutch ] = "Tot aan regelbegin selecteren"; - SlotName[ french ] = "S閘ect. jusqu'au d閎ut de ligne"; + SlotName[ french ] = "S閘ectionner jusqu'au d閎ut de la ligne"; SlotName[ spanish ] = "Seleccionar hasta el comienzo de la l韓ea"; SlotName[ italian ] = "Seleziona fino all'inizio della riga"; SlotName[ danish ] = "Marker til r鎘kens begyndelse"; @@ -7345,7 +7364,7 @@ SfxSlotInfo FN_START_OF_LINE_SEL SlotName[ dutch ] = "Tot aan regelbegin selecteren"; SlotName[ chinese_simplified ] = "閫夋嫨鍒拌棣"; SlotName[ greek ] = "硼殡镢 甍 翮 狁鬓 翮 泷犰燹"; - SlotName[ korean ] = "頄 鞁滌瀾攵攵勱箤歆 靹犿儩"; + SlotName[ korean ] = "欷 鞁滌瀾旯岇 靹犿儩"; SlotName[ turkish ] = "Sat齬 bana kadar se"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Selecciona fins al comen鏰ment de la l韓ia"; @@ -7403,7 +7422,7 @@ SfxSlotInfo FN_START_OF_NEXT_PAGE SlotName[ dutch ] = "Naar begin volgende pagina"; SlotName[ chinese_simplified ] = "杞埌涓嬩釜椤甸潰鐨勮捣濮嬩綅缃"; SlotName[ greek ] = "旭矧 翮 狁鬓 翮 屦屙珧 箦脒溽"; - SlotName[ korean ] = "雼れ潓 韼橃澊歆 鞁滌瀾 攵攵勳溂搿"; + SlotName[ korean ] = "雼れ潓 韼橃澊歆鞚 鞁滌瀾鞙茧"; SlotName[ turkish ] = "Sonraki sayfan齨 baang齝"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Al comen鏰ment de la p鄃ina seg黣nt"; @@ -7418,7 +7437,7 @@ SfxSlotInfo FN_START_OF_NEXT_PAGE_SEL SlotName[ portuguese ] = "Seleccionar at in韈io da p醙ina seguinte"; SlotName[ russian ] = "蔓溴腓螯 漕 磬鬣豚 耠邃簋 耱疣龛鳆"; SlotName[ dutch ] = "Tot aan begin volgende pagina selecteren"; - SlotName[ french ] = "S閘ect. jusqu'au d閎ut de la page suivante"; + SlotName[ french ] = "S閘ectionner jusqu'au d閎ut de la page suivante"; SlotName[ spanish ] = "Seleccionar hasta comienzo de la p醙ina siguiente"; SlotName[ italian ] = "Seleziona fino all'inizio della pagina successiva"; SlotName[ danish ] = "Marker til n鎠te sides begyndelse"; @@ -7432,7 +7451,7 @@ SfxSlotInfo FN_START_OF_NEXT_PAGE_SEL SlotName[ dutch ] = "Tot aan begin volgende pagina selecteren"; SlotName[ chinese_simplified ] = "閫変腑鑷充笅椤电殑璧峰浣嶇疆"; SlotName[ greek ] = "硼殡镢 甍 翮 狁鬓 翮 屦屙珧 箦脒溽"; - SlotName[ korean ] = "雼れ潓 韼橃澊歆 鞁滌瀾 攵攵勱箤歆 靹犿儩"; + SlotName[ korean ] = "雼れ潓 韼橃澊歆鞚 鞁滌瀾旯岇 靹犿儩"; SlotName[ turkish ] = "Sonraki sayfan齨 baang齝齨a kadar se"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Selecciona fins al comen鏰ment de la p鄃ina seg黣nt"; @@ -7461,7 +7480,7 @@ SfxSlotInfo FN_START_OF_PAGE SlotName[ dutch ] = "Naar begin pagina"; SlotName[ chinese_simplified ] = "杞埌椤电殑璧峰浣嶇疆"; SlotName[ greek ] = "旭矧 翮 狁鬓 翮 箦脒溽"; - SlotName[ korean ] = "韼橃澊歆 鞁滌瀾 攵攵勳溂搿"; + SlotName[ korean ] = "韼橃澊歆鞚 鞁滌瀾鞙茧"; SlotName[ turkish ] = "Sayfa baang齝"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Al comen鏰ment de la p鄃ina"; @@ -7476,7 +7495,7 @@ SfxSlotInfo FN_START_OF_PAGE_SEL SlotName[ portuguese ] = "Seleccionar at in韈io da p醙ina"; SlotName[ russian ] = "蔓溴腓螯 漕 磬鬣豚 耱疣龛鳆"; SlotName[ dutch ] = "Tot aan begin pagina selecteren"; - SlotName[ french ] = "S閘ect. jusqu'au d閎ut de la page"; + SlotName[ french ] = "S閘ectionner jusqu'au d閎ut de la page"; SlotName[ spanish ] = "Seleccionar hasta el comienzo de la p醙ina"; SlotName[ italian ] = "Seleziona fino all'inizio della pagina"; SlotName[ danish ] = "Marker til sidens begyndelse"; @@ -7490,7 +7509,7 @@ SfxSlotInfo FN_START_OF_PAGE_SEL SlotName[ dutch ] = "Tot aan begin pagina selecteren"; SlotName[ chinese_simplified ] = "閫夋嫨鑷抽〉鐨勮捣濮嬩綅缃"; SlotName[ greek ] = "硼殡镢 甍 翮 狁鬓 翮 箦脒溽"; - SlotName[ korean ] = "韼橃澊歆 鞁滌瀾 攵攵勱箤歆 靹犿儩"; + SlotName[ korean ] = "韼橃澊歆鞚 鞁滌瀾旯岇 靹犿儩"; SlotName[ turkish ] = "Sayfan齨 baang齝齨a kadar se"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Selecciona fins al comen鏰ment de la p鄃ina"; @@ -7534,7 +7553,7 @@ SfxSlotInfo FN_START_OF_PARA_SEL SlotName[ portuguese ] = "Seleccionar at in韈io do par醙rafo"; SlotName[ russian ] = "蔓溴腓螯 漕 磬鬣豚 噌玎鲟"; SlotName[ dutch ] = "Tot aan begin alinea selecteren"; - SlotName[ french ] = "S閘ect. jusqu'au d閎ut du paragraphe"; + SlotName[ french ] = "S閘ectionner jusqu'au d閎ut du paragraphe"; SlotName[ spanish ] = "Seleccionar hasta el comienzo del p醨rafo"; SlotName[ italian ] = "Selezioni fini all'inizio del parametro"; SlotName[ danish ] = "Marker til afsnittets begyndelse"; @@ -7548,7 +7567,7 @@ SfxSlotInfo FN_START_OF_PARA_SEL SlotName[ dutch ] = "Tot aan begin alinea selecteren"; SlotName[ chinese_simplified ] = "閫変腑鑷虫钀界殑璧峰浣嶇疆"; SlotName[ greek ] = "硼殡镢 甍 翮 狁鬓 翮 疳襻泷荟秕"; - SlotName[ korean ] = "雼澖 鞁滌瀾 攵攵勱箤歆 靹犿儩"; + SlotName[ korean ] = "雼澖 鞁滌瀾旯岇 靹犿儩"; SlotName[ turkish ] = "Paragraf baang齝齨a kadar se"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Selecciona fins al comen鏰ment del par鄃raf"; @@ -7606,7 +7625,7 @@ SfxSlotInfo FN_START_OF_PREV_PAGE SlotName[ dutch ] = "Naar begin vorige pagina"; SlotName[ chinese_simplified ] = "杞埌涓婁竴椤电殑璧峰浣嶇疆"; SlotName[ greek ] = "旭矧 狁鬓 瘃镧泔屙珧 箦脒溽"; - SlotName[ korean ] = "鞚挫爠 韼橃澊歆 鞁滌瀾 攵攵勳溂搿"; + SlotName[ korean ] = "鞚挫爠 韼橃澊歆 鞁滌瀾鞙茧"; SlotName[ turkish ] = "謓ceki sayfan齨 baang齝"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Al comen鏰ment de la p鄃ina anterior"; @@ -7621,7 +7640,7 @@ SfxSlotInfo FN_START_OF_PREV_PAGE_SEL SlotName[ portuguese ] = "Seleccionar at in韈io da p醙ina anterior"; SlotName[ russian ] = "蔓溴腓螯 漕 磬鬣豚 镳邃簌彘 耱疣龛鳆"; SlotName[ dutch ] = "Tot aan begin vorige pagina selecteren"; - SlotName[ french ] = "S閘ect. jusqu'au d閎ut de la page pr閏閐ente"; + SlotName[ french ] = "S閘ectionner jusqu'au d閎ut de la page pr閏閐ente"; SlotName[ spanish ] = "Seleccionar hasta el comienzo de la p醙ina anterior"; SlotName[ italian ] = "Seleziona fino all'inizio della pagina precedente"; SlotName[ danish ] = "Marker til forrige sides begyndelse"; @@ -7635,7 +7654,7 @@ SfxSlotInfo FN_START_OF_PREV_PAGE_SEL SlotName[ dutch ] = "Tot aan begin vorige pagina selecteren"; SlotName[ chinese_simplified ] = "閫変腑鑷充笂涓椤电殑璧峰浣嶇疆"; SlotName[ greek ] = "硼殡镢 甍 翮 狁鬓 翮 瘃镧泔屙珧 箦脒溽"; - SlotName[ korean ] = "鞚挫爠 韼橃澊歆 鞁滌瀾 攵攵勱箤歆 靹犿儩"; + SlotName[ korean ] = "鞚挫爠 韼橃澊歆 鞁滌瀾旯岇 靹犿儩"; SlotName[ turkish ] = "謓ceki sayfan齨 baang齝齨a kadar se"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Selecciona fins al comen鏰ment de la p鄃ina anterior"; @@ -7664,7 +7683,7 @@ SfxSlotInfo FN_START_TABLE SlotName[ dutch ] = "Naar begin tabel"; SlotName[ chinese_simplified ] = "杞埌琛ㄦ牸鐨勮捣濮嬩綅缃"; SlotName[ greek ] = "旭矧 翮 狁鬓 麸 疬磲赆"; - SlotName[ korean ] = "響 鞁滌瀾 攵攵勳溂搿"; + SlotName[ korean ] = "響 鞁滌瀾鞙茧"; SlotName[ turkish ] = "Tablo baang齝"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Al comen鏰ment de la taula"; @@ -7679,8 +7698,8 @@ SfxSlotInfo FN_STAT_HYPERLINKS SlotName[ portuguese ] = "Activar hiperliga珲es"; SlotName[ russian ] = "狸蜩忭 汨镥瘃覃腙 "; SlotName[ dutch ] = "Hyperlinks actief"; - SlotName[ french ] = "Activer hyperliens"; - SlotName[ spanish ] = "Activar Hiperenlaces"; + SlotName[ french ] = "Hyperliens actifs"; + SlotName[ spanish ] = "Hiperenlaces activos"; SlotName[ italian ] = "Hyperlink attivi"; SlotName[ danish ] = "Hyperlinks aktive"; SlotName[ swedish ] = "Hyperl鋘kar aktiva"; @@ -7864,7 +7883,7 @@ SfxSlotInfo FN_TABLE_BALANCE_CELLS SlotName[ dutch ] = "Kolommen gelijkmatig verdelen"; SlotName[ chinese_simplified ] = "骞冲潎鍒嗛厤鍒楀"; SlotName[ greek ] = "后 赆翎盹燹 篝珉"; - SlotName[ korean ] = "鞐 臧勱博 鞚检爼頃橁矊"; + SlotName[ korean ] = "鞐 臧勱博 攴犽摫頃橁矊"; SlotName[ turkish ] = "S黷unlar geniiklerini e㱮tle"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Distribueix les columnes uniformement"; @@ -7893,7 +7912,7 @@ SfxSlotInfo FN_TABLE_BALANCE_ROWS SlotName[ dutch ] = "Rijen gelijkmatig verdelen"; SlotName[ chinese_simplified ] = "骞冲潎鍒嗛厤琛岄珮"; SlotName[ greek ] = "后 赆翎盹燹 泷犰忐"; - SlotName[ korean ] = "頄 臧勱博 鞚检爼頃橁矊"; + SlotName[ korean ] = "頄 臧勱博 攴犽摫頃橁矊"; SlotName[ turkish ] = "Sat齬 y黭sekliklerini e㱮tle"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Distribueix les files uniformement"; @@ -7909,7 +7928,7 @@ SfxSlotInfo FN_TABLE_DELETE_COL SlotName[ russian ] = "愉嚯栩 耱铍徨"; SlotName[ dutch ] = "Kolom wissen"; SlotName[ french ] = "Supprimer la colonne"; - SlotName[ spanish ] = "Eliminar columna"; + SlotName[ spanish ] = "Borrar la columna"; SlotName[ italian ] = "Elimina colonna"; SlotName[ danish ] = "Slet kolonne"; SlotName[ swedish ] = "Radera kolumn"; @@ -7938,7 +7957,7 @@ SfxSlotInfo FN_TABLE_DELETE_ROW SlotName[ russian ] = "愉嚯栩 耱痤牦"; SlotName[ dutch ] = "Rij wissen"; SlotName[ french ] = "Supprimer la ligne"; - SlotName[ spanish ] = "Eliminar fila"; + SlotName[ spanish ] = "Borrar fila"; SlotName[ italian ] = "Elimina riga"; SlotName[ danish ] = "Slet r鎘ke"; SlotName[ swedish ] = "Radera rad"; @@ -8096,7 +8115,7 @@ SfxSlotInfo FN_TABLE_MODE_FIX SlotName[ dutch ] = "Tabel: vast"; SlotName[ chinese_simplified ] = "琛ㄦ牸鍥哄畾"; SlotName[ greek ] = "羞磲赆: 郁徼羼"; - SlotName[ korean ] = "響:瓿犾爼"; + SlotName[ korean ] = "響: 瓿犾爼"; SlotName[ turkish ] = "Tablo: Sabit"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Taula: fixa"; @@ -8125,7 +8144,7 @@ SfxSlotInfo FN_TABLE_MODE_FIX_PROP SlotName[ dutch ] = "Tabel; vast, proportioneel"; SlotName[ chinese_simplified ] = "琛ㄦ牸鍥哄畾鎴愭瘮渚"; SlotName[ greek ] = "羞磲赆: 郁徼羼, 犴犭镢殛"; - SlotName[ korean ] = "響: 瓿犾爼,牍勲"; + SlotName[ korean ] = "響: 瓿犾爼 牍勲"; SlotName[ turkish ] = "Tablo: Sabit, orant齦"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Taula: fixa, proporcional"; @@ -8154,7 +8173,7 @@ SfxSlotInfo FN_TABLE_MODE_VARIABLE SlotName[ dutch ] = "Tabel: variabel"; SlotName[ chinese_simplified ] = "琛ㄦ牸鍙彉"; SlotName[ greek ] = "羞磲赆: 体翎怆玺"; - SlotName[ korean ] = "響:氤靾"; + SlotName[ korean ] = "響: 氤靾"; SlotName[ turkish ] = "Tablo: De餴⺧en"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Taula: variable"; @@ -8198,7 +8217,7 @@ SfxSlotInfo FN_TABLE_SELECT_ALL SlotName[ portuguese ] = "Seleccionar tabela"; SlotName[ russian ] = "蔓溴腓螯 蜞犭桷"; SlotName[ dutch ] = "Tabel selecteren"; - SlotName[ french ] = "S閘ectionner tableau"; + SlotName[ french ] = "S閘ectionner le tableau"; SlotName[ spanish ] = "Seleccionar tabla"; SlotName[ italian ] = "Seleziona tabella"; SlotName[ danish ] = "Marker tabel"; @@ -8256,7 +8275,7 @@ SfxSlotInfo FN_TABLE_SELECT_ROW SlotName[ portuguese ] = "Seleccionar linha"; SlotName[ russian ] = "蔓溴腓螯 耱痤牦"; SlotName[ dutch ] = "Rij selecteren"; - SlotName[ french ] = "S閘ectionner ligne"; + SlotName[ french ] = "S閘ectionner la ligne"; SlotName[ spanish ] = "Selecionar fila"; SlotName[ italian ] = "Seleziona riga"; SlotName[ danish ] = "Marker r鎘ke"; @@ -8415,7 +8434,7 @@ SfxSlotInfo FN_TABLE_UNSET_READ_ONLY SlotName[ dutch ] = "Werkbladbeveiliging opheffen"; SlotName[ chinese_simplified ] = "鍙栨秷琛ㄦ牸淇濇姢"; SlotName[ greek ] = "梳糗胥珞 瘃矬翎筮狎 疬磲赆"; - SlotName[ korean ] = "響 氤错樃 頃挫牅"; + SlotName[ korean ] = "鞁滍姼 氤错樃 頃挫牅"; SlotName[ turkish ] = "Tablo korumas齨 kald齬"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Desprotegeix la taula"; @@ -8647,7 +8666,7 @@ SfxSlotInfo FN_TOOL_ANKER SlotName[ dutch ] = "Verankering wisselen"; SlotName[ chinese_simplified ] = "鏇存敼閿佸畾"; SlotName[ greek ] = "岭脶戕 徙挲聩箸"; - SlotName[ korean ] = "瓿犾爼鞙勳箻 氤瓴"; + SlotName[ korean ] = "旮办 鞙勳箻 氤瓴"; SlotName[ turkish ] = "Sabitleme t黵黱 de餴⺶ir"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Canvia l'ancoratge"; @@ -8676,7 +8695,7 @@ SfxSlotInfo FN_TOOL_ANKER_AT_CHAR SlotName[ dutch ] = "Als teken verankeren"; SlotName[ chinese_simplified ] = "閿佸畾鍦ㄥ瓧绗︿笂"; SlotName[ greek ] = "零挲聩箸 篝镯 麽襻牯揆"; - SlotName[ korean ] = "氍胳瀽鞐 鞙勳箻 瓿犾爼"; + SlotName[ korean ] = "氍胳瀽鞐 旮办 鞙勳箻"; SlotName[ turkish ] = "Karaktere sabitle"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Ancora al car郼ter"; @@ -8705,7 +8724,7 @@ SfxSlotInfo FN_TOOL_ANKER_CHAR SlotName[ dutch ] = "Als teken verankeren"; SlotName[ chinese_simplified ] = "褰撲綔瀛楃閿佸畾"; SlotName[ greek ] = "零挲聩箸 篝镯 麽襻牯揆"; - SlotName[ korean ] = "氍胳瀽搿 鞙勳箻瓿犾爼"; + SlotName[ korean ] = "氍胳瀽搿 旮办 鞙勳箻"; SlotName[ turkish ] = "Karaktere sabitle"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Ancora com a car郼ter"; @@ -8734,7 +8753,7 @@ SfxSlotInfo FN_TOOL_ANKER_FRAME SlotName[ dutch ] = "Aan kader verankeren"; SlotName[ chinese_simplified ] = "閿佸畾鍦ㄦ杈"; SlotName[ greek ] = "零挲聩箸 篝 痣徇箝"; - SlotName[ korean ] = "頂勲爤鞛勳棎 鞙勳箻瓿犾爼"; + SlotName[ korean ] = "頂勲爤鞛勳棎 旮办 鞙勳箻"; SlotName[ turkish ] = "莈r鏴veye sabitle"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Ancora al marc"; @@ -8763,7 +8782,7 @@ SfxSlotInfo FN_TOOL_ANKER_PAGE SlotName[ dutch ] = "Aan pagina verankeren"; SlotName[ chinese_simplified ] = "閿佸畾鍦ㄩ〉闈笂"; SlotName[ greek ] = "零挲聩箸 篝 箦脒溽"; - SlotName[ korean ] = "韼橃澊歆 鞙勳箻瓿犾爼"; + SlotName[ korean ] = "韼橃澊歆鞐 旮办 鞙勳箻"; SlotName[ turkish ] = "Sayfaya sabitle"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Ancora a la p鄃ina"; @@ -8792,7 +8811,7 @@ SfxSlotInfo FN_TOOL_ANKER_PARAGRAPH SlotName[ dutch ] = "Aan alinea verankeren"; SlotName[ chinese_simplified ] = "閿佸畾鍦ㄦ钀戒笂"; SlotName[ greek ] = "零挲聩箸 篝 疳褴泷狯"; - SlotName[ korean ] = "雼澖鞐 鞙勳箻瓿犾爼"; + SlotName[ korean ] = "雼澖鞐 旮办 鞙勳箻"; SlotName[ turkish ] = "Paragrafa sabitle"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Ancora al par鄃raf"; @@ -8805,7 +8824,7 @@ SfxSlotInfo FN_TOOL_GROUP SlotName [ english ] = "Gruppierung"; SlotName[ english_us ] = "Group"; SlotName[ portuguese ] = "Agrupar"; - SlotName[ russian ] = "灭箫镨痤忄龛"; + SlotName[ russian ] = "灭箫镨痤忄螯"; SlotName[ dutch ] = "Groepering"; SlotName[ french ] = "Grouper"; SlotName[ spanish ] = "Agrupar"; @@ -8966,7 +8985,7 @@ SfxSlotInfo FN_UPDATE_ALL_LINKS SlotName[ dutch ] = "Koppelingen bijwerken"; SlotName[ chinese_simplified ] = "鏇存柊閾炬帴"; SlotName[ greek ] = "彭珈蓠 豉 篚礓蒹妁"; - SlotName[ korean ] = "氇摖 鞐瓣舶 鞐呺嵃鞚错姼"; + SlotName[ korean ] = "氇摖 毵來伂 鞐呺嵃鞚错姼"; SlotName[ turkish ] = "Ba餷ant齦ar g黱celle"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Actualitza els enlla鏾s"; @@ -9010,7 +9029,7 @@ SfxSlotInfo FN_EDIT_CURRENT_TOX SlotName[ portuguese ] = "Editar 韓dice"; SlotName[ greek ] = "硼孱羼汜筮 艴皴翮襁秕"; SlotName[ dutch ] = "Index bewerken"; - SlotName[ french ] = "Modifier l'index"; + SlotName[ french ] = "蒬iter l'index"; SlotName[ spanish ] = "Editar 韓dice"; SlotName[ swedish ] = "Redigera f鰎teckning"; SlotName[ russian ] = "橡噔赅 钽豚怆屙"; @@ -9080,7 +9099,7 @@ SfxSlotInfo FN_UPDATE_INPUTFIELDS SlotName[ dutch ] = "Invoervelden bijwerken"; SlotName[ chinese_simplified ] = "鏇存柊杈撳叆瀛楁"; SlotName[ greek ] = "彭珈蓠 疱溥 彘筢泫戕"; - SlotName[ korean ] = "鞛呺牓頃勲摐 鞐呺嵃鞚错姼"; + SlotName[ korean ] = "鞛呺牓 頃勲摐 鞐呺嵃鞚错姼"; SlotName[ turkish ] = "Giri alanlar齨 g黱celle"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Actualitza els camps d'entrada"; @@ -9138,7 +9157,7 @@ SfxSlotInfo FN_VIEW_BOUNDS SlotName[ dutch ] = "Tekstbegrenzingen"; SlotName[ chinese_simplified ] = "姝ｆ枃杈圭晫"; SlotName[ greek ] = "捡獒 赍殪蓓秕"; - SlotName[ korean ] = "韰嶌姢韸 瓴疥硠靹"; + SlotName[ korean ] = "韰嶌姢韸 瓴疥硠"; SlotName[ turkish ] = "Metin s齨齬lar"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "L韒its del text"; @@ -9196,7 +9215,7 @@ SfxSlotInfo FN_VIEW_FIELDS SlotName[ dutch ] = "Veldopdrachten"; SlotName[ chinese_simplified ] = "瀛楁鎸囦护"; SlotName[ greek ] = "彭麸胼 疱溥秕"; - SlotName[ korean ] = "頃勲摐氇呺牴"; + SlotName[ korean ] = "頃勲摐"; SlotName[ turkish ] = "Alan 鲳eleri"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Camps"; @@ -9213,14 +9232,14 @@ SfxSlotInfo FN_VIEW_GRAPHIC SlotName[ greek ] = "民狯殛 歪/槛"; SlotName[ dutch ] = "Afbeelding aan/uit"; SlotName[ french ] = "Afficher/masquer les images"; - SlotName[ spanish ] = "Imagen"; + SlotName[ spanish ] = "Activar/desactivar im醙enes"; SlotName[ italian ] = "Immagine"; SlotName[ danish ] = "Grafik til/fra"; SlotName[ swedish ] = "Grafik p/av"; SlotName[ polish ] = "W彻cz/Wy彻cz grafik"; SlotName[ portuguese_brazilian ] = "ViewGraphic"; SlotName[ japanese ] = "鍥 銈兂/銈儠"; - SlotName[ korean ] = "攴鸽灅頂 響滌嫓/靾赴旮"; + SlotName[ korean ] = "攴鸽 響滌嫓/靾赴旮"; SlotName[ chinese_simplified ] = "鏄剧ず/闅愬叆鍥惧舰"; SlotName[ chinese_traditional ] = "椤ず鎴栭毐鍏ュ湒褰"; SlotName[ turkish ] = "Grafik"; @@ -9281,7 +9300,7 @@ SfxSlotInfo FN_VIEW_MARKS SlotName[ dutch ] = "Markeringen"; SlotName[ chinese_simplified ] = "绾㈣壊鏇茬嚎"; SlotName[ greek ] = "隅燔溟"; - SlotName[ korean ] = "響滌嫓鞛"; + SlotName[ korean ] = "頃勲摐 鞚岇榿"; SlotName[ turkish ] = "Belirte鏻er"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Marques"; @@ -9322,7 +9341,7 @@ SfxSlotInfo FN_VIEW_TABLEGRID SlotName[ portuguese ] = "Margens da tabela"; SlotName[ russian ] = "灭囗桷 蜞犭桷"; SlotName[ dutch ] = "Tabelbegrenzingen"; - SlotName[ french ] = "Limiteurs de tableaux"; + SlotName[ french ] = "D閘imitations de tableau"; SlotName[ spanish ] = "L韒ites de la tabla"; SlotName[ italian ] = "Limiti tabella"; SlotName[ danish ] = "Tabelgr鎛ser"; @@ -9336,7 +9355,7 @@ SfxSlotInfo FN_VIEW_TABLEGRID SlotName[ dutch ] = "Tabelbegrenzingen"; SlotName[ chinese_simplified ] = "琛ㄦ牸杈圭晫"; SlotName[ greek ] = "捡獒 疬磲赆"; - SlotName[ korean ] = "響 瓴疥硠靹"; + SlotName[ korean ] = "響 瓴疥硠"; SlotName[ turkish ] = "Tablo s齨齬lar"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "L韒its de la taula"; @@ -9365,7 +9384,7 @@ SfxSlotInfo FN_VLINEAL SlotName[ dutch ] = "Verticale liniaal"; SlotName[ chinese_simplified ] = "鍨傜洿鏍囧昂"; SlotName[ greek ] = "梳翎挈聃鲲 鬈襻赆"; - SlotName[ korean ] = "靾橃 雸堦笀鞛"; + SlotName[ korean ] = "靹鸽 雸堦笀鞛"; SlotName[ turkish ] = "Dikey cetvel"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Regle vertical"; @@ -9394,7 +9413,7 @@ SfxSlotInfo FN_VSCROLLBAR SlotName[ dutch ] = "Verticale beeldschuifbalk"; SlotName[ chinese_simplified ] = "鍨傜洿婊氬姩鏉"; SlotName[ greek ] = "梳翎挈聃鲧 泷犰燹 挲腴箸"; - SlotName[ korean ] = "靾橃 鞀ろ伂搿 氚"; + SlotName[ korean ] = "靾橃 鞀ろ伂搿 毵夒寑"; SlotName[ turkish ] = "Dikey kayd齬ma 鐄bu饀"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Barra de despla鏰ment vertical"; @@ -9409,8 +9428,8 @@ SfxSlotInfo FN_WRAP_ANCHOR_ONLY SlotName[ portuguese ] = "Ajuste do primeiro par醙rafo"; SlotName[ russian ] = "吾蝈赅龛 镥疴钽 噌玎鲟"; SlotName[ dutch ] = "Omloop eerste alinea"; - SlotName[ french ] = "Adaptation premier paragraphe"; - SlotName[ spanish ] = "Ajuste del primer p醨rafo"; + SlotName[ french ] = "Adaptation au premier paragraphe"; + SlotName[ spanish ] = "Ajuste al primer p醨rafo"; SlotName[ italian ] = "Scorrimento primo paragrafo"; SlotName[ danish ] = "Ombryd f鴕ste afsnit"; SlotName[ swedish ] = "Textanpassning f鰎sta stycket"; @@ -9423,7 +9442,7 @@ SfxSlotInfo FN_WRAP_ANCHOR_ONLY SlotName[ dutch ] = "Omloop eerste alinea"; SlotName[ chinese_simplified ] = "鐜粫绗竴涓钀"; SlotName[ greek ] = "另徜唣膣箸 瘃珧 疳襻泷荟秕"; - SlotName[ korean ] = "氍胳瀽鞐 氚办箻, 觳 雼澖"; + SlotName[ korean ] = "觳 雼澖 氍胳灔 氚办箻"; SlotName[ turkish ] = "輑k paragrafta metin da瘕l齧"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Ajusta el primer par鄃raf"; @@ -9439,7 +9458,7 @@ SfxSlotInfo SID_ATTR_CHAR_COLOR_BACKGROUND SlotName[ russian ] = "蔓溴脲龛 鲡弪铎"; SlotName[ dutch ] = "Tekenachtergrond"; SlotName[ french ] = "Trame de fond"; - SlotName[ spanish ] = "Fondo de car醕ter"; + SlotName[ spanish ] = "Fondo del car醕ter"; SlotName[ italian ] = "Sfondo caratteri"; SlotName[ danish ] = "Tegnbaggrund"; SlotName[ swedish ] = "Teckenbakgrund"; @@ -9468,7 +9487,7 @@ SfxSlotInfo SID_ATTR_CHAR_COLOR_BACKGROUND_EXT SlotName[ russian ] = "青腓怅, 恹溴脲龛 鲡弪铎"; SlotName[ dutch ] = "Tekenachtergrond gieter"; SlotName[ french ] = "Trame de fond - Verseuse"; - SlotName[ spanish ] = "Fondo de car醕ter"; + SlotName[ spanish ] = "Color del fondo de car醕ter"; SlotName[ italian ] = "Colore sfondo caratteri"; SlotName[ danish ] = "Tegnbaggrund-fyld"; SlotName[ swedish ] = "F鋜g鰒erstrykning teckenbakgrund"; @@ -9481,7 +9500,7 @@ SfxSlotInfo SID_ATTR_CHAR_COLOR_BACKGROUND_EXT SlotName[ dutch ] = "Tekenachtergrond gieter"; SlotName[ chinese_simplified ] = "瀛楃鑳屾櫙濉壊"; SlotName[ greek ] = "酗糸篝揆 鳇眙秕 麽襻牯揆"; - SlotName[ korean ] = "氍胳瀽 氚瓣步锛嶌眲鞖瓣赴"; + SlotName[ korean ] = "氍胳瀽 氚瓣步 毂勳毎旮"; SlotName[ turkish ] = "Vurgu renk doldurma"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Ressalta l'emplenament"; @@ -9510,7 +9529,7 @@ SfxSlotInfo SID_ATTR_CHAR_COLOR_EXT SlotName[ dutch ] = "Tekenkleur-gieter"; SlotName[ chinese_simplified ] = "瀛楃棰滆壊濉壊"; SlotName[ greek ] = "酗糸篝揆 黢狒矧 麽襻牯揆"; - SlotName[ korean ] = "旮昙挫儔锛嶌眲鞖瓣赴"; + SlotName[ korean ] = "旮昙 靸夓儊 毂勳毎旮"; SlotName[ turkish ] = "Yaz齮ipi rengi doldurma"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Color d'emplenament de la lletra"; @@ -9568,7 +9587,7 @@ SfxSlotInfo SID_TEMPLATE_LOAD SlotName[ dutch ] = "Opmaakprofielen laden"; SlotName[ chinese_simplified ] = "瑁呭叆鏍峰紡"; SlotName[ greek ] = "贮耵 瘃雉"; - SlotName[ korean ] = "韰滍攲毽 搿滊摐"; + SlotName[ korean ] = "鞀ろ儉鞚 搿滊摐"; SlotName[ turkish ] = "轪blonlar y黭le"; SlotName[ language_user1 ] = " "; SlotName[ catalan ] = "Carrega els estils"; @@ -9584,7 +9603,7 @@ SfxSlotInfo FN_INSERT_COLUMN_SECTION SlotName[ greek ] = "砰筢泫戕 屙玺狎"; SlotName[ dutch ] = "Bereik invoegen"; SlotName[ french ] = "Ins閞er une section"; - SlotName[ spanish ] = "Insertar 醨ea"; + SlotName[ spanish ] = "Insertar una secci髇"; SlotName[ swedish ] = "Infoga omr錮e"; SlotName[ russian ] = "埋蜞忤螯 疣玟咫"; SlotName[ italian ] = "Inserisci sezione"; @@ -9592,7 +9611,7 @@ SfxSlotInfo FN_INSERT_COLUMN_SECTION SlotName[ polish ] = "Wstaw obszar"; SlotName[ portuguese_brazilian ] = "Insert Section"; SlotName[ japanese ] = "绡勫洸銇尶鍏"; - SlotName[ korean ] = "鞓侅棴 靷届瀰"; + SlotName[ korean ] = "甑棴 靷届瀰"; SlotName[ chinese_simplified ] = "鎻掑叆鍖哄煙"; SlotName[ chinese_traditional ] = "鎻掑叆鍗鍩"; SlotName[ arabic ] = "畔亚 湄寝"; @@ -9723,7 +9742,7 @@ SfxSlotInfo FN_REMOVE_CUR_TOX SlotName[ greek ] = "拈徙襻鲛 艴皴翮襁秕"; SlotName[ dutch ] = "Index wissen"; SlotName[ french ] = "Supprimer l'index"; - SlotName[ spanish ] = "Eliminar 韓dice"; + SlotName[ spanish ] = "Borrar 韓dice"; SlotName[ italian ] = "Rimuovi indice"; SlotName[ danish ] = "Slet indeks"; SlotName[ swedish ] = "Radera f鰎teckning"; @@ -9784,7 +9803,7 @@ SfxSlotInfo FN_SET_MODOPT_TBLNUMFMT SlotName[ polish ] = "Identyfikacja numeru"; SlotName[ portuguese_brazilian ] = "Number recognition"; SlotName[ japanese ] = "鐣彿瑾嶈瓨"; - SlotName[ korean ] = "氩堩樃 鞚胳嫕"; + SlotName[ korean ] = "靾瀽 鞚胳嫕"; SlotName[ chinese_simplified ] = "鏁板瓧璇嗗埆"; SlotName[ chinese_traditional ] = "鏁稿瓧璀樺垾"; SlotName[ turkish ] = "Number recognition"; @@ -9810,7 +9829,7 @@ SfxSlotInfo FN_UPDATE_CHARTS SlotName[ polish ] = "Aktualizuj wykresy"; SlotName[ portuguese_brazilian ] = "Update Charts"; SlotName[ japanese ] = "銈般儵銉曘伄鏇存柊"; - SlotName[ korean ] = "鞐呺嵃鞚错姼 彀姼"; + SlotName[ korean ] = "彀姼 鞐呺嵃鞚错姼"; SlotName[ chinese_simplified ] = "鏇存柊鍥捐〃"; SlotName[ chinese_traditional ] = "鏇存柊鍦栬〃"; SlotName[ turkish ] = "Update Charts"; @@ -9926,3 +9945,8 @@ SfxSlotInfo FN_READONLY_SELECTION_MODE SlotName[ thai ] = "Select text"; }; + + + + + diff --git a/sw/sdi/wrtapp.sdi b/sw/sdi/wrtapp.sdi index 212decbd7d6c..e614bd817e4a 100644 --- a/sw/sdi/wrtapp.sdi +++ b/sw/sdi/wrtapp.sdi @@ -2,9 +2,9 @@ * * $RCSfile: wrtapp.sdi,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: os $ $Date: 2002-11-29 12:09:03 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -130,11 +130,6 @@ interface StarWriter : Module StateMethod = NoState ; ]*/ - FN_QRY_MERGE // status() - [ - ExecMethod = ExecDB ; - DisableFlags="SW_DISABLE_ON_MAILBOX_EDITOR"; - ] SID_ATTR_UNDO_COUNT // ole(no) api(final/play) [ diff --git a/sw/sdi/wviewsh.sdi b/sw/sdi/wviewsh.sdi index 969361943ac9..af71a92b96a1 100644 --- a/sw/sdi/wviewsh.sdi +++ b/sw/sdi/wviewsh.sdi @@ -2,9 +2,9 @@ * * $RCSfile: wviewsh.sdi,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: os $ $Date: 2002-08-30 10:22:41 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -203,6 +203,26 @@ interface WebSourceView : View ExecMethod = Execute ; StateMethod = NoState ; ] + SID_MAIL_SENDDOC + [ + StateMethod = GetState ; + ] + SID_MAIL_SENDDOCASPDF + [ + StateMethod = GetState ; + ] + SID_EXPORTDOC + [ + StateMethod = GetState ; + ] + SID_EXPORTDOCASPDF + [ + StateMethod = GetState ; + ] + SID_DIRECTEXPORTDOCASPDF + [ + StateMethod = GetState ; + ] } shell SwSrcView : SfxViewShell diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx index 2864690d86c9..253de82cdd06 100644 --- a/sw/source/core/access/acccell.cxx +++ b/sw/source/core/access/acccell.cxx @@ -2,9 +2,9 @@ * * $RCSfile: acccell.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: mib $ $Date: 2002-11-25 15:14:37 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -380,11 +380,14 @@ Sequence< Type > SAL_CALL SwAccessibleCell::getTypes() throw(RuntimeException) Sequence< sal_Int8 > SAL_CALL SwAccessibleCell::getImplementationId() throw(RuntimeException) { + vos::OGuard aGuard(Application::GetSolarMutex()); static Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) - rtl_createUuid( reinterpret_cast< sal_uInt8 * >(aId.getArray() ), - 0, sal_True ); + { + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; + } return aId; } diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index a215555e7c45..cbb2b6413ba5 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: acccontext.cxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: mib $ $Date: 2002-12-05 14:10:33 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -139,6 +139,9 @@ #ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_SHAPE_HXX #include <svx/AccessibleShape.hxx> #endif +#ifndef COMPHELPER_ACCESSIBLE_EVENT_NOTIFIER +#include <comphelper/accessibleeventnotifier.hxx> +#endif #if defined DEBUG && defined TEST_MIB #define DBG_MSG( _msg ) \ @@ -532,31 +535,8 @@ void SwAccessibleContext::FireAccessibleEvent( AccessibleEventObject& rEvent ) rEvent.Source = xThis; } - ::cppu::OInterfaceIteratorHelper aIter( aAccessibleEventListeners ); - while( aIter.hasMoreElements() ) - { - Reference < XAccessibleEventListener > xListener( aIter.next(), - UNO_QUERY ); - if( xListener.is() ) // TODO: test is unneccessary soon - { - try - { - xListener->notifyEvent( rEvent ); - } - catch( ::com::sun::star::uno::RuntimeException& r ) - { -#ifdef DEBUG - ByteString aError( "Runtime exception caught for event" ); - aError += ByteString::CreateFromInt32( rEvent.EventId ); - aError += ".:\n"; - aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US ); - DBG_ERROR( aError.GetBuffer() ); -#endif -// aIter.remove(); - } - } - } - + if (nClientId) + comphelper::AccessibleEventNotifier::addEvent( nClientId, rEvent ); } void SwAccessibleContext::FireVisibleDataEvent() @@ -615,10 +595,10 @@ SwAccessibleContext::SwAccessibleContext( SwAccessibleMap *pM, const SwFrm *pF ) : SwAccessibleFrame( pM->GetVisArea().SVRect(), pF, pM->GetShell()->IsPreView() ), - aAccessibleEventListeners( aListenerMutex ), pMap( pM ), nRole( nR ), - bDisposing( sal_False ) + bDisposing( sal_False ), + nClientId(0) { InitStates(); DBG_MSG_CD( "constructed" ) @@ -631,10 +611,10 @@ SwAccessibleContext::SwAccessibleContext( SwAccessibleMap *pM, SwAccessibleFrame( pM->GetVisArea().SVRect(), pF, pM->GetShell()->IsPreView() ), sName( rName ), - aAccessibleEventListeners( aListenerMutex ), pMap( pM ), nRole( nR ), - bDisposing( sal_False ) + bDisposing( sal_False ), + nClientId(0) { InitStates(); DBG_MSG_CD( "constructed" ) @@ -816,7 +796,14 @@ void SAL_CALL SwAccessibleContext::addEventListener( throw (::com::sun::star::uno::RuntimeException) { DBG_MSG( "accessible event listener added" ) - aAccessibleEventListeners.addInterface( xListener ); + + if (xListener.is()) + { + vos::OGuard aGuard(Application::GetSolarMutex()); + if (!nClientId) + nClientId = comphelper::AccessibleEventNotifier::registerClient( ); + comphelper::AccessibleEventNotifier::addEventListener( nClientId, xListener ); + } } void SAL_CALL SwAccessibleContext::removeEventListener( @@ -824,7 +811,21 @@ void SAL_CALL SwAccessibleContext::removeEventListener( throw (::com::sun::star::uno::RuntimeException) { DBG_MSG( "accessible event listener removed" ) - aAccessibleEventListeners.removeInterface( xListener ); + + if (xListener.is()) + { + vos::OGuard aGuard(Application::GetSolarMutex()); + sal_Int32 nListenerCount = comphelper::AccessibleEventNotifier::removeEventListener( nClientId, 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( nClientId ); + nClientId = 0; + } + } } static sal_Bool lcl_PointInRectangle(const awt::Point & aPoint, @@ -866,8 +867,8 @@ Reference< XAccessible > SAL_CALL SwAccessibleContext::getAccessibleAt( Point aPixPoint( aPoint.X, aPoint.Y ); // px rel to parent if( !GetFrm()->IsRootFrm() ) { - Point aLogPos( GetBounds( GetFrm() ).Pos() ); // twip rel to doc root - Point aPixPos( GetMap()->CoreToPixel( aLogPos ) ); + SwRect aLogBounds( GetBounds( GetFrm() ) ); // twip rel to doc root + Point aPixPos( GetMap()->CoreToPixel( aLogBounds.SVRect() ).TopLeft() ); aPixPoint.X() += aPixPos.X(); aPixPoint.Y() += aPixPos.Y(); } @@ -924,15 +925,20 @@ awt::Rectangle SAL_CALL SwAccessibleContext::getBoundsImpl(sal_Bool bRelative) { ASSERT( GetShell()->IsPreView(), "empty page accessible?" ); if( GetShell()->IsPreView() ) - aLogBounds.SSize( GetMap()->GetPreViewPageSize() ); + { + // OD 15.01.2003 #103492# - adjust method call <GetMap()->GetPreViewPageSize()> + sal_uInt16 nPageNum = + static_cast < const SwPageFrm * >( GetFrm() )->GetPhyPageNum(); + aLogBounds.SSize( GetMap()->GetPreViewPageSize( nPageNum ) ); + } } if( !aLogBounds.IsEmpty() ) { aPixBounds = GetMap()->CoreToPixel( aLogBounds.SVRect() ); if( !pParent->IsRootFrm() && bRelative) { - Point aParentLogPos( GetBounds( pParent ).Pos() ); // twip rel to doc root - Point aParentPixPos( GetMap()->CoreToPixel( aParentLogPos ) ); + SwRect aParentLogBounds( GetBounds( pParent ) ); // twip rel to doc root + Point aParentPixPos( GetMap()->CoreToPixel( aParentLogBounds.SVRect() ).TopLeft() ); aPixBounds.Move( -aParentPixPos.X(), -aParentPixPos.Y() ); } } @@ -1150,10 +1156,10 @@ void SwAccessibleContext::Dispose( sal_Bool bRecursive ) } // broadcast dispose event + if ( nClientId ) { - EventObject aEvent; - aEvent.Source = xThis; - aAccessibleEventListeners.disposeAndClear( aEvent ); + comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( nClientId, *this ); + nClientId = 0; DBG_MSG_CD( "dispose" ) } diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx index e1a984d95a72..832d64d41d2d 100644 --- a/sw/source/core/access/acccontext.hxx +++ b/sw/source/core/access/acccontext.hxx @@ -2,9 +2,9 @@ * * $RCSfile: acccontext.hxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: mib $ $Date: 2002-10-29 14:05:36 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -140,7 +140,6 @@ protected: private: ::rtl::OUString sName; // immutable outside constructor - ::cppu::OInterfaceContainerHelper aAccessibleEventListeners; // The parent if it has been retrieved. This is always an // SwAccessibleContext. (protected by Mutex) @@ -149,6 +148,7 @@ private: SwAccessibleMap *pMap; // must be protected by solar mutex + sal_uInt32 nClientId; // client id in the AccessibleEventNotifier queue sal_Int16 nRole; // immutable outside constructor // The current states (protected by mutex) diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index f58ea220b161..6398729b0baf 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: accdoc.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: hbrinkm $ $Date: 2002-10-02 08:48:09 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -514,11 +514,14 @@ Sequence< Type > SAL_CALL SwAccessibleDocument::getTypes() throw(RuntimeExceptio Sequence< sal_Int8 > SAL_CALL SwAccessibleDocument::getImplementationId() throw(RuntimeException) { + vos::OGuard aGuard(Application::GetSolarMutex()); static Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) - rtl_createUuid( reinterpret_cast< sal_uInt8 * >(aId.getArray() ), - 0, sal_True ); + { + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; + } return aId; } diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx index 53acc19460d6..331ae57e14c6 100644 --- a/sw/source/core/access/accembedded.cxx +++ b/sw/source/core/access/accembedded.cxx @@ -2,9 +2,9 @@ * * $RCSfile: accembedded.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mib $ $Date: 2002-08-15 10:25:08 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,6 +65,10 @@ #pragma hdrstop +#ifndef _SV_SVAPP_HXX +#include <vcl/svapp.hxx> +#endif + #ifndef _DRAFTS_COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLEROLE_HPP_ #include <drafts/com/sun/star/accessibility/AccessibleRole.hpp> #endif @@ -132,10 +136,13 @@ Sequence< OUString > SAL_CALL SwAccessibleEmbeddedObject::getSupportedServiceNam Sequence< sal_Int8 > SAL_CALL SwAccessibleEmbeddedObject::getImplementationId() throw(RuntimeException) { + vos::OGuard aGuard(Application::GetSolarMutex()); static Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) - rtl_createUuid( reinterpret_cast< sal_uInt8 * >(aId.getArray() ), - 0, sal_True ); + { + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; + } return aId; } diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx index c8d9874f642c..ea272622d3c8 100644 --- a/sw/source/core/access/accfootnote.cxx +++ b/sw/source/core/access/accfootnote.cxx @@ -2,9 +2,9 @@ * * $RCSfile: accfootnote.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: mib $ $Date: 2002-12-05 14:32:16 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -213,11 +213,14 @@ Sequence< OUString > SAL_CALL SwAccessibleFootnote::getSupportedServiceNames() Sequence< sal_Int8 > SAL_CALL SwAccessibleFootnote::getImplementationId() throw(RuntimeException) { + vos::OGuard aGuard(Application::GetSolarMutex()); static Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) - rtl_createUuid( reinterpret_cast< sal_uInt8 * >(aId.getArray() ), - 0, sal_True ); + { + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; + } return aId; } diff --git a/sw/source/core/access/accgraphic.cxx b/sw/source/core/access/accgraphic.cxx index f958e8828fc6..8a5680659eed 100644 --- a/sw/source/core/access/accgraphic.cxx +++ b/sw/source/core/access/accgraphic.cxx @@ -2,9 +2,9 @@ * * $RCSfile: accgraphic.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mib $ $Date: 2002-08-15 10:25:12 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,6 +65,10 @@ #pragma hdrstop +#ifndef _SV_SVAPP_HXX +#include <vcl/svapp.hxx> +#endif + #ifndef _DRAFTS_COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLEROLE_HPP_ #include <drafts/com/sun/star/accessibility/AccessibleRole.hpp> #endif @@ -131,10 +135,13 @@ Sequence< OUString > SAL_CALL SwAccessibleGraphic::getSupportedServiceNames() Sequence< sal_Int8 > SAL_CALL SwAccessibleGraphic::getImplementationId() throw(RuntimeException) { + vos::OGuard aGuard(Application::GetSolarMutex()); static Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) - rtl_createUuid( reinterpret_cast< sal_uInt8 * >(aId.getArray() ), - 0, sal_True ); + { + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; + } return aId; } diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx index 15604c509ab6..c61e327c18a9 100644 --- a/sw/source/core/access/accheaderfooter.cxx +++ b/sw/source/core/access/accheaderfooter.cxx @@ -2,9 +2,9 @@ * * $RCSfile: accheaderfooter.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: mib $ $Date: 2002-12-05 14:32:16 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -190,10 +190,13 @@ Sequence< OUString > SAL_CALL SwAccessibleHeaderFooter::getSupportedServiceNames Sequence< sal_Int8 > SAL_CALL SwAccessibleHeaderFooter::getImplementationId() throw(RuntimeException) { + vos::OGuard aGuard(Application::GetSolarMutex()); static Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) - rtl_createUuid( reinterpret_cast< sal_uInt8 * >(aId.getArray() ), - 0, sal_True ); + { + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; + } return aId; } diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 90c9fff643b9..bf09b4b517fb 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -2,9 +2,9 @@ * * $RCSfile: accmap.cxx,v $ * - * $Revision: 1.39 $ + * $Revision: 1.40 $ * - * last change: $Author: mib $ $Date: 2002-09-27 11:44:18 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -184,7 +184,10 @@ #ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> #endif - +// OD 15.01.2003 #103492# +#ifndef _PAGEPREVIEWLAYOUT_HXX +#include <pagepreviewlayout.hxx> +#endif using namespace ::com::sun::star::uno; using namespace ::drafts::com::sun::star::accessibility; @@ -1084,27 +1087,23 @@ Reference< XAccessible > SwAccessibleMap::GetDocumentView( ) return _GetDocumentView( sal_False ); } +// OD 14.01.2003 #103492# - complete re-factoring of method due to new page/print +// preview functionality. Reference<XAccessible> SwAccessibleMap::GetDocumentPreview( - sal_uInt8 nRow, - sal_uInt8 nColumn, - sal_Int16 nStartPage, - const Size& rPageSize, - const Point& rFreePoint, - const Fraction& rScale, - sal_uInt16 nSelectedPage ) + const std::vector<PrevwPage*>& _rPrevwPages, + const Fraction& _rScale, + const SwPageFrm* _pSelectedPageFrm, + const Size& _rPrevwWinSize ) { // create & update preview data object if( mpPreview == NULL ) mpPreview = new SwAccPreviewData(); - mpPreview->Update( nRow, nColumn, nStartPage, - rPageSize, rFreePoint, rScale, GetShell(), - nSelectedPage ); + mpPreview->Update( _rPrevwPages, _rScale, _pSelectedPageFrm, _rPrevwWinSize ); Reference<XAccessible> xAcc = _GetDocumentView( sal_True ); return xAcc; } - Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm, sal_Bool bCreate ) { @@ -1836,19 +1835,18 @@ void SwAccessibleMap::InvalidateRelationSet( const SwFrm* pMaster, _InvalidateRelationSet( pFollow, sal_True ); } -void SwAccessibleMap::UpdatePreview( sal_uInt8 nRow, sal_uInt8 nColumn, - sal_Int16 nStartPage, - const Size& rPageSize, - const Point& rFreePoint, - const Fraction& rScale, - sal_uInt16 nSelectedPage ) +// OD 15.01.2003 #103492# - complete re-factoring of method due to new page/print +// preview functionality. +void SwAccessibleMap::UpdatePreview( const std::vector<PrevwPage*>& _rPrevwPages, + const Fraction& _rScale, + const SwPageFrm* _pSelectedPageFrm, + const Size& _rPrevwWinSize ) { DBG_ASSERT( GetShell()->IsPreView(), "no preview?" ); DBG_ASSERT( mpPreview != NULL, "no preview data?" ); - mpPreview->Update( nRow, nColumn, nStartPage, - rPageSize, rFreePoint, rScale, GetShell(), - nSelectedPage ); + // OD 15.01.2003 #103492# - adjustments for changed method signature + mpPreview->Update( _rPrevwPages, _rScale, _pSelectedPageFrm, _rPrevwWinSize ); // propagate change of VisArea through the document's // accessibility tree; this will also send appropriate scroll @@ -1885,7 +1883,8 @@ void SwAccessibleMap::InvalidatePreViewSelection( sal_uInt16 nSelPage ) DBG_ASSERT( GetShell()->IsPreView(), "no preview?" ); DBG_ASSERT( mpPreview != NULL, "no preview data?" ); - mpPreview->InvalidateSelection( nSelPage ); + // OD 16.01.2003 #103492# - changed metthod call due to method signature change. + mpPreview->InvalidateSelection( GetShell()->GetLayout()->GetPageByPageNum( nSelPage ) ); Reference < XAccessible > xOldAcc; Reference < XAccessible > xAcc; @@ -1974,7 +1973,10 @@ Point SwAccessibleMap::LogicToPixel( const Point& rPoint ) const Window *pWin = GetShell()->GetWin(); if( pWin ) { - aPoint = pWin->LogicToPixel( aPoint ); + // OD 16.01.2003 #103492# - get mapping mode for LogicToPixel conversion + MapMode aMapMode; + GetMapMode( aPoint, aMapMode ); + aPoint = pWin->LogicToPixel( aPoint, aMapMode ); aPoint = pWin->OutputToAbsoluteScreenPixel( aPoint ); } @@ -1988,7 +1990,10 @@ Size SwAccessibleMap::LogicToPixel( const Size& rSize ) const Size aSize( OutputDevice::LogicToLogic( rSize, aSrc, aDest ) ); if( GetShell()->GetWin() ) { - aSize = GetShell()->GetWin()->LogicToPixel( aSize ); + // OD 16.01.2003 #103492# - get mapping mode for LogicToPixel conversion + MapMode aMapMode; + GetMapMode( Point(0,0), aMapMode ); + aSize = GetShell()->GetWin()->LogicToPixel( aSize, aMapMode ); } return aSize; @@ -2001,7 +2006,10 @@ Point SwAccessibleMap::PixelToLogic( const Point& rPoint ) const if( pWin ) { aPoint = pWin->ScreenToOutputPixel( rPoint ); - aPoint = pWin->PixelToLogic( aPoint ); + // OD 16.01.2003 #103492# - get mapping mode for PixelToLogic conversion + MapMode aMapMode; + GetMapMode( aPoint, aMapMode ); + aPoint = pWin->PixelToLogic( aPoint, aMapMode ); MapMode aSrc( MAP_TWIP ); MapMode aDest( MAP_100TH_MM ); aPoint = OutputDevice::LogicToLogic( aPoint, aSrc, aDest ); @@ -2015,7 +2023,10 @@ Size SwAccessibleMap::PixelToLogic( const Size& rSize ) const Size aSize; if( GetShell()->GetWin() ) { - aSize = GetShell()->GetWin()->PixelToLogic( rSize ); + // OD 16.01.2003 #103492# - get mapping mode for PixelToLogic conversion + MapMode aMapMode; + GetMapMode( Point(0,0), aMapMode ); + aSize = GetShell()->GetWin()->PixelToLogic( rSize, aMapMode ); MapMode aSrc( MAP_TWIP ); MapMode aDest( MAP_100TH_MM ); aSize = OutputDevice::LogicToLogic( aSize, aSrc, aDest ); @@ -2102,24 +2113,15 @@ sal_Bool SwAccessibleMap::ReplaceChild ( return sal_True; } -Point SwAccessibleMap::CoreToPixel( const Point& rPoint ) const -{ - Point aPoint; - if( GetShell()->GetWin() ) - { - PreviewAdjust( rPoint, sal_False ); - aPoint = GetShell()->GetWin()->LogicToPixel( rPoint ); - } - return aPoint; -} - Point SwAccessibleMap::PixelToCore( const Point& rPoint ) const { Point aPoint; if( GetShell()->GetWin() ) { - PreviewAdjust( rPoint, sal_True ); - aPoint = GetShell()->GetWin()->PixelToLogic( rPoint ); + // OD 15.01.2003 #103492# - replace <PreviewAdjust(..)> by <GetMapMode(..)> + MapMode aMapMode; + GetMapMode( rPoint, aMapMode ); + aPoint = GetShell()->GetWin()->PixelToLogic( rPoint, aMapMode ); } return aPoint; } @@ -2162,10 +2164,12 @@ Rectangle SwAccessibleMap::CoreToPixel( const Rectangle& rRect ) const Rectangle aRect; if( GetShell()->GetWin() ) { - PreviewAdjust( rRect.TopLeft(), sal_False ); - aRect = GetShell()->GetWin()->LogicToPixel( rRect ); + // OD 15.01.2003 #103492# - replace <PreviewAdjust(..)> by <GetMapMode(..)> + MapMode aMapMode; + GetMapMode( rRect.TopLeft(), aMapMode ); + aRect = GetShell()->GetWin()->LogicToPixel( rRect, aMapMode ); - Rectangle aTmpRect = GetShell()->GetWin()->PixelToLogic( aRect ); + Rectangle aTmpRect = GetShell()->GetWin()->PixelToLogic( aRect, aMapMode ); lcl_CorrectRectangle(aRect, rRect, aTmpRect); } @@ -2177,38 +2181,69 @@ Rectangle SwAccessibleMap::PixelToCore( const Rectangle& rRect ) const Rectangle aRect; if( GetShell()->GetWin() ) { - PreviewAdjust( rRect.TopLeft(), sal_True ); - aRect = GetShell()->GetWin()->PixelToLogic( rRect ); + // OD 15.01.2003 #103492# - replace <PreviewAdjust(..)> by <GetMapMode(..)> + MapMode aMapMode; + GetMapMode( rRect.TopLeft(), aMapMode ); + aRect = GetShell()->GetWin()->PixelToLogic( rRect, aMapMode ); - Rectangle aTmpRect = GetShell()->GetWin()->LogicToPixel( aRect ); + Rectangle aTmpRect = GetShell()->GetWin()->LogicToPixel( aRect, aMapMode ); lcl_CorrectRectangle(aRect, rRect, aTmpRect); } return aRect; } -inline void SwAccessibleMap::PreviewAdjust( const Point& rPoint, - sal_Bool bFromPreview ) const +/** get mapping mode for LogicToPixel and PixelToLogic conversions + + OD 15.01.2003 #103492# + Replacement method <PreviewAdjust(..)> by new method <GetMapMode>. + Method returns mapping mode of current output device and adjusts it, + if the shell is in page/print preview. + Necessary, because <PreviewAdjust(..)> changes mapping mode at current + output device for mapping logic document positions to page preview window + positions and vice versa and doesn't take care to recover its changes. + + @author OD +*/ +void SwAccessibleMap::GetMapMode( const Point& _rPoint, + MapMode& _orMapMode ) const { + MapMode aMapMode = GetShell()->GetWin()->GetMapMode(); if( GetShell()->IsPreView() ) { DBG_ASSERT( mpPreview != NULL, "need preview data" ); - Window* pWin = GetShell()->GetWin(); - MapMode aMode = pWin->GetMapMode(); - mpPreview->AdjustMapMode( aMode, rPoint, sal_True ); - pWin->SetMapMode( aMode ); + mpPreview->AdjustMapMode( aMapMode, _rPoint ); } + _orMapMode = aMapMode; } +/** get size of a dedicated preview page + + OD 15.01.2003 #103492# + + @author OD +*/ +Size SwAccessibleMap::GetPreViewPageSize( sal_uInt16 _nPrevwPageNum ) const +{ + DBG_ASSERT( mpVSh->IsPreView(), "no page preview accessible." ); + DBG_ASSERT( mpVSh->IsPreView() && ( mpPreview != NULL ), + "missing accessible preview data at page preview" ); + if ( mpVSh->IsPreView() && ( mpPreview != NULL ) ) + { + return mpVSh->PagePreviewLayout()->GetPrevwPageSizeByPageNum( _nPrevwPageNum ); + } + else + { + return Size( 0, 0 ); + } +} // // SwAccPreviewData // SwAccPreviewData::SwAccPreviewData() : - mpStartPage( 0 ), - mpSelPage( 0 ), - mnStartPage( 0 ) + mpSelPage( 0 ) { } @@ -2216,139 +2251,61 @@ SwAccPreviewData::~SwAccPreviewData() { } -void SwAccPreviewData::Update( sal_uInt8 nRow, - sal_uInt8 nColumn, - sal_uInt16 nStartPage, - const Size& rPageSize, - const Point& rFreePixel, - const Fraction& rScale, - ViewShell* pShell, - sal_uInt16 nSelPage ) -{ - DBG_ASSERT( nRow > 0, "invalid row value" ); - DBG_ASSERT( nColumn > 0, "invalid column value" ); - DBG_ASSERT( nStartPage >= 0, "invalid start page" ); - DBG_ASSERT( pShell != NULL, "need view shell" ); - DBG_ASSERT( pShell->IsPreView(), "not inpreview?" ); - - // store the rScale (for AdjustMapMode; will be called from here, too) - maScale = rScale; - maPageSize = rPageSize; - - // get first page frame from layout, and iterate to page nSttPage - SwRootFrm* pRoot = pShell->GetLayout(); - DBG_ASSERT( pRoot != NULL, "No layout?" ); - - SwPageFrm* pPage = static_cast<SwPageFrm*>( pRoot->Lower() ); - DBG_ASSERT( pPage != NULL, "No page?" ); - - // adjust for the first page (which is always a right page) if - // there is more than one column - sal_Bool bSkipFirstPage = (nStartPage == 0) && (nColumn != 1); - - // get offset of selected page - mnStartPage = nStartPage; - nSelPage -= nStartPage; - - // we'll count on nStartPage, so it should be zero-based - if( nStartPage > 0 ) - nStartPage--; - - // iterate until nStartPage is found - sal_Int32 nPage = 0; - while( (nStartPage > 0) && (pPage != NULL) ) - { - pPage = static_cast<SwPageFrm*>( pPage->GetNext() ); - nStartPage--; - - // if pPage isn't valid, thethe parameter checking allowed an - // invalid index - DBG_ASSERT( pPage != NULL, "non-existing start page" ); - } - - // iterate over pages and collect data - // 1) VisArea as union of visible pages - // 2) areas of visible pages for preview/logic mapping - mpStartPage = pPage; - mpSelPage = 0; - if( pPage != NULL ) - { - // first page: use to initialize VisArea - SwFrmOrObj aPage( pPage ); - maVisArea = aPage.GetBox(); - maPreviewRects.clear(); - maLogicRects.clear(); - - // compute free point - MapMode aMapMode( MAP_TWIP ); - AdjustMapMode( aMapMode ); - Point aFreePoint = pShell->GetWin()->PixelToLogic( rFreePixel, - aMapMode ); - - // loop over col*row pages, and advance aCurrentPoint to start - // of this page's previeww - Point aCurrentPoint = aFreePoint; - for( sal_uInt8 nR = 0; (pPage != NULL) && (nR < nRow); nR++ ) - { - aCurrentPoint.X() = aFreePoint.X(); +// OD 13.01.2003 #103492# - complete re-factoring of method due to new page/print +// preview functionality. +void SwAccPreviewData::Update( const std::vector<PrevwPage*>& _rPrevwPages, + const Fraction& _rScale, + const SwPageFrm* _pSelectedPageFrm, + const Size& _rPrevwWinSize ) +{ + // store preview scaling, maximal preview page size and selected page + maScale = _rScale; + mpSelPage = _pSelectedPageFrm; + + // prepare loop on preview pages + maPreviewRects.clear(); + maLogicRects.clear(); + SwFrmOrObj aPage; + maVisArea.Clear(); + + // loop on preview pages to calculate <maPreviewRects>, <maLogicRects> and + // <maVisArea> + for ( std::vector<PrevwPage*>::const_iterator aPageIter = _rPrevwPages.begin(); + aPageIter != _rPrevwPages.end(); + ++aPageIter ) + { + aPage = (*aPageIter)->pPage; + + // add preview page rectangle to <maPreviewRects> + Rectangle aPrevwPgRect( (*aPageIter)->aPrevwWinPos, (*aPageIter)->aPageSize ); + maPreviewRects.push_back( aPrevwPgRect ); - for( sal_uInt8 nC = 0; (pPage != NULL) && (nC < nColumn); nC++ ) + // add logic page rectangle to <maLogicRects> + SwRect aLogicPgSwRect( aPage.GetBox() ); + Rectangle aLogicPgRect( aLogicPgSwRect.SVRect() ); + maLogicRects.push_back( aLogicPgRect ); + // union visible area with visible part of logic page rectangle + if ( (*aPageIter)->bVisible ) + { + if ( !(*aPageIter)->pPage->IsEmptyPage() ) { - if( bSkipFirstPage ) - { - aCurrentPoint.X() += rPageSize.Width(); - bSkipFirstPage = sal_False; - // DON'T proceed to next page! - } - else - { - // collect data - aPage = pPage; - SwRect aSwRect = aPage.GetBox(); - maVisArea.Union( aSwRect ); - - Rectangle aRect = aSwRect.SVRect(); - maLogicRects.push_back( aRect ); - aRect.SetPos( aCurrentPoint ); - maPreviewRects.push_back( aRect ); - - aCurrentPoint.X() += pPage->IsEmptyPage() - ? rPageSize.Width() - : aSwRect.Width(); - if( 0 == nSelPage ) - mpSelPage = pPage; - - pPage = static_cast<SwPageFrm*>( pPage->GetNext() ); - } - aCurrentPoint.X() += aFreePoint.X() +1; - nSelPage--; + AdjustLogicPgRectToVisibleArea( aLogicPgSwRect, + SwRect( aPrevwPgRect ), + _rPrevwWinSize ); } - aCurrentPoint.Y() += rPageSize.Height() + 1 + aFreePoint.Y(); + if ( maVisArea.IsEmpty() ) + maVisArea = aLogicPgSwRect; + else + maVisArea.Union( aLogicPgSwRect ); } } } -void SwAccPreviewData::InvalidateSelection( sal_uInt16 nSelPage ) +// OD 16.01.2003 #103492# - complete re-factoring of method due to new page/print +// preview functionality. +void SwAccPreviewData::InvalidateSelection( const SwPageFrm* _pSelectedPageFrm ) { - mpSelPage = 0; - nSelPage -= mnStartPage; - ASSERT( nSelPage >= 0, "invalid selected page" ); - ASSERT( mpStartPage, "no start page" ); - if( mpStartPage != NULL ) - { - const SwPageFrm *pPage = mpStartPage; - - // loop over col*row pages, and advance aCurrentPoint to start - // of this page's preview - while( mpSelPage == 0 && pPage != 0 ) - { - if( 0 == nSelPage ) - mpSelPage = pPage; - - pPage = static_cast<const SwPageFrm*>( pPage->GetNext() ); - nSelPage--; - } - } + mpSelPage = _pSelectedPageFrm; ASSERT( mpSelPage, "selected page not found" ); } @@ -2367,67 +2324,16 @@ const SwRect& SwAccPreviewData::GetVisArea() const return maVisArea; } -Point SwAccPreviewData::PreviewToLogic(const Point& rPoint) const -{ - Rectangles::const_iterator aIter = find_if( maPreviewRects.begin(), - maPreviewRects.end(), - ContainsPredicate( rPoint ) ); - if( aIter != maPreviewRects.end() ) - { - Point aPoint = rPoint; - aPoint -= aIter->TopLeft(); - aPoint += (maLogicRects.begin() + ( aIter - maPreviewRects.begin() )) - ->TopLeft(); - return aPoint; - } - else - return Point(0,0); -} - -Point SwAccPreviewData::LogicToPreview(const Point& rPoint) const -{ - Rectangles::const_iterator aIter = find_if( maLogicRects.begin(), - maLogicRects.end(), - ContainsPredicate( rPoint ) ); - if( aIter != maLogicRects.end() ) - { - Point aPoint = rPoint; - aPoint -= aIter->TopLeft(); - aPoint += (maPreviewRects.begin() + ( aIter - maLogicRects.begin() )) - ->TopLeft(); - return aPoint; - } - else - return Point(0,0); -} - -void SwAccPreviewData::AdjustMapMode( MapMode& rMapMode ) const +void SwAccPreviewData::AdjustMapMode( MapMode& rMapMode, + const Point& rPoint ) const { // adjust scale rMapMode.SetScaleX( maScale ); rMapMode.SetScaleY( maScale ); -} - -void SwAccPreviewData::DisposePage(const SwPageFrm *pPageFrm ) -{ - if( mpStartPage == pPageFrm ) - mpStartPage = 0; - if( mpSelPage == pPageFrm ) - mpSelPage = 0; -} - - -void SwAccPreviewData::AdjustMapMode( MapMode& rMapMode, - const Point& rPoint, - sal_Bool bFromPreview ) const -{ - // adjust scale - AdjustMapMode( rMapMode ); // find proper rectangle - const Rectangles& rRects = bFromPreview ? maLogicRects : maPreviewRects; - Rectangles::const_iterator aBegin = rRects.begin(); - Rectangles::const_iterator aEnd = rRects.end(); + Rectangles::const_iterator aBegin = maLogicRects.begin(); + Rectangles::const_iterator aEnd = maLogicRects.end(); Rectangles::const_iterator aFound = find_if( aBegin, aEnd, ContainsPredicate( rPoint ) ); @@ -2440,3 +2346,45 @@ void SwAccPreviewData::AdjustMapMode( MapMode& rMapMode, } // else: don't adjust MapMode } + +void SwAccPreviewData::DisposePage(const SwPageFrm *pPageFrm ) +{ + if( mpSelPage == pPageFrm ) + mpSelPage = 0; +} + +/** adjust logic page retangle to its visible part + + OD 17.01.2003 #103492# + + @author OD +*/ +void SwAccPreviewData::AdjustLogicPgRectToVisibleArea( + SwRect& _iorLogicPgSwRect, + const SwRect& _rPrevwPgSwRect, + const Size& _rPrevwWinSize ) +{ + // determine preview window rectangle + const SwRect aPrevwWinSwRect( Point( 0, 0 ), _rPrevwWinSize ); + // calculate visible preview page rectangle + SwRect aVisPrevwPgSwRect( _rPrevwPgSwRect ); + aVisPrevwPgSwRect.Intersection( aPrevwWinSwRect ); + // adjust logic page rectangle + SwTwips nTmpDiff; + // left + nTmpDiff = aVisPrevwPgSwRect.Left() - _rPrevwPgSwRect.Left(); + if ( nTmpDiff > 0 ) + _iorLogicPgSwRect.Left( _iorLogicPgSwRect.Left() + nTmpDiff ); + // top + nTmpDiff = aVisPrevwPgSwRect.Top() - _rPrevwPgSwRect.Top(); + if ( nTmpDiff > 0 ) + _iorLogicPgSwRect.Top( _iorLogicPgSwRect.Top() + nTmpDiff ); + // right + nTmpDiff = _rPrevwPgSwRect.Right() - aVisPrevwPgSwRect.Right(); + if ( nTmpDiff > 0 ) + _iorLogicPgSwRect.Right( _iorLogicPgSwRect.Right() - nTmpDiff ); + // bottom + nTmpDiff = _rPrevwPgSwRect.Bottom() - aVisPrevwPgSwRect.Bottom(); + if ( nTmpDiff > 0 ) + _iorLogicPgSwRect.Bottom( _iorLogicPgSwRect.Bottom() - nTmpDiff ); +} diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx index d8e3f977a097..bab45c3cbf39 100644 --- a/sw/source/core/access/accpage.cxx +++ b/sw/source/core/access/accpage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: accpage.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: mib $ $Date: 2002-08-15 12:18:38 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -249,11 +249,14 @@ Sequence<OUString> SwAccessiblePage::getSupportedServiceNames( ) Sequence< sal_Int8 > SAL_CALL SwAccessiblePage::getImplementationId() throw(RuntimeException) { + vos::OGuard aGuard(Application::GetSolarMutex()); static Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) - rtl_createUuid( reinterpret_cast< sal_uInt8 * >(aId.getArray() ), - 0, sal_True ); + { + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; + } return aId; } diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 5f596d0508ef..4feca8692506 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -2,9 +2,9 @@ * * $RCSfile: accpara.cxx,v $ * - * $Revision: 1.47 $ + * $Revision: 1.48 $ * - * last change: $Author: mib $ $Date: 2002-12-05 14:10:33 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1099,11 +1099,14 @@ Sequence< Type > SAL_CALL SwAccessibleParagraph::getTypes() throw(RuntimeExcepti Sequence< sal_Int8 > SAL_CALL SwAccessibleParagraph::getImplementationId() throw(RuntimeException) { + vos::OGuard aGuard(Application::GetSolarMutex()); static Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) - rtl_createUuid( reinterpret_cast< sal_uInt8 * >(aId.getArray() ), - 0, sal_True ); + { + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; + } return aId; } @@ -1263,8 +1266,8 @@ com::sun::star::awt::Rectangle SwAccessibleParagraph::getCharacterBounds( CHECK_FOR_WINDOW( XAccessibleComponent, pWin ); Rectangle aScreenRect( GetMap()->CoreToPixel( aCoreRect.SVRect() )); - Point aFrmLogPos( GetBounds().Pos() ); // twip rel to doc root - Point aFrmPixPos( GetMap()->CoreToPixel( aFrmLogPos ) ); + SwRect aFrmLogBounds( GetBounds() ); // twip rel to doc root + Point aFrmPixPos( GetMap()->CoreToPixel( aFrmLogBounds.SVRect() ).TopLeft() ); aScreenRect.Move( -aFrmPixPos.X(), -aFrmPixPos.Y() ); // convert into AWT Rectangle @@ -1288,6 +1291,7 @@ sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const com::sun::star::awt::Poi { vos::OGuard aGuard(Application::GetSolarMutex()); + CHECK_FOR_DEFUNC( XAccessibleText ); // construct SwPosition (where GetCrsrOfst() will put the result into) @@ -1300,7 +1304,7 @@ sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const com::sun::star::awt::Poi CHECK_FOR_WINDOW( XAccessibleComponent, pWin ); Point aPoint( rPoint.X, rPoint.Y ); SwRect aLogBounds( GetBounds( GetFrm() ) ); // twip rel to doc root - Point aPixPos( GetMap()->CoreToPixel( aLogBounds.Pos() ) ); + Point aPixPos( GetMap()->CoreToPixel( aLogBounds.SVRect() ).TopLeft() ); aPoint.X() += aPixPos.X(); aPoint.Y() += aPixPos.Y(); MapMode aMapMode = pWin->GetMapMode(); diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx index 89acf5d63ad4..dac84cd53299 100644 --- a/sw/source/core/access/accpreview.cxx +++ b/sw/source/core/access/accpreview.cxx @@ -2,9 +2,9 @@ * * $RCSfile: accpreview.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: mib $ $Date: 2002-08-15 10:25:19 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,6 +65,10 @@ #pragma hdrstop +#ifndef _SV_SVAPP_HXX +#include <vcl/svapp.hxx> +#endif + #ifndef _RTL_UUID_H_ #include <rtl/uuid.h> #endif @@ -131,10 +135,13 @@ Sequence<OUString> SwAccessiblePreview::getSupportedServiceNames( ) Sequence< sal_Int8 > SAL_CALL SwAccessiblePreview::getImplementationId() throw(RuntimeException) { + vos::OGuard aGuard(Application::GetSolarMutex()); static Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) - rtl_createUuid( reinterpret_cast< sal_uInt8 * >(aId.getArray() ), - 0, sal_True ); + { + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; + } return aId; } diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 18524e54915d..3cdb7ff3b82f 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -2,9 +2,9 @@ * * $RCSfile: acctable.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: hbrinkm $ $Date: 2002-09-11 13:50:11 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -916,11 +916,14 @@ Sequence< ::com::sun::star::uno::Type > SAL_CALL SwAccessibleTable::getTypes() t Sequence< sal_Int8 > SAL_CALL SwAccessibleTable::getImplementationId() throw(RuntimeException) { + vos::OGuard aGuard(Application::GetSolarMutex()); static Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) - rtl_createUuid( reinterpret_cast< sal_uInt8 * >(aId.getArray() ), - 0, sal_True ); + { + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; + } return aId; } diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx index acb0b890cca1..6e890ce25e2e 100644 --- a/sw/source/core/access/acctextframe.cxx +++ b/sw/source/core/access/acctextframe.cxx @@ -2,9 +2,9 @@ * * $RCSfile: acctextframe.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: mib $ $Date: 2002-08-15 10:25:22 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -206,11 +206,14 @@ Sequence< OUString > SAL_CALL SwAccessibleTextFrame::getSupportedServiceNames() Sequence< sal_Int8 > SAL_CALL SwAccessibleTextFrame::getImplementationId() throw(RuntimeException) { + vos::OGuard aGuard(Application::GetSolarMutex()); static Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) - rtl_createUuid( reinterpret_cast< sal_uInt8 * >(aId.getArray() ), - 0, sal_True ); + { + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; + } return aId; } diff --git a/sw/source/core/bastyp/bparr.cxx b/sw/source/core/bastyp/bparr.cxx index 69ad8c6b0894..afd1c7f135a7 100644 --- a/sw/source/core/bastyp/bparr.cxx +++ b/sw/source/core/bastyp/bparr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: bparr.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mib $ $Date: 2001-11-28 13:47:32 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -117,11 +117,11 @@ BigPtrArray::~BigPtrArray() BlockInfo** pp = ppInf; for( USHORT n = 0; n < nBlock; ++n, ++pp ) { - __DELETE( (*pp)->nElem ) (*pp)->pData; - delete *pp; + delete[] (*pp)->pData; + delete *pp; } } - __DELETE( nMaxBlock ) ppInf; + delete[] ppInf; } // Einfachst-Implementation, evtl. spaeter mal komplexer @@ -278,7 +278,7 @@ BlockInfo* BigPtrArray::InsBlock( USHORT pos ) // dann sollte wir mal das Array erweitern BlockInfo** ppNew = new BlockInfo* [ nMaxBlock + nBlockGrowSize ]; memcpy( ppNew, ppInf, nMaxBlock * sizeof( BlockInfo* )); - __DELETE( nMaxBlock ) ppInf; + delete[] ppInf; nMaxBlock += nBlockGrowSize; ppInf = ppNew; } @@ -309,7 +309,7 @@ void BigPtrArray::BlockDel( USHORT nDel ) nDel = (( nBlock / nBlockGrowSize ) + 1 ) * nBlockGrowSize; BlockInfo** ppNew = new BlockInfo* [ nDel ]; memcpy( ppNew, ppInf, nBlock * sizeof( BlockInfo* )); - __DELETE( nMaxBlock ) ppInf; + delete[] ppInf; ppInf = ppNew; nMaxBlock = nDel; } @@ -449,7 +449,7 @@ void BigPtrArray::Remove( ULONG pos, ULONG n ) if( !p->nElem ) { // eventuell Block ganz entfernen - delete p->pData; + delete[] p->pData; nBlkdel++; if( USHRT_MAX == nBlk1del ) nBlk1del = cur; @@ -588,8 +588,8 @@ USHORT BigPtrArray::Compress( short nMax ) if( !p->nElem ) { // dann kann der entfernt werden - delete p->pData; - delete p, p = 0; + delete[] p->pData; + delete p, p = 0; ++nBlkdel; } else diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index c2ffd57314c2..342e2bff30ee 100644 --- a/sw/source/core/bastyp/calc.cxx +++ b/sw/source/core/bastyp/calc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: calc.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: fme $ $Date: 2002-11-07 09:43:32 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,8 +83,8 @@ #include <tools/svwin.h> #endif -#ifndef _TOOLS_SOLMATH_HXX -#include <tools/solmath.hxx> +#ifndef INCLUDED_RTL_MATH_HXX +#include <rtl/math.hxx> #endif #ifndef _SVX_ADRITEM_HXX //autogen #include <svx/adritem.hxx> @@ -144,6 +144,9 @@ #ifndef _SWUNODEF_HXX #include <swunodef.hxx> #endif +#ifndef _SWTYPES_HXX +#include <swtypes.hxx> +#endif // tippt sich schneller #define RESOURCE ViewShell::GetShellRes() @@ -556,13 +559,11 @@ String SwCalc::GetStrResult( double nValue, BOOL bRound ) } USHORT nDec = 15; //pLclData->getNumDigits(); - String aRetStr; - - SolarMath::DoubleToString( aRetStr, nValue, - 'A', /// 'F' 'E' 'G' 'A' - nDec, /// Nachkommastellen - pLclData->getNumDecimalSep().GetChar(0), /// Dezimalseparator - TRUE ); + String aRetStr( ::rtl::math::doubleToUString( nValue, + rtl_math_StringFormat_Automatic, + nDec, + pLclData->getNumDecimalSep().GetChar(0), + true )); return aRetStr; } @@ -1628,18 +1629,20 @@ FASTBOOL SwCalc::Str2Double( const String& rCommand, xub_StrLen& rCommandPos, if( !pLclD ) pLclD = &GetAppLocaleData(); - const xub_Unicode *pEnd, nCurrCmdPos = rCommandPos; - int nErrno; - rVal = SolarMath::StringToDouble( rCommand.GetBuffer() + rCommandPos, - pLclD->getNumThousandSep().GetChar(0), - pLclD->getNumDecimalSep().GetChar(0), - nErrno, &pEnd ); + const xub_Unicode nCurrCmdPos = rCommandPos; + rtl_math_ConversionStatus eStatus; + const sal_Unicode* pEnd; + rVal = rtl_math_uStringToDouble( rCommand.GetBuffer() + rCommandPos, + rCommand.GetBuffer() + rCommand.Len(), + pLclD->getNumDecimalSep().GetChar(0), + pLclD->getNumThousandSep().GetChar(0), + &eStatus, &pEnd ); rCommandPos = pEnd - rCommand.GetBuffer(); if( !pLclData && pLclD != &GetAppLocaleData() ) delete (LocaleDataWrapper*)pLclD; - return 0 == nErrno && nCurrCmdPos != rCommandPos; + return rtl_math_ConversionStatus_Ok == eStatus && nCurrCmdPos != rCommandPos; } FASTBOOL SwCalc::Str2Double( const String& rCommand, xub_StrLen& rCommandPos, @@ -1656,18 +1659,20 @@ FASTBOOL SwCalc::Str2Double( const String& rCommand, xub_StrLen& rCommandPos, SvxCreateLocale( eLang ) ); } - const xub_Unicode *pEnd, nCurrCmdPos = rCommandPos; - int nErrno; - rVal = SolarMath::StringToDouble( rCommand.GetBuffer() + rCommandPos, - pLclD->getNumThousandSep().GetChar(0), - pLclD->getNumDecimalSep().GetChar(0), - nErrno, &pEnd ); + const xub_Unicode nCurrCmdPos = rCommandPos; + rtl_math_ConversionStatus eStatus; + const sal_Unicode* pEnd; + rVal = rtl_math_uStringToDouble( rCommand.GetBuffer() + rCommandPos, + rCommand.GetBuffer() + rCommand.Len(), + pLclD->getNumDecimalSep().GetChar(0), + pLclD->getNumThousandSep().GetChar(0), + &eStatus, &pEnd ); rCommandPos = pEnd - rCommand.GetBuffer(); if( pLclD != &GetAppLocaleData() ) delete (LocaleDataWrapper*)pLclD; - return 0 == nErrno && nCurrCmdPos != rCommandPos; + return rtl_math_ConversionStatus_Ok == eStatus && nCurrCmdPos != rCommandPos; } //------------------------------------------------------------------------------ @@ -1740,7 +1745,6 @@ SwSbxValue::~SwSbxValue() { } - BOOL SwSbxValue::GetBool() const { return SbxSTRING == GetType() ? 0 != GetString().Len() @@ -1755,6 +1759,10 @@ double SwSbxValue::GetDouble() const xub_StrLen nStt = 0; SwCalc::Str2Double( GetString(), nStt, nRet ); } + else if (IsBool()) + { + nRet = 0 != GetBool() ? 1.0 : 0.0; + } else nRet = SbxValue::GetDouble(); return nRet; diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx index a6b85ced9b74..ead3be0207b1 100644 --- a/sw/source/core/bastyp/init.cxx +++ b/sw/source/core/bastyp/init.cxx @@ -2,9 +2,9 @@ * * $RCSfile: init.cxx,v $ * - * $Revision: 1.35 $ + * $Revision: 1.36 $ * - * last change: $Author: os $ $Date: 2002-08-26 11:36:56 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -991,7 +991,7 @@ void _FinitCore() #ifndef PRODUCT //Defaultattribut freigeben lassen um asserts zu vermeiden. - if ( aAttrTab[0]->GetRef() ) + if ( aAttrTab[0]->GetRefCount() ) SfxItemPool::ReleaseDefaults( aAttrTab, POOLATTR_END-POOLATTR_BEGIN, FALSE); #endif delete SwDoc::pACmpltWords; diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index d44181235787..2dddf0139e2a 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: crsrsh.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: hbrinkm $ $Date: 2002-12-03 14:13:46 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -143,6 +143,9 @@ #ifndef _DOCSH_HXX #include <docsh.hxx> #endif +#ifndef _DRAWFONT_HXX +#include <drawfont.hxx> +#endif #ifndef _SWGLOBDOCSH_HXX //autogen #include <globdoc.hxx> #endif @@ -437,7 +440,8 @@ FASTBOOL SwCrsrShell::LeftRight( BOOL bLeft, USHORT nCnt, USHORT nMode, return bLeft ? GoPrevCell() : GoNextCell(); SwCallLink aLk( *this ); // Crsr-Moves ueberwachen, evt. Link callen - FASTBOOL bRet = pCurCrsr->LeftRight( bLeft, nCnt, nMode, bVisualAllowed ); + FASTBOOL bRet = pCurCrsr->LeftRight( bLeft, nCnt, nMode, bVisualAllowed, + ! IsOverwriteCrsr() ); if( bRet ) UpdateCrsr(); return bRet; @@ -2344,6 +2348,8 @@ SwCrsrShell::SwCrsrShell( SwCrsrShell& rShell, Window *pWin ) eMvState = MV_NONE; // Status fuers Crsr-Travelling - GetCrsrOfst pVisCrsr = new SwVisCrsr( this ); // UpdateCrsr( 0 ); + // OD 11.02.2003 #100556# + mbMacroExecAllowed = rShell.IsMacroExecAllowed(); } @@ -2392,6 +2398,8 @@ SwCrsrShell::SwCrsrShell( SwDoc& rDoc, Window *pWin, SwRootFrm *pRoot, pVisCrsr = new SwVisCrsr( this ); // UpdateCrsr( 0 ); + // OD 11.02.2003 #100556# + mbMacroExecAllowed = true; } @@ -2785,7 +2793,9 @@ FASTBOOL SwCrsrShell::IsInVerticalText( const Point* pPt ) const FASTBOOL SwCrsrShell::IsInRightToLeftText( const Point* pPt ) const { const short nDir = GetTextDirection( pPt ); - return FRMDIR_HORI_RIGHT_TOP == nDir; + // GetTextDirection uses FRMDIR_VERT_TOP_LEFT to indicate RTL in + // vertical environment + return FRMDIR_VERT_TOP_LEFT == nDir || FRMDIR_HORI_RIGHT_TOP == nDir; } #else diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx index 699ec063b2cf..2d8e8f3ccf3e 100644 --- a/sw/source/core/crsr/pam.cxx +++ b/sw/source/core/crsr/pam.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pam.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: jp $ $Date: 2002-02-01 12:37:59 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -552,6 +552,8 @@ SwPaM &SwPaM::operator=( SwPaM &rPam ) SetMark(); *pMark = *( rPam.pMark ); } + else + DeleteMark(); return *this; } diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx index 886d81c78081..ace4e9f419fd 100644 --- a/sw/source/core/crsr/swcrsr.cxx +++ b/sw/source/core/crsr/swcrsr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: swcrsr.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: fme $ $Date: 2002-12-03 12:58:01 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -420,35 +420,32 @@ FASTBOOL SwCursor::IsSelOvr( int eFlags ) if( pNd->IsCntntNode() && 0 == (SwUnoCrsr*)*this ) { const SwCntntFrm* pFrm = ((SwCntntNode*)pNd)->GetFrm(); - if( pFrm && pFrm->IsValid() && 0 == pFrm->Frm().Height() ) + if( pFrm && pFrm->IsValid() && 0 == pFrm->Frm().Height() && + 0 != ( SELOVER_CHANGEPOS & eFlags ) ) { - if( 0 != ( SELOVER_CHANGEPOS & eFlags ) ) + // skip to the next / prev valida paragraph with a layout + SwNodeIndex& rPtIdx = GetPoint()->nNode; + int bGoNxt = pSavePos->nNode < rPtIdx.GetIndex(); + while( 0 != ( pFrm = ( bGoNxt ? pFrm->GetNextCntntFrm() + : pFrm->GetPrevCntntFrm() )) && + 0 == pFrm->Frm().Height() ) + ; + + SwCntntNode* pCNd; + if( pFrm && 0 != (pCNd = (SwCntntNode*)pFrm->GetNode()) ) { - // skip to the next / prev valida paragraph with a layout - SwNodeIndex& rPtIdx = GetPoint()->nNode; - int bGoNxt = pSavePos->nNode < rPtIdx.GetIndex(); - while( 0 != ( pFrm = ( bGoNxt ? pFrm->GetNextCntntFrm() - : pFrm->GetPrevCntntFrm() )) && - 0 == pFrm->Frm().Height() ) - ; - - SwCntntNode* pCNd; - if( pFrm && 0 != (pCNd = (SwCntntNode*)pFrm->GetNode()) ) - { - // set this cntntNode as new position - rPtIdx = *pCNd; - pNd = pCNd; + // set this cntntNode as new position + rPtIdx = *pCNd; + pNd = pCNd; - // ContentIndex noch anmelden: - xub_StrLen nTmpPos = bGoNxt ? 0 : pCNd->Len(); - GetPoint()->nContent.Assign( pCNd, nTmpPos ); - // sollten wir in einer Tabelle gelandet sein? - if( IsInProtectTable( TRUE ) ) - pFrm = 0; - } + // ContentIndex noch anmelden: + xub_StrLen nTmpPos = bGoNxt ? 0 : pCNd->Len(); + GetPoint()->nContent.Assign( pCNd, nTmpPos ); + + // sollten wir in einer Tabelle gelandet sein? + if( IsInProtectTable( TRUE ) ) + pFrm = 0; } - else - pFrm = 0; } if( !pFrm ) @@ -1097,7 +1094,7 @@ ULONG SwCursor::FindAll( SwFindParas& rParas, *GetMark() = aMarkPos; } - if( nFound && SwCursor::IsSelOvr( SELOVER_TOGGLE | SELOVER_CHANGEPOS ) ) + if( nFound && SwCursor::IsSelOvr( SELOVER_TOGGLE ) ) nFound = 0; return nFound; } @@ -1289,10 +1286,12 @@ FASTBOOL SwCursor::GoPrevWord() { SwCrsrSaveState aSave( *this ); xub_StrLen nPtPos = GetPoint()->nContent.GetIndex(); + const xub_StrLen nPtStart = nPtPos; + if( nPtPos ) --nPtPos; nPtPos = (xub_StrLen)pBreakIt->xBreak->previousWord( - pTxtNd->GetTxt(), nPtPos, + pTxtNd->GetTxt(), nPtStart, pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos, 1 ) ), WordType::ANYWORD_IGNOREWHITESPACES ).startPos; @@ -1391,53 +1390,56 @@ FASTBOOL SwCursor::GoSentence( SentenceMoveType eMoveType ) FASTBOOL SwCursor::LeftRight( BOOL bLeft, USHORT nCnt, USHORT nMode, - BOOL bVisualAllowed ) + BOOL bVisualAllowed, BOOL bInsertCrsr ) { SwTableCursor* pTblCrsr = (SwTableCursor*)*this; if( pTblCrsr ) return bLeft ? pTblCrsr->GoPrevCell( nCnt ) : pTblCrsr->GoNextCell( nCnt ); - + // calculate cursor bidi level + const SwCntntFrm* pSttFrm = NULL; SwNode& rNode = GetPoint()->nNode.GetNode(); - const BOOL bIsUnoCrsr = 0 != (SwUnoCrsr*)*this; + const BOOL bDoNotSetBidiLevel = 0 != (SwUnoCrsr*)*this; - // The visual cursor travelling requires a layout. Therefore we do not - // want this for an UnoCursor. - if ( ! bIsUnoCrsr && rNode.IsTxtNode() ) + if ( ! bDoNotSetBidiLevel ) { - const SwTxtNode& rTNd = *rNode.GetTxtNode(); - SwIndex& rIdx = GetPoint()->nContent; - xub_StrLen nPos = rIdx.GetIndex(); - - SvtCTLOptions aCTLOptions; - if ( bVisualAllowed && aCTLOptions.IsCTLFontEnabled() && - SvtCTLOptions::MOVEMENT_VISUAL == - aCTLOptions.GetCTLCursorMovement() ) + if( rNode.IsTxtNode() ) { - // for visual cursor travelling (used in bidi layout) - // we first have to convert the logic to a visual position - Point aPt; - SwCntntFrm* pFrm = rTNd.GetFrm( &aPt, GetPoint() ); - if( pFrm ) + const SwTxtNode& rTNd = *rNode.GetTxtNode(); + SwIndex& rIdx = GetPoint()->nContent; + xub_StrLen nPos = rIdx.GetIndex(); + + SvtCTLOptions aCTLOptions; + if ( bVisualAllowed && aCTLOptions.IsCTLFontEnabled() && + SvtCTLOptions::MOVEMENT_VISUAL == + aCTLOptions.GetCTLCursorMovement() ) { - BYTE nCrsrLevel = GetCrsrBidiLevel(); - sal_Bool bForward = ! bLeft; - ((SwTxtFrm*)pFrm)->PrepareVisualMove( nPos, nCrsrLevel, bForward ); - rIdx = nPos; - SetCrsrBidiLevel( nCrsrLevel ); - bLeft = ! bForward; + // for visual cursor travelling (used in bidi layout) + // we first have to convert the logic to a visual position + Point aPt; + pSttFrm = rTNd.GetFrm( &aPt, GetPoint() ); + if( pSttFrm ) + { + BYTE nCrsrLevel = GetCrsrBidiLevel(); + sal_Bool bForward = ! bLeft; + ((SwTxtFrm*)pSttFrm)->PrepareVisualMove( nPos, nCrsrLevel, + bForward, bInsertCrsr ); + rIdx = nPos; + SetCrsrBidiLevel( nCrsrLevel ); + bLeft = ! bForward; + } } - } - else - { - const SwScriptInfo* pScriptInfo = SwScriptInfo::GetScriptInfo( rTNd ); - if ( pScriptInfo ) + else { - const xub_StrLen nMoveOverPos = bLeft ? - ( nPos ? nPos - 1 : 0 ) : - nPos; - SetCrsrBidiLevel( pScriptInfo->DirType( nMoveOverPos ) ); + const SwScriptInfo* pSI = SwScriptInfo::GetScriptInfo( rTNd ); + if ( pSI ) + { + const xub_StrLen nMoveOverPos = bLeft ? + ( nPos ? nPos - 1 : 0 ) : + nPos; + SetCrsrBidiLevel( pSI->DirType( nMoveOverPos ) ); + } } } } @@ -1449,6 +1451,27 @@ FASTBOOL SwCursor::LeftRight( BOOL bLeft, USHORT nCnt, USHORT nMode, while( nCnt && Move( fnMove, fnGo ) ) --nCnt; + // here come some special rules for visual cursor travelling + if ( pSttFrm ) + { + SwNode& rTmpNode = GetPoint()->nNode.GetNode(); + if ( &rTmpNode != &rNode && rTmpNode.IsTxtNode() ) + { + Point aPt; + const SwCntntFrm* pEndFrm = ((SwTxtNode&)rTmpNode).GetFrm( &aPt, GetPoint() ); + if ( pEndFrm ) + { + if ( ! pEndFrm->IsRightToLeft() != ! pSttFrm->IsRightToLeft() ) + { + if ( ! bLeft ) + pEndFrm->RightMargin( this ); + else + pEndFrm->LeftMargin( this ); + } + } + } + } + return 0 == nCnt && !IsInProtectTable( TRUE ) && !IsSelOvr( SELOVER_TOGGLE | SELOVER_CHANGEPOS ); } @@ -1540,6 +1563,37 @@ FASTBOOL SwCursor::UpDown( BOOL bUp, USHORT nCnt, } else *GetPoint() = aOldPos; + + // calculate cursor bidi level + const BOOL bDoNotSetBidiLevel = 0 != (SwUnoCrsr*)*this; + + if ( ! bDoNotSetBidiLevel ) + { + SwNode& rNode = GetPoint()->nNode.GetNode(); + if ( rNode.IsTxtNode() ) + { + const SwScriptInfo* pSI = SwScriptInfo::GetScriptInfo( (SwTxtNode&)rNode ); + if ( pSI ) + { + SwIndex& rIdx = GetPoint()->nContent; + xub_StrLen nPos = rIdx.GetIndex(); + + if( nPos && nPos < ((SwTxtNode&)rNode).GetTxt().Len() ) + { + const BYTE nCurrLevel = pSI->DirType( nPos ); + const BYTE nPrevLevel = pSI->DirType( nPos - 1 ); + + if ( nCurrLevel % 2 != nPrevLevel % 2 ) + { + // set cursor level to the lower of the two levels + SetCrsrBidiLevel( Min( nCurrLevel, nPrevLevel ) ); + } + else + SetCrsrBidiLevel( nCurrLevel ); + } + } + } + } } return bRet; } @@ -1548,6 +1602,11 @@ FASTBOOL SwCursor::LeftRightMargin( BOOL bLeft, BOOL bAPI ) { Point aPt; SwCntntFrm * pFrm = GetCntntNode()->GetFrm( &aPt, GetPoint() ); + + // calculate cursor bidi level + if ( pFrm ) + SetCrsrBidiLevel( pFrm->IsRightToLeft() ? 1 : 0 ); + return pFrm && (bLeft ? pFrm->LeftMargin( this ) : pFrm->RightMargin( this, bAPI )); } diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index af41f46db34b..8071a0502e4e 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viscrs.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: fme $ $Date: 2002-09-17 14:34:06 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -125,6 +125,9 @@ #ifndef _NDTXT_HXX #include <ndtxt.hxx> #endif +#ifndef _DRAWFONT_HXX +#include <drawfont.hxx> +#endif #ifndef _MDIEXP_HXX #include <mdiexp.hxx> // GetSearchDialog @@ -134,7 +137,8 @@ #endif -extern void MA_FASTCALL SwAlignRect( SwRect &rRect, ViewShell *pSh ); +// OD 24.01.2003 #106593# - no longer needed, included in <frmtool.hxx> +//extern void MA_FASTCALL SwAlignRect( SwRect &rRect, ViewShell *pSh ); extern void SwCalcPixStatics( OutputDevice *pOut ); @@ -528,6 +532,30 @@ void SwVisCrsr::_SetPosAndShow() Size( pCrsrShell->aCharRect.Width(), nTmpY ) ); aRect.Pos().Y() += pCrsrShell->aCrsrHeight.X(); } + + // check if cursor should show the current cursor bidi level + aTxtCrsr.SetDirection( CURSOR_DIRECTION_NONE ); + const SwCursor* pTmpCrsr = pCrsrShell->_GetCrsr(); + + if ( pTmpCrsr && !pCrsrShell->IsOverwriteCrsr() ) + { + SwNode& rNode = pTmpCrsr->GetPoint()->nNode.GetNode(); + if( rNode.IsTxtNode() ) + { + const SwTxtNode& rTNd = *rNode.GetTxtNode(); + const SwScriptInfo* pSI = SwScriptInfo::GetScriptInfo( rTNd ); + + // cursor level has to be shown + if ( pSI && pSI->CountDirChg() > 1 ) + { + aTxtCrsr.SetDirection( + ( pTmpCrsr->GetCrsrBidiLevel() % 2 ) ? + CURSOR_DIRECTION_RTL : + CURSOR_DIRECTION_LTR ); + } + } + } + if( aRect.Height() ) { ::SwCalcPixStatics( pCrsrShell->GetOut() ); diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx b/sw/source/core/doc/SwStyleNameMapper.cxx index 5a9f5fab487c..f2316267cf8a 100644 --- a/sw/source/core/doc/SwStyleNameMapper.cxx +++ b/sw/source/core/doc/SwStyleNameMapper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: SwStyleNameMapper.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: os $ $Date: 2002-06-05 14:48:36 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1116,3 +1116,57 @@ const SvStringsDtor& SwStyleNameMapper::GetNumRuleProgNameArray() *NewProgNameArray( pNumRuleProgNameArray, NumRuleProgNameTable, sizeof ( NumRuleProgNameTable ) / sizeof ( SwTableEntry ) ); } + + +const String SwStyleNameMapper::GetSpecialExtraProgName( const String& rExtraUIName ) +{ + String aRes = rExtraUIName; + BOOL bChgName = FALSE; + const SvStringsDtor& rExtraArr = GetExtraUINameArray(); + static sal_uInt16 nIds[] = + { + RES_POOLCOLL_LABEL_DRAWING - RES_POOLCOLL_EXTRA_BEGIN, + RES_POOLCOLL_LABEL_ABB - RES_POOLCOLL_EXTRA_BEGIN, + RES_POOLCOLL_LABEL_TABLE - RES_POOLCOLL_EXTRA_BEGIN, + RES_POOLCOLL_LABEL_FRAME- RES_POOLCOLL_EXTRA_BEGIN, + 0 + }; + for (const sal_uInt16 * pIds = nIds; *pIds; ++pIds) + { + if (aRes == *rExtraArr[ *pIds ]) + { + bChgName = TRUE; + break; + } + } + if (bChgName) + aRes = *GetExtraProgNameArray()[*pIds]; + return aRes; +} + +const String SwStyleNameMapper::GetSpecialExtraUIName( const String& rExtraProgName ) +{ + String aRes = rExtraProgName; + BOOL bChgName = FALSE; + const SvStringsDtor& rExtraArr = GetExtraProgNameArray(); + static sal_uInt16 nIds[] = + { + RES_POOLCOLL_LABEL_DRAWING - RES_POOLCOLL_EXTRA_BEGIN, + RES_POOLCOLL_LABEL_ABB - RES_POOLCOLL_EXTRA_BEGIN, + RES_POOLCOLL_LABEL_TABLE - RES_POOLCOLL_EXTRA_BEGIN, + RES_POOLCOLL_LABEL_FRAME- RES_POOLCOLL_EXTRA_BEGIN, + 0 + }; + for (const sal_uInt16 * pIds = nIds; *pIds; ++pIds) + { + if (aRes == *rExtraArr[ *pIds ]) + { + bChgName = TRUE; + break; + } + } + if (bChgName) + aRes = *GetExtraUINameArray()[*pIds]; + return aRes; +} + diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx index 740f3b663033..3d3c6a154a73 100644 --- a/sw/source/core/doc/docbm.cxx +++ b/sw/source/core/doc/docbm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docbm.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: dvo $ $Date: 2002-11-07 18:39:16 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -480,17 +480,16 @@ void _DelBookmarks( const SwNodeIndex& rStt, const SwNodeIndex& rEnd, for( nCnt = 0; nCnt < rTbl.Count(); ++nCnt ) { // liegt auf der Position ?? + int eType = BKMK_POS_NONE; SwRedline* pRedl = rTbl[ nCnt ]; - // get start/end positions - SwPosition *pRStt = pRedl->GetPoint(), - *pREnd = pRedl->GetMark(); + SwPosition *pRStt = &pRedl->GetBound(TRUE), + *pREnd = &pRedl->GetBound(FALSE); if( *pRStt > *pREnd ) { - SwPosition *pTmp = pRStt; pRStt = pREnd; pREnd = pTmp; + SwPosition *pTmp = pRStt; pRStt = pREnd, pREnd = pTmp; } - // treat start position if( Greater( *pRStt, rStt, pSttIdx ) && Lower( *pRStt, rEnd, pEndIdx )) { pRStt->nNode = rEnd; @@ -514,10 +513,7 @@ void _DelBookmarks( const SwNodeIndex& rStt, const SwNodeIndex& rEnd, pRStt->nContent.Assign( pCNd, nTmp ); } } - - // treat end position (unless start == end, i.e. no mark) - if( ( pRStt != pREnd ) && - Greater( *pREnd, rStt, pSttIdx ) && Lower( *pREnd, rEnd, pEndIdx )) + if( Greater( *pREnd, rStt, pSttIdx ) && Lower( *pREnd, rEnd, pEndIdx )) { pREnd->nNode = rStt; if( pSttIdx ) diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index 3c65a80803ee..bb5d1081705f 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: doccomp.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: dvo $ $Date: 2002-11-11 15:24:59 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -91,13 +91,6 @@ #include <sfx2/docinf.hxx> #endif -#ifdef JP_DUMP -#include <stdio.h> -#ifndef _STREAM_HXX //autogen -#include <tools/stream.hxx> -#endif -#endif - #ifndef _DOC_HXX #include <doc.hxx> #endif @@ -200,11 +193,6 @@ public: { return aLines.GetObject( nLine ); } void InsertLine( CompareLine* pLine ) { aLines.Insert( pLine, LIST_APPEND ); } - -#ifdef JP_DUMP - // zum Debuggen! - virtual void Dump(); -#endif }; class Hash @@ -306,12 +294,6 @@ void CompareData::SetIndex( ULONG nLine, ULONG nIndex ) pIndex[ nLine ] = nIndex; } -#ifdef JP_DUMP -void CompareData::Dump() -{ -} -#endif - void CompareData::SetChanged( ULONG nLine, BOOL bFlag ) { if( !pChangedFlag ) @@ -719,9 +701,6 @@ Compare::CompareSequence::CompareSequence( pFDiag = pMemory + ( rMD2.GetCount() + 1 ); pBDiag = pMemory + ( nSize + rMD2.GetCount() + 1 ); -#ifdef JP_DUMP - rD1.Dump(), rD2.Dump(); -#endif Compare( 0, rMD1.GetCount(), 0, rMD2.GetCount() ); } @@ -977,11 +956,6 @@ public: virtual ~SwCompareData(); void SetRedlinesToDoc( BOOL bUseDocInfo, const SwDoc& rSrcDoc ); - -#ifdef JP_DUMP - // zum Debuggen! - virtual void Dump(); -#endif }; // ---------------------------------------------------------------- @@ -1576,34 +1550,6 @@ void SwCompareData::SetRedlinesToDoc( BOOL bUseDocInfo, const SwDoc& rSrcDoc ) } } -#ifdef JP_DUMP -void SwCompareData::Dump() -{ - static int nFirst = 1; - SvFileStream aStrm( "d:\\tmp\\compare.dmp", nFirst - ? STREAM_WRITE | STREAM_TRUNC - : STREAM_WRITE | STREAM_NOCREATE ); - if( !nFirst ) - aStrm.Seek( STREAM_SEEK_TO_END ); - - nFirst = 0; - - aStrm << "\n"; - ULONG nLCount = aLines.Count(); - for( ULONG n = 0; n < nLCount; ++n ) - { - SwCompareLine* pLine = (SwCompareLine*)GetLine( n ); - String sTxt( pLine->GetText() ); - char sBuffer[ 20 ]; - sprintf( sBuffer, "[%4ld][%3ld][%1d]", - pLine->GetNode().GetIndex(), - GetIndex( n ), GetChanged( n ) ); - ( aStrm << sBuffer ).WriteByteString( sTxt ) << '\n'; - } -} - -#endif - /* */ @@ -1639,10 +1585,6 @@ long SwDoc::CompareDoc( const SwDoc& rDoc ) SetModified(); } -#ifdef JP_DUMP - aD0.Dump(), aD1.Dump(); -#endif - rSrcDoc.SetRedlineMode( eSrcRedlMode ); SetRedlineMode( REDLINE_SHOW_INSERT | REDLINE_SHOW_DELETE ); diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx index 33095bf50dd6..c57cdf9401b3 100644 --- a/sw/source/core/doc/docdesc.cxx +++ b/sw/source/core/doc/docdesc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docdesc.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: hbrinkm $ $Date: 2002-12-04 14:34:31 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -687,8 +687,6 @@ void SwDoc::DelPageDesc( USHORT i ) |* |*************************************************************************/ -extern SvxFrameDirection lcl_GetFrameDirection(ULONG aLanguage); - USHORT SwDoc::MakePageDesc( const String &rName, const SwPageDesc *pCpy, BOOL bRegardLanguage) { @@ -712,7 +710,7 @@ USHORT SwDoc::MakePageDesc( const String &rName, const SwPageDesc *pCpy, GetPrt(), FALSE ); SvxFrameDirection aFrameDirection = bRegardLanguage ? - lcl_GetFrameDirection(GetAppLanguage()) + GetDefaultFrameDirection(GetAppLanguage()) : FRMDIR_HORI_LEFT_TOP; pNew->GetMaster().SetAttr( SvxFrameDirectionItem(aFrameDirection) ); diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index 22c0db2a7b6b..706c62a7aae8 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docedt.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: dvo $ $Date: 2002-10-10 16:29:45 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2181,13 +2181,19 @@ sal_Bool SwDoc::DelFullPara( SwPaM& rPam ) pNd->StartOfSectionIndex(); sal_uInt32 nNodeDiff = rEnd.nNode.GetIndex() - rStt.nNode.GetIndex(); - if( nSectDiff-2 <= nNodeDiff || IsRedlineOn() ) + if ( nSectDiff-2 <= nNodeDiff || IsRedlineOn() || + /* #i9185# Prevent getting the node after the end node (see below) */ + rEnd.nNode.GetIndex() + 1 == aNodes.Count() ) return sal_False; // harte SeitenUmbrueche am nachfolgenden Node verschieben sal_Bool bSavePageBreak = sal_False, bSavePageDesc = sal_False; + + /* #i9185# This whould lead to a segmentation fault if not catched + above. */ sal_uInt32 nNextNd = rEnd.nNode.GetIndex() + 1; - SwTableNode* pTblNd = GetNodes()[ nNextNd ]->GetTableNode(); + SwTableNode* pTblNd = aNodes[ nNextNd ]->GetTableNode(); + if( pTblNd && pNd->IsCntntNode() ) { SwFrmFmt* pTableFmt = pTblNd->GetTable().GetFrmFmt(); @@ -2277,6 +2283,7 @@ sal_Bool SwDoc::DelFullPara( SwPaM& rPam ) } rPam.DeleteMark(); SetModified(); + return sal_True; } diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx index 2190d1a92ee6..0c639a029ff6 100644 --- a/sw/source/core/doc/docfld.cxx +++ b/sw/source/core/doc/docfld.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docfld.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: od $ $Date: 2002-10-10 09:14:08 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1279,6 +1279,10 @@ void SwDoc::FldsToExpand( SwHash**& ppHashTbl, USHORT& rTblSize, if( !aNew.Len() ) // nichts gefunden, dann ist aNew = pSFld->GetFormula(); // die Formel der neue Wert + // OD 11.02.2003 #i3141# - update expression of field as in + // method <SwDoc::UpdateExpFlds(..)> for string/text fields + pSFld->ChgExpStr( aNew ); + // suche den Namen vom Feld aNew = ((SwSetExpFieldType*)pSFld->GetTyp())->GetSetRefName(); // Eintrag vorhanden ? @@ -2150,6 +2154,8 @@ void SwDoc::ReplaceUsedDBs( const SvStringsDtor& rUsedDBNames, String sFormel(rFormel); String sNewName( rNewName ); sNewName.SearchAndReplace( DB_DELIM, '.'); + //the command type is not part of the condition + sNewName = sNewName.GetToken(0, DB_DELIM); String sUpperNewNm( sNewName ); @@ -2158,7 +2164,9 @@ void SwDoc::ReplaceUsedDBs( const SvStringsDtor& rUsedDBNames, String sDBName( *rUsedDBNames.GetObject( i ) ); sDBName.SearchAndReplace( DB_DELIM, '.'); - if( sDBName.Equals( sUpperNewNm )) + //cut off command type + sDBName = sDBName.GetToken(0, DB_DELIM); + if( !sDBName.Equals( sUpperNewNm )) { xub_StrLen nPos = 0; @@ -2169,6 +2177,10 @@ void SwDoc::ReplaceUsedDBs( const SvStringsDtor& rUsedDBNames, { rFormel.Erase( nPos, sDBName.Len() ); rFormel.Insert( sNewName, nPos ); + //prevent re-searching - this is useless and provokes + //endless loops when names containing each other and numbers are exchanged + //e.g.: old 12345.12345 new: i12345.12345 + nPos += sNewName.Len(); sFormel = rFormel; } } @@ -2643,7 +2655,7 @@ void SwDocUpdtFld::GetBodyNode( const SwTxtFld& rTFld, USHORT nFldWhich ) Point aPt; const SwCntntFrm* pFrm = rTxtNd.GetFrm( &aPt, 0, FALSE ); - _SetGetExpFld* pNew; + _SetGetExpFld* pNew = NULL; BOOL bIsInBody = FALSE; if( !pFrm || pFrm->IsInDocBody() ) @@ -2651,7 +2663,13 @@ void SwDocUpdtFld::GetBodyNode( const SwTxtFld& rTFld, USHORT nFldWhich ) // einen Index fuers bestimmen vom TextNode anlegen SwNodeIndex aIdx( rTxtNd ); bIsInBody = rDoc.GetNodes().GetEndOfExtras().GetIndex() < aIdx.GetIndex(); - pNew = new _SetGetExpFld( aIdx, &rTFld ); + + // #104291# dvo: We don't want to update fields in redlines, or those + // in frames whose anchor is in redline. However, we do want to update + // fields in hidden sections. So: In order to be updated, a field 1) + // must have a frame, or 2) it must be in the document body. + if( (pFrm != NULL) || bIsInBody ) + pNew = new _SetGetExpFld( aIdx, &rTFld ); } else { @@ -2677,8 +2695,9 @@ void SwDocUpdtFld::GetBodyNode( const SwTxtFld& rTFld, USHORT nFldWhich ) pDBFld->ChgBodyTxtFlag( bIsInBody ); } - if( !pFldSortLst->Insert( pNew )) - delete pNew; + if( pNew != NULL ) + if( !pFldSortLst->Insert( pNew )) + delete pNew; } void SwDocUpdtFld::GetBodyNode( const SwSectionNode& rSectNd ) diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index cac250512e4e..319cace70c0e 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -2,9 +2,9 @@ * * $RCSfile: doclay.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: mib $ $Date: 2002-07-24 13:12:32 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1135,11 +1135,43 @@ void SwDoc::GetAllFlyFmts( SwPosFlyFrms& rPosFlyFmts, |* |*************************************************************************/ +/* #i6447# changed behaviour if lcl_CpyAttr: + + If the old item set contains the item to set (no inheritance) copy the item + into the new set. + + If the old item set contains the item by inheritance and the new set + contains the item, too: + If the two items differ copy the item from the old set to the new set. + + Otherwise the new set will not be changed. +*/ + void lcl_CpyAttr( SfxItemSet &rNewSet, const SfxItemSet &rOldSet, sal_uInt16 nWhich ) { - const SfxPoolItem *pItem; - if ( SFX_ITEM_SET == (rOldSet.GetItemState( nWhich, sal_False, &pItem))) - rNewSet.Put( *pItem ); + const SfxPoolItem *pOldItem = NULL, *pNewItem = NULL; + + rOldSet.GetItemState( nWhich, sal_False, &pOldItem); + if (pOldItem != NULL) + rNewSet.Put( *pOldItem ); + else + { + pOldItem = rOldSet.GetItem( nWhich, sal_True); + if (pOldItem != NULL) + { + pNewItem = rNewSet.GetItem( nWhich, sal_True); + if (pNewItem != NULL) + { + if (*pOldItem != *pNewItem) + rNewSet.Put( *pOldItem ); + } + else + ASSERT(0, "What am I doing here?"); + } + else + ASSERT(0, "What am I doing here?"); + } + } @@ -1229,11 +1261,14 @@ SwFlyFrmFmt* SwDoc::InsertLabel( const SwLabelType eType, const String &rTxt, ASSERT( pOldFmt, "Format des Fly nicht gefunden." ); pOldFmt->DelFrms(); - SfxItemSet* pNewSet = pOldFmt->GetAttrSet().Clone( sal_False ); - pNewFmt = MakeFlyFrmFmt( GetUniqueFrameName(), GetFrmFmtFromPool( RES_POOLFRM_FRAME )); + /* #i6447#: Only the selected items are copied from the old + format. */ + SfxItemSet* pNewSet = pNewFmt->GetAttrSet().Clone( sal_True ); + + //Diejenigen Attribute uebertragen die auch gesetzt sind, //andere sollen weiterhin aus den Vorlagen gueltig werden. lcl_CpyAttr( *pNewSet, pOldFmt->GetAttrSet(), RES_PRINT ); @@ -1244,6 +1279,7 @@ SwFlyFrmFmt* SwDoc::InsertLabel( const SwLabelType eType, const String &rTxt, lcl_CpyAttr( *pNewSet, pOldFmt->GetAttrSet(), RES_HORI_ORIENT ); lcl_CpyAttr( *pNewSet, pOldFmt->GetAttrSet(), RES_LR_SPACE ); lcl_CpyAttr( *pNewSet, pOldFmt->GetAttrSet(), RES_UL_SPACE ); + lcl_CpyAttr( *pNewSet, pOldFmt->GetAttrSet(), RES_BACKGROUND ); if( bCpyBrd ) { // JP 07.07.99: Bug 67029 - if at Grafik no BoxItem but @@ -1322,6 +1358,7 @@ SwFlyFrmFmt* SwDoc::InsertLabel( const SwLabelType eType, const String &rTxt, pNewSet->ClearItem(); pNewSet->Put( SwFmtSurround( SURROUND_NONE ) ); + pNewSet->Put( SvxOpaqueItem( RES_OPAQUE, sal_True ) ); pNewSet->Put( SwFmtVertOrient( VERT_TOP ) ); pNewSet->Put( SwFmtHoriOrient( HORI_CENTER ) ); diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index d7afd642216b..188ca770dead 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docnum.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: od $ $Date: 2002-12-10 16:03:17 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -505,8 +505,10 @@ USHORT lcl_FindOutlineNum( const SwNodes& rNds, String& rName ) sName.Erase( 0, nPos ); nPos = 0; sNum = sName.GetToken( 0, '.', nPos ); + // #i4533# without this check all parts delimited by a dot are treated as outline numbers + if(!ByteString(sNum, gsl_getSystemTextEncoding()).IsNumericAscii()) + nPos = STRING_NOTFOUND; } - rName = sName; // das ist der nachfolgende Text. // alle Levels gelesen, dann suche mal im Document nach dieser @@ -591,7 +593,21 @@ BOOL SwDoc::GotoOutline( SwPosition& rPos, const String& rName ) const if( USHRT_MAX != nFndPos ) { SwTxtNode* pNd = rOutlNds[ nFndPos ]->GetTxtNode(); - if( !pNd->GetExpandTxt().Equals( sName ) ) + String sExpandedText = pNd->GetExpandTxt(); + //#i4533# leading numbers followed by a dot have been remove while + //searching for the outline position + //to compensate this they must be removed from the paragraphs text content, too + USHORT nPos = 0; + String sTempNum; + while(sExpandedText.Len() && (sTempNum = sExpandedText.GetToken(0, '.', nPos)).Len() && + STRING_NOTFOUND != nPos && + ByteString(sTempNum, gsl_getSystemTextEncoding()).IsNumericAscii()) + { + sExpandedText.Erase(0, nPos); + nPos = 0; + } + + if( !sExpandedText.Equals( sName ) ) { USHORT nTmp = ::lcl_FindOutlineName( GetNodes(), sName, TRUE ); if( USHRT_MAX != nTmp ) // ueber den Namen gefunden diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index db7a1aedca84..1169ef788152 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docredln.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: dvo $ $Date: 2002-11-28 17:45:15 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -162,6 +162,14 @@ for( USHORT i = 0; i < rTbl.Count(); ++i ) lcl_CheckPam( rTbl[ i ] ); + for( USHORT j = 0; j < rTbl.Count(); ++j ) + { + // check for empty redlines + ASSERT( ( *(rTbl[j]->GetPoint()) != *(rTbl[j]->GetMark()) ) || + ( rTbl[j]->GetContentIdx() != NULL ), + "redline table corrupted: empty redline" ); + } + // verify proper redline sorting for( USHORT n = 1; n < rTbl.Count(); ++n ) { @@ -291,11 +299,24 @@ BOOL SwDoc::AppendRedline( SwRedline* pNewRedl, BOOL bCallDelete ) for( ; pNewRedl && n < pRedlineTbl->Count(); ++n ) { + +#ifdef DVO_TEST + _CHECK_REDLINE( this ) +#endif + SwRedline* pRedl = (*pRedlineTbl)[ n ]; SwPosition* pRStt = pRedl->Start(), * pREnd = pRStt == pRedl->GetPoint() ? pRedl->GetMark() : pRedl->GetPoint(); + // #i8518# remove empty redlines while we're at it + if( ( *pRStt == *pREnd ) && + ( pRedl->GetContentIdx() == NULL ) ) + { + pRedlineTbl->DeleteAndDestroy(n); + continue; + } + SwComparePosition eCmpPos = ComparePosition( *pStt, *pEnd, *pRStt, *pREnd ); switch( pNewRedl->GetType() ) @@ -336,6 +357,14 @@ BOOL SwDoc::AppendRedline( SwRedline* pNewRedl, BOOL bCallDelete ) pRedlineTbl->Remove( n ); pRedlineTbl->Insert( pRedl ); } + else if ( POS_OUTSIDE == eCmpPos ) + { + // #107164# own insert-over-insert + // redlines: just scrap the inside ones + pRedlineTbl->Remove( n ); + n--; + break; + } else if( POS_INSIDE != eCmpPos && POS_EQUAL != eCmpPos) break; @@ -372,6 +401,18 @@ BOOL SwDoc::AppendRedline( SwRedline* pNewRedl, BOOL bCallDelete ) pNewRedl->SetStart( *pREnd ); pRedlineTbl->Insert( pSplit ); } + else if ( POS_OVERLAP_BEHIND == eCmpPos ) + { + // #107164# handle overlapping redlines in broken + // documents + pNewRedl->SetStart( *pREnd ); + } + else if ( POS_OVERLAP_BEFORE == eCmpPos ) + { + // #107164# handle overlapping redlines in broken + // documents + pNewRedl->SetEnd( *pRStt ); + } break; case REDLINE_DELETE: if( POS_INSIDE == eCmpPos ) @@ -518,7 +559,27 @@ BOOL SwDoc::AppendRedline( SwRedline* pNewRedl, BOOL bCallDelete ) pNewRedl->SetStart( *pRStt, pStt ); else pNewRedl->SetEnd( *pREnd, pEnd ); - pRedlineTbl->DeleteAndDestroy( n-- ); + + // delete current (below), and restart process with + // previous + USHORT nToBeDeleted = n; + n--; + + // #107359# Do it again, Sam! + // If you can do it for them, you can do it for me. + if( *(pNewRedl->Start()) <= *pREnd ) + { + // Whoooah, we just extended the new 'redline' + // beyond previous redlines, so better start + // again. Of course this is not supposed to + // happen, and in an ideal world it doesn't, + // but unfortunately this code is buggy and + // totally rotten so it does happen and we + // better fix it. + n = -1; + } + + pRedlineTbl->DeleteAndDestroy( nToBeDeleted ); } break; } diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx index eca9c8744e38..256efbf7d70e 100644 --- a/sw/source/core/doc/docsort.cxx +++ b/sw/source/core/doc/docsort.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docsort.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: jp $ $Date: 2002-03-21 13:12:29 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,8 +69,8 @@ #include <hintids.hxx> #endif -#ifndef _TOOLS_SOLMATH_HXX -#include <tools/solmath.hxx> +#ifndef INCLUDED_RTL_MATH_HXX +#include <rtl/math.hxx> #endif #ifndef _UNOTOOLS_COLLATORWRAPPER_HXX #include <unotools/collatorwrapper.hxx> @@ -213,14 +213,14 @@ double SwSortElement::StrToDouble( const String& rStr ) const pLclData = new LocaleDataWrapper( ::comphelper::getProcessServiceFactory(), *pLocale ); - const xub_Unicode *pEnd; - int nErrno; - double nRet = SolarMath::StringToDouble( rStr.GetBuffer(), - pLclData->getNumThousandSep().GetChar(0), + rtl_math_ConversionStatus eStatus; + sal_Int32 nEnd; + double nRet = ::rtl::math::stringToDouble( rStr, pLclData->getNumDecimalSep().GetChar(0), - nErrno, &pEnd ); + pLclData->getNumThousandSep().GetChar(0), + &eStatus, &nEnd ); - if( 0 != nErrno || pEnd == rStr.GetBuffer() ) + if( rtl_math_ConversionStatus_Ok != eStatus || nEnd == 0 ) nRet = 0.0; return nRet; } @@ -587,7 +587,12 @@ BOOL SwDoc::SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt) // Auf gehts sortieren // suche alle Boxen / Lines - _FndBox aFndBox( rBoxes ); + _FndBox aFndBox( 0, 0 ); + { + _FndPara aPara( rBoxes, &aFndBox ); + pTblNd->GetTable().GetTabLines().ForEach( &_FndLineCopyCol, &aPara );; + } + if(!aFndBox.GetLines().Count()) return FALSE; diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index 85e233701fef..c4d880840052 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: doctxm.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: hbrinkm $ $Date: 2002-10-29 14:37:26 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1493,7 +1493,15 @@ void SwTOXBaseSection::UpdateAuthorities( const SwTxtNode* pOwnChapterNode, rTxtNode.GetNodes().IsDocNodes() /*&& (!IsFromChapter() || pChapterCompareNode == pOwnChapterNode) */) { - SwTOXAuthority* pNew = new SwTOXAuthority( rTxtNode, *pFmtFld, rIntl ); + //#106485# the body node has to be used! + SwCntntFrm *pFrm = rTxtNode.GetFrm(); + SwPosition aFldPos(rTxtNode); + const SwTxtNode* pTxtNode = 0; + if(pFrm && !pFrm->IsInDocBody()) + pTxtNode = GetBodyTxtNode( *pDoc, aFldPos, *pFrm ); + if(!pTxtNode) + pTxtNode = &rTxtNode; + SwTOXAuthority* pNew = new SwTOXAuthority( *pTxtNode, *pFmtFld, rIntl ); InsertSorted(pNew); } diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index 7bbbdae60267..b4831304a9ed 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: notxtfrm.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: od $ $Date: 2002-11-29 15:09:22 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -213,11 +213,12 @@ #define DEFTEXTSIZE 12 -/// OD 25.09.2002 #99739# - insert declaration of global methods <SwAlignRect> -/// and <SwAlignGrtRect>. -/// Methods are implemented in /core/layout/paintfrm.cxx -extern void MA_FASTCALL SwAlignRect( SwRect &rRect, ViewShell *pSh ); -extern void SwAlignGrfRect( SwRect *pGrfRect, const OutputDevice &rOut ); +// OD 25.09.2002 #99739# - insert declaration of global methods <SwAlignRect> +// and <SwAlignGrtRect>. +// Methods are implemented in /core/layout/paintfrm.cxx +// OD 24.01.2003 #106593# - no longer needed, included in <frmtool.hxx> +//extern void MA_FASTCALL SwAlignRect( SwRect &rRect, ViewShell *pSh ); +//extern void SwAlignGrfRect( SwRect *pGrfRect, const OutputDevice &rOut ); //Zum asynchronen (erstmaligem) anfordern von Grafiken class SwRequestGraphic : public SwClient @@ -485,7 +486,8 @@ void SwNoTxtFrm::Paint( const SwRect &rRect ) const if( !pSh->GetViewOptions()->IsGraphic() ) { StopAnimation(); - if ( pSh->GetWin() ) + // OD 10.01.2003 #i6467# - no paint of placeholder for page preview + if ( pSh->GetWin() && !pSh->IsPreView() ) { const SwNoTxtNode* pNd = GetNode()->GetNoTxtNode(); String aTxt( pNd->GetAlternateText() ); diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx index 829b5cdb41b3..21616f836f74 100644 --- a/sw/source/core/doc/poolfmt.cxx +++ b/sw/source/core/doc/poolfmt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: poolfmt.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: hbrinkm $ $Date: 2002-12-04 14:38:05 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -138,6 +138,9 @@ #ifndef _SVX_FRMDIRITEM_HXX #include <svx/frmdiritem.hxx> #endif +#ifndef _SVX_EMPHITEM_HXX +#include <svx/emphitem.hxx> +#endif #ifndef _VIEWOPT_HXX #include <viewopt.hxx> #endif @@ -435,7 +438,7 @@ void lcl_SetNumBul( SwDoc* pDoc, SwTxtFmtColl* pColl, // Ist der String-Pointer definiert, dann erfrage nur die // Beschreibung der Attribute, !! es legt keine Vorlage an !! -SvxFrameDirection lcl_GetFrameDirection(ULONG nLanguage) +SvxFrameDirection GetDefaultFrameDirection(ULONG nLanguage) { SvxFrameDirection eResult = FRMDIR_HORI_LEFT_TOP; @@ -555,7 +558,8 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool // allgemeine Inhaltsformen case RES_POOLCOLL_STANDARD: if (bRegardLanguage && - lcl_GetFrameDirection(GetAppLanguage()) == FRMDIR_HORI_RIGHT_TOP) + GetDefaultFrameDirection(GetAppLanguage()) == + FRMDIR_HORI_RIGHT_TOP) { SvxAdjustItem aAdjust(SVX_ADJUST_RIGHT); aSet.Put(aAdjust); @@ -1432,6 +1436,8 @@ SwFmt* SwDoc::GetFmtFromPool( USHORT nId, String* pDesc, long nH = ((SvxFontHeightItem*)GetDfltAttr( RES_CHRATR_CJK_FONTSIZE ))->GetHeight() / 2; SetAllScriptItem( aSet, SvxFontHeightItem( nH )); + aSet.Put(SvxUnderlineItem( UNDERLINE_NONE )); + aSet.Put(SvxEmphasisMarkItem( EMPHASISMARK_NONE) ); } break; diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx index e11da889ac06..612fb927667e 100644 --- a/sw/source/core/doc/tblcpy.cxx +++ b/sw/source/core/doc/tblcpy.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tblcpy.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: jp $ $Date: 2002-03-21 13:12:30 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -392,7 +392,12 @@ BOOL SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes, USHORT nLn, nBx; _FndLine *pFLine, *pInsFLine = 0; - _FndBox aFndBox( rSelBoxes ); + _FndBox aFndBox( 0, 0 ); + // suche alle Boxen / Lines + { + _FndPara aPara( rSelBoxes, &aFndBox ); + ((SwTableLines&)GetTabLines()).ForEach( &_FndLineCopyCol, &aPara ); + } // JP 06.09.96: Sonderfall - eine Box in der Tabelle -> in alle // selektierten Boxen kopieren! diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index eebcef006252..736b703f5691 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tblrwcl.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: fme $ $Date: 2002-11-15 09:31:09 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -588,7 +588,11 @@ BOOL SwTable::InsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, return FALSE; // suche alle Boxen / Lines - _FndBox aFndBox( rBoxes ); + _FndBox aFndBox( 0, 0 ); + { + _FndPara aPara( rBoxes, &aFndBox ); + GetTabLines().ForEach( &_FndLineCopyCol, &aPara ); + } if( !aFndBox.GetLines().Count() ) return FALSE; @@ -625,7 +629,11 @@ BOOL SwTable::InsertRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, return FALSE; // suche alle Boxen / Lines - _FndBox aFndBox( rBoxes ); + _FndBox aFndBox( 0, 0 ); + { + _FndPara aPara( rBoxes, &aFndBox ); + GetTabLines().ForEach( &_FndLineCopyCol, &aPara ); + } if( !aFndBox.GetLines().Count() ) return FALSE; @@ -702,6 +710,41 @@ BOOL SwTable::InsertRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, return TRUE; } +BOOL _FndBoxAppendRowLine( const SwTableLine*& rpLine, void* pPara ); + +BOOL _FndBoxAppendRowBox( const SwTableBox*& rpBox, void* pPara ) +{ + _FndPara* pFndPara = (_FndPara*)pPara; + _FndBox* pFndBox = new _FndBox( (SwTableBox*)rpBox, pFndPara->pFndLine ); + if( rpBox->GetTabLines().Count() ) + { + _FndPara aPara( *pFndPara, pFndBox ); + pFndBox->GetBox()->GetTabLines().ForEach( &_FndBoxAppendRowLine, &aPara ); + if( !pFndBox->GetLines().Count() ) + delete pFndBox; + } + else + pFndPara->pFndLine->GetBoxes().C40_INSERT( _FndBox, pFndBox, + pFndPara->pFndLine->GetBoxes().Count() ); + return TRUE; +} + +BOOL _FndBoxAppendRowLine( const SwTableLine*& rpLine, void* pPara ) +{ + _FndPara* pFndPara = (_FndPara*)pPara; + _FndLine* pFndLine = new _FndLine( (SwTableLine*)rpLine, pFndPara->pFndBox ); + _FndPara aPara( *pFndPara, pFndLine ); + pFndLine->GetLine()->GetTabBoxes().ForEach( &_FndBoxAppendRowBox, &aPara ); + if( pFndLine->GetBoxes().Count() ) + { + pFndPara->pFndBox->GetLines().C40_INSERT( _FndLine, pFndLine, + pFndPara->pFndBox->GetLines().Count() ); + } + else + delete pFndLine; + return TRUE; +} + BOOL SwTable::AppendRow( SwDoc* pDoc, USHORT nCnt ) { @@ -710,7 +753,15 @@ BOOL SwTable::AppendRow( SwDoc* pDoc, USHORT nCnt ) return FALSE; // suche alle Boxen / Lines - _FndBox aFndBox( *GetTabLines()[ GetTabLines().Count()-1 ] ); + _FndBox aFndBox( 0, 0 ); + { + const SwTableLine* pLLine = GetTabLines()[ GetTabLines().Count()-1 ]; + + const SwSelBoxes* pBxs = 0; // Dummy !!! + _FndPara aPara( *pBxs, &aFndBox ); + + _FndBoxAppendRowLine( pLLine, &aPara ); + } if( !aFndBox.GetLines().Count() ) return FALSE; @@ -1683,7 +1734,11 @@ BOOL SwTable::Merge( SwDoc* pDoc, const SwSelBoxes& rBoxes, return FALSE; // suche alle Boxen / Lines - _FndBox aFndBox( rBoxes ); + _FndBox aFndBox( 0, 0 ); + { + _FndPara aPara( rBoxes, &aFndBox ); + GetTabLines().ForEach( &_FndLineCopyCol, &aPara ); + } if( !aFndBox.GetLines().Count() ) return FALSE; @@ -1953,7 +2008,11 @@ BOOL SwTable::CopyHeadlineIntoTable( SwTableNode& rTblNd ) pBox = GetTblBox( pBox->GetSttNd()->FindStartNode()->GetIndex() + 1 ); SelLineFromBox( pBox, aSelBoxes, TRUE ); - _FndBox aFndBox( aSelBoxes ); + _FndBox aFndBox( 0, 0 ); + { + _FndPara aPara( aSelBoxes, &aFndBox ); + ((SwTableLines&)GetTabLines()).ForEach( &_FndLineCopyCol, &aPara ); + } if( !aFndBox.GetLines().Count() ) return FALSE; @@ -1978,7 +2037,11 @@ BOOL SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos, BOOL bCpyName ) const { // suche alle Boxen / Lines - _FndBox aFndBox( rSelBoxes ); + _FndBox aFndBox( 0, 0 ); + { + _FndPara aPara( rSelBoxes, &aFndBox ); + ((SwTableLines&)GetTabLines()).ForEach( &_FndLineCopyCol, &aPara ); + } if( !aFndBox.GetLines().Count() ) return FALSE; @@ -3285,15 +3348,13 @@ _FndBox* lcl_SaveInsDelData( CR_SetBoxWidth& rParam, SwUndo** ppUndo, rTbl.GetTabSortBoxes().Count() ) return 0; - _FndBox* pFndBox; + _FndBox* pFndBox = new _FndBox( 0, 0 ); if( rParam.bBigger ) - { - pFndBox = new _FndBox( 0, 0 ); pFndBox->SetTableLines( rParam.aBoxes, rTbl ); - } else { - pFndBox = new _FndBox( rParam.aBoxes ); + _FndPara aPara( rParam.aBoxes, pFndBox ); + rTbl.GetTabLines().ForEach( &_FndLineCopyCol, &aPara ); ASSERT( pFndBox->GetLines().Count(), "Wo sind die Boxen" ); pFndBox->SetTableLines( rTbl ); @@ -3813,15 +3874,13 @@ _FndBox* lcl_SaveInsDelData( CR_SetLineHeight& rParam, SwUndo** ppUndo, rTbl.GetTabSortBoxes().Count() ) return 0; - _FndBox* pFndBox; + _FndBox* pFndBox = new _FndBox( 0, 0 ); if( !rParam.bBigger ) - { - pFndBox = new _FndBox( 0, 0 ); pFndBox->SetTableLines( rParam.aBoxes, rTbl ); - } else { - pFndBox = new _FndBox( rParam.aBoxes ); + _FndPara aPara( rParam.aBoxes, pFndBox ); + rTbl.GetTabLines().ForEach( &_FndLineCopyCol, &aPara ); ASSERT( pFndBox->GetLines().Count(), "Wo sind die Boxen" ); pFndBox->SetTableLines( rTbl ); diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx index be8dfb911719..55ee8ff4b5b4 100644 --- a/sw/source/core/docnode/ndcopy.cxx +++ b/sw/source/core/docnode/ndcopy.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ndcopy.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: hbrinkm $ $Date: 2002-11-05 12:37:07 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -148,7 +148,6 @@ #include <poolfmt.hxx> #endif - // Struktur fuer das Mappen von alten und neuen Frame-Formaten an den // Boxen und Lines einer Tabelle @@ -902,6 +901,23 @@ BOOL SwDoc::_Copy( SwPaM& rPam, SwPosition& rPos, } } + const SfxPoolItem * pItem = NULL; + SwAttrSet * pAttrSet = pDestNd->GetpSwAttrSet(); + + /* #107213#: Safe numrule item at destination. */ + int aState = SFX_ITEM_UNKNOWN; + SwNumRuleItem aNumRuleItem; + + if (pAttrSet != NULL) + { + aState = pAttrSet->GetItemState + (RES_PARATR_NUMRULE, FALSE, &pItem); + + if (SFX_ITEM_SET == aState) + aNumRuleItem = *((SwNumRuleItem *) pItem); + } + /* #107213# */ + if( !bCopyOk ) { xub_StrLen nCpyLen = ( bOneNode ? pEnd->nContent.GetIndex() @@ -918,11 +934,21 @@ BOOL SwDoc::_Copy( SwPaM& rPam, SwPosition& rPos, if( bCopyCollFmt ) { pSttNd->CopyCollFmt( *pDestNd ); - if( pSttNd->GetNum() ) - pDestNd->UpdateNum( *pSttNd->GetNum() ); + + if (pSttNd->GetNum()) + pDestNd->UpdateNum(*pSttNd->GetNum()); + + /* #107213# If only a part of one paragraph is copied + restore the numrule at the destination. */ + if (SFX_ITEM_SET == aState) + pDestNd->SwCntntNode::SetAttr(aNumRuleItem); + else + pDestNd->ResetAttr(RES_PARATR_NUMRULE); } + break; } + aRg.aStart++; } } @@ -983,6 +1009,23 @@ BOOL SwDoc::_Copy( SwPaM& rPam, SwPosition& rPos, aInsPos--; } + const SfxPoolItem * pItem = NULL; + SwAttrSet * pAttrSet = pDestNd->GetpSwAttrSet(); + + /* #107213# Save numrule at destination */ + int aState = SFX_ITEM_UNKNOWN; + SwNumRuleItem aNumRuleItem; + + if (pAttrSet != NULL) + { + aState = pAttrSet->GetItemState + (RES_PARATR_NUMRULE, FALSE, &pItem); + + if (SFX_ITEM_SET == aState) + aNumRuleItem = *((SwNumRuleItem *) pItem); + } + /* #107213# */ + BOOL bEmptyDestNd = 0 == pDestNd->GetTxt().Len(); pEndNd->Copy( pDestNd, aDestIdx, SwIndex( pEndNd ), pEnd->nContent.GetIndex() ); @@ -991,8 +1034,19 @@ BOOL SwDoc::_Copy( SwPaM& rPam, SwPosition& rPos, if( bCopyCollFmt && ( bOneNode || bEmptyDestNd )) { pEndNd->CopyCollFmt( *pDestNd ); - if( pEndNd->GetNum() ) + + if (pEndNd->GetNum()) pDestNd->UpdateNum( *pEndNd->GetNum() ); + + if (bOneNode) + { + /* #107213# If only a part of one paragraph is copied + restore the numrule at the destination. */ + if (SFX_ITEM_SET == aState) + pDestNd->SwCntntNode::SetAttr(aNumRuleItem); + else + pDestNd->ResetAttr(RES_PARATR_NUMRULE); + } } } @@ -1065,6 +1119,7 @@ BOOL SwDoc::_Copy( SwPaM& rPam, SwPosition& rPos, } pDoc->SetRedlineMode_intern( eOld ); pDoc->SetModified(); + return TRUE; } diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx index 5a812a85ee1e..e1e97e2bc7ec 100644 --- a/sw/source/core/docnode/ndsect.cxx +++ b/sw/source/core/docnode/ndsect.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ndsect.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: od $ $Date: 2002-11-15 11:07:52 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -412,8 +412,8 @@ USHORT SwDoc::IsInsRegionAvailable( const SwPaM& rRange, const SwCntntNode* pCNd = pEnd->nNode.GetNode().GetCntntNode(); const SwNode* pNd = &pStt->nNode.GetNode(); const SwSectionNode* pSectNd = pNd->FindSectionNode(); - const SwSectionNode* pEndSectNd = pCNd->FindSectionNode(); - if( pSectNd && pEndSectNd && pSectNd != pCNd->FindSectionNode() ) + const SwSectionNode* pEndSectNd = pCNd ? pCNd->FindSectionNode() : 0; + if( pSectNd && pEndSectNd && pSectNd != pEndSectNd ) { // versuche eine umschliessende Section zu erzeugen // Aber, nur wenn der Start am Sectionanfang und das Ende am diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 9e5d7e7eec53..301091d13c4b 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ndtbl.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: fme $ $Date: 2002-11-15 09:51:05 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -115,6 +115,9 @@ #ifndef _CELLFRM_HXX //autogen #include <cellfrm.hxx> #endif +#ifndef _PAGEFRM_HXX +#include <pagefrm.hxx> +#endif #ifndef _TABCOL_HXX //autogen #include <tabcol.hxx> #endif @@ -249,17 +252,17 @@ class lcl_DelRedlines SwDoc* pDoc; public: lcl_DelRedlines( const SwTableNode& rNd, BOOL bCheckForOwnRedline ); - lcl_DelRedlines( SwPaM& rPam ) - : pDoc( rPam.GetDoc() ) - { - pDoc->StartUndo(); - if( !pDoc->IsIgnoreRedline() && pDoc->GetRedlineTbl().Count() ) - pDoc->DeleteRedline( rPam ); - } + lcl_DelRedlines( SwPaM& rPam ); ~lcl_DelRedlines() { pDoc->EndUndo(); } }; +lcl_DelRedlines::lcl_DelRedlines( SwPaM & rPam) : pDoc( rPam.GetDoc() ) +{ + pDoc->StartUndo(); + if( !pDoc->IsIgnoreRedline() && pDoc->GetRedlineTbl().Count() ) + pDoc->AcceptRedline( rPam ); +} void lcl_SetDfltBoxAttr( SwFrmFmt& rFmt, BYTE nId ) { @@ -514,6 +517,9 @@ const SwTable* SwDoc::InsertTable( const SwPosition& rPos, USHORT nRows, if( (nInsTblFlags & HEADLINE) && (1 != nRows || !bDfltBorders) ) pHeadColl = GetTxtCollFromPool( RES_POOLCOLL_TABLE_HDLN ); + /* #106283# Save content node to extract FRAMEDIR from. */ + const SwCntntNode * pCntntNd = rPos.nNode.GetNode().GetCntntNode(); + SwTableNode *pTblNd = GetNodes().InsertTable( rPos.nNode, nCols, pBodyColl, nRows, pHeadColl ); @@ -521,6 +527,20 @@ const SwTable* SwDoc::InsertTable( const SwPosition& rPos, USHORT nRows, SwTableLineFmt* pLineFmt = MakeTableLineFmt(); SwTableFmt* pTableFmt = MakeTblFrmFmt( GetUniqueTblName(), GetDfltFrmFmt() ); + /* #106283# If the node to insert the table at is a context node and has a + non-default FRAMEDIR propagate it to the table. */ + if (pCntntNd) + { + const SwAttrSet & aNdSet = pCntntNd->GetSwAttrSet(); + const SfxPoolItem *pItem = NULL; + + if (SFX_ITEM_SET == aNdSet.GetItemState( RES_FRAMEDIR, TRUE, &pItem ) + && pItem != NULL) + { + pTableFmt->SetAttr( *pItem ); + } + } + //Orientation am Fmt der Table setzen pTableFmt->SetAttr( SwFmtHoriOrient( 0, eAdjust ) ); // alle Zeilen haben die Fill-Order von links nach rechts ! @@ -716,6 +736,9 @@ const SwTable* SwDoc::TextToTable( const SwPaM& rRange, sal_Unicode cCh, return 0; } + /* #106283# Save first node in the selection if it is a context node. */ + SwCntntNode * pSttCntntNd = pStt->nNode.GetNode().GetCntntNode(); + SwPaM aOriginal( *pStt, *pEnd ); pStt = aOriginal.GetMark(); pEnd = aOriginal.GetPoint(); @@ -786,6 +809,21 @@ const SwTable* SwDoc::TextToTable( const SwPaM& rRange, sal_Unicode cCh, if( !(nInsTblFlags & SPLIT_LAYOUT) ) pTableFmt->SetAttr( SwFmtLayoutSplit( FALSE )); + /* #106283# If the first node in the selection is a context node and if it + has an item FRAMEDIR set (no default) propagate the item to the + replacing table. */ + if (pSttCntntNd) + { + const SwAttrSet & aNdSet = pSttCntntNd->GetSwAttrSet(); + const SfxPoolItem *pItem = NULL; + + if (SFX_ITEM_SET == aNdSet.GetItemState( RES_FRAMEDIR, TRUE, &pItem ) + && pItem != NULL) + { + pTableFmt->SetAttr( *pItem ); + } + } + SwTableNode* pTblNd = GetNodes().TextToTable( aRg, cCh, pTableFmt, pLineFmt, pBoxFmt, GetTxtCollFromPool( RES_POOLCOLL_STANDARD ), @@ -1526,7 +1564,12 @@ BOOL SwDoc::DeleteRow( const SwCursor& rCursor ) return FALSE; // suche alle Boxen / Lines - _FndBox aFndBox( aBoxes ); + _FndBox aFndBox( 0, 0 ); + { + _FndPara aPara( aBoxes, &aFndBox ); + pTblNd->GetTable().GetTabLines().ForEach( &_FndLineCopyCol, &aPara ); + } + if( !aFndBox.GetLines().Count() ) return FALSE; @@ -2133,18 +2176,19 @@ void SwDoc::GetTabCols( SwTabCols &rFill, const SwCursor* pCrsr, } //Fix-Punkte setzen, LeftMin in Dokumentkoordinaten die anderen relativ. -#ifdef VERTICAL_LAYOUT SWRECTFN( pTab ) - rFill.SetLeftMin ( (USHORT)(pTab->Frm().*fnRect->fnGetLeft)() ); + const SwPageFrm* pPage = pTab->FindPageFrm(); + const ULONG nLeftMin = (pTab->Frm().*fnRect->fnGetLeft)() - + (pPage->Frm().*fnRect->fnGetLeft)() + + DOCUMENTBORDER; + const ULONG nRightMax = (pTab->Frm().*fnRect->fnGetRight)() - + (pPage->Frm().*fnRect->fnGetLeft)() + + DOCUMENTBORDER; + + rFill.SetLeftMin ( nLeftMin ); rFill.SetLeft ( (pTab->Prt().*fnRect->fnGetLeft)() ); rFill.SetRight ( (pTab->Prt().*fnRect->fnGetRight)()); - rFill.SetRightMax( (USHORT)(pTab->Frm().*fnRect->fnGetRight)() - rFill.GetLeftMin() ); -#else - rFill.SetLeftMin ( (USHORT)pTab->Frm().Left() ); - rFill.SetLeft ( pTab->Prt().Left() ); - rFill.SetRight ( pTab->Prt().Right()); - rFill.SetRightMax( (USHORT)pTab->Frm().Right() - rFill.GetLeftMin() ); -#endif + rFill.SetRightMax( nRightMax - nLeftMin ); pTab->GetTable()->GetTabCols( rFill, pBox ); } @@ -2205,18 +2249,19 @@ void SwDoc::SetTabCols( const SwTabCols &rNew, BOOL bCurRowOnly, SwTabCols aOld( rNew.Count() ); + const SwPageFrm* pPage = pTab->FindPageFrm(); + const ULONG nLeftMin = (pTab->Frm().*fnRect->fnGetLeft)() - + (pPage->Frm().*fnRect->fnGetLeft)() + + DOCUMENTBORDER; + const ULONG nRightMax = (pTab->Frm().*fnRect->fnGetRight)() - + (pPage->Frm().*fnRect->fnGetLeft)() + + DOCUMENTBORDER; + //Fix-Punkte setzen, LeftMin in Dokumentkoordinaten die anderen relativ. -#ifdef VERTICAL_LAYOUT - aOld.SetLeftMin ( (USHORT)(pTab->Frm().*fnRect->fnGetLeft)() ); + aOld.SetLeftMin ( nLeftMin ); aOld.SetLeft ( (pTab->Prt().*fnRect->fnGetLeft)() ); aOld.SetRight ( (pTab->Prt().*fnRect->fnGetRight)()); - aOld.SetRightMax( (USHORT)(pTab->Frm().*fnRect->fnGetRight)() - aOld.GetLeftMin() ); -#else - aOld.SetLeftMin ( (USHORT)pTab->Frm().Left() ); - aOld.SetLeft ( pTab->Prt().Left() ); - aOld.SetRight ( pTab->Prt().Right()); - aOld.SetRightMax( (USHORT)pTab->Frm().Right() - aOld.GetLeftMin() ); -#endif + aOld.SetRightMax( nRightMax - nLeftMin ); /* if( DoesUndo() ) { @@ -3018,7 +3063,11 @@ BOOL SwDoc::SetTableAutoFmt( const SwSelBoxes& rBoxes, const SwTableAutoFmt& rNe return FALSE; // suche alle Boxen / Lines - _FndBox aFndBox( rBoxes ); + _FndBox aFndBox( 0, 0 ); + { + _FndPara aPara( rBoxes, &aFndBox ); + pTblNd->GetTable().GetTabLines().ForEach( &_FndLineCopyCol, &aPara ); + } if( !aFndBox.GetLines().Count() ) return FALSE; @@ -3089,7 +3138,11 @@ BOOL SwDoc::GetTableAutoFmt( const SwSelBoxes& rBoxes, SwTableAutoFmt& rGet ) return FALSE; // suche alle Boxen / Lines - _FndBox aFndBox( rBoxes ); + _FndBox aFndBox( 0, 0 ); + { + _FndPara aPara( rBoxes, &aFndBox ); + pTblNd->GetTable().GetTabLines().ForEach( &_FndLineCopyCol, &aPara ); + } if( !aFndBox.GetLines().Count() ) return FALSE; @@ -3890,7 +3943,10 @@ lcl_DelRedlines::lcl_DelRedlines( const SwTableNode& rNd, } } if( bDelete ) - pDoc->DeleteRedline( rNd ); + { + SwPaM aPam(*rNd.EndOfSectionNode(), rNd); + pDoc->AcceptRedline( aPam ); + } } } diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx index a9fb82f3c6ae..1e1a5cf41211 100644 --- a/sw/source/core/docnode/ndtbl1.cxx +++ b/sw/source/core/docnode/ndtbl1.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ndtbl1.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: fme $ $Date: 2002-12-02 12:24:28 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -287,7 +287,6 @@ BOOL _FindLine( const _FndLine*& rpLine, void* pPara ) return TRUE; } - void lcl_CollectLines( SvPtrarr &rArr, const SwCursor& rCursor ) { //Zuerst die selektierten Boxen einsammeln. @@ -296,11 +295,15 @@ void lcl_CollectLines( SvPtrarr &rArr, const SwCursor& rCursor ) return ; //Die selektierte Struktur kopieren. - _FndBox aFndBox( aBoxes ); - - //Diejenigen Lines einsammeln, die nur selektierte Boxen enthalten. const SwTable &rTable = aBoxes[0]->GetSttNd()->FindTableNode()->GetTable(); LinesAndTable aPara( rArr, rTable ); + _FndBox aFndBox( 0, 0 ); + { + _FndPara aPara( aBoxes, &aFndBox ); + ((SwTableLines&)rTable.GetTabLines()).ForEach( &_FndLineCopyCol, &aPara ); + } + + //Diejenigen Lines einsammeln, die nur selektierte Boxen enthalten. const _FndBox *pTmp = &aFndBox; ::_FindBox( pTmp, &aPara ); @@ -1427,6 +1430,9 @@ void SwDoc::AdjustCellWidth( const SwCursor& rCursor, BOOL bBalance ) SwTabCols aTabCols; GetTabCols( aTabCols, 0, (SwCellFrm*)pBoxFrm ); + if ( ! aTabCols.Count() ) + return; + const BYTE nTmp = (BYTE)Max( USHORT(255), USHORT(aTabCols.Count() + 1) ); SvUShorts aWish( nTmp, nTmp ), aMins( nTmp, nTmp ); @@ -1501,13 +1507,13 @@ void SwDoc::AdjustCellWidth( const SwCursor& rCursor, BOOL bBalance ) else nDiff -= aTabCols[i] - aTabCols[i-1]; - USHORT nTabRight = aTabCols.GetRight() + nDiff; + long nTabRight = aTabCols.GetRight() + nDiff; //Wenn die Tabelle zu breit wuerde begrenzen wir die Anpassung //auf das erlaubte Maximum. if ( !bBalance && nTabRight > aTabCols.GetRightMax() ) { - const USHORT nTmp = nTabRight - aTabCols.GetRightMax(); + const long nTmp = nTabRight - aTabCols.GetRightMax(); nDiff -= nTmp; nTabRight -= nTmp; } diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx index 41cce89dd5de..422e6c295369 100644 --- a/sw/source/core/docnode/nodes.cxx +++ b/sw/source/core/docnode/nodes.cxx @@ -2,9 +2,9 @@ * * $RCSfile: nodes.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: od $ $Date: 2003-02-28 12:41:34 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx index dcd8db0e9f74..386169d1b4c1 100644 --- a/sw/source/core/docnode/swbaslnk.cxx +++ b/sw/source/core/docnode/swbaslnk.cxx @@ -2,9 +2,9 @@ * * $RCSfile: swbaslnk.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: jp $ $Date: 2001-07-04 18:13:29 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,6 +69,13 @@ #include <hintids.hxx> +#ifndef _SV_SVAPP_HXX +#include <vcl/svapp.hxx> +#endif +#ifndef _SV_OUTDEV_HXX +#include <vcl/outdev.hxx> +#endif + #ifndef _LNKBASE_HXX //autogen #include <so3/lnkbase.hxx> #endif @@ -146,7 +153,7 @@ #include <htmltbl.hxx> #endif -BOOL SetGrfFlySize( const Size& rGrfSz, SwGrfNode* pGrfNd ); +BOOL SetGrfFlySize( const Size& rGrfSz, const Size& rFrmSz, SwGrfNode* pGrfNd ); TYPEINIT1( SwBaseLink, ::so3::SvBaseLink ); @@ -228,7 +235,7 @@ void SwBaseLink::DataChanged( const String& rMimeType, FASTBOOL bGraphicArrived = FALSE; FASTBOOL bGraphicPieceArrived = FALSE; FASTBOOL bDontNotify = FALSE; - Size aGrfSz; + Size aGrfSz, aFrmFmtSz; if( pCntntNode->IsGrfNode() ) { @@ -246,6 +253,18 @@ void SwBaseLink::DataChanged( const String& rMimeType, GRAPHIC_DEFAULT != rGrfObj.GetType() ) ) { aGrfSz = ::GetGraphicSizeTwip( aGrf, 0 ); + if( static_cast< const SwGrfNode * >( pCntntNode )->IsChgTwipSizeFromPixel() ) + { + const MapMode aMapTwip( MAP_TWIP ); + aFrmFmtSz = + Application::GetDefaultDevice()->PixelToLogic( + aGrf.GetSizePixel(), aMapTwip ); + + } + else + { + aFrmFmtSz = aGrfSz; + } Size aSz( ((SwGrfNode*)pCntntNode)->GetTwipSize() ); if( bGraphicPieceArrived && GRAPHIC_DEFAULT != aGrf.GetType() && @@ -341,11 +360,11 @@ void SwBaseLink::DataChanged( const String& rMimeType, IsGrafikArrived() ); // Fly der Grafik anpassen ! - if( !::SetGrfFlySize( aGrfSz, pGrfNd ) ) + if( !::SetGrfFlySize( aGrfSz, aFrmFmtSz, pGrfNd ) ) ::lcl_CallModify( *pGrfNd, aMsgHint ); } else if( pBLink == this && - !::SetGrfFlySize( aGrfSz, pGrfNd ) ) + !::SetGrfFlySize( aGrfSz, aFrmFmtSz, pGrfNd ) ) // Fly der Grafik anpassen ! ::lcl_CallModify( *pGrfNd, aMsgHint ); } @@ -387,7 +406,7 @@ FASTBOOL SwBaseLink::IsShowQuickDrawBmp() const } -BOOL SetGrfFlySize( const Size& rGrfSz, SwGrfNode* pGrfNd ) +BOOL SetGrfFlySize( const Size& rGrfSz, const Size& rFrmSz, SwGrfNode* pGrfNd ) { BOOL bRet = FALSE; ViewShell *pSh; @@ -406,15 +425,15 @@ BOOL SetGrfFlySize( const Size& rGrfSz, SwGrfNode* pGrfNd ) Size aCalcSz( aSz ); if ( !aSz.Height() && aSz.Width() ) //passende Hoehe ausrechnen. - aCalcSz.Height() = rGrfSz.Height() * - aSz.Width() / rGrfSz.Width(); + aCalcSz.Height() = rFrmSz.Height() * + aSz.Width() / rFrmSz.Width(); else if ( !aSz.Width() && aSz.Height() ) //passende Breite ausrechnen - aCalcSz.Width() = rGrfSz.Width() * - aSz.Height() / rGrfSz.Height(); + aCalcSz.Width() = rFrmSz.Width() * + aSz.Height() / rFrmSz.Height(); else //Hoehe und Breite uebernehmen - aCalcSz = rGrfSz; + aCalcSz = rFrmSz; const SvxBoxItem &rBox = pFmt->GetBox(); aCalcSz.Width() += rBox.CalcLineSpace(BOX_LINE_LEFT) + diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index 7c29ff6851d1..b37fd7e988d8 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dflyobj.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: fme $ $Date: 2002-10-10 08:45:44 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -301,16 +301,22 @@ SdrObject* __EXPORT SwVirtFlyDrawObj::CheckHit( const Point& rPnt, USHORT nTol, && !rURL.GetURL().Len() && !rURL.GetMap() */ ) { - //Vor dem Return noch 3a (siehe oben) pruefen. - SdrPage *pPg = GetPage(); - for ( UINT32 i = GetOrdNumDirect()+1; i < pPg->GetObjCount(); ++i ) - { - SdrObject *pObj = pPg->GetObj( i ); - if ( pObj->IsWriterFlyFrame() && - ((SwVirtFlyDrawObj*)pObj)->GetBoundRect().IsInside( rPnt ) ) - return 0; - } + // #107513# + // This test needs to be done outside, since also drawing layer HitTest + // methods are called. Not all drawing objects are derived and the + // CheckHit() overloaded. That's an conceptual error here. return (SdrObject*)this; + + //Vor dem Return noch 3a (siehe oben) pruefen. + //SdrPage *pPg = GetPage(); + //for ( UINT32 i = GetOrdNumDirect()+1; i < pPg->GetObjCount(); ++i ) + //{ + // SdrObject *pObj = pPg->GetObj( i ); + // if ( pObj->IsWriterFlyFrame() && + // ((SwVirtFlyDrawObj*)pObj)->GetBoundRect().IsInside( rPnt ) ) + // return 0; + //} + //return (SdrObject*)this; } else { diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx index 5cbd2c28745b..4277d6505d73 100644 --- a/sw/source/core/draw/dpage.cxx +++ b/sw/source/core/draw/dpage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dpage.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: os $ $Date: 2000-11-27 07:50:16 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -168,10 +168,12 @@ SwDPage::~SwDPage() } -Point SwDPage::GetOffset() const -{ - return Point( DOCUMENTBORDER, DOCUMENTBORDER ); -} +// #i3694# +// This GetOffset() method is not needed anymore, it even leads to errors. +//Point SwDPage::GetOffset() const +//{ +// return Point( DOCUMENTBORDER, DOCUMENTBORDER ); +//} /************************************************************************* |* diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx index 2133aec830e5..d32c209ce6e1 100644 --- a/sw/source/core/draw/drawdoc.cxx +++ b/sw/source/core/draw/drawdoc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drawdoc.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: ka $ $Date: 2001-11-02 16:05:52 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -244,6 +244,8 @@ SwDrawDocument::SwDrawDocument( SfxItemPool *pPool, SwDocShell *pDocSh ) SwDrawDocument::~SwDrawDocument() { + Broadcast(SdrHint(HINT_MODELCLEARED)); + Clear(); } diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx index 13aaecf3083b..d6948d20bb9d 100644 --- a/sw/source/core/edit/acorrect.cxx +++ b/sw/source/core/edit/acorrect.cxx @@ -2,9 +2,9 @@ * * $RCSfile: acorrect.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: jp $ $Date: 2002-02-22 12:00:10 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -472,6 +472,7 @@ BOOL SwAutoCorrDoc::ChgAutoCorrWord( xub_StrLen & rSttPos, xub_StrLen nEndPos, pDoc->DontExpandFmt( *aPam.GetPoint() ); pDoc->Insert( aPam, pCorr->Correct() ); + pDoc->AppendTmpCorr(sKurz, pCorr->Correct()); bRet = TRUE; } } diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index 62a31723b732..53881e32594c 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: autofmt.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: iha $ $Date: 2002-11-28 12:12:41 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -961,9 +961,14 @@ USHORT SwAutoFormat::GetDigitLevel( const SwTxtNode& rNd, xub_StrLen& rPos, // Numerierung mit c oder d anfangen will, werden diese erstmal // zu chars und spaeter ggfs. zu romischen Zeichen! // if( strchr( "mdclxvi", cLow )) +#ifdef WITH_ALPHANUM_AS_NUMFMT + //detection of 'c' and 'd' a ROMAN numbering should not be done here if( 256 > cLow &&( (eScan & (LOWER_ROMAN|UPPER_ROMAN)) ? strchr( "mdclxvi", cLow ) : strchr( "mlxvi", cLow ) )) +#else + if( 256 > cLow && ( strchr( "mdclxvi", cLow ) )) +#endif { if( bIsUpper ) cNumTyp = '0' + SVX_NUM_ROMAN_UPPER, eTmpScan = UPPER_ROMAN; diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx index 9f3eda4c4408..137b20354461 100644 --- a/sw/source/core/edit/edattr.cxx +++ b/sw/source/core/edit/edattr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: edattr.cxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: fme $ $Date: 2002-12-02 10:26:44 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -149,11 +149,15 @@ using namespace ::com::sun::star::i18n; // wenn Selektion groesser Max Nodes oder mehr als Max Selektionen // => keine Attribute -static const USHORT nMaxLookup = 255; +const USHORT& getMaxLookup() +{ + static const USHORT nMaxLookup = 1000; + return nMaxLookup; +} BOOL SwEditShell::GetAttr( SfxItemSet& rSet ) const { - if( GetCrsrCnt() > nMaxLookup ) + if( GetCrsrCnt() > getMaxLookup() ) { rSet.InvalidateAllItems(); return FALSE; @@ -175,7 +179,7 @@ BOOL SwEditShell::GetAttr( SfxItemSet& rSet ) const nTmp = nSttCnt; nSttCnt = nEndCnt; nEndCnt = (xub_StrLen)nTmp; } - if( nEndNd - nSttNd >= nMaxLookup ) + if( nEndNd - nSttNd >= getMaxLookup() ) { rSet.ClearItem(); rSet.InvalidateAllItems(); @@ -246,7 +250,7 @@ SwTxtFmtColl* SwEditShell::GetCurTxtFmtColl() const { SwTxtFmtColl *pFmt = 0; - if ( GetCrsrCnt() > nMaxLookup ) + if ( GetCrsrCnt() > getMaxLookup() ) return 0; FOREACHPAM_START(this) @@ -262,7 +266,7 @@ SwTxtFmtColl* SwEditShell::GetCurTxtFmtColl() const nTmp = nSttCnt; nSttCnt = nEndCnt; nEndCnt = (xub_StrLen)nTmp; } - if( nEndNd - nSttNd >= nMaxLookup ) + if( nEndNd - nSttNd >= getMaxLookup() ) { pFmt = 0; break; @@ -480,10 +484,41 @@ inline USHORT lcl_SetScriptFlags( USHORT nType ) } BOOL lcl_IsNoEndTxtAttrAtPos( const SwTxtNode& rTNd, xub_StrLen nPos, - USHORT &rScrpt, BOOL bInSelection ) + USHORT &rScrpt, BOOL bInSelection, BOOL bNum ) { BOOL bRet = FALSE; const String& rTxt = rTNd.GetTxt(); + String sExp; + + // consider numbering + if ( bNum ) + { + bRet = FALSE; + + const SwNumRule* pNumRule = rTNd.GetNumRule(); + const SwNodeNum* pNum = rTNd.GetNum(); + + if( !pNumRule ) // oder sollte OutlineNum an sein? + { + pNum = rTNd.GetOutlineNum(); + if( pNum ) + pNumRule = rTNd.GetDoc()->GetOutlineNumRule(); + } + + if( pNumRule && pNum && MAXLEVEL > pNum->GetLevel() ) + { + const SwNumFmt &rNumFmt = pNumRule->Get( pNum->GetLevel() ); + + if( SVX_NUM_BITMAP != rNumFmt.GetNumberingType() ) + { + sExp = ( SVX_NUM_CHAR_SPECIAL == rNumFmt.GetNumberingType() ? + rNumFmt.GetBulletChar() : + pNumRule->MakeNumString( *pNum ) ); + } + } + } + + // and fields const SwTxtAttr* pTFld; if( CH_TXTATR_BREAKWORD == rTxt.GetChar( nPos ) && 0 != ( pTFld = rTNd.GetTxtAttr( nPos ) ) ) @@ -491,27 +526,32 @@ BOOL lcl_IsNoEndTxtAttrAtPos( const SwTxtNode& rTNd, xub_StrLen nPos, bRet = TRUE; // all other then fields can be // defined as weak-script ? const SwField* pFld; - String sExp; if( RES_TXTATR_FIELD == pTFld->Which() && - 0 != (pFld = pTFld->GetFld().GetFld() ) && - (sExp = pFld->Expand()).Len() ) + 0 != (pFld = pTFld->GetFld().GetFld() ) ) + { + sExp += pFld->Expand(); + } + } + + xub_StrLen nEnd = sExp.Len(); + if ( nEnd ) + { + xub_StrLen n; + if( bInSelection ) { - xub_StrLen n, nEnd = sExp.Len(); - if( bInSelection ) + USHORT nScript; + for( n = 0; n < nEnd; n = (xub_StrLen) + pBreakIt->xBreak->endOfScript( sExp, n, nScript )) { - USHORT nScript; - for( n = 0; n < nEnd; n = (xub_StrLen) - pBreakIt->xBreak->endOfScript( sExp, n, nScript )) - { - nScript = pBreakIt->xBreak->getScriptType( sExp, n ); - rScrpt |= nScript; - } + nScript = pBreakIt->xBreak->getScriptType( sExp, n ); + rScrpt |= lcl_SetScriptFlags( nScript ); } - else - rScrpt |= lcl_SetScriptFlags( pBreakIt->xBreak-> - getScriptType( sExp, nEnd-1 )); } + else + rScrpt |= lcl_SetScriptFlags( pBreakIt->xBreak-> + getScriptType( sExp, nEnd-1 )); } + return bRet; } @@ -557,7 +597,7 @@ USHORT SwEditShell::GetScriptType( USHORT nFlags ) const else nScript = GetI18NScriptTypeOfLanguage( (USHORT)GetAppLanguage() ); - if( !lcl_IsNoEndTxtAttrAtPos( *pTNd, nPos, nRet, FALSE )) + if( !lcl_IsNoEndTxtAttrAtPos( *pTNd, nPos, nRet, FALSE, FALSE )) nRet |= lcl_SetScriptFlags( nScript ); } } @@ -581,6 +621,7 @@ USHORT SwEditShell::GetScriptType( USHORT nFlags ) const ? pEnd->nContent.GetIndex() : rTxt.Len(), nSttPos = nChg; + ASSERT( nEndPos <= rTxt.Len(), "Index outside the range - endless loop!" ); if( nEndPos > rTxt.Len() ) nEndPos = rTxt.Len(); @@ -593,7 +634,8 @@ USHORT SwEditShell::GetScriptType( USHORT nFlags ) const pBreakIt->xBreak->getScriptType( rTxt, nChg ); - if( !lcl_IsNoEndTxtAttrAtPos( *pTNd, nChg, nRet, TRUE ) ) + if( !lcl_IsNoEndTxtAttrAtPos( *pTNd, nChg, nRet, TRUE, + 0 == nChg && rTxt.Len() == nEndPos ) ) nRet |= lcl_SetScriptFlags( nScript ); if( (SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx index 62922b838f79..57282dbf4cf8 100644 --- a/sw/source/core/edit/editsh.cxx +++ b/sw/source/core/edit/editsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: editsh.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: os $ $Date: 2002-08-26 14:39:30 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -172,6 +172,9 @@ #ifndef _CRSSKIP_HXX #include <crsskip.hxx> #endif +#ifndef _DRAWFONT_HXX +#include <drawfont.hxx> +#endif #ifndef _UNOOBJ_HXX #include <unoobj.hxx> #endif @@ -217,6 +220,57 @@ void SwEditShell::Insert(const String &rStr) SaveTblBoxCntnt( PCURCRSR->GetPoint() ); FOREACHPAM_END() + + // calculate cursor bidi level + SwCursor* pTmpCrsr = _GetCrsr(); + const BOOL bDoNotSetBidiLevel = ! pTmpCrsr || + ( 0 != (SwUnoCrsr*)*pTmpCrsr ); + + if ( ! bDoNotSetBidiLevel ) + { + SwNode& rNode = pTmpCrsr->GetPoint()->nNode.GetNode(); + if ( rNode.IsTxtNode() ) + { + SwIndex& rIdx = pTmpCrsr->GetPoint()->nContent; + xub_StrLen nPos = rIdx.GetIndex(); + xub_StrLen nPrevPos = nPos; + if ( nPrevPos ) + --nPrevPos; + + // If some day the font fallback works, we should do this here: + // 1. get script info + // 2. call InitScriptInfo( rNode, bRTL ) + // This would avoid calling UpdateBidiInfo here, instead it would + // be called within InitScriptInfo and only if there are complex + // characters in the string. + + SwScriptInfo* pSI = SwScriptInfo::GetScriptInfo( ((SwTxtNode&)rNode), + sal_True ); + + BYTE nLevel = 0; + if ( ! pSI ) + { + // seems to be an empty paragraph. + Point aPt; + SwCntntFrm* pFrm = + ((SwTxtNode&)rNode).GetFrm( &aPt, pTmpCrsr->GetPoint(), + sal_False ); + + SwScriptInfo aScriptInfo; + aScriptInfo.SetDefaultDir( pFrm->IsRightToLeft() ); + aScriptInfo.UpdateBidiInfo( ((SwTxtNode&)rNode).GetTxt() ); + nLevel = aScriptInfo.DirType( nPrevPos ); + } + else + { + pSI->UpdateBidiInfo( ((SwTxtNode&)rNode).GetTxt() ); + nLevel = pSI->DirType( nPrevPos ); + } + + pTmpCrsr->SetCrsrBidiLevel( nLevel ); + } + } + EndAllAction(); } @@ -1071,7 +1125,14 @@ String SwEditShell::DeleteExtTextInput( SwExtTextInput* pDel, BOOL bInsText ) StartAllAction(); pDel->SetInsText( bInsText ); SetOverwriteCrsr( pDel->IsOverwriteCursor() ); + const SwPosition aPos( *pDel->GetPoint() ); GetDoc()->DeleteExtTextInput( pDel ); + + // In this case, the "replace" function did not set the cursor + // to the original position. Therefore we have to do this manually. + if ( ! bInsText && IsOverwriteCrsr() ) + *GetCrsr()->GetPoint() = aPos; + EndAllAction(); } return sRet; diff --git a/sw/source/core/edit/edsect.cxx b/sw/source/core/edit/edsect.cxx index 1eca7b181411..d8da67c80ef6 100644 --- a/sw/source/core/edit/edsect.cxx +++ b/sw/source/core/edit/edsect.cxx @@ -2,9 +2,9 @@ * * $RCSfile: edsect.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: os $ $Date: 2001-05-08 08:58:18 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -371,140 +371,149 @@ USHORT SwEditShell::GetFullSelectedSectionCount() const return nRet; } -// is the cursor at the last contentposition of any section and is the -// insertposition not readonly? -// The return have 3 values: -// 0 - not at start or end of Section -// 1 - at start of Section -// 2 - at End of Section -int SwEditShell::CanInsertNodeAtEndOfSection() const + +/** + * Find the suitable node for a special insert (alt-enter). + * This should enable inserting text before/after sections and tables. + * + * A node is found if: + * 1) the innermost table/section is not in a write-protected area + * 2) pCurrentPos is at or just before an end node + * (or at or just after a start node) + * 3) there are only start/end nodes between pCurrentPos and the innermost + * table/section + * + * If a suitable node is found, an SwNode* is returned; else it is NULL. + */ +const SwNode* lcl_SpecialInsertNode(const SwPosition* pCurrentPos) { - int nRet = 0; - if( !IsTableMode() ) + const SwNode* pReturn = NULL; + + // the current position + // const SwPosition* pCurrentPos = GetCrsr()->GetPoint(); + DBG_ASSERT( pCurrentPos != NULL, "Strange, we have no position!" ); + const SwNode& rCurrentNode = pCurrentPos->nNode.GetNode(); + + + // find innermost section or table. At the end of this scope, + // pInntermostNode contain the section/table before/after which we should + // insert our empty paragraph, or it will be NULL if none is found. + const SwNode* pInnermostNode = NULL; { - const SwPosition& rPos = *GetCrsr()->GetPoint(); - const SwSectionNode* pSectNd = rPos.nNode.GetNode().FindSectionNode(); - if( pSectNd ) + const SwNode* pTableNode = rCurrentNode.FindTableNode(); + const SwNode* pSectionNode = rCurrentNode.FindSectionNode(); + + // find the table/section which is close + if( pTableNode == NULL ) + pInnermostNode = pSectionNode; + else if ( pSectionNode == NULL ) + pInnermostNode = pTableNode; + else { - BOOL bEnd = FALSE, bStart = FALSE; - const SwCntntNode* pCntNd = rPos.nNode.GetNode().GetCntntNode(); - - SwNodeIndex aEnd( rPos.nNode, 1 ); - while( aEnd.GetNode().IsEndNode() && - (const SwNode*)&aEnd.GetNode() != - pSectNd->EndOfSectionNode() ) - aEnd++; - - if( aEnd.GetNode().IsEndNode() && - ( !pCntNd || pCntNd->Len() == rPos.nContent.GetIndex() )) - bEnd = TRUE; - else - { - aEnd = rPos.nNode; - aEnd--; - while( aEnd.GetNode().IsStartNode() && - (const SwNode*)&aEnd.GetNode() != pSectNd ) - aEnd--; - - if( (const SwNode*)&aEnd.GetNode() == pSectNd && - ( !pCntNd || !rPos.nContent.GetIndex() )) - bStart = TRUE; - } + // compare and choose the larger one + pInnermostNode = + ( pSectionNode->GetIndex() > pTableNode->GetIndex() ) + ? pSectionNode : pTableNode; + } + } - if( bEnd || bStart ) - { - // is the insertposition readonly? - if( bEnd ) - { - aEnd = *pSectNd->EndOfSectionNode(); - aEnd++; - } - else - { - aEnd = *pSectNd; - aEnd--; - // the IsProtect-Method of SwNode test by sectionnode - // his parent! - if( aEnd.GetNode().IsSectionNode() ) - aEnd = *pSectNd; - } + // The previous version had a check to skip empty read-only sections. Those + // shouldn't occur, so we only need to check whether our pInnermostNode is + // inside a protected area. - do { - if( !aEnd.GetNode().IsProtect() ) - { - nRet = bStart ? 1 : 2; - break; - } - else - { - // skip protected sections without any content at - // start or end - if( bStart ) - { - if( !aEnd.GetNode().IsSectionNode() || - !aEnd.GetNode().StartOfSectionIndex() ) - break; - aEnd--; - } - else - { - if( !aEnd.GetNode().IsEndNode() || - !aEnd.GetNode().StartOfSectionNode()-> - IsSectionNode() ) - break; - aEnd++; - } - } - } while( TRUE ); - } - } + // Now, pInnermostNode is NULL or the innermost section or table node. + if( (pInnermostNode != NULL) && !pInnermostNode->IsProtect() ) + { + DBG_ASSERT( pInnermostNode->IsTableNode() || + pInnermostNode->IsSectionNode(), "wrong node found" ); + DBG_ASSERT( ( pInnermostNode->GetIndex() <= rCurrentNode.GetIndex() )&& + ( pInnermostNode->EndOfSectionNode()->GetIndex() >= + rCurrentNode.GetIndex() ), "wrong node found" ); + + // we now need to find the possible start/end positions + + // we found a start if + // - we're at or just before a start node + // - there are only start nodes between the current and pInnermostNode + SwNodeIndex aBegin( pCurrentPos->nNode ); + if( rCurrentNode.IsCntntNode() && + (pCurrentPos->nContent.GetIndex() == 0)) + aBegin--; + while( (aBegin != pInnermostNode->GetIndex()) && + aBegin.GetNode().IsStartNode() ) + aBegin--; + bool bStart = ( aBegin == pInnermostNode->GetIndex() ); + + // we found an end if + // - we're at or just before an end node + // - there are only end nodes between the current node and + // pInnermostNode's end node + SwNodeIndex aEnd( pCurrentPos->nNode ); + if( rCurrentNode.IsCntntNode() && + ( pCurrentPos->nContent.GetIndex() == + rCurrentNode.GetCntntNode()->Len() ) ) + aEnd++; + while( (aEnd != pInnermostNode->EndOfSectionNode()->GetIndex()) && + aEnd.GetNode().IsEndNode() ) + aEnd++; + bool bEnd = ( aEnd == pInnermostNode->EndOfSectionNode()->GetIndex() ); + + // evalutate result: if both start + end, end is preferred + if( bEnd ) + pReturn = pInnermostNode->EndOfSectionNode(); + else if ( bStart ) + pReturn = pInnermostNode; + // else pReturn = NULL; } - return nRet; + // else: pReturn = NULL + + + DBG_ASSERT( ( pReturn == NULL ) || pReturn->IsStartNode() || + pReturn->IsEndNode(), + "SpecialInsertNode failed" ); + return pReturn; } -BOOL SwEditShell::AppendNodeInSection() + +/** a node can be special-inserted (alt-Enter) whenever lcl_SpecialInsertNode + finds a suitable position +*/ +bool SwEditShell::CanSpecialInsert() const +{ + return NULL != lcl_SpecialInsertNode( GetCrsr()->GetPoint() ); +} + + +/** check whether a node cen be special-inserted (alt-Enter), and do so. Return + whether insertion was possible. + */ +bool SwEditShell::DoSpecialInsert() { - int nRet = CanInsertNodeAtEndOfSection(); - if( nRet ) + bool bRet = false; + + // get current node + SwPosition* pCursorPos = GetCrsr()->GetPoint(); + const SwNode* pInsertNode = lcl_SpecialInsertNode( pCursorPos ); + if( pInsertNode != NULL ) { StartAllAction(); - SwPosition& rPos = *GetCrsr()->GetPoint(); - const SwSectionNode* pSectNd = rPos.nNode.GetNode().FindSectionNode(); - SwPosition aPos( *pSectNd ); - if( 1 == nRet ) - { - do { - const SwNode* pPrvNd = &aPos.nNode.GetNode(); - aPos.nNode--; - if( !aPos.nNode.GetNode().IsSectionNode() || - !pPrvNd->IsProtect() ) - break; - } while( TRUE ); - } - else - { - SwNodeIndex aIdx( *pSectNd->EndOfSectionNode(), 1 ); - do { - if( !aIdx.GetNode().IsEndNode() || - !aIdx.GetNode().FindStartNode()->IsSectionNode() || - !aIdx.GetNode().IsProtect() ) - break; - aIdx++; - } while( TRUE ); - aIdx--; - aPos.nNode = aIdx; - } + // adjust insert position to insert before start nodes and after end + // nodes + SwNodeIndex aInsertIndex( *pInsertNode, + pInsertNode->IsStartNode() ? -1 : 0 ); + SwPosition aInsertPos( aInsertIndex ); - GetDoc()->AppendTxtNode( aPos ); - rPos = aPos; + // insert a new text node, and set the cursor + bRet = GetDoc()->AppendTxtNode( aInsertPos ); + *pCursorPos = aInsertPos; - // rufe das AttrChangeNotify auf der UI-Seite. + // call AttrChangeNotify for the UI CallChgLnk(); + EndAllAction(); } - return 0 != nRet; -} - + return bRet; +} diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx index 017583b06693..e031972b937e 100644 --- a/sw/source/core/fields/authfld.cxx +++ b/sw/source/core/fields/authfld.cxx @@ -2,9 +2,9 @@ * * $RCSfile: authfld.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: os $ $Date: 2002-10-30 10:38:14 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -94,6 +94,15 @@ #ifndef _AUTHFLD_HXX #include <authfld.hxx> #endif +#ifndef _EXPFLD_HXX +#include <expfld.hxx> +#endif +#ifndef _PAM_HXX +#include <pam.hxx> +#endif +#ifndef _CNTFRM_HXX +#include <cntfrm.hxx> +#endif #ifndef _TOX_HXX #include <tox.hxx> #endif @@ -531,12 +540,22 @@ USHORT SwAuthorityFieldType::GetSequencePos(long nHandle) #endif continue; } - const SwTxtNode& rTxtNode = pTxtFld->GetTxtNode(); - ULONG nPos = rTxtNode.GetIndex(); - if( rTxtNode.GetTxt().Len() && rTxtNode.GetFrm() && - rTxtNode.GetNodes().IsDocNodes() ) + const SwTxtNode& rFldTxtNode = pTxtFld->GetTxtNode(); + SwPosition aFldPos(rFldTxtNode); + SwDoc& rDoc = *(SwDoc*)rFldTxtNode.GetDoc(); + SwCntntFrm *pFrm = rFldTxtNode.GetFrm(); + const SwTxtNode* pTxtNode = 0; + if(pFrm && !pFrm->IsInDocBody()) + pTxtNode = GetBodyTxtNode( rDoc, aFldPos, *pFrm ); + //if no text node could be found or the field is in the document + //body the directly available text node will be used + if(!pTxtNode) + pTxtNode = &rFldTxtNode; + ULONG nPos = pTxtNode->GetIndex(); + if( pTxtNode->GetTxt().Len() && pTxtNode->GetFrm() && + pTxtNode->GetNodes().IsDocNodes() ) { - SwTOXAuthority* pNew = new SwTOXAuthority( rTxtNode, + SwTOXAuthority* pNew = new SwTOXAuthority( *pTxtNode, *pFmtFld, aIntl ); for(short i = 0; i < aSortArr.Count(); ++i) diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx index 565ce94eb4dd..04fc46d127ac 100644 --- a/sw/source/core/fields/fldbas.cxx +++ b/sw/source/core/fields/fldbas.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fldbas.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: os $ $Date: 2002-11-15 11:43:50 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:39:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,8 +71,8 @@ #endif #include <float.h> -#ifndef _TOOLS_SOLMATH_HXX -#include <tools/solmath.hxx> +#ifndef INCLUDED_RTL_MATH_HXX +#include <rtl/math.hxx> #endif #ifndef _ZFORLIST_HXX //autogen #include <svtools/zforlist.hxx> @@ -800,9 +800,8 @@ void SwValueFieldType::DoubleToString( String &rValue, const double &rVal, nLng = LANGUAGE_SYSTEM; pFormatter->ChangeIntl( nLng ); // Separator in der richtigen Sprache besorgen - rValue.Erase(); - SolarMath::DoubleToString( rValue, rVal, 'F', 12, - pFormatter->GetDecSep(), TRUE ); + rValue = ::rtl::math::doubleToUString( rVal, rtl_math_StringFormat_F, 12, + pFormatter->GetDecSep(), true ); } /*-------------------------------------------------------------------- diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index f8a1f6f53e20..1fcaf5b76d6d 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fecopy.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: fme $ $Date: 2002-09-16 08:46:08 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -124,6 +124,9 @@ #ifndef _SVDPAGE_HXX #include <svx/svdpage.hxx> #endif +#ifndef _SVDOGRP_HXX +#include <svx/svdogrp.hxx> +#endif #ifndef _XOUTBMP_HXX #include <svx/xoutbmp.hxx> #endif @@ -389,9 +392,10 @@ BOOL SwFEShell::Copy( SwDoc* pClpDoc, const String* pNewClpTxt ) aSet.Put( aAnchor ); SdrObject* pNew = pClpDoc->CloneSdrObj( *pObj, FALSE, TRUE ); + //JP 07.01.00: why move?? // pNew->NbcMove( aSiz ); - pClpDoc->Insert( SwPaM( aPos ), *pNew, &aSet ); + pClpDoc->Insert( SwPaM( aPos ), *pNew, &aSet ); } else { @@ -953,7 +957,8 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc ) if( !Imp()->GetDrawView() ) MakeDrawView(); - Size aSiz( 0, GetCharRect().Top() ); + // FME: removed for #105977# + // Size aSiz( 0, GetCharRect().Top() ); for ( USHORT i = 0; i < pClpDoc->GetSpzFrmFmts()->Count(); ++i ) { BOOL bInsWithFmt = TRUE; @@ -968,9 +973,40 @@ BOOL SwFEShell::Paste( SwDoc* pClpDoc ) { SdrObject* pNew = GetDoc()->CloneSdrObj( *pSdrObj, FALSE, FALSE ); - pNew->NbcMove( aSiz ); + + // FME: removed for #105977# + // pNew->NbcMove( aSiz ); + + // Insert object sets any anchor position to 0. + // Therefore we calculate the absolute position here + // and after the insert the anchor of the object + // is set to the anchor of the group object. + Rectangle aSnapRect = pNew->GetSnapRect(); + if( pNew->GetAnchorPos().X() || pNew->GetAnchorPos().Y() ) + { + const Point aPoint( 0, 0 ); + pNew->NbcSetAnchorPos( aPoint ); + pNew->NbcSetSnapRect( aSnapRect ); + } + Imp()->GetDrawView()->InsertObject( pNew, *Imp()->GetPageView() ); + + Point aGrpAnchor( 0, 0 ); + SdrObjList* pList = pNew->GetObjList(); + if ( pList ) + { + SdrObject* pOwner = pList->GetOwnerObj(); + if ( pOwner ) + { + SdrObjGroup* pThisGroup = PTR_CAST(SdrObjGroup, pOwner); + aGrpAnchor = pThisGroup->GetAnchorPos(); + } + } + + pNew->NbcSetAnchorPos( aGrpAnchor ); + pNew->NbcSetSnapRect( aSnapRect ); + bInsWithFmt = FALSE; } } diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index ba22928cdc72..b8d3ffdcba97 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fefly1.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: fme $ $Date: 2002-09-16 08:46:09 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -321,6 +321,9 @@ BOOL lcl_FindAnchorPos( SwDoc& rDoc, const Point& rPt, const SwFrm& rFrm, return bRet; } +// +//! also used in unoframe.cxx +// sal_Bool lcl_ChkAndSetNewAnchor( const SwFlyFrm& rFly, SfxItemSet& rSet ) { const SwFrmFmt& rFmt = *rFly.GetFmt(); diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index d6163f34607c..70d309f53f13 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -2,9 +2,9 @@ * * $RCSfile: feshview.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: od $ $Date: 2002-12-10 14:12:18 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1262,6 +1262,44 @@ int SwFEShell::IsObjSelectable( const Point& rPt ) #endif } +// #107513# +// Test if there is a draw object at that position and if it should be selected. +// The 'should' is aimed at Writer text fly frames which may be in front of +// the draw object. +sal_Bool SwFEShell::ShouldObjectBeSelected(const Point& rPt) +{ + SET_CURR_SHELL(this); + SwDrawView *pDrawView = Imp()->GetDrawView(); + sal_Bool bRet(sal_False); + + if(pDrawView) + { + SdrObject* pObj; + SdrPageView* pPV; + sal_uInt16 nOld(pDrawView->GetHitTolerancePixel()); + + pDrawView->SetHitTolerancePixel(pDrawView->GetMarkHdlSizePixel()/2); + bRet = pDrawView->PickObj(rPt, pObj, pPV, SDRSEARCH_PICKMARKABLE); + pDrawView->SetHitTolerancePixel(nOld); + + if(bRet && pObj) + { + SdrPage* pPage = GetDoc()->GetDrawModel()->GetPage(0); + + for(sal_uInt32 a(pObj->GetOrdNumDirect() + 1); bRet && a < pPage->GetObjCount(); a++) + { + SdrObject *pCandidate = pPage->GetObj(a); + + if(pCandidate->IsWriterFlyFrame() && ((SwVirtFlyDrawObj*)pCandidate)->GetBoundRect().IsInside(rPt)) + { + bRet = sal_False; + } + } + } + } + + return bRet; +} /************************************************************************* |* @@ -1464,6 +1502,10 @@ BOOL SwFEShell::GotoObj( BOOL bNext, GotoObjType eType ) if( pBest ) { + // OD 11.02.2003 #100556# - set flag value to avoid macro execution. + bool bSavedFlagValue = IsMacroExecAllowed(); + SetMacroExecAllowed( false ); + BOOL bFlyFrm = pBest->IsWriterFlyFrame(); if( bFlyFrm ) { @@ -1479,6 +1521,10 @@ BOOL SwFEShell::GotoObj( BOOL bNext, GotoObjType eType ) if( !ActionPend() ) MakeVisible( pBest->GetBoundRect() ); } + + // OD 11.02.2003 #100556# - reset flag value + SetMacroExecAllowed( bSavedFlagValue ); + CallChgLnk(); bRet = TRUE; } @@ -2566,10 +2612,8 @@ BOOL SwFEShell::IsAlignPossible() const { SdrObject *pO = Imp()->GetDrawView()->GetMarkList().GetMark(0)->GetObj(); SwDrawContact *pC = (SwDrawContact*)GetUserCall(pO); - if (pC->GetFmt()->GetAnchor().GetAnchorId() == FLY_AT_CNTNT) - bRet = FALSE; - else - bRet = pC->GetAnchor() ? pC->GetAnchor()->IsInDocBody() : FALSE; + //only as character bound drawings can be aligned + bRet = pC->GetFmt()->GetAnchor().GetAnchorId() == FLY_IN_CNTNT; } if ( bRet ) return Imp()->GetDrawView()->IsAlignPossible(); @@ -2947,8 +2991,6 @@ void SwFEShell::CreateDefaultShape(UINT16 eSdrObjectKind, const Rectangle& rRect pObj->SetItemSet(aSet); } - String aText = SW_RESSTR(STR_POOLCOLL_LABEL_FRAME); - ((SdrCaptionObj*)pObj)->SetText(aText); ((SdrCaptionObj*)pObj)->SetLogicRect(aRect); ((SdrCaptionObj*)pObj)->SetTailPos( aRect.TopLeft() - Point(aRect.GetWidth() / 2, aRect.GetHeight() / 2)); diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx index b8b771211be0..59e6a3057b49 100644 --- a/sw/source/core/frmedt/fetab.cxx +++ b/sw/source/core/frmedt/fetab.cxx @@ -1,10 +1,18 @@ -/************************************************************************* + /************************************************************************* * * $RCSfile: fetab.cxx,v $ * - * $Revision: 1.11 $ +<<<<<<< fetab.cxx + * $Revision: 1.12 $ +======= + * $Revision: 1.12 $ +>>>>>>> 1.4.2.6.2.1.20.2 * - * last change: $Author: fme $ $Date: 2002-11-15 09:54:42 $ +<<<<<<< fetab.cxx + * last change: $Author: hr $ $Date: 2003-03-27 15:40:03 $ +======= + * last change: $Author: hr $ $Date: 2003-03-27 15:40:03 $ +>>>>>>> 1.4.2.6.2.1.20.2 * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -166,7 +174,6 @@ #include <swerror.h> #endif - //siehe auch swtable.cxx #define COLFUZZY 20L @@ -202,6 +209,89 @@ inline const SwCursor& GetShellCursor( const SwCrsrShell& rShell ) return *pCrsr; } +void SwFEShell::ParkCursorInTab() +{ + SwCursor * pSwCrsr = GetSwCrsr(); + + ASSERT(pSwCrsr, "no SwCursor"); + + SwPosition aStartPos = *pSwCrsr->GetPoint(), aEndPos = aStartPos; + + SwCursor * pTmpCrsr = (SwCursor *) pSwCrsr; + + /* Search least and greatest position in current cursor ring. + */ + do + { + const SwPosition * pPt = pTmpCrsr->GetPoint(), + * pMk = pTmpCrsr->GetMark(); + + if (*pPt < aStartPos) + aStartPos = *pPt; + + if (*pPt > aEndPos) + aEndPos = *pPt; + + if (*pMk < aStartPos) + aStartPos = *pMk; + + if (*pMk > aEndPos) + aEndPos = *pMk; + + pTmpCrsr = (SwCursor *) pTmpCrsr->GetNext(); + } + while (pTmpCrsr != pSwCrsr); + + KillPams(); + + /* Set cursor to end of selection to ensure IsLastCellInRow works + properly. */ + { + SwCursor aTmpCrsr(aEndPos); + *pSwCrsr = aTmpCrsr; + } + + /* Move the cursor out of the columns to delete and stay in the + same row. If the table has only one column the cursor will + stay in the row and the shell will take care of it. */ + if (IsLastCellInRow()) + { + /* If the cursor is in the last row of the table, first + try to move it to the previous cell. If that fails move + it to the next cell. */ + + { + SwCursor aTmpCrsr(aStartPos); + *pSwCrsr = aTmpCrsr; + } + + if (! pSwCrsr->GoPrevCell()) + { + SwCursor aTmpCrsr(aEndPos); + *pSwCrsr = aTmpCrsr; + pSwCrsr->GoNextCell(); + } + } + else + { + /* If the cursor is not in the last row of the table, first + try to move it to the next cell. If that fails move it + to the previous cell. */ + + { + SwCursor aTmpCrsr(aEndPos); + *pSwCrsr = aTmpCrsr; + } + + if (! pSwCrsr->GoNextCell()) + { + SwCursor aTmpCrsr(aStartPos); + *pSwCrsr = aTmpCrsr; + pSwCrsr->GoPrevCell(); + } + } +} + /*********************************************************************** #* Class : SwFEShell #* Methoden : GetStartEndCell @@ -301,6 +391,26 @@ BOOL SwFEShell::InsertCol( USHORT nCnt, BOOL bBehind ) #* Datum : MA 03. May. 93 #* Update : MA 19. Apr. 95 #***********************************************************************/ + +/** + Determines if the current cursor is in the last row of the table. +*/ +BOOL SwFEShell::IsLastCellInRow() const +{ + SwTabCols aTabCols; + GetTabCols( aTabCols ); + BOOL bResult = FALSE; + + if (IsTableRightToLeft()) + /* If the table is right-to-left the last row is the most left one. */ + bResult = 0 == GetCurTabColNum(); + else + /* If the table is left-to-right the last row is the most right one. */ + bResult = aTabCols.Count() == GetCurTabColNum(); + + return bResult; +} + BOOL SwFEShell::DeleteCol() { // pruefe ob vom aktuellen Crsr der SPoint/Mark in einer Tabelle stehen @@ -331,13 +441,16 @@ BOOL SwFEShell::DeleteCol() // Dokument-Position werden sie dann immer an die alte Position gesetzt. while( !pFrm->IsCellFrm() ) pFrm = pFrm->GetUpper(); - ParkCrsr( SwNodeIndex( *((SwCellFrm*)pFrm)->GetTabBox()->GetSttNd() )); + + ParkCursorInTab(); // dann loesche doch die Spalten bRet = GetDoc()->DeleteRowCol( aBoxes ); + } else bRet = FALSE; + EndAllActionAndCall(); return bRet; } @@ -377,7 +490,12 @@ BOOL SwFEShell::DeleteRow() SwTableNode* pTblNd = ((SwCntntFrm*)pFrm)->GetNode()->FindTableNode(); // suche alle Boxen / Lines - _FndBox aFndBox( aBoxes ); + _FndBox aFndBox( 0, 0 ); + { + _FndPara aPara( aBoxes, &aFndBox ); + pTblNd->GetTable().GetTabLines().ForEach( &_FndLineCopyCol, &aPara ); + } + if( !aFndBox.GetLines().Count() ) { EndAllActionAndCall(); @@ -553,20 +671,30 @@ void SwFEShell::_GetTabCols( SwTabCols &rToFill, const SwFrm *pBox ) const if ( pLastTable == pTab->GetTable() ) { bDel = FALSE; -#ifdef VERTICAL_LAYOUT SWRECTFN( pTab ) -#endif + + const SwPageFrm* pPage = pTab->FindPageFrm(); + const ULONG nLeftMin = (pTab->Frm().*fnRect->fnGetLeft)() - + (pPage->Frm().*fnRect->fnGetLeft)() + + DOCUMENTBORDER; + const ULONG nRightMax = (pTab->Frm().*fnRect->fnGetRight)() - + (pPage->Frm().*fnRect->fnGetLeft)() + + DOCUMENTBORDER; + if ( pLastTabFrm != pTab ) { //Wenn der TabFrm gewechselt hat, brauchen wir bei gleicher //Breite nur ein wenig shiften. -#ifdef VERTICAL_LAYOUT SWRECTFNX( pLastTabFrm ) if( (pLastTabFrm->Frm().*fnRect->fnGetWidth)() == (pTab->Frm().*fnRect->fnGetWidth)() ) { - pLastCols->SetLeftMin( (USHORT) - (pTab->Frm().*fnRect->fnGetLeft)() ); + pLastCols->SetLeftMin( nLeftMin ); + + ASSERT( bVert || + pLastCols->GetLeftMin() == (pTab->Frm().*fnRect->fnGetLeft)(), + "GetTabCols: wrong result" ) + pLastTabFrm = pTab; } else @@ -574,28 +702,10 @@ void SwFEShell::_GetTabCols( SwTabCols &rToFill, const SwFrm *pBox ) const } if ( !bDel && - pLastCols->GetLeftMin () == (USHORT)(pTab->Frm().*fnRect->fnGetLeft)() && + pLastCols->GetLeftMin () == (USHORT)nLeftMin && pLastCols->GetLeft () == (USHORT)(pTab->Prt().*fnRect->fnGetLeft)() && pLastCols->GetRight () == (USHORT)(pTab->Prt().*fnRect->fnGetRight)()&& - pLastCols->GetRightMax() == - (USHORT)(pTab->Frm().*fnRect->fnGetRight)() - pLastCols->GetLeftMin() ) -#else - if ( pLastTabFrm->Frm().Width() == pTab->Frm().Width() ) - { - pLastCols->SetLeftMin( (USHORT)pTab->Frm().Left() ); - pLastTabFrm = pTab; - } - else - bDel = TRUE; - } - - if ( !bDel && - pLastCols->GetLeftMin () == (USHORT)pTab->Frm().Left() && - pLastCols->GetLeft () == (USHORT)pTab->Prt().Left() && - pLastCols->GetRight () == (USHORT)pTab->Prt().Right()&& - pLastCols->GetRightMax() == - (USHORT)pTab->Frm().Right() - pLastCols->GetLeftMin() ) -#endif + pLastCols->GetRightMax() == (USHORT)nRightMax - pLastCols->GetLeftMin() ) { if ( pLastCellFrm != pBox ) { @@ -894,7 +1004,7 @@ void SwFEShell::ProtectCells() { if( IsTableMode() ) ClearMark(); - ParkCrsr( GetCrsr()->GetPoint()->nNode ); + ParkCursorInTab(); } EndAllActionAndCall(); } @@ -1240,27 +1350,43 @@ USHORT SwFEShell::GetCurTabColNum() const // dem CellFrame vergleichen???? pFrm = pFrm->GetUpper(); } while ( !pFrm->IsCellFrm() ); -#ifdef VERTICAL_LAYOUT SWRECTFN( pFrm ) const long nX = (pFrm->Frm().*fnRect->fnGetLeft)(); -#else - const long nX = pFrm->Frm().Left(); -#endif //TabCols besorgen, den nur ueber diese erreichen wir die Position. SwTabCols aTabCols; GetTabCols( aTabCols ); - const long nLeft = aTabCols.GetLeftMin(); + if( pFrm->FindTabFrm()->IsRightToLeft() ) + { + long nX = (pFrm->Frm().*fnRect->fnGetRight)(); + const long nRight = aTabCols.GetLeftMin() + aTabCols.GetRight();; - if ( !::IsSame( nX, nLeft + aTabCols.GetLeft() ) ) + if ( !::IsSame( nX, nRight ) ) + { + nX = nRight - nX + aTabCols.GetLeft(); + for ( USHORT i = 0; i < aTabCols.Count(); ++i ) + if ( ::IsSame( nX, aTabCols[i] ) ) + { + nRet = i + 1; + break; + } + } + } + else { - for ( USHORT i = 0; i < aTabCols.Count(); ++i ) - if ( ::IsSame( nX, nLeft + aTabCols[i] ) ) - { - nRet = i + 1; - break; - } + const long nX = (pFrm->Frm().*fnRect->fnGetLeft)(); + const long nLeft = aTabCols.GetLeftMin(); + + if ( !::IsSame( nX, nLeft + aTabCols.GetLeft() ) ) + { + for ( USHORT i = 0; i < aTabCols.Count(); ++i ) + if ( ::IsSame( nX, nLeft + aTabCols[i] ) ) + { + nRet = i + 1; + break; + } + } } } return nRet; @@ -1327,7 +1453,6 @@ const SwFrm *lcl_FindFrm( const SwLayoutFrm *pLay, const Point &rPt, SwTwips nFu pFrm = pFrm->GetUpper(); if ( pFrm ) { -#ifdef VERTICAL_LAYOUT if( pFrm->IsVertical() ) { if ( ::IsSame(pFrm->Frm().Top(), rPt.Y()) || @@ -1340,13 +1465,6 @@ const SwFrm *lcl_FindFrm( const SwLayoutFrm *pLay, const Point &rPt, SwTwips nFu ::IsSame(pFrm->Frm().Right(),rPt.X()) ) return pFrm; } -#else - if ( ::IsSame(pFrm->Frm().Left(), rPt.X()) || - ::IsSame(pFrm->Frm().Right(),rPt.X()) ) - { - return pFrm; - } -#endif pFrm = pFrm->GetUpper(); } } while ( pFrm ); @@ -1558,12 +1676,8 @@ BOOL SwFEShell::SetColRowWidthHeight( USHORT eType, USHORT nDiff ) // sollte die Tabelle noch auf relativen Werten (USHRT_MAX) stehen // dann muss es jetzt auf absolute umgerechnet werden. const SwFmtFrmSize& rTblFrmSz = pTab->GetFmt()->GetFrmSize(); -#ifdef VERTICAL_LAYOUT SWRECTFN( pTab ) long nPrtWidth = (pTab->Prt().*fnRect->fnGetWidth)(); -#else - long nPrtWidth = pTab->Prt().Width(); -#endif if( TBLVAR_CHGABS == pTab->GetTable()->GetTblChgMode() && ( eType & WH_COL_LEFT || eType & WH_COL_RIGHT ) && HORI_NONE == pTab->GetFmt()->GetHoriOrient().GetHoriOrient() && @@ -1576,11 +1690,7 @@ BOOL SwFEShell::SetColRowWidthHeight( USHORT eType, USHORT nDiff ) if( (eType & (WH_FLAG_BIGGER | WH_FLAG_INSDEL)) == (WH_FLAG_BIGGER | WH_FLAG_INSDEL) ) -#ifdef VERTICAL_LAYOUT nDiff = USHORT((pFrm->Frm().*fnRect->fnGetWidth)()); -#else - nDiff = USHORT(pFrm->Frm().Width()); -#endif SwTwips nLogDiff = nDiff; nLogDiff *= pTab->GetFmt()->GetFrmSize().GetWidth(); @@ -1762,7 +1872,7 @@ BOOL SwFEShell::GetAutoSum( String& rFml ) const return TRUE; } -/* -----------------------------22.08.2002 12:37------------------------------ +/* -----------------------------22.08.2002 12:50------------------------------ ---------------------------------------------------------------------------*/ BOOL SwFEShell::IsTableRightToLeft() const @@ -1783,3 +1893,4 @@ BOOL SwFEShell::IsMouseTableRightToLeft(const Point &rPt) const ASSERT( pTabFrm, "Table not found" ); return pTabFrm ? pTabFrm->IsRightToLeft() : FALSE; } + diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx index 4e40a6c9b087..448a8a38be3c 100644 --- a/sw/source/core/frmedt/tblsel.cxx +++ b/sw/source/core/frmedt/tblsel.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tblsel.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: fme $ $Date: 2002-09-26 13:17:23 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -159,7 +159,6 @@ //siehe auch swtable.cxx #define COLFUZZY 20L - // defines, die bestimmen, wie Tabellen Boxen gemergt werden: // - 1. alle leeren Zeilen entfernen, alle Boxen werden mit Blank, // alle Lines mit ParaBreak getrennt @@ -1575,7 +1574,11 @@ USHORT CheckMergeSel( const SwSelBoxes& rBoxes ) { eRet = TBLMERGE_OK; - _FndBox aFndBox( rBoxes ); + _FndBox aFndBox( 0, 0 ); + _FndPara aPara( rBoxes, &aFndBox ); + const SwTableNode* pTblNd = aPara.rBoxes[0]->GetSttNd()->FindTableNode(); + ((SwTable&)pTblNd->GetTable()).GetTabLines().ForEach( + &_FndLineCopyCol, &aPara ); if( aFndBox.GetLines().Count() ) { BOOL bMergeSelOk = TRUE; @@ -1616,8 +1619,8 @@ SwTwips lcl_CalcWish( const SwLayoutFrm *pCell, long nWish, #ifdef BIDI const sal_Bool bRTL = pCell->IsRightToLeft(); SwTwips nRet = bRTL ? - nAct - pCell->GetFmt()->GetFrmSize().GetWidth() * nAct / nWish : - 0; + nAct - pCell->Frm().Width() : + 0; #else SwTwips nRet = 0; #endif @@ -2172,6 +2175,51 @@ void lcl_InsertRow( SwTableLine &rLine, SwLayoutFrm *pUpper, SwFrm *pSibling ) } +BOOL _FndBoxCopyCol( const SwTableBox*& rpBox, void* pPara ) +{ + _FndPara* pFndPara = (_FndPara*)pPara; + _FndBox* pFndBox = new _FndBox( (SwTableBox*)rpBox, pFndPara->pFndLine ); + if( rpBox->GetTabLines().Count() ) + { + _FndPara aPara( *pFndPara, pFndBox ); + pFndBox->GetBox()->GetTabLines().ForEach( &_FndLineCopyCol, &aPara ); + if( !pFndBox->GetLines().Count() ) + { + delete pFndBox; + return TRUE; + } + } + else + { + SwTableBoxPtr pSrch = (SwTableBoxPtr)rpBox; + USHORT nFndPos; + if( !pFndPara->rBoxes.Seek_Entry( pSrch, &nFndPos )) + { + delete pFndBox; + return TRUE; + } + } + pFndPara->pFndLine->GetBoxes().C40_INSERT( _FndBox, pFndBox, + pFndPara->pFndLine->GetBoxes().Count() ); + return TRUE; +} + +BOOL _FndLineCopyCol( const SwTableLine*& rpLine, void* pPara ) +{ + _FndPara* pFndPara = (_FndPara*)pPara; + _FndLine* pFndLine = new _FndLine( (SwTableLine*)rpLine, pFndPara->pFndBox ); + _FndPara aPara( *pFndPara, pFndLine ); + pFndLine->GetLine()->GetTabBoxes().ForEach( &_FndBoxCopyCol, &aPara ); + if( pFndLine->GetBoxes().Count() ) + { + pFndPara->pFndBox->GetLines().C40_INSERT( _FndLine, pFndLine, + pFndPara->pFndBox->GetLines().Count() ); + } + else + delete pFndLine; + return TRUE; +} + void _FndBox::SetTableLines( const SwSelBoxes &rBoxes, const SwTable &rTable ) { //Pointer auf die Lines vor und hinter den zu verarbeitenden Bereich @@ -2429,6 +2477,7 @@ void _FndBox::MakeNewFrms( SwTable &rTable, const USHORT nNumber, SwTabFrm *pTable; for ( pTable = (SwTabFrm*)aTabIter.First( TYPE(SwFrm) ); pTable; pTable = (SwTabFrm*)aTabIter.Next() ) + { if( !pTable->IsFollow() ) { SwFrm *pSibling = 0; @@ -2497,29 +2546,33 @@ void _FndBox::MakeNewFrms( SwTable &rTable, const USHORT nNumber, ((SwTabFrm*)pUpper)->SetCalcLowers(); } } + } //Die Headlines mussen ggf. auch verarbeitet werden. Um gut arbeitenden //Code nicht zu zerfasern wird hier nochmals iteriert. if ( !bBehind && nBfPos == USHRT_MAX && rTable.IsHeadlineRepeat() ) { - SwTabFrm *pTab = (SwTabFrm*)aTabIter.First( TYPE(SwFrm) ); - if ( pTab->Lower() ) + for ( pTable = (SwTabFrm*)aTabIter.First( TYPE(SwFrm) ); pTable; + pTable = (SwTabFrm*)aTabIter.Next() ) { - if ( pTab->IsFollow() ) - { - //Alte Headline vernichten - SwFrm *pLow = pTab->Lower(); - pLow->Cut(); - delete pLow; - } - if ( ((SwRowFrm*)pTab->Lower())->GetTabLine() != - rTable.GetTabLines()[0] ) + if ( pTable->Lower() ) { - //Neue Headline einsetzen - SwRowFrm *pRow = new SwRowFrm( *rTable.GetTabLines()[0]); - pRow->Paste( pTab, pTab->Lower() ); - pRow->RegistFlys(); - pTab->SetCalcLowers(); + if ( pTable->IsFollow() ) + { + //Alte Headline vernichten + SwFrm *pLow = pTable->Lower(); + pLow->Cut(); + delete pLow; + } + if ( ((SwRowFrm*)pTable->Lower())->GetTabLine() != + rTable.GetTabLines()[0] ) + { + //Neue Headline einsetzen + SwRowFrm *pRow = new SwRowFrm( *rTable.GetTabLines()[0]); + pRow->Paste( pTable, pTable->Lower() ); + pRow->RegistFlys(); + pTable->SetCalcLowers(); + } } } } @@ -2626,112 +2679,6 @@ const SwTableBox *lcl_FindLastBox( const SwTable &rTable ) return pBox; } - // fill the structure from the selection (the selboxes) into - // his own structure. Works only if the box contains no data! -_FndBox::_FndBox( const SwSelBoxes& rBoxes ) - : pBox( 0 ), pUpper( 0 ), pLineBefore( 0 ), pLineBehind( 0 ) -{ - if( 1 == rBoxes.Count() ) - { - _FndBox *pTmp = this; - AddToFndBox( pTmp, *rBoxes[0] ); - } - else - { - SwSelBoxes aBoxes; - aBoxes.Insert( &rBoxes ); - const SwTable &rTable = rBoxes[0]->GetSttNd()->FindTableNode()->GetTable(); - for( USHORT n = 0, nEnd = rTable.GetTabLines().Count(); - n < nEnd && aBoxes.Count(); ++n ) - _FndBox::AddSelLine( *this, *rTable.GetTabLines()[ n ], aBoxes ); - } -} - -_FndBox::_FndBox( const SwTableLine& rLine ) - : pBox( 0 ), pUpper( 0 ), pLineBefore( 0 ), pLineBehind( 0 ) -{ - AppendLine( *this, rLine ); -} - -void _FndBox::AddToFndBox( _FndBox*& rpParent, const SwTableBox& rBox ) -{ - // search the toplevel parent - if( rBox.GetUpper()->GetUpper() ) - _FndBox::AddToFndBox( rpParent, *rBox.GetUpper()->GetUpper() ); - - _FndLine* pFndLine = new _FndLine( (SwTableLine*)rBox.GetUpper(), - rpParent ); - rpParent->GetLines().C40_INSERT( _FndLine, pFndLine, 0 ); - _FndBox* pFndBox = new _FndBox( (SwTableBox*)&rBox, pFndLine ); - pFndLine->GetBoxes().C40_INSERT( _FndBox, pFndBox, 0 ); - - rpParent = pFndBox; -} - - -void _FndBox::AppendLine( _FndBox& rBox, const SwTableLine& rLine ) -{ - USHORT n = 0, nEnd = rLine.GetTabBoxes().Count(); - if( nEnd ) - { - _FndLine* pFndLine = new _FndLine( (SwTableLine*)&rLine, &rBox ); - rBox.GetLines().C40_INSERT( _FndLine, pFndLine, rBox.GetLines().Count() ); - for( ; n < nEnd; ++n ) - _FndBox::AppendBox( *pFndLine, *rLine.GetTabBoxes()[ n ] ); - } -} - -void _FndBox::AppendBox( _FndLine& rLine, const SwTableBox& rBox ) -{ - _FndBox* pFndBox = new _FndBox( (SwTableBox*)&rBox, &rLine ); - rLine.GetBoxes().C40_INSERT( _FndBox, pFndBox, rLine.GetBoxes().Count() ); - for( USHORT n = 0, nEnd = rBox.GetTabLines().Count(); n < nEnd; ++n ) - _FndBox::AppendLine( *pFndBox, *rBox.GetTabLines()[ n ] ); -} - -void _FndBox::AddSelLine( _FndBox& rBox, const SwTableLine& rLine, - SwSelBoxes& rBoxes ) -{ - _FndLine* pFndLine = new _FndLine( (SwTableLine*)&rLine, &rBox ); - for( USHORT n = 0, nEnd = rLine.GetTabBoxes().Count(); - n < nEnd && rBoxes.Count(); ++n ) - _FndBox::AddSelBox( *pFndLine, *rLine.GetTabBoxes()[ n ], rBoxes ); - - if( pFndLine->GetBoxes().Count() ) - rBox.GetLines().C40_INSERT( _FndLine, pFndLine, rBox.GetLines().Count() ); - else - delete pFndLine; -} - -void _FndBox::AddSelBox( _FndLine& rLine, const SwTableBox& rBox, - SwSelBoxes& rBoxes ) -{ - _FndBox* pFndBox; - USHORT n = 0, nEnd = rBox.GetTabLines().Count(); - if( nEnd ) - { - pFndBox = new _FndBox( (SwTableBox*)&rBox, &rLine ); - for( ; n < nEnd && rBoxes.Count(); ++n ) - _FndBox::AddSelLine( *pFndBox, *rBox.GetTabLines()[ n ], rBoxes ); - if( !pFndBox->GetLines().Count() ) - delete pFndBox, pFndBox = 0; - } - else - { - SwTableBoxPtr pSrch = (SwTableBoxPtr)&rBox; - USHORT nFndPos; - if( rBoxes.Seek_Entry( pSrch, &nFndPos )) - { - pFndBox = new _FndBox( pSrch, &rLine ); - rBoxes.Remove( nFndPos ); - } - else - pFndBox = 0; - } - if( pFndBox ) - rLine.GetBoxes().C40_INSERT( _FndBox, pFndBox, rLine.GetBoxes().Count() ); -} - //GPF bei Tab in letzer Zelle mit MSC4 #pragma optimize("",off) @@ -2834,4 +2781,3 @@ void _FndBox::RestoreChartData( const SwTable &rTable ) #pragma optimize("",on) - diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 7d5377c1f80d..9e1e5a95d835 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ndgrf.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: od $ $Date: 2002-09-17 13:47:09 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -164,8 +164,8 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere, : SwNoTxtNode( rWhere, ND_GRFNODE, pGrfColl, pAutoAttr ) { aGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) ); - bInSwapIn = bChgTwipSize = bLoadLowResGrf = bFrameInPaint = - bScaleImageMap = FALSE; + bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel = bLoadLowResGrf = + bFrameInPaint = bScaleImageMap = FALSE; bGrafikArrived = TRUE; ReRead( rGrfName, rFltName, pGraphic, 0, FALSE ); } @@ -179,8 +179,8 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere, aGrfObj.SetSwapStreamHdl( LINK( this, SwGrfNode, SwapGraphic ) ); if( rGrfObj.HasUserData() && rGrfObj.IsSwappedOut() ) aGrfObj.SetSwapState(); - bInSwapIn = bChgTwipSize = bLoadLowResGrf = bFrameInPaint = - bScaleImageMap = FALSE; + bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel= bLoadLowResGrf = + bFrameInPaint = bScaleImageMap = FALSE; bGrafikArrived = TRUE; } @@ -199,8 +199,8 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere, Graphic aGrf; aGrf.SetDefaultType(); aGrfObj.SetGraphic( aGrf, rGrfName ); - bInSwapIn = bChgTwipSize = bLoadLowResGrf = bFrameInPaint = - bScaleImageMap = FALSE; + bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel = bLoadLowResGrf = + bFrameInPaint = bScaleImageMap = FALSE; bGrafikArrived = TRUE; InsertLink( rGrfName, rFltName ); diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx index 462623d484c4..9c1f690bbb52 100644 --- a/sw/source/core/inc/drawfont.hxx +++ b/sw/source/core/inc/drawfont.hxx @@ -2,9 +2,9 @@ * * $RCSfile: drawfont.hxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: fme $ $Date: 2002-12-02 10:27:19 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -153,20 +153,28 @@ private: SvXub_StrLens aCompLen; SvBytes aCompType; xub_StrLen nInvalidityPos; + BYTE nDefaultDir; + sal_Bool bBidiInfoValid; public: enum CompType { KANA, SPECIAL_LEFT, SPECIAL_RIGHT, NONE }; - inline SwScriptInfo() : nInvalidityPos( 0 ) {}; + inline SwScriptInfo() : nInvalidityPos( 0 ), nDefaultDir( 0 ), + bBidiInfoValid( sal_False ) {}; // determines script changes void InitScriptInfo( const SwTxtNode& rNode, SwAttrHandler& rAH, const OutputDevice& rOut ); + void UpdateBidiInfo( const String& rTxt ); // set/get position from which data is invalid inline void SetInvalidity( const xub_StrLen nPos ); inline xub_StrLen GetInvalidity() const { return nInvalidityPos; }; + // get default direction for paragraph + inline BYTE GetDefaultDir() const { return nDefaultDir; }; + inline void SetDefaultDir( BYTE nNew ) { nDefaultDir = nNew; }; + // array operations, nCnt refers to array position inline USHORT CountScriptChg() const; inline xub_StrLen GetScriptChg( const USHORT nCnt ) const; @@ -263,13 +271,15 @@ public: long* pScrArray, xub_StrLen nIdx, xub_StrLen nLen, USHORT nSpace = 0 ); - static const SwScriptInfo* GetScriptInfo( const SwTxtNode& rNode ); + static SwScriptInfo* GetScriptInfo( const SwTxtNode& rNode, + sal_Bool bAllowInvalid = sal_False ); }; inline void SwScriptInfo::SetInvalidity( const xub_StrLen nPos ) { if ( nPos < nInvalidityPos ) nInvalidityPos = nPos; + bBidiInfoValid = sal_False; }; inline USHORT SwScriptInfo::CountScriptChg() const { return aScriptChg.Count(); } inline xub_StrLen SwScriptInfo::GetScriptChg( const USHORT nCnt ) const @@ -356,6 +366,7 @@ class SwDrawTextInfo short nSperren; short nKern; short nSpace; + BYTE nCursorBidiLevel; BOOL bBullet : 1; BOOL bUpper : 1; // Fuer Kapitaelchen: Grossbuchstaben-Flag BOOL bDrawSpace : 1; // Fuer Kapitaelchen: Unter/Durchstreichung @@ -396,239 +407,384 @@ public: BOOL bOfst : 1; BOOL bHyph : 1; #endif + SwDrawTextInfo( ViewShell *pS, OutputDevice &rO, const SwScriptInfo* pSI, const XubString &rSt, xub_StrLen nI, xub_StrLen nL, - USHORT nW = 0, BOOL bB = FALSE) - { pSh = pS; pOut = &rO; pScriptInfo = pSI; pText = &rSt; nIdx = nI; - nLen = nL; nKern = 0; nCompress = 0; nWidth = nW; - bBullet = bB; pUnderFnt = 0; bGreyWave = bSpaceStop = -#ifdef BIDI - bSnapToGrid = bIgnoreFrmRTL = FALSE; -#else + USHORT nW = 0, BOOL bB = FALSE ) + { + pFrm = NULL; + pSh = pS; + pOut = &rO; + pScriptInfo = pSI; + pText = &rSt; + nIdx = nI; + nLen = nL; + nKern = 0; + nCompress = 0; + nWidth = nW; + nCursorBidiLevel = 0; + bBullet = bB; + pUnderFnt = 0; + bGreyWave = FALSE; + bSpaceStop = FALSE; bSnapToGrid = FALSE; +#ifdef BIDI + bIgnoreFrmRTL = FALSE; #endif - pFrm = 0; #ifndef PRODUCT bOut = bText = bIdx = bLen = bWidth = bKern = bBull = bSpec = - bGreyWv = TRUE; + bGreyWv = TRUE; + bPos = bWrong = bSize = bFnt = bAscent = bSpace = bUppr = - bDrawSp = bLeft = bRight = bKana = bOfst = bHyph = FALSE; + bDrawSp = bLeft = bRight = bKana = bOfst = bHyph = FALSE; #endif } - const SwTxtFrm* GetFrm() const { return pFrm; } - void SetFrm( const SwTxtFrm* pNewFrm ) { pFrm = pNewFrm; } + const SwTxtFrm* GetFrm() const + { + return pFrm; + } + + void SetFrm( const SwTxtFrm* pNewFrm ) + { + pFrm = pNewFrm; + } + + ViewShell *GetShell() const + { + return pSh; + } - ViewShell *GetShell() const { return pSh; } - OutputDevice& GetOut() const { + OutputDevice& GetOut() const + { ASSERT( bOut, "DrawTextInfo: Undefined Outputdevice" ); return *pOut; } - OutputDevice *GetpOut() const { + + OutputDevice *GetpOut() const + { ASSERT( bOut, "DrawTextInfo: Undefined Outputdevice" ); return pOut; } - const SwScriptInfo* GetScriptInfo() const { + + const SwScriptInfo* GetScriptInfo() const + { return pScriptInfo; } - const Point &GetPos() const { + + const Point &GetPos() const + { ASSERT( bPos, "DrawTextInfo: Undefined Position" ); return *pPos; } - xub_StrLen *GetHyphPos() const { + + xub_StrLen *GetHyphPos() const + { ASSERT( bHyph, "DrawTextInfo: Undefined Hyph Position" ); return pHyphPos; } - const Fraction &GetZoom() const { return aZoom; } - Fraction &GetZoom() { return aZoom; } + const Fraction &GetZoom() const + { + return aZoom; + } + + Fraction &GetZoom() + { + return aZoom; + } - const XubString &GetText() const { + const XubString &GetText() const + { ASSERT( bText, "DrawTextInfo: Undefined String" ); return *pText; } - const SwWrongList* GetWrong() const { + + const SwWrongList* GetWrong() const + { ASSERT( bWrong, "DrawTextInfo: Undefined WrongList" ); return pWrong; } - const Size &GetSize() const { + + const Size &GetSize() const + { ASSERT( bSize, "DrawTextInfo: Undefined Size" ); return *pSize; } - SwFont* GetFont() const { + + SwFont* GetFont() const + { ASSERT( bFnt, "DrawTextInfo: Undefined Font" ); return pFnt; } - SwUnderlineFont* GetUnderFnt() const { + + SwUnderlineFont* GetUnderFnt() const + { ASSERT( bSpec, "DrawTextInfo: Undefined Underlinefont" ); return pUnderFnt; } - xub_StrLen GetIdx() const { + + xub_StrLen GetIdx() const + { ASSERT( bIdx, "DrawTextInfo: Undefined Index" ); return nIdx; } - xub_StrLen GetLen() const { + + xub_StrLen GetLen() const + { ASSERT( bLen, "DrawTextInfo: Undefined Length" ); return nLen; } - xub_StrLen GetOfst() const { + + xub_StrLen GetOfst() const + { ASSERT( bOfst, "DrawTextInfo: Undefined Offset" ); return nOfst; } - xub_StrLen GetEnd() const { + + xub_StrLen GetEnd() const + { ASSERT( bIdx, "DrawTextInfo: Undefined Index" ); ASSERT( bLen, "DrawTextInfo: Undefined Length" ); return nIdx + nLen; } - long GetLeft() const { + + long GetLeft() const + { ASSERT( bLeft, "DrawTextInfo: Undefined left range" ); return nLeft; } - long GetRight() const { + + long GetRight() const + { ASSERT( bRight, "DrawTextInfo: Undefined right range" ); return nRight; } - long GetKanaDiff() const { + + long GetKanaDiff() const + { ASSERT( bKana, "DrawTextInfo: Undefined kana difference" ); return nKanaDiff; } - USHORT GetWidth() const { + + USHORT GetWidth() const + { ASSERT( bWidth, "DrawTextInfo: Undefined Width" ); return nWidth; } - USHORT GetAscent() const { + + USHORT GetAscent() const + { ASSERT( bAscent, "DrawTextInfo: Undefined Ascent" ); return nAscent; } - USHORT GetKanaComp() const { + + USHORT GetKanaComp() const + { return nCompress; } - short GetSperren() const { + + short GetSperren() const + { ASSERT( bSperr, "DrawTextInfo: Undefined >Sperren<" ); return nSperren; } - short GetKern() const { + + short GetKern() const + { ASSERT( bKern, "DrawTextInfo: Undefined Kerning" ); return nKern; } - short GetSpace() const { + + short GetSpace() const + { ASSERT( bSpace, "DrawTextInfo: Undefined Spacing" ); return nSpace; } - BOOL GetBullet() const { + + BYTE GetCursorBidiLevel() const + { + return nCursorBidiLevel; + } + + BOOL GetBullet() const + { ASSERT( bBull, "DrawTextInfo: Undefined Bulletflag" ); return bBullet; } - BOOL GetUpper() const { + + BOOL GetUpper() const + { ASSERT( bUppr, "DrawTextInfo: Undefined Upperflag" ); return bUpper; } - BOOL GetDrawSpace() const { + + BOOL GetDrawSpace() const + { ASSERT( bDrawSp, "DrawTextInfo: Undefined DrawSpaceflag" ); return bDrawSpace; } - BOOL GetGreyWave() const { + + BOOL GetGreyWave() const + { ASSERT( bGreyWv, "DrawTextInfo: Undefined GreyWave" ); return bGreyWave; } - BOOL IsSpaceStop() const { + + BOOL IsSpaceStop() const + { return bSpaceStop; } - BOOL SnapToGrid() const { + + BOOL SnapToGrid() const + { return bSnapToGrid; } - BOOL IsIgnoreFrmRTL() const { + BOOL IsIgnoreFrmRTL() const + { return bIgnoreFrmRTL; } - void SetOut( OutputDevice &rNew ){ pOut = &rNew; + void SetOut( OutputDevice &rNew ) + { + pOut = &rNew; #ifndef PRODUCT bOut = TRUE; #endif } - void SetPos( const Point &rNew ){ pPos = &rNew; + + void SetPos( const Point &rNew ) + { + pPos = &rNew; #ifndef PRODUCT bPos = TRUE; #endif } - void SetHyphPos( xub_StrLen *pNew ){ pHyphPos = pNew; + + void SetHyphPos( xub_StrLen *pNew ) + { + pHyphPos = pNew; #ifndef PRODUCT bHyph = TRUE; #endif } - void SetText( const XubString &rNew ){ pText = &rNew; + + void SetText( const XubString &rNew ) + { + pText = &rNew; #ifndef PRODUCT bText = TRUE; #endif } - void SetWrong( const SwWrongList* pNew ){ pWrong = pNew; + + void SetWrong( const SwWrongList* pNew ) + { + pWrong = pNew; #ifndef PRODUCT bWrong = TRUE; #endif } - void SetSize( const Size &rNew ){ pSize = &rNew; + + void SetSize( const Size &rNew ) + { + pSize = &rNew; #ifndef PRODUCT bSize = TRUE; #endif } - void SetFont( SwFont* pNew ){ pFnt = pNew; + + void SetFont( SwFont* pNew ) + { + pFnt = pNew; #ifndef PRODUCT bFnt = TRUE; #endif } - void SetIdx( xub_StrLen nNew ){ nIdx = nNew; + + void SetIdx( xub_StrLen nNew ) + { + nIdx = nNew; #ifndef PRODUCT bIdx = TRUE; #endif } - void SetLen( xub_StrLen nNew ){ nLen = nNew; + + void SetLen( xub_StrLen nNew ) + { + nLen = nNew; #ifndef PRODUCT bLen = TRUE; #endif } - void SetOfst( xub_StrLen nNew ){ nOfst = nNew; + + void SetOfst( xub_StrLen nNew ) + { + nOfst = nNew; #ifndef PRODUCT bOfst = TRUE; #endif } - void SetLeft( long nNew ){ nLeft = nNew; + + void SetLeft( long nNew ) + { + nLeft = nNew; #ifndef PRODUCT bLeft = TRUE; #endif } - void SetRight( long nNew ){ nRight = nNew; + + void SetRight( long nNew ) + { + nRight = nNew; #ifndef PRODUCT bRight = TRUE; #endif } - void SetKanaDiff( long nNew ){ nKanaDiff = nNew; + + void SetKanaDiff( long nNew ) + { + nKanaDiff = nNew; #ifndef PRODUCT bKana = TRUE; #endif } - void SetWidth( USHORT nNew ){ nWidth = nNew; + + void SetWidth( USHORT nNew ) + { + nWidth = nNew; #ifndef PRODUCT bWidth = TRUE; #endif } - void SetAscent( USHORT nNew ){ nAscent = nNew; + + void SetAscent( USHORT nNew ) + { + nAscent = nNew; #ifndef PRODUCT bAscent = TRUE; #endif } - void SetKern( short nNew ){ nKern = nNew; + + void SetKern( short nNew ) + { + nKern = nNew; #ifndef PRODUCT bKern = TRUE; #endif } - void SetSperren( short nNew ){ nSperren = nNew; + + void SetSperren( short nNew ) + { + nSperren = nNew; #ifndef PRODUCT bSperr = TRUE; #endif } - void SetSpace( short nNew ){ + + void SetSpace( short nNew ) + { if( nNew < 0 ) { SetSperren( -nNew ); @@ -643,40 +799,72 @@ public: bSpace = TRUE; #endif } - void SetKanaComp( short nNew ){ + + void SetCursorBidiLevel( BYTE nNew ) + { + nCursorBidiLevel = nNew; + } + + void SetKanaComp( short nNew ) + { nCompress = nNew; } - void SetBullet( BOOL bNew ){ bBullet = bNew; + + void SetBullet( BOOL bNew ) + { + bBullet = bNew; #ifndef PRODUCT bBull = TRUE; #endif } - void SetUnderFnt( SwUnderlineFont* pFnt ){ pUnderFnt = pFnt; + + void SetUnderFnt( SwUnderlineFont* pFnt ) + { + pUnderFnt = pFnt; #ifndef PRODUCT bSpec = TRUE; #endif } - void SetUpper( BOOL bNew ){ bUpper = bNew; + + void SetUpper( BOOL bNew ) + { + bUpper = bNew; #ifndef PRODUCT bUppr = TRUE; #endif } - void SetDrawSpace( BOOL bNew ){ bDrawSpace = bNew; + + void SetDrawSpace( BOOL bNew ) + { + bDrawSpace = bNew; #ifndef PRODUCT bDrawSp = TRUE; #endif } - void SetGreyWave( BOOL bNew ){ bGreyWave = bNew; + + void SetGreyWave( BOOL bNew ) + { + bGreyWave = bNew; #ifndef PRODUCT bGreyWv = TRUE; #endif } - void SetSpaceStop( BOOL bNew ) { bSpaceStop = bNew; } - void SetSnapToGrid( BOOL bNew ) { bSnapToGrid = bNew; } + void SetSpaceStop( BOOL bNew ) + { + bSpaceStop = bNew; + } + + void SetSnapToGrid( BOOL bNew ) + { + bSnapToGrid = bNew; + } #ifdef BIDI - void SetIgnoreFrmRTL( BOOL bNew ) { bIgnoreFrmRTL = bNew; } + void SetIgnoreFrmRTL( BOOL bNew ) + { + bIgnoreFrmRTL = bNew; + } #endif void Shift( USHORT nDir ); diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx index 8ba389020e5c..e24d1d299d82 100644 --- a/sw/source/core/inc/frmtool.hxx +++ b/sw/source/core/inc/frmtool.hxx @@ -2,9 +2,9 @@ * * $RCSfile: frmtool.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: od $ $Date: 2002-10-11 11:05:26 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -95,12 +95,20 @@ class SwCrsrShell; #define GRFNUM_REPLACE 2 //Painten des Hintergrunds. Mit Brush oder Graphic. -/// OD 05.08.2002 #99657# - add 6th parameter to indicate that method should -/// consider background transparency, saved in the color of the brush item +// OD 05.08.2002 #99657# - add 6th parameter to indicate that method should +// consider background transparency, saved in the color of the brush item void MA_FASTCALL DrawGraphic( const SvxBrushItem *, OutputDevice *, const SwRect &rOrg, const SwRect &rOut, const BYTE nGrfNum = GRFNUM_NO, const sal_Bool bConsiderBackgroundTransparency = sal_False ); +// OD 24.01.2003 #106593# - method to align rectangle +// Created declaration here to avoid <extern> declarations +void MA_FASTCALL SwAlignRect( SwRect &rRect, ViewShell *pSh ); + +// OD 24.01.2003 #106593# - method to align graphic rectangle +// Created declaration here to avoid <extern> declarations +void SwAlignGrfRect( SwRect *pGrfRect, const OutputDevice &rOut ); + //Fly besorgen, wenn keine List hineingereicht wird, wir die der aktuellen //Shell benutzt. //Implementierung in feshview.cxx @@ -239,6 +247,8 @@ public: //!!!Achtung: Wenn weitere Attribute gecached werden muss unbedingt die //Methode Modify::Modify mitgepflegt werden!!! +// OD 23.01.2003 #106895# - delete old method <SwBorderAttrs::CalcRight()> and +// the stuff that belongs to it. class SwBorderAttrs : public SwCacheObj { const SwAttrSet &rAttrSet; @@ -247,7 +257,6 @@ class SwBorderAttrs : public SwCacheObj const SvxBoxItem &rBox; const SvxShadowItem &rShadow; const Size aFrmSize; //Die FrmSize - long nRight; BOOL bBorderDist :1; //Ist's ein Frm der auch ohne Linie //einen Abstand haben kann? @@ -260,7 +269,6 @@ class SwBorderAttrs : public SwCacheObj BOOL bRightLine :1; BOOL bTop :1; BOOL bBottom :1; - BOOL bRight :1; BOOL bLine :1; BOOL bIsLine :1; //Umrandung an mind. einer Kante? @@ -288,7 +296,6 @@ class SwBorderAttrs : public SwCacheObj //Lines + Shadow + Abstaende void _CalcTop(); void _CalcBottom(); - void _CalcRight(); void _IsLine(); @@ -318,10 +325,7 @@ public: inline USHORT CalcTop() const; inline USHORT CalcBottom() const; long CalcLeft( const SwFrm *pCaller ) const; -#ifdef BIDI - long CalcRight( const SwFrm *pCaller ); -#endif - inline long CalcRight() const; + long CalcRight( const SwFrm *pCaller ) const; inline BOOL IsLine() const; @@ -447,12 +451,6 @@ inline USHORT SwBorderAttrs::CalcBottom() const ((SwBorderAttrs*)this)->_CalcBottom(); return nBottom; } -inline long SwBorderAttrs::CalcRight() const -{ - if ( bRight ) - ((SwBorderAttrs*)this)->_CalcRight(); - return nRight; -} inline BOOL SwBorderAttrs::IsLine() const { if ( bLine ) diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx index 92891e48cf6d..d1e65e54188f 100644 --- a/sw/source/core/inc/pagefrm.hxx +++ b/sw/source/core/inc/pagefrm.hxx @@ -2,9 +2,9 @@ * * $RCSfile: pagefrm.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: od $ $Date: 2002-11-20 13:14:44 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -121,6 +121,11 @@ class SwPageFrm: public SwFtnBossFrm #ifdef VERTICAL_LAYOUT BOOL bHasGrid :1; // Grid for Asian layout #endif + + // OD 12.02.2003 #i9719#, #105645# + static const sal_Int8 mnBorderPxWidth; + static const sal_Int8 mnShadowPxWidth; + //Anpassung der RootSize und Benachrichtigungen beim Einsetzen, //Entfernen und Groessenaenderungen der Seite. void AdjustRootSize( const SwPageChg eChgType, const SwRect *pOld ); @@ -131,6 +136,75 @@ class SwPageFrm: public SwFtnBossFrm // Anpassen der max. Fussnotenhoehen in den einzelnen Spalten void SetColMaxFtnHeight(); + /** determine rectangle for page border + + OD 12.02.2003 for #i9719# and #105645# + + @author OD + + @param _rPageRect + input parameter - constant instance reference of the page rectangle. + Generally, it's the frame area of the page, but for empty pages in print + preview, this parameter is useful. + + @param _pViewShell + input parameter - instance of the view shell, for which the rectangle + has to be generated. + + @param _orBorderRect + output parameter - instance reference of the border rectangle for + the given page rectangle + */ + void GetBorderRect( const SwRect& _rPageRect, + ViewShell* _pViewShell, + SwRect& _orBorderRect ) const; + + /** determine rectangle for right page shadow + + OD 12.02.2003 for #i9719# and #105645# + + @author OD + + @param _rPageRect + input parameter - constant instance reference of the page rectangle. + Generally, it's the frame area of the page, but for empty pages in print + preview, this parameter is useful. + + @param _pViewShell + input parameter - instance of the view shell, for which the rectangle + has to be generated. + + @param _orRightShadowRect + output parameter - instance reference of the right shadow rectangle for + the given page rectangle + */ + void GetRightShadowRect( const SwRect& _rPageRect, + ViewShell* _pViewShell, + SwRect& _orRightShadowRect ) const; + + /** determine rectangle for bottom page shadow + + OD 12.02.2003 for #i9719# and #105645# + + @author OD + + @param _rPageRect + input parameter - constant instance reference of the page rectangle. + Generally, it's the frame area of the page, but for empty pages in print + preview, this parameter is useful. + + @param _pViewShell + input parameter - instance of the view shell, for which the rectangle + has to be generated. + + @param _orBottomShadowRect + output parameter - instance reference of the bottom shadow rectangle for + the given page rectangle + */ + void GetBottomShadowRect( const SwRect& _rPageRect, + ViewShell* _pViewShell, + SwRect& _orBottomShadowRect ) const; + protected: virtual void MakeAll(); @@ -271,6 +345,58 @@ public: */ void PaintMarginArea( const SwRect& _rOutputRect, ViewShell* _pViewShell ) const; + + /** paint page border and shadow + + OD 12.02.2003 for #i9719# and #105645# + implement paint of page border and shadow + + @author OD + + @param _rPageRect + input parameter - constant instance reference of the page rectangle. + Generally, it's the frame area of the page, but for empty pages in print + preview, this parameter is useful. + + @param _pViewShell + input parameter - instance of the view shell, on which the output + has to be generated. + */ + void PaintBorderAndShadow( const SwRect& _rPageRect, + ViewShell* _pViewShell ) const; + + /** get bound rectangle of border and shadow for repaints + + OD 12.02.2003 for #i9719# and #105645# + + author OD + + @param _rPageRect + input parameter - constant instance reference of the page rectangle. + Generally, it's the frame area of the page, but for empty pages in print + preview, this parameter is useful. + + @param _pViewShell + input parameter - instance of the view shell, for which the rectangle + has to be generated. + + @param _orBorderAndShadowBoundRect + output parameter - instance reference of the bounded border and shadow + rectangle for the given page rectangle + */ + void GetBorderAndShadowBoundRect( const SwRect& _rPageRect, + ViewShell* _pViewShell, + SwRect& _orBorderAndShadowBoundRect ) const; + + // OD 12.02.2003 #i9719#, #105645# + inline sal_Int8 BorderPxWidth() const + { + return mnBorderPxWidth; + } + inline sal_Int8 ShadowPxWidth() const + { + return mnShadowPxWidth; + } }; inline SwCntntFrm *SwPageFrm::FindFirstBodyCntnt() diff --git a/sw/source/core/inc/prevwpage.hxx b/sw/source/core/inc/prevwpage.hxx new file mode 100644 index 000000000000..65dc4542557d --- /dev/null +++ b/sw/source/core/inc/prevwpage.hxx @@ -0,0 +1,38 @@ +#ifndef _PREVIEWPAGES_HXX +#define _PREVIEWPAGES_HXX + +// classes <Point>, <Size> and <Rectangle> +#ifndef _GEN_HXX +#include <tools/gen.hxx> +#endif + +class SwPageFrm; + +/** data structure for a preview page in the current preview layout + + OD 12.12.2002 #103492# - struct <PrevwPage> + + @author OD +*/ +struct PrevwPage +{ + const SwPageFrm* pPage; + bool bVisible; + Size aPageSize; + Point aPrevwWinPos; + Point aLogicPos; + Point aMapOffset; + + inline PrevwPage(); +}; + +inline PrevwPage::PrevwPage() + : pPage( 0 ), + bVisible( false ), + aPageSize( Size(0,0) ), + aPrevwWinPos( Point(0,0) ), + aLogicPos( Point(0,0) ), + aMapOffset( Point(0,0) ) +{}; + +#endif diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx index 62907753f669..8f344b079661 100644 --- a/sw/source/core/inc/rootfrm.hxx +++ b/sw/source/core/inc/rootfrm.hxx @@ -2,9 +2,9 @@ * * $RCSfile: rootfrm.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: ama $ $Date: 2002-05-06 10:04:06 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -324,6 +324,22 @@ public: void AddAccessibleShell() { ++nAccessibleShells; } void RemoveAccessibleShell() { --nAccessibleShells; } #endif + + /** get page frame by phyiscal page number + + OD 14.01.2003 #103492# + looping through the lowers, which are page frame, in order to find the + page frame with the given physical page number. + if no page frame is found, 0 is returned. + Note: Empty page frames are also returned. + + @param _nPageNum + input parameter - physical page number of page frame to be searched and + returned. + + @return pointer to the page frame with the given physical page number + */ + SwPageFrm* GetPageByPageNum( sal_uInt16 _nPageNum ) const; }; inline long SwRootFrm::GetBrowseWidth() const diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx index 21d417d6c8e7..4ce78723c2be 100644 --- a/sw/source/core/inc/swfont.hxx +++ b/sw/source/core/inc/swfont.hxx @@ -2,9 +2,9 @@ * * $RCSfile: swfont.hxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: fme $ $Date: 2002-11-14 08:54:53 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -145,7 +145,7 @@ class SwSubFont : public SvxFont inline void SetStrikeout( const FontStrikeout eStrikeout ); inline void SetItalic( const FontItalic eItalic ); inline void SetOutline( const BOOL bOutline ); - inline void SetVertical( const USHORT nDir ); + inline void SetVertical( const USHORT nDir, const BOOL bVertFormat ); inline void SetShadow( const BOOL bShadow ); inline void SetAutoKern( const BYTE nAutoKern ); inline void SetWordLineMode( const BOOL bWordLineMode ); @@ -836,10 +836,10 @@ inline void SwFont::SetNoCol( const BOOL bNew ) bNoColReplace = bNew; } -inline void SwSubFont::SetVertical( const USHORT nDir ) +inline void SwSubFont::SetVertical( const USHORT nDir, const BOOL bVertFormat ) { pMagic = 0; - Font::SetVertical( nDir > 1000 ); + Font::SetVertical( bVertFormat ); Font::SetOrientation( nDir ); } diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index d16e1c325c22..6eec5990a0fa 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -2,9 +2,9 @@ * * $RCSfile: txtfrm.hxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: fme $ $Date: 2002-12-02 10:27:42 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -272,7 +272,10 @@ public: sal_Bool _UnitDown(SwPaM *, const SwTwips nOffset = 0, sal_Bool bSetInReadOnly = sal_False ) const; - void PrepareVisualMove( xub_StrLen& nPos, BYTE& nCrsrLevel, sal_Bool& bRight ); + // Prepares the cursor position for a visual cursor move (BiDi). + // The behaviour is different for insert and overwrite cursors + void PrepareVisualMove( xub_StrLen& nPos, BYTE& nCrsrLevel, + sal_Bool& bRight, sal_Bool bInsertCrsr ); // Methoden zur Verwaltung von FolgeFrames SwCntntFrm *SplitFrm( const xub_StrLen nTxtPos ); diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx index 0e9d3a6d2864..2b2cad189bf6 100644 --- a/sw/source/core/inc/viewimp.hxx +++ b/sw/source/core/inc/viewimp.hxx @@ -2,9 +2,9 @@ * * $RCSfile: viewimp.hxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: od $ $Date: 2002-12-10 14:16:07 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,8 +70,6 @@ #endif #include "swtypes.hxx" #include "swrect.hxx" -// OD 04.12.2002 #103492# -#include "previewdata.hxx" class ViewShell; class SwFlyFrm; @@ -94,6 +92,14 @@ class SwAccessibleMap; class SdrObject; class Fraction; #endif +// OD 12.12.2002 #103492# +class SwPagePreviewLayout; +// OD 15.01.2003 #103492# +#ifndef _PREVWPAGE_HXX +#include <prevwpage.hxx> +#endif +// OD 15.01.2003 #103492# +#include <vector> class SwViewImp { @@ -102,6 +108,9 @@ class SwViewImp friend class SwLayAction; //Lay- und IdleAction tragen sich ein und aus. friend class SwLayIdle; + // OD 12.12.2002 #103492# - for paint of page preview + friend class SwPagePreviewLayout; + ViewShell *pSh; //Falls jemand einen Imp durchreicht und doch //mal eine ViewShell braucht hier die //Rueckwaertsverkettung. @@ -143,8 +152,8 @@ class SwViewImp USHORT nRestoreActions ; //Die Anzahl der zu restaurierenden Actions (UNO) SwRect aSmoothRect; - // OD 27.11.2002 #103492# - CurrentPreviewData* mpCurrPreviewData; + // OD 12.12.2002 #103492# + SwPagePreviewLayout* mpPgPrevwLayout; /** Signal whether to stop printing. @@ -284,16 +293,13 @@ public: void SetRestoreActions(USHORT nSet){nRestoreActions = nSet;} USHORT GetRestoreActions() const{return nRestoreActions;} - // OD 04.12.2002 #103492# - inline void InitPreviewData() - { - mpCurrPreviewData = new CurrentPreviewData; - } + // OD 12.12.2002 #103492# + void InitPagePreviewLayout(); - // OD 04.12.2002 #103492# - inline CurrentPreviewData* CurrPrevwData() + // OD 12.12.2002 #103492# + inline SwPagePreviewLayout* PagePreviewLayout() { - return mpCurrPreviewData; + return mpPgPrevwLayout; } #ifdef ACCESSIBLE_LAYOUT @@ -340,12 +346,12 @@ public: const SwFlyFrm *pFollow ); // update data for accessible preview - void UpdateAccessiblePreview( sal_uInt8 nRow, sal_uInt8 nColumn, - sal_Int16 nStartPage, - const Size& rPageSize, - const Point& rFreePoint, - const Fraction& rScale, - USHORT nSelectedPage ); + // OD 15.01.2003 #103492# - change method signature due to new page preview + // functionality + void UpdateAccessiblePreview( const std::vector<PrevwPage*>& _rPrevwPages, + const Fraction& _rScale, + const SwPageFrm* _pSelectedPageFrm, + const Size& _rPrevwWinSize ); void InvalidateAccessiblePreViewSelection( sal_uInt16 nSelPage ); diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index e94437df50d8..99a1d65d94be 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: atrfrm.cxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: od $ $Date: 2002-10-11 11:39:45 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -569,7 +569,7 @@ BOOL SwFmtFrmSize::PutValue( const uno::Any& rVal, BYTE nMemberId ) { sal_Int16 nSet; rVal >>= nSet; - if(nSet >= 0 && nSet <= 100) + if(nSet >= 0 && nSet <= 0xfe) SetHeightPercent((BYTE)nSet); else bRet = sal_False; diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index 5495398e4a2e..5095c65d200b 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -2,9 +2,9 @@ * * $RCSfile: calcmove.cxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: od $ $Date: 2002-11-11 09:40:33 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -96,6 +96,10 @@ #ifndef _FMTANCHR_HXX //autogen #include <fmtanchr.hxx> #endif +#ifndef _FMTCLBL_HXX +#include <fmtclbl.hxx> +#endif + #include "tabfrm.hxx" #include "ftnfrm.hxx" #include "txtfrm.hxx" @@ -979,7 +983,18 @@ BOOL SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs ) //4. Der Abstand fuer TextFrms entspricht mindestens dem Durchschuss nUpper = CalcUpperSpace( &rAttrs, NULL ); - SwTwips nLower = rAttrs.GetBottomLine( this ); + // in balanced columned section frames we do not want the + // common border + sal_Bool bCommonBorder = sal_True; + if ( IsInSct() && GetUpper()->IsColBodyFrm() ) + { + const SwSectionFrm* pSct = FindSctFrm(); + bCommonBorder = pSct->GetFmt()->GetBalancedColumns().GetValue(); + } + SwTwips nLower = bCommonBorder ? + rAttrs.GetBottomLine( this ) : + rAttrs.CalcBottomLine(); + (Prt().*fnRect->fnSetPosY)( (!bVert || bReverse) ? nUpper : nLower); nUpper += nLower; nUpper -= (Frm().*fnRect->fnGetHeight)() - @@ -1453,10 +1468,25 @@ void SwCntntFrm::MakeAll() ((SwSectionFrm*)pOldUp->GetUpper()->GetUpper())->MoveAllowed(this) ) bMovedFwd = FALSE; + const sal_Bool bCheckForGrownBody = pOldUp->IsBodyFrm(); + const long nOldBodyHeight = (pOldUp->Frm().*fnRect->fnGetHeight)(); + if ( !bMovedFwd && !MoveFwd( bMakePage, FALSE ) ) bMakePage = FALSE; SWREFRESHFN( this ) - bMovedFwd = TRUE; + + // If MoveFwd moves the paragraph to the next page, a following + // paragraph, which contains footnotes can can cause the old upper + // frame to grow. In this case we explicitely allow a new check + // for MoveBwd. Robust: We also check the bMovedBwd flag again. + // If pOldUp was a footnote frame, it has been deleted inside MoveFwd. + // Therefore we only check for growing body frames. + if ( bCheckForGrownBody && ! bMovedBwd && pOldUp != GetUpper() && + (pOldUp->Frm().*fnRect->fnGetHeight)() > nOldBodyHeight ) + bMovedFwd = FALSE; + else + bMovedFwd = TRUE; + bFormatted = FALSE; if ( bMoveOrFit && GetUpper() == pOldUp ) { @@ -1649,7 +1679,17 @@ BOOL SwCntntFrm::_WouldFit( SwTwips nSpace, SwLayoutFrm *pNewUpper, BOOL bTstMov nUpper = CalcUpperSpace( NULL, pPrev ); SwBorderAttrAccess aAccess( SwFrm::GetCache(), pFrm ); const SwBorderAttrs &rAttrs = *aAccess.Get(); - nUpper += rAttrs.GetBottomLine( pFrm ); + // in balanced columned section frames we do not want the + // common border + sal_Bool bCommonBorder = sal_True; + if ( pFrm->IsInSct() && pFrm->GetUpper()->IsColBodyFrm() ) + { + const SwSectionFrm* pSct = pFrm->FindSctFrm(); + bCommonBorder = pSct->GetFmt()->GetBalancedColumns().GetValue(); + } + nUpper += bCommonBorder ? + rAttrs.GetBottomLine( pFrm ) : + rAttrs.CalcBottomLine(); } else { diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx index 003b6de4a3ea..3ae5574e7ba9 100644 --- a/sw/source/core/layout/findfrm.cxx +++ b/sw/source/core/layout/findfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: findfrm.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: od $ $Date: 2002-11-11 09:36:02 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -736,6 +736,13 @@ SwFrm *SwFrm::_FindNext() if( ((SwCntntFrm*)this)->GetFollow() ) return ((SwCntntFrm*)this)->GetFollow(); } + else if ( IsRowFrm() ) + { + SwFrm* pUpper = GetUpper(); + if ( pUpper->IsTabFrm() && ((SwTabFrm*)pUpper)->GetFollow() ) + return ((SwTabFrm*)pUpper)->GetFollow()->GetLower(); + else return NULL; + } else return NULL; diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index c1dd7c23ed46..638670e7e1b5 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: flowfrm.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: fme $ $Date: 2002-11-13 09:40:43 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1070,7 +1070,7 @@ BOOL SwFlowFrm::IsPrevObjMove() const pPreUp = pPreUp->GetUpper(); else if( pPreUp->IsColBodyFrm() && pPreUp->GetUpper()->GetUpper()->IsSctFrm() ) - pPreUp = pPreUp->GetUpper()->GetUpper(); + pPreUp = pPreUp->GetUpper()->GetUpper()->GetUpper(); } const long nBottom = pPreUp->Frm().Bottom(); const long nRight = pPreUp->Frm().Right(); diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index 24ecaa6587bf..a863e146b0de 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fly.cxx,v $ * - * $Revision: 1.37 $ + * $Revision: 1.38 $ * - * last change: $Author: fme $ $Date: 2002-11-05 12:30:42 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1461,6 +1461,7 @@ void CalcCntnt( SwLayoutFrm *pLay, BOOL bNoColl ) if ( ((SwTabFrm*)pFrm)->IsFollow() ) ((SwTabFrm*)pFrm)->bLockBackMove = FALSE; } + pFrm = pFrm->FindNext(); if( pFrm && pFrm->IsSctFrm() && pSect ) { @@ -2180,12 +2181,15 @@ void SwFrm::CalcFlys( BOOL bPosOnly ) { // change anchor position pO->SetAnchorPos( GetAnchorPos() ); - SwPageFrm* pPage = FindPageFrm(); - if ( pPage ) + if ( GetValidPosFlag() ) { - // check if the new position - // would not exceed the margins of the page - CaptureDrawObj( *pO, pPage->Frm() ); + SwPageFrm* pPage = FindPageFrm(); + if ( pPage && ! pPage->IsInvalidLayout() ) + { + // check if the new position + // would not exceed the margins of the page + CaptureDrawObj( *pO, pPage->Frm() ); + } } ((SwDrawContact*)GetUserCall(pO))->ChkPage(); diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx index cdda6682195e..d585f2fb3135 100644 --- a/sw/source/core/layout/flycnt.cxx +++ b/sw/source/core/layout/flycnt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: flycnt.cxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: fme $ $Date: 2002-10-30 15:04:08 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1100,11 +1100,7 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew ) const SwRect aOld( AddSpacesToFrm() ); Point aNew( rNew ); -#ifdef BIDI if( GetAnchor()->IsVertical() || GetAnchor()->IsRightToLeft() ) -#else - if( GetAnchor()->IsVertical() ) -#endif aNew.X() += Frm().Width(); SwCntntFrm *pCnt = (SwCntntFrm*)::FindAnchor( GetAnchor(), aNew ); @@ -1113,7 +1109,6 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew ) SwPageFrm *pPage = 0; SWRECTFN( pCnt ) -#ifdef BIDI const sal_Bool bRTL = pCnt->IsRightToLeft(); if( ( bVert != GetAnchor()->IsVertical() ) || @@ -1124,15 +1119,6 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew ) else aNew.X() -= Frm().Width(); } -#else - if( ( bVert != GetAnchor()->IsVertical() ) - { - if( bVert ) - aNew.X() += Frm().Width(); - else - aNew.X() -= Frm().Width(); - } -#endif if ( pCnt->IsInDocBody() ) { @@ -1214,20 +1200,16 @@ void SwFlyAtCntFrm::SetAbsPos( const Point &rNew ) { if( !pFrm ) { -#ifdef BIDI if ( pCnt->IsRightToLeft() ) nX += pCnt->Frm().Right() - rNew.X() - Frm().Width(); else -#endif nX += rNew.X() - pCnt->Frm().Left(); } else { -#ifdef BIDI if ( pFrm->IsRightToLeft() ) nX += pFrm->Frm().Right() - rNew.X() - Frm().Width(); else -#endif nX = rNew.X() - pFrm->Frm().Left(); } } @@ -1479,6 +1461,22 @@ void SwFlyAtCntFrm::AssertPage() if ( Frm().Top() < pNewPage->Frm().Top() && pNewPage->GetPrev() ) { pNewPage = (SwPageFrm*)pNewPage->GetPrev(); + // OD 19.02.2003 #105643# - skip empty page and consider empty + // page at the beginning of the document. + // Assumption about document layout: + // No two empty pages following each other. + if ( pNewPage->IsEmptyPage() ) + { + if ( pNewPage->GetPrev() ) + { + pNewPage = static_cast<SwPageFrm*>(pNewPage->GetPrev()); + } + else + { + bFound = TRUE; + pNewPage = static_cast<SwPageFrm*>(pNewPage->GetNext()); + } + } if ( nDir == 2 ) { bFound = TRUE; @@ -2127,12 +2125,8 @@ void SwFlyAtCntFrm::MakeFlyPos() nRelPosX += aHori.GetPos(); } else if( bToggle || ( !aHori.IsPosToggle() && bR2L ) ) -#ifdef BIDI nRelPosX = nWidth - aFrm.Width() - aHori.GetPos() + ( bR2L ? nAdd : 0 ); -#else - nRelPosX = nWidth - aFrm.Width() - aHori.GetPos(); -#endif else nRelPosX += aHori.GetPos(); //Da die relative Position immer zum Anker relativ ist, diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 4fda29b450f4..bdad954d2e90 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frmtool.cxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: fme $ $Date: 2002-12-09 10:37:57 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1630,7 +1630,7 @@ SwBorderAttrs::SwBorderAttrs( const SwModify *pMod, const SwFrm *pConstructor ) //Muessen alle einmal berechnet werden: bTopLine = bBottomLine = bLeftLine = bRightLine = - bTop = bBottom = bRight = bLine = TRUE; + bTop = bBottom = bLine = TRUE; bCacheGetLine = bCachedGetTopLine = bCachedGetBottomLine = FALSE; @@ -1668,56 +1668,49 @@ void SwBorderAttrs::_CalcBottom() bBottom = FALSE; } -void SwBorderAttrs::_CalcRight() +long SwBorderAttrs::CalcRight( const SwFrm* pCaller ) const { - nRight = CalcRightLine() + rLR.GetRight(); - bRight = FALSE; -} - + long nRight; -#ifdef BIDI + // OD 23.01.2003 #106895# - for cell frame in R2L text direction the left + // and right border are painted on the right respectively left. + if ( pCaller->IsCellFrm() && pCaller->IsRightToLeft() ) + nRight = CalcLeftLine(); + else + nRight = CalcRightLine(); -long SwBorderAttrs::CalcRight( const SwFrm* pCaller ) -{ // for paragraphs, "left" is "before text" and "right" is "after text" - nRight = CalcRightLine() + - ( pCaller->IsTxtFrm() && pCaller->IsRightToLeft() ? - rLR.GetLeft() : - rLR.GetRight() ); + if ( pCaller->IsTxtFrm() && pCaller->IsRightToLeft() ) + nRight += rLR.GetLeft(); + else + nRight += rLR.GetRight(); return nRight; } long SwBorderAttrs::CalcLeft( const SwFrm *pCaller ) const { - // for paragraphs, "left" is "before text" and "right" is "after text" - long nLeft = CalcLeftLine() + - ( pCaller->IsTxtFrm() && pCaller->IsRightToLeft() ? - rLR.GetRight() : - rLR.GetLeft() ); + long nLeft; -#ifdef NUM_RELSPACE - if ( pCaller->IsTxtFrm() ) - nLeft += ((SwTxtFrm*)pCaller)->GetTxtNode()->GetLeftMarginWithNum(); -#endif - return nLeft; -} + // OD 23.01.2003 #106895# - for cell frame in R2L text direction the left + // and right border are painted on the right respectively left. + if ( pCaller->IsCellFrm() && pCaller->IsRightToLeft() ) + nLeft = CalcRightLine(); + else + nLeft = CalcLeftLine(); -#else + // for paragraphs, "left" is "before text" and "right" is "after text" + if ( pCaller->IsTxtFrm() && pCaller->IsRightToLeft() ) + nLeft += rLR.GetRight(); + else + nLeft += rLR.GetLeft(); -long SwBorderAttrs::CalcLeft( const SwFrm *pCaller ) const -{ - long nLeft = rLR.GetLeft() + CalcLeftLine(); -#ifdef NUM_RELSPACE if ( pCaller->IsTxtFrm() ) nLeft += ((SwTxtFrm*)pCaller)->GetTxtNode()->GetLeftMarginWithNum(); -#endif + return nLeft; } -#endif - - /************************************************************************* |* |* SwBorderAttrs::CalcTopLine(), CalcBottomLine(), diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx index 3bce18e8f25b..98a96d6bacac 100644 --- a/sw/source/core/layout/hffrm.cxx +++ b/sw/source/core/layout/hffrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: hffrm.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: fme $ $Date: 2002-10-23 11:16:54 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -237,7 +237,8 @@ void SwHeadFootFrm::FormatPrt(SwTwips & nUL, const SwBorderAttrs * pAttrs) nUL = pAttrs->CalcBottom() + nSpace; /* set print area */ - SwTwips nLR = pAttrs->CalcLeft(this) + pAttrs->CalcRight(); + // OD 23.01.2003 #106895# - add first parameter to <SwBorderAttrs::CalcRight(..)> + SwTwips nLR = pAttrs->CalcLeft( this ) + pAttrs->CalcRight( this ); aPrt.Left(pAttrs->CalcLeft(this)); @@ -266,7 +267,8 @@ void SwHeadFootFrm::FormatPrt(SwTwips & nUL, const SwBorderAttrs * pAttrs) //Sizes einstellen; die Groesse gibt der umgebende Frm vor, die //die Raender werden einfach abgezogen. - SwTwips nLR = pAttrs->CalcLeft(this) + pAttrs->CalcRight(); + // OD 23.01.2003 #106895# - add first parameter to <SwBorderAttrs::CalcRight(..)> + SwTwips nLR = pAttrs->CalcLeft( this ) + pAttrs->CalcRight( this ); aPrt.Width ( aFrm.Width() - nLR ); aPrt.Height( aFrm.Height()- nUL ); @@ -313,6 +315,7 @@ void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs) } nRemaining = 0; pFrm = Lower(); + while ( pFrm ) { nRemaining += pFrm->Frm().Height(); @@ -372,6 +375,18 @@ void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs) pTmpFrm->Prepare(PREP_ADJUST_FRM); } } + /* #i3568# Undersized sections need to be + invalidated too. */ + else if (pFrm->IsSctFrm()) + { + SwSectionFrm * pTmpFrm = + (SwSectionFrm*) pFrm; + if (pTmpFrm->IsUndersized() ) + { + pTmpFrm->InvalidateSize(); + pTmpFrm->Prepare(PREP_ADJUST_FRM); + } + } pFrm = pFrm->GetNext(); } } diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 125e76073ccd..2d52c361df48 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -2,9 +2,9 @@ * * $RCSfile: layact.cxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: od $ $Date: 2002-11-15 10:46:47 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1536,13 +1536,21 @@ BOOL SwLayAction::FormatLayout( SwLayoutFrm *pLay, BOOL bAddRect ) if ( !bNoPaint && IsPaint() && bAddRect && (pLay->IsCompletePaint() || bChanged) ) { SwRect aPaint( pLay->Frm() ); - // OD 11.11.2002 #104414# - not necessary to enlarge paint area - /* - aPaint.Pos().Y() -= 1; - aPaint.Pos().X() -= 1; - aPaint.SSize().Height() += 2; - aPaint.SSize().Width() += 2; - */ + // OD 13.02.2003 #i9719#, #105645# - consider border and shadow for + // page frames -> enlarge paint rectangle correspondingly. + if ( pLay->IsPageFrm() ) + { + SwPageFrm* pPageFrm = static_cast<SwPageFrm*>(pLay); + const nBorderWidth = + pImp->GetShell()->GetOut()->PixelToLogic( Size( pPageFrm->BorderPxWidth(), 0 ) ).Width(); + const nShadowWidth = + pImp->GetShell()->GetOut()->PixelToLogic( Size( pPageFrm->ShadowPxWidth(), 0 ) ).Width(); + aPaint.Left( aPaint.Left() - nBorderWidth ); + aPaint.Top( aPaint.Top() - nBorderWidth ); + aPaint.Right( aPaint.Right() + nBorderWidth + nShadowWidth ); + aPaint.Bottom( aPaint.Bottom() + nBorderWidth + nShadowWidth ); + } + if ( pLay->IsPageFrm() && pLay->GetFmt()->GetDoc()->IsBrowseMode() ) { @@ -1567,22 +1575,6 @@ BOOL SwLayAction::FormatLayout( SwLayoutFrm *pLay, BOOL bAddRect ) pImp->GetShell()->AddPaintRect( aRegion[i] ); } - //ggf. die Zwischenraeume mit invalidieren. - if ( pLay->GetPrev() ) - { - SwRect aTmp( aPaint ); - long nTmp = aTmp.Top() - DOCUMENTBORDER/2; - if ( nTmp >= 0 ) - aTmp.Top( nTmp ); - aTmp.Bottom( pLay->Frm().Top() ); - pImp->GetShell()->AddPaintRect( aTmp ); - } - if ( pLay->GetNext() ) - { - aPaint.Bottom( aPaint.Bottom() + DOCUMENTBORDER/2 ); - aPaint.Top( pLay->Frm().Bottom() ); - pImp->GetShell()->AddPaintRect( aPaint ); - } } else { @@ -1591,6 +1583,29 @@ BOOL SwLayAction::FormatLayout( SwLayoutFrm *pLay, BOOL bAddRect ) // OD 11.11.2002 #104414# - remember frame at complete paint aFrmAtCompletePaint = pLay->Frm(); } + + // OD 13.02.2003 #i9719#, #105645# - provide paint of spacing + // between pages (not only for in online mode). + if ( pLay->IsPageFrm() ) + { + if ( pLay->GetPrev() ) + { + SwRect aSpaceToPrevPage( pLay->Frm() ); + SwTwips nTop = aSpaceToPrevPage.Top() - DOCUMENTBORDER/2; + if ( nTop >= 0 ) + aSpaceToPrevPage.Top( nTop ); + aSpaceToPrevPage.Bottom( pLay->Frm().Top() ); + pImp->GetShell()->AddPaintRect( aSpaceToPrevPage ); + } + if ( pLay->GetNext() ) + { + SwRect aSpaceToNextPage( pLay->Frm() ); + aSpaceToNextPage.Bottom( aSpaceToNextPage.Bottom() + DOCUMENTBORDER/2 ); + aSpaceToNextPage.Top( pLay->Frm().Bottom() ); + pImp->GetShell()->AddPaintRect( aSpaceToNextPage ); + } + } + } pLay->ResetCompletePaint(); } diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index 3fd57b8fbbf1..1fc5e788d781 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pagechg.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: od $ $Date: 2002-11-01 11:10:54 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -341,6 +341,11 @@ SwPageFrm::~SwPageFrm() pImp->SetFirstVisPageInvalid(); if ( pImp->IsAction() ) pImp->GetLayAction().SetAgain(); + // OD 12.02.2003 #i9719#, #105645# - retouche area of page + // including border and shadow area. + SwRect aRetoucheRect; + GetBorderAndShadowBoundRect( Frm(), pSh, aRetoucheRect ); + pSh->AddPaintRect( aRetoucheRect ); } } } @@ -636,7 +641,7 @@ void SwPageFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, /* kein break hier */ case RES_FRM_SIZE: { - const SwRect aOldRect( Frm() ); + const SwRect aOldPageFrmRect( Frm() ); if ( GetFmt()->GetDoc()->IsBrowseMode() ) { bValidSize = FALSE; @@ -659,14 +664,20 @@ void SwPageFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, Frm().Height( Max( rSz.GetHeight(), long(MINLAY) ) ); Frm().Width ( Max( rSz.GetWidth(), long(MINLAY) ) ); - AdjustRootSize( CHG_CHGPAGE, &aOldRect ); + AdjustRootSize( CHG_CHGPAGE, &aOldPageFrmRect ); } //Window aufraeumen. ViewShell *pSh; - if ( 0 != (pSh = GetShell()) && pSh->GetWin() && aOldRect.HasArea() ) - pSh->InvalidateWindows( aOldRect ); + if ( 0 != (pSh = GetShell()) && pSh->GetWin() && aOldPageFrmRect.HasArea() ) + { + // OD 12.02.2003 #i9719#, #105645# - consider border and shadow of + // page frame for determine 'old' rectangle - it's used for invalidating. + SwRect aOldRectWithBorderAndShadow; + GetBorderAndShadowBoundRect( aOldPageFrmRect, pSh, aOldRectWithBorderAndShadow ); + pSh->InvalidateWindows( aOldRectWithBorderAndShadow ); + } rInvFlags |= 0x03; - if ( aOldRect.Height() != Frm().Height() ) + if ( aOldPageFrmRect.Height() != Frm().Height() ) rInvFlags |= 0x04; } break; @@ -1886,7 +1897,8 @@ void SwRootFrm::ImplCalcBrowseWidth() switch ( rHori.GetHoriOrient() ) { case HORI_NONE: - nWidth += rAttrs.CalcLeft( pFrm ) + rAttrs.CalcRight(); + // OD 23.01.2003 #106895# - add 1st param to <SwBorderAttrs::CalcRight(..)> + nWidth += rAttrs.CalcLeft( pFrm ) + rAttrs.CalcRight( pFrm ); break; case HORI_LEFT_AND_WIDTH: nWidth += rAttrs.CalcLeft( pFrm ); diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index ed0cae1bf92f..d8d2ba18fddc 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: paintfrm.cxx,v $ * - * $Revision: 1.56 $ + * $Revision: 1.57 $ * - * last change: $Author: od $ $Date: 2002-12-10 14:24:00 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -209,6 +209,14 @@ #ifndef _ACCESSIBILITYOPTIONS_HXX #include <accessibilityoptions.hxx> #endif +// OD 20.12.2002 #94627# +#ifndef _DOCSH_HXX +#include <docsh.hxx> +#endif +// OD 28.02.2003 #b4779636#, #107692# +#ifndef _SWTABLE_HXX +#include <swtable.hxx> +#endif #define GETOBJSHELL() ((SfxObjectShell*)rSh.GetDoc()->GetDocShell()) @@ -298,12 +306,6 @@ public: static ViewShell *pGlobalShell = 0; -/// OD 05.09.2002 #102912# - <bPageOnly> no longer needed -/* -//Fuer PaintBackground, eigentlich lokal, aber fuer SwSavePaintStatics jetzt global -static FASTBOOL bPageOnly = FALSE; -*/ - //Wenn durchsichtige FlyInCnts im PaintBackground gepainted werden so soll der //Hintergrund nicht mehr retouchiert werden. //static FASTBOOL bLockFlyBackground = FALSE; @@ -411,13 +413,10 @@ public: }; SwSavePaintStatics::SwSavePaintStatics() : -// bSLockFlyBackground ( bLockFlyBackground), bSFlyMetafile ( bFlyMetafile ), bSPixelHeightOdd ( bPixelHeightOdd ), bSPixelWidthOdd ( bPixelWidthOdd ), bSOneBeepOnly ( bOneBeepOnly ), -/// OD 05.09.2002 #102912# - <bPageOnly> no longer needed -// bSPageOnly ( bPageOnly ), pSGlobalShell ( pGlobalShell ), pSFlyMetafileOut ( pFlyMetafileOut ), pSRetoucheFly ( pRetoucheFly ), @@ -436,8 +435,7 @@ SwSavePaintStatics::SwSavePaintStatics() : aSScaleX ( aScaleX ), aSScaleY ( aScaleY ) { - /// OD 05.09.2002 #102912# - <bPageOnly> no longer needed - /*bPageOnly = *//*bLockFlyBackground = */bFlyMetafile = FALSE; + bFlyMetafile = FALSE; pFlyMetafileOut = 0; pRetoucheFly = 0; pRetoucheFly2 = 0; @@ -455,14 +453,11 @@ SwSavePaintStatics::SwSavePaintStatics() : SwSavePaintStatics::~SwSavePaintStatics() { -// bLockFlyBackground = bSLockFlyBackground; pGlobalShell = pSGlobalShell; bFlyMetafile = bSFlyMetafile; bPixelHeightOdd = bSPixelHeightOdd; bPixelWidthOdd = bSPixelWidthOdd; bOneBeepOnly = bSOneBeepOnly; -/// OD 05.09.2002 #102912# - <bPageOnly> no longer needed -// bPageOnly = bSPageOnly; pFlyMetafileOut = pSFlyMetafileOut; pRetoucheFly = pSRetoucheFly; pRetoucheFly2 = pSRetoucheFly2; @@ -742,7 +737,10 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects ) // an <insert> may destroy the object due to a necessary array resize. const SwLineRect aSubsLineRect = SwLineRect( operator[](i) ); - if ( aSubsLineRect.IsPainted() ) + // OD 19.12.2002 #106318# - add condition <aSubsLineRect.IsLocked()> + // in order to consider only border lines, which are *not* locked. + if ( aSubsLineRect.IsPainted() || + aSubsLineRect.IsLocked() ) continue; const bool bVerticalSubs = aSubsLineRect.Height() > aSubsLineRect.Width(); @@ -761,6 +759,12 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects ) { SwLineRect &rLine = rRects[k]; + // OD 20.12.2002 #106318# - do *not* consider painted or locked + // border lines. + // OD 20.01.2003 #i1837# - locked border lines have to be considered. + if ( rLine.IsLocked () ) + continue; + if ( !bVerticalSubs == rLine.Height() > rLine.Width() ) //gleiche Ausrichtung? continue; @@ -996,10 +1000,24 @@ void SwSubsRects::PaintSubsidiary( OutputDevice *pOut, { pOut->Push( PUSH_FILLCOLOR ); + // OD 14.01.2003 #106660# - reset draw mode in high contrast + // mode in order to get fill color set at output device. + // Recover draw mode after draw of lines. + // Necessary for the subsidiary lines painted by the fly frames. + ULONG nOldDrawMode = pOut->GetDrawMode(); + if( pGlobalShell->GetWin() && + Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) + { + pOut->SetDrawMode( 0 ); + } + for ( USHORT i = 0; i < Count(); ++i ) { SwLineRect &rLRect = operator[](i); - if ( !rLRect.IsPainted() ) + // OD 19.12.2002 #106318# - add condition <!rLRect.IsLocked()> + // to prevent paint of locked subsidiary lines. + if ( !rLRect.IsPainted() && + !rLRect.IsLocked() ) { const Color *pCol; switch ( rLRect.GetSubColor() ) @@ -1010,12 +1028,18 @@ void SwSubsRects::PaintSubsidiary( OutputDevice *pOut, case SUBCOL_SECT: pCol = &SwViewOption::GetSectionBoundColor(); break; case SUBCOL_BREAK: pCol = &SwViewOption::GetPageBreakColor(); break; } + if ( pOut->GetFillColor() != *pCol ) pOut->SetFillColor( *pCol ); pOut->DrawRect( rLRect.SVRect() ); + rLRect.SetPainted(); } } + + // OD 14.01.2003 #106660# - recovering draw mode + pOut->SetDrawMode( nOldDrawMode ); + pOut->Pop(); } } @@ -1024,6 +1048,7 @@ void SwSubsRects::PaintSubsidiary( OutputDevice *pOut, //------------------------------------------------------------------------- //Diverse Functions die in diesem File so verwendet werden. +// OD 20.02.2003 - Note: function <SwAlignRect(..)> also used outside this file. void MA_FASTCALL SwAlignRect( SwRect &rRect, ViewShell *pSh ) { if( !rRect.HasArea() ) @@ -1158,7 +1183,15 @@ void MA_FASTCALL lcl_CalcBorderRect( SwRect &rRect, const SwFrm *pFrm, const SwBorderAttrs &rAttrs, const BOOL bShadow ) { - if( pFrm->IsSctFrm() ) + // OD 23.01.2003 #106386# - special handling for cell frames. + // The printing area of a cell frame is completely enclosed in the frame area + // and a cell frame has no shadow. Thus, for cell frames the calculated + // area equals the frame area. + // Notes: Borders of cell frames in R2L text direction will switch its side + // - left border is painted on the right; right border on the left. + // See <lcl_PaintLeftLine> and <lcl_PaintRightLine>. + if( pFrm->IsSctFrm() || + pFrm->IsCellFrm() ) rRect = pFrm->Frm(); else { @@ -1176,7 +1209,9 @@ void MA_FASTCALL lcl_CalcBorderRect( SwRect &rRect, const SwFrm *pFrm, SwTwips nDiff = rBox.GetTop() ? rBox.CalcLineSpace( BOX_LINE_TOP ) : ( rAttrs.IsBorderDist() ? - rBox.GetDistance( BOX_LINE_TOP ) + 1 : 0 ); + // OD 23.01.2003 #106386# - increase of distance by + // one twip is incorrect. + rBox.GetDistance( BOX_LINE_TOP ) : 0 ); if( nDiff ) (rRect.*fnRect->fnSubTop)( nDiff ); } @@ -1187,20 +1222,24 @@ void MA_FASTCALL lcl_CalcBorderRect( SwRect &rRect, const SwFrm *pFrm, SwTwips nDiff = rBox.GetBottom() ? rBox.CalcLineSpace( BOX_LINE_BOTTOM ) : ( rAttrs.IsBorderDist() ? - rBox.GetDistance( BOX_LINE_BOTTOM ) + 1 : 0 ); + // OD 23.01.2003 #106386# - increase of distance by + // one twip is incorrect. + rBox.GetDistance( BOX_LINE_BOTTOM ) : 0 ); if( nDiff ) (rRect.*fnRect->fnAddBottom)( nDiff ); } if ( rBox.GetLeft() ) - (rRect.*fnRect->fnSubLeft)( rBox.CalcLineSpace(BOX_LINE_LEFT) ); + (rRect.*fnRect->fnSubLeft)( rBox.CalcLineSpace( BOX_LINE_LEFT ) ); else if ( rAttrs.IsBorderDist() ) - (rRect.*fnRect->fnSubLeft)(rBox.GetDistance( BOX_LINE_LEFT )+1); + // OD 23.01.2003 #106386# - increase of distance by one twip is incorrect. + (rRect.*fnRect->fnSubLeft)( rBox.GetDistance( BOX_LINE_LEFT ) ); if ( rBox.GetRight() ) - (rRect.*fnRect->fnAddRight)(rBox.CalcLineSpace(BOX_LINE_RIGHT)); + (rRect.*fnRect->fnAddRight)( rBox.CalcLineSpace( BOX_LINE_RIGHT ) ); else if ( rAttrs.IsBorderDist() ) - (rRect.*fnRect->fnAddRight)(rBox.GetDistance(BOX_LINE_RIGHT)+1); + // OD 23.01.2003 #106386# - increase of distance by one twip is incorrect. + (rRect.*fnRect->fnAddRight)( rBox.GetDistance( BOX_LINE_RIGHT ) ); if ( bShadow && rAttrs.GetShadow().GetLocation() != SVX_SHADOW_NONE ) { @@ -1407,32 +1446,6 @@ inline FASTBOOL IsShortCut( const SwRect &rRect, const SwRect &rFrmRect ) (rFrmRect.Left() > rRect.Right()) ); } - -void lcl_PaintShadow( const SwRect& aFrm, ViewShell* pSh ) -{ - const Color& rColor = SwViewOption::GetFontColor(); - Color aFill( pSh->GetOut()->GetFillColor() ); - Color aLine( pSh->GetOut()->GetLineColor() ); - pSh->GetOut()->SetFillColor( Color( COL_TRANSPARENT ) ); - pSh->GetOut()->SetLineColor( rColor ); - Rectangle aPageRect( aFrm.SVRect() ); - pSh->GetOut()->DrawRect( aPageRect ); - aPageRect = pSh->GetOut()->LogicToPixel( aPageRect ); - Rectangle aShadow( aPageRect.Left()+2, aPageRect.Bottom()+1, - aPageRect.Right()+2, aPageRect.Bottom()+2 ); - pSh->GetOut()->SetFillColor( rColor ); - aShadow = pSh->GetOut()->PixelToLogic( aShadow ); - pSh->GetOut()->DrawRect( aShadow ); - aShadow.Left() = aPageRect.Right() + 1; - aShadow.Right() = aShadow.Left() + 1; - aShadow.Top() = aPageRect.Top() + 2; - aShadow.Bottom() = aPageRect.Bottom(); - aShadow = pSh->GetOut()->PixelToLogic( aShadow ); - pSh->GetOut()->DrawRect( aShadow ); - pSh->GetOut()->SetFillColor( aFill ); - pSh->GetOut()->SetLineColor( aLine ); -} - //---------------- Ausgabe fuer das BrushItem ---------------- /** lcl_DrawGraphicBackgrd - local help method to draw a background for a graphic @@ -2122,8 +2135,17 @@ void SwRootFrm::Paint( const SwRect& rRect ) const } pPage->Paint( aPaintRect ); - if( pSh->GetWin() ) - lcl_PaintShadow( pPage->Frm(), pSh ); + + // OD 20.12.2002 #94627# - no paint of page border and shadow, if + // writer is in place mode. + if( pSh->GetWin() && + !pSh->GetDoc()->GetDocShell()->GetProtocol().IsInPlaceActive() ) + { + // OD 12.02.2003 #i9719#, #105645# - use new method + // <SwPageFrm::PaintBorderAndShadow(..)>. + pPage->PaintBorderAndShadow( pPage->Frm(), pSh ); + } + pLines->PaintLines( pSh->GetOut() ); BOOL bControlExtra = FALSE; @@ -2311,7 +2333,7 @@ void SwLayoutFrm::Paint( const SwRect& rRect ) const if ( pFrm->IsRetoucheFrm() && bWin && !pFrm->GetNext() ) { if ( !pPage ) pPage = FindPageFrm(); - pFrm->Retouche( pPage, rRect ); + pFrm->Retouche( pPage, rRect ); } pFrm->ResetRetouche(); } @@ -2579,10 +2601,10 @@ void SwFlyFrm::Paint( const SwRect& rRect ) const SwRect aRect( rRect ); aRect._Intersection( Frm() ); - OutputDevice *pOut = pGlobalShell->GetOut(); + OutputDevice* pOut = pGlobalShell->GetOut(); pOut->Push( PUSH_CLIPREGION ); pOut->SetClipRegion(); - const SwPageFrm *pPage = FindPageFrm(); + const SwPageFrm* pPage = FindPageFrm(); const SwNoTxtFrm *pNoTxt = Lower() && Lower()->IsNoTxtFrm() ? (SwNoTxtFrm*)Lower() : 0; @@ -2640,31 +2662,14 @@ void SwFlyFrm::Paint( const SwRect& rRect ) const SwBorderAttrAccess aAccess( SwFrm::GetCache(), (SwFrm*)this ); const SwBorderAttrs &rAttrs = *aAccess.Get(); -/* //Das Paint der FlyInCnt's wird vom Paint der Lines gerufen. Damit - //der Rand (UL-/LRSpace) mit der richtigen Farbe retouchiert wird, - //muss Das Paint an den Anker weitergereicht werden. - FASTBOOL bUnlock = FALSE; - if ( IsFlyInCntFrm() ) - { - bLockFlyBackground = bUnlock = TRUE; - SwBorderAttrAccess aAccess( SwFrm::GetCache(), GetAnchor()); - const SwBorderAttrs &rAttrs = *aAccess.Get(); - GetAnchor()->PaintBackground( aRect, pPage, rAttrs, FALSE ); - } -*/ - - /// OD 06.08.2002 #99657# - paint border before painting background - /// paint border + // OD 06.08.2002 #99657# - paint border before painting background + // paint border { SwRect aTmp( rRect ); -//?? aTmp._Intersection( Frm() ); PaintBorder( aTmp, pPage, rAttrs ); -/* if ( bUnlock ) - bLockFlyBackground = FALSE; -*/ } - /// paint background + // paint background { SwRegionRects aRegion( aRect ); if ( pNoTxt && !bIsGraphicTransparent ) @@ -2694,11 +2699,65 @@ void SwFlyFrm::Paint( const SwRect& rRect ) const } } + // OD 19.12.2002 #106318# - fly frame will paint it's subsidiary lines and + // the subsidiary lines of its lowers on its own, due to overlapping with + // other fly frames or other objects. + if( pGlobalShell->GetWin() ) + { + bool bSubsLineRectsCreated; + if ( pSubsLines ) + { + // Lock already existing subsidiary lines + pSubsLines->LockLines( TRUE ); + bSubsLineRectsCreated = false; + } + else + { + // create new subsidiardy lines + pSubsLines = new SwSubsRects; + bSubsLineRectsCreated = true; + } + + bool bSpecSubsLineRectsCreated; + if ( pSpecSubsLines ) + { + // Lock already existing special subsidiary lines + pSpecSubsLines->LockLines( TRUE ); + bSpecSubsLineRectsCreated = false; + } + else + { + // create new special subsidiardy lines + pSpecSubsLines = new SwSubsRects; + bSpecSubsLineRectsCreated = true; + } + // Add subsidiary lines of fly frame and its lowers + RefreshLaySubsidiary( pPage, aRect ); + // paint subsidiary lines of fly frame and its lowers + pSpecSubsLines->PaintSubsidiary( pOut, NULL ); + pSubsLines->PaintSubsidiary( pOut, pLines ); + if ( !bSubsLineRectsCreated ) + // unlock subsidiary lines + pSubsLines->LockLines( FALSE ); + else + // delete created subsidiary lines container + DELETEZ( pSubsLines ); + + if ( !bSpecSubsLineRectsCreated ) + // unlock special subsidiary lines + pSpecSubsLines->LockLines( FALSE ); + else + // delete created special subsidiary lines container + DELETEZ( pSpecSubsLines ); + } + SwLayoutFrm::Paint( aRect ); Validate(); - pLines->LockLines( FALSE ); + // OD 19.12.2002 #106318# - first paint lines added by fly frame paint + // and then unlock other lines. pLines->PaintLines( pOut ); + pLines->LockLines( FALSE ); pOut->Pop(); @@ -2716,12 +2775,20 @@ void SwFlyFrm::Paint( const SwRect& rRect ) const void SwTabFrm::Paint( const SwRect& rRect ) const { - if( pGlobalShell->GetViewOptions()->IsTable() ) + if ( pGlobalShell->GetViewOptions()->IsTable() ) + { SwLayoutFrm::Paint( rRect ); - else if( pGlobalShell->GetWin() ) + } + // OD 10.01.2003 #i6467# - no light grey rectangle for page preview + else if ( pGlobalShell->GetWin() && !pGlobalShell->IsPreView() ) { + // OD 10.01.2003 #i6467# - intersect output rectangle with table frame + SwRect aTabRect( Prt() ); + aTabRect.Pos() += Frm().Pos(); + SwRect aTabOutRect( rRect ); + aTabOutRect.Intersection( aTabRect ); pGlobalShell->GetViewOptions()-> - DrawRect( pGlobalShell->GetOut(), rRect, COL_LIGHTGRAY ); + DrawRect( pGlobalShell->GetOut(), aTabOutRect, COL_LIGHTGRAY ); } ((SwTabFrm*)this)->ResetComplete(); } @@ -2922,12 +2989,12 @@ void SwFrm::PaintShadow( const SwRect& rRect, SwRect& rOutRect, { SwRect &rOut = aRegion[i]; aOut = rOut; - /// OD 30.09.2002 #103636# - no SwAlign of shadow rectangle - /// no alignment necessary, because (1) <rRect> is already aligned - /// and because (2) paint of border and background will occur later. - /// Thus, (1) assures that no conflicts with neighbour object will occure - /// and (2) assures that border and background is not affected by the - /// shadow paint. + // OD 30.09.2002 #103636# - no SwAlign of shadow rectangle + // no alignment necessary, because (1) <rRect> is already aligned + // and because (2) paint of border and background will occur later. + // Thus, (1) assures that no conflicts with neighbour object will occure + // and (2) assures that border and background is not affected by the + // shadow paint. /* ::SwAlignRect( aOut, pGlobalShell ); */ @@ -3163,6 +3230,144 @@ void MA_FASTCALL lcl_PaintBottomLine( const SwFrm *pFrm, const SwPageFrm *pPage, |* |*************************************************************************/ +/** local method to determine cell frame, from which the border attributes + for paint of top/bottom border has to be used. + + OD 21.02.2003 #b4779636#, #107692# + + @author OD + + + @param _pCellFrm + input parameter - constant pointer to cell frame for which the cell frame + for the border attributes has to be determined. + + @param _rCellBorderAttrs + input parameter - constant reference to the border attributes of cell frame + <_pCellFrm>. + + @param _bTop + input parameter - boolean, that controls, if cell frame for top border or + for bottom border has to be determined. + + @return constant pointer to cell frame, for which the border attributes has + to be used +*/ +const SwFrm* lcl_GetCellFrmForBorderAttrs( const SwFrm* _pCellFrm, + const SwBorderAttrs& _rCellBorderAttrs, + const bool _bTop ) +{ + // determine, if cell frame is at bottom/top border of a table frame and + // the table frame has/is a follow. + const SwFrm* pTmpFrm = _pCellFrm; + bool bCellAtBorder = true; + while( !pTmpFrm->IsRowFrm() || !pTmpFrm->GetUpper()->IsTabFrm() ) + { + pTmpFrm = pTmpFrm->GetUpper(); + if ( pTmpFrm->IsRowFrm() && + (_bTop ? pTmpFrm->GetPrev() : pTmpFrm->GetNext()) + ) + { + bCellAtBorder = false; + } + } + ASSERT( pTmpFrm && pTmpFrm->IsRowFrm(), "No RowFrm available" ); + + const SwLayoutFrm* pParentRowFrm = static_cast<const SwLayoutFrm*>(pTmpFrm); + const SwTabFrm* pParentTabFrm = + static_cast<const SwTabFrm*>(pParentRowFrm->GetUpper()); + + const bool bCellNeedsAttribute = bCellAtBorder && + ( _bTop ? + // bCellInFirstRowWithMaster + ( !pParentRowFrm->GetPrev() && + pParentTabFrm->IsFollow() && + !pParentTabFrm->GetTable()->IsHeadlineRepeat() ) : + // bCellInLastRowWithFollow + ( !pParentRowFrm->GetNext() && + pParentTabFrm->GetFollow() ) + ); + + const SwFrm* pRet = _pCellFrm; + if ( bCellNeedsAttribute ) + { + // determine, if cell frame has no borders inside the table. + const SvxBoxItem aBorderBox = _rCellBorderAttrs.GetBox(); + const bool bNoBordersInside = + ( !aBorderBox.GetTop() || !pParentRowFrm->GetPrev() ) && + ( !aBorderBox.GetLeft() || !_pCellFrm->GetPrev() ) && + ( !aBorderBox.GetRight() || !_pCellFrm->GetNext() ) && + ( !aBorderBox.GetBottom() || !pParentRowFrm->GetNext() ); + + if ( bNoBordersInside ) + { + if ( _bTop && !_rCellBorderAttrs.GetBox().GetTop() ) + { + // #b4779636#-hack: + // Cell frame has no top border and no border inside the table, but + // it is at the top border of a table frame, which is a follow. + // Thus, use border attributes of cell frame in first row of complete table. + // First, determine first table frame of complete table. + SwTabFrm* pMasterTabFrm = const_cast<SwTabFrm*>(pParentTabFrm->FindMaster()); + while ( pMasterTabFrm->IsFollow() ) + { + pMasterTabFrm = pMasterTabFrm->FindMaster(); + } + // determine first row of complete table. + const SwFrm* pFirstRow = pMasterTabFrm->GetLower(); + // return first cell in first row + SwFrm* pTmpFrm = const_cast<SwFrm*>(pFirstRow->GetLower()); + while ( !pTmpFrm->IsCellFrm() || + ( pTmpFrm->GetLower() && pTmpFrm->GetLower()->IsLayoutFrm() ) + ) + { + pTmpFrm = pTmpFrm->GetLower(); + } + ASSERT( pTmpFrm && pTmpFrm->IsCellFrm(), "No CellFrm available" ); + pRet = pTmpFrm; + } + else if ( !_bTop && !_rCellBorderAttrs.GetBox().GetBottom() ) + { + // #b4779636#-hack: + // Cell frame has no bottom border and no border inside the table, + // but it is at the bottom border of a table frame, which has a follow. + // Thus, use border attributes of cell frame in last row of complete table. + // First, determine last table frame of complete table. + SwTabFrm* pLastTabFrm = const_cast<SwTabFrm*>(pParentTabFrm->GetFollow()); + while ( pLastTabFrm->GetFollow() ) + { + pLastTabFrm = pLastTabFrm->GetFollow(); + } + // determine last row of complete table. + SwFrm* pLastRow = pLastTabFrm->GetLower(); + while ( pLastRow->GetNext() ) + { + pLastRow = pLastRow->GetNext(); + } + // return first bottom border cell in last row + SwFrm* pTmpFrm = const_cast<SwFrm*>(pLastRow->GetLower()); + while ( !pTmpFrm->IsCellFrm() || + ( pTmpFrm->GetLower() && pTmpFrm->GetLower()->IsLayoutFrm() ) + ) + { + if ( pTmpFrm->IsRowFrm() ) + { + while ( pTmpFrm->GetNext() ) + { + pTmpFrm = pTmpFrm->GetNext(); + } + } + pTmpFrm = pTmpFrm->GetLower(); + } + ASSERT( pTmpFrm && pTmpFrm->IsCellFrm(), "No CellFrm available" ); + pRet = pTmpFrm; + } + } + } + + return pRet; +} + void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage, const SwBorderAttrs &rAttrs ) const { @@ -3175,9 +3380,29 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage, !pGlobalShell->GetViewOptions()->IsTable() ) return; - const FASTBOOL bLine = rAttrs.IsLine(); - const FASTBOOL bShadow = rAttrs.GetShadow().GetLocation() != SVX_SHADOW_NONE; - if ( bLine || bShadow ) + const bool bLine = rAttrs.IsLine() ? true : false; + const bool bShadow = rAttrs.GetShadow().GetLocation() != SVX_SHADOW_NONE; + + // OD 24.02.2003 #b4779636#, #107692# - flag to control, + // if #b4779636#-hack has to be used. + const bool bb4779636HackActive = true; + // OD 21.02.2003 #b4779636#, #107692# + const SwFrm* pCellFrmForBottomBorderAttrs = 0; + const SwFrm* pCellFrmForTopBorderAttrs = 0; + bool bFoundCellForTopOrBorderAttrs = false; + if ( bb4779636HackActive && IsCellFrm() ) + { + pCellFrmForBottomBorderAttrs = lcl_GetCellFrmForBorderAttrs( this, rAttrs, false ); + if ( pCellFrmForBottomBorderAttrs != this ) + bFoundCellForTopOrBorderAttrs = true; + pCellFrmForTopBorderAttrs = lcl_GetCellFrmForBorderAttrs( this, rAttrs, true ); + if ( pCellFrmForTopBorderAttrs != this ) + bFoundCellForTopOrBorderAttrs = true; + } + + // OD 24.02.2003 #b4779636#, #107692# - add condition <bFoundCellForTopOrBorderAttrs> + // for #b4779636#-hack + if ( bLine || bShadow || bFoundCellForTopOrBorderAttrs ) { //Wenn das Rechteck vollstandig innerhalb der PrtArea liegt, //so braucht kein Rand gepainted werden. @@ -3186,21 +3411,21 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage, SwRect aRect( Prt() ); aRect += Frm().Pos(); ::SwAlignRect( aRect, pGlobalShell ); - /// OD 27.09.2002 #103636# - new local boolean variable in order to - /// suspend border paint under special cases - see below. - /// NOTE: This is a fix for the implementation of feature #99657#. + // OD 27.09.2002 #103636# - new local boolean variable in order to + // suspend border paint under special cases - see below. + // NOTE: This is a fix for the implementation of feature #99657#. bool bDrawOnlyShadowForTransparentFrame = false; if ( aRect.IsInside( rRect ) ) { - /// OD 27.09.2002 #103636# - paint shadow, if background is transparent. - /// Because of introduced transparent background for fly frame #99657#, - /// the shadow have to be drawn if the background is transparent, - /// in spite the fact that the paint rectangle <rRect> lies fully - /// in the printing area. - /// NOTE to chosen solution: - /// On transparent background, continue processing, but suspend - /// drawing of border by setting <bDrawOnlyShadowForTransparentFrame> - /// to true. + // OD 27.09.2002 #103636# - paint shadow, if background is transparent. + // Because of introduced transparent background for fly frame #99657#, + // the shadow have to be drawn if the background is transparent, + // in spite the fact that the paint rectangle <rRect> lies fully + // in the printing area. + // NOTE to chosen solution: + // On transparent background, continue processing, but suspend + // drawing of border by setting <bDrawOnlyShadowForTransparentFrame> + // to true. if ( IsLayoutFrm() && static_cast<const SwLayoutFrm*>(this)->GetFmt()->IsBackgroundTransparent() ) { @@ -3219,17 +3444,50 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage, rAttrs.SetGetCacheLine( TRUE ); if ( bShadow ) PaintShadow( rRect, aRect, pPage, rAttrs ); - /// OD 27.09.2002 #103636# - suspend drawing of border - /// add condition < NOT bDrawOnlyShadowForTransparentFrame > - see above - if ( bLine && !bDrawOnlyShadowForTransparentFrame ) + // OD 27.09.2002 #103636# - suspend drawing of border + // add condition < NOT bDrawOnlyShadowForTransparentFrame > - see above + // OD 24.02.2003 #b4779636#, #107692# - add condition <bFoundCellForTopOrBorderAttrs> + // for #b4779636#-hack. + if ( ( bLine || bFoundCellForTopOrBorderAttrs ) && + !bDrawOnlyShadowForTransparentFrame ) { SWRECTFN( this ) ::lcl_PaintLeftLine ( this, pPage, aRect, rRect, rAttrs, fnRect ); ::lcl_PaintRightLine ( this, pPage, aRect, rRect, rAttrs, fnRect ); if ( !IsCntntFrm() || rAttrs.GetTopLine( this ) ) - ::lcl_PaintTopLine( this, pPage, aRect, rRect, rAttrs, fnRect ); + { + // OD 21.02.2003 #b4779636#, #107692# - + // #b4779636#-hack: If another cell frame for top border + // paint is found, paint its top border. + if ( IsCellFrm() && pCellFrmForTopBorderAttrs != this ) + { + SwBorderAttrAccess aAccess( SwFrm::GetCache(), + pCellFrmForTopBorderAttrs ); + const SwBorderAttrs &rTopAttrs = *aAccess.Get(); + ::lcl_PaintTopLine( this, pPage, aRect, rRect, rTopAttrs, fnRect ); + } + else + { + ::lcl_PaintTopLine( this, pPage, aRect, rRect, rAttrs, fnRect ); + } + } if ( !IsCntntFrm() || rAttrs.GetBottomLine( this ) ) - ::lcl_PaintBottomLine(this, pPage, aRect, rRect, rAttrs,fnRect); + { + // OD 21.02.2003 #b4779636#, #107692# - + // #b4779636#-hack: If another cell frame for bottom border + // paint is found, paint its bottom border. + if ( IsCellFrm() && pCellFrmForBottomBorderAttrs != this ) + { + SwBorderAttrAccess aAccess( SwFrm::GetCache(), + pCellFrmForBottomBorderAttrs ); + const SwBorderAttrs &rBottomAttrs = *aAccess.Get(); + ::lcl_PaintBottomLine(this, pPage, aRect, rRect, rBottomAttrs, fnRect); + } + else + { + ::lcl_PaintBottomLine(this, pPage, aRect, rRect, rAttrs, fnRect); + } + } } rAttrs.SetGetCacheLine( FALSE ); } @@ -3379,7 +3637,7 @@ void SwPageFrm::PaintGrid( OutputDevice* pOut, SwRect &rRect ) const { SwRect aGrid( pBody->Prt() ); aGrid += pBody->Frm().Pos(); - // ::SwAlignRect( aGrid, pGlobalShell ); + SwRect aInter( aGrid ); aInter.Intersection( rRect ); if( aInter.HasArea() ) @@ -3712,6 +3970,149 @@ void SwPageFrm::PaintMarginArea( const SwRect& _rOutputRect, } } +// ---------------------------------------------------------------------- +// +// const SwPageFrm::mnBorderPxWidth, const SwPageFrm::mnShadowPxWidth +// SwPageFrm::GetBorderRect (..), SwPageFrm::GetRightShadowRect(..), +// SwPageFrm::GetBottomShadowRect(..), +// SwPageFrm::PaintBorderAndShadow(..), +// SwPageFrm::GetBorderAndShadowBoundRect(..) +// +// OD 12.02.2003 for #i9719# and #105645# +// ---------------------------------------------------------------------- + +const sal_Int8 SwPageFrm::mnBorderPxWidth = 1; +const sal_Int8 SwPageFrm::mnShadowPxWidth = 2; + +/** determine rectangle for page border + + OD 12.02.2003 for #i9719# and #105645# + + @author OD +*/ +void SwPageFrm::GetBorderRect( const SwRect& _rPageRect, + ViewShell* _pViewShell, + SwRect& _orBorderRect ) const +{ + SwRect aAlignedPageRect( _rPageRect ); + SwAlignRect( aAlignedPageRect, _pViewShell ); + Rectangle aBorderPxRect = + _pViewShell->GetOut()->LogicToPixel( aAlignedPageRect.SVRect() ); + + aBorderPxRect.Left() = aBorderPxRect.Left() - mnBorderPxWidth; + aBorderPxRect.Top() = aBorderPxRect.Top() - mnBorderPxWidth; + aBorderPxRect.Right() = aBorderPxRect.Right() + mnBorderPxWidth; + aBorderPxRect.Bottom() = aBorderPxRect.Bottom() + mnBorderPxWidth; + + _orBorderRect = + SwRect( _pViewShell->GetOut()->PixelToLogic( aBorderPxRect ) ); +} + +/** determine rectangle for right page shadow + + OD 12.02.2003 for #i9719# and #105645# + + @author OD +*/ +void SwPageFrm::GetRightShadowRect( const SwRect& _rPageRect, + ViewShell* _pViewShell, + SwRect& _orRightShadowRect ) const +{ + SwRect aAlignedPageRect( _rPageRect ); + SwAlignRect( aAlignedPageRect, _pViewShell ); + Rectangle aPagePxRect = + _pViewShell->GetOut()->LogicToPixel( aAlignedPageRect.SVRect() ); + + Rectangle aRightShadowPxRect( + aPagePxRect.Right() + mnShadowPxWidth, + aPagePxRect.Top() + 1, + aPagePxRect.Right() + mnBorderPxWidth + mnShadowPxWidth, + aPagePxRect.Bottom() + mnBorderPxWidth + mnShadowPxWidth ); + + _orRightShadowRect = + SwRect( _pViewShell->GetOut()->PixelToLogic( aRightShadowPxRect ) ); +} + +/** determine rectangle for bottom page shadow + + OD 12.02.2003 for #i9719# and #105645# + + @author OD +*/ +void SwPageFrm::GetBottomShadowRect( const SwRect& _rPageRect, + ViewShell* _pViewShell, + SwRect& _orBottomShadowRect ) const +{ + SwRect aAlignedPageRect( _rPageRect ); + SwAlignRect( aAlignedPageRect, _pViewShell ); + Rectangle aPagePxRect = + _pViewShell->GetOut()->LogicToPixel( aAlignedPageRect.SVRect() ); + + Rectangle aBottomShadowPxRect( + aPagePxRect.Left() + 1, + aPagePxRect.Bottom() + mnShadowPxWidth, + aPagePxRect.Right() + mnBorderPxWidth + mnShadowPxWidth, + aPagePxRect.Bottom() + mnBorderPxWidth + mnShadowPxWidth ); + + _orBottomShadowRect = + SwRect( _pViewShell->GetOut()->PixelToLogic( aBottomShadowPxRect ) ); +} + +/** paint page border and shadow + + OD 12.02.2003 for #i9719# and #105645# + implement paint of page border and shadow + + @author OD +*/ +void SwPageFrm::PaintBorderAndShadow( const SwRect& _rPageRect, + ViewShell* _pViewShell ) const +{ + // get color for page border and shadow paint + const Color& rColor = SwViewOption::GetFontColor(); + + // save current fill and line color of output device + Color aFill( _pViewShell->GetOut()->GetFillColor() ); + Color aLine( _pViewShell->GetOut()->GetLineColor() ); + + // paint page border + _pViewShell->GetOut()->SetFillColor(); // OD 20.02.2003 #107369# - no fill color + _pViewShell->GetOut()->SetLineColor( rColor ); + SwRect aPaintRect; + GetBorderRect( _rPageRect, _pViewShell, aPaintRect ); + _pViewShell->GetOut()->DrawRect( aPaintRect.SVRect() ); + + // paint shadow + _pViewShell->GetOut()->SetFillColor( rColor ); + GetRightShadowRect( _rPageRect, _pViewShell, aPaintRect ); + _pViewShell->GetOut()->DrawRect( aPaintRect.SVRect() ); + GetBottomShadowRect( _rPageRect, _pViewShell, aPaintRect ); + _pViewShell->GetOut()->DrawRect( aPaintRect.SVRect() ); + + _pViewShell->GetOut()->SetFillColor( aFill ); + _pViewShell->GetOut()->SetLineColor( aLine ); + +} + +/** get bound rectangle of border and shadow for repaints + + OD 12.02.2003 for #i9719# and #105645# + + author OD +*/ +void SwPageFrm::GetBorderAndShadowBoundRect( + const SwRect& _rPageRect, + ViewShell* _pViewShell, + SwRect& _orBorderAndShadowBoundRect ) const +{ + SwRect aTmpRect; + GetBorderRect( _rPageRect, _pViewShell, _orBorderAndShadowBoundRect ); + GetRightShadowRect( _rPageRect, _pViewShell, aTmpRect ); + _orBorderAndShadowBoundRect.Union( aTmpRect ); + GetBottomShadowRect( _rPageRect, _pViewShell, aTmpRect ); + _orBorderAndShadowBoundRect.Union( aTmpRect ); +} + /************************************************************************* |* |* SwFrm::PaintBaBo() @@ -3788,6 +4189,14 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage, const BOOL bLowerMode, const BOOL bLowerBorder ) const { + // OD 20.01.2003 #i1837# - no paint of table background, if corresponding + // option is *not* set. + if( IsTabFrm() && + !pGlobalShell->GetViewOptions()->IsTable() ) + { + return; + } + ViewShell *pSh = pGlobalShell; const FASTBOOL bWin = pSh->GetWin() ? TRUE : FALSE; const SvxBrushItem* pItem; @@ -3804,19 +4213,34 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage, bool bNoFlyBackground = !bFlyMetafile && !bBack && IsFlyFrm(); if ( bNoFlyBackground ) { - /// OD 05.09.2002 #102912# - Fly frame has no background. - /// Try to find background brush at parents, if previous call of - /// <GetBackgroundBrush> disabled this option with the parameter <bLowerMode> + // OD 05.09.2002 #102912# - Fly frame has no background. + // Try to find background brush at parents, if previous call of + // <GetBackgroundBrush> disabled this option with the parameter <bLowerMode> if ( bLowerMode ) { bBack = GetBackgroundBrush( pItem, pCol, aOrigBackRect, false ); } - /// If still no background found for the fly frame, initialize the - /// background brush <pItem> with global retouche color and set <bBack> - /// to TRUE, that fly frame will paint its background using this color. + // If still no background found for the fly frame, initialize the + // background brush <pItem> with global retouche color and set <bBack> + // to TRUE, that fly frame will paint its background using this color. if ( !bBack ) { - pTmpBackBrush = new SvxBrushItem( aGlobalRetoucheColor ); + // OD 10.01.2003 #i6467# - on print output, pdf output and + // in embedded mode not editing color COL_WHITE is used instead of + // the global retouche color. + if ( pSh->GetOut()->GetOutDevType() == OUTDEV_PRINTER || + pSh->GetViewOptions()->IsPDFExport() || + ( pSh->GetDoc()->GetDocShell()->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED && + !pSh->GetDoc()->GetDocShell()->GetProtocol().IsInPlaceActive() + ) + ) + { + pTmpBackBrush = new SvxBrushItem( Color( COL_WHITE ) ); + } + else + { + pTmpBackBrush = new SvxBrushItem( aGlobalRetoucheColor ); + } pItem = pTmpBackBrush; bBack = true; } @@ -3950,7 +4374,9 @@ void SwPageFrm::RefreshSubsidiary( const SwRect &rRect ) const if ( IS_SUBS || IS_SUBS_TABLE || IS_SUBS_SECTION || IS_SUBS_FLYS ) { SwRect aRect( rRect ); - ::SwAlignRect( aRect, pGlobalShell ); + // OD 18.02.2003 #104989# - Not necessary and incorrect alignment of + // the output rectangle. + //::SwAlignRect( aRect, pGlobalShell ); if ( aRect.HasArea() ) { //Beim Paint ueber die Root wird das Array von dort gesteuert. @@ -3959,30 +4385,20 @@ void SwPageFrm::RefreshSubsidiary( const SwRect &rRect ) const if ( !pSubsLines ) { pSubsLines = new SwSubsRects; + // OD 20.12.2002 #106318# - create container for special subsidiary lines + pSpecSubsLines = new SwSubsRects; bDelSubs = TRUE; } RefreshLaySubsidiary( this, aRect ); - if ( GetSortedObjs() ) - { - const SwSortDrawObjs &rObjs = *GetSortedObjs(); - for ( USHORT i = 0; i < rObjs.Count(); ++i ) - { - SdrObject *pO = rObjs[i]; - if ( pO->IsWriterFlyFrame() ) - { - const SwFlyFrm *pFly = ((SwVirtFlyDrawObj*)pO)->GetFlyFrm(); - if ( pFly->Frm().IsOver( aRect ) ) - { - if ( !pFly->Lower() || !pFly->Lower()->IsNoTxtFrm() || - !((SwNoTxtFrm*)pFly->Lower())->HasAnimation()) - pFly->RefreshLaySubsidiary( this, aRect ); - } - } - } - } + if ( bDelSubs ) { + // OD 20.12.2002 #106318# - paint special subsidiary lines + // and delete its container + pSpecSubsLines->PaintSubsidiary( pGlobalShell->GetOut(), NULL ); + DELETEZ( pSpecSubsLines ); + pSubsLines->PaintSubsidiary( pGlobalShell->GetOut(), pLines ); DELETEZ( pSubsLines ); } @@ -4132,7 +4548,16 @@ void MA_FASTCALL lcl_RefreshLine( const SwLayoutFrm *pLay, //Mir selbst weiche ich natuerlich nicht aus. Auch wenn ich //_in_ dem Fly sitze weiche ich nicht aus. if ( !pFly || (pFly == pLay || pFly->IsAnLower( pLay )) ) - { aIter.Next(); + { + aIter.Next(); + continue; + } + + // OD 19.12.2002 #106318# - do *not* consider fly frames with + // a transparent background. + if ( pFly->IsBackgroundTransparent() ) + { + aIter.Next(); continue; } @@ -4174,9 +4599,21 @@ void SwLayoutFrm::PaintSubsidiaryLines( const SwPageFrm *pPage, const bool bCell = IsCellFrm() ? true : false; // use frame area for cells - SwRect aOriginal( bCell ? Frm() : Prt() ); - if ( !bCell ) + // OD 13.02.2003 #i3662# - for section use also frame area + const bool bUseFrmArea = bCell || IsSctFrm(); + SwRect aOriginal( bUseFrmArea ? Frm() : Prt() ); + if ( !bUseFrmArea ) aOriginal.Pos() += Frm().Pos(); + // OD 13.02.2003 #i3662# - enlarge top of column body frame's printing area + // in sections to top of section frame. + const bool bColBodyInSection = IsBodyFrm() && + !IsPageBodyFrm() && + GetUpper()->GetUpper()->IsSctFrm(); + if ( bColBodyInSection ) + { + aOriginal.Top( GetUpper()->GetUpper()->Frm().Top() ); + } + ::SwAlignRect( aOriginal, pGlobalShell ); if ( !aOriginal.IsOver( rRect ) ) @@ -4184,7 +4621,13 @@ void SwLayoutFrm::PaintSubsidiaryLines( const SwPageFrm *pPage, SwRect aOut( aOriginal ); aOut._Intersection( rRect ); - aOut.Intersection( PaintArea() ); + // OD 13.02.2003 #i3662# - do not intersect *enlarged* column body frame's + // printing area with the paint area of the body frame. Otherwise enlargement + // will get lost. + if ( !bColBodyInSection ) + { + aOut.Intersection( PaintArea() ); + } const SwTwips nRight = aOut.Right(); const SwTwips nBottom= aOut.Bottom(); diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index dfa982ed3942..d0ea64989fa7 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sectfrm.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: od $ $Date: 2002-11-15 11:00:24 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1214,6 +1214,13 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr ) //Inhalt selbst verantwortlich. BOOL bMaximize = ToMaximize( FALSE ); + // Column widths have to be adjusted before calling _CheckClipping. + // _CheckClipping can cause the formatting of the lower frames + // which still have a width of 0. + const sal_Bool bHasColumns = Lower() && Lower()->IsColumnFrm(); + if ( bHasColumns && Lower()->GetNext() ) + AdjustColumns( 0, FALSE ); + if( GetUpper() ) { long nWidth = (GetUpper()->Prt().*fnRect->fnGetWidth)(); @@ -1228,13 +1235,8 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr ) } //Breite der Spalten pruefen und ggf. einstellen. - if ( Lower() && Lower()->IsColumnFrm() ) - { - if( Lower()->GetNext() ) - AdjustColumns( 0, FALSE ); - else if( bMaximize ) - ((SwColumnFrm*)Lower())->Lower()->Calc(); - } + if ( bHasColumns && ! Lower()->GetNext() && bMaximize ) + ((SwColumnFrm*)Lower())->Lower()->Calc(); if ( !bMaximize ) { @@ -1674,7 +1676,12 @@ SwLayoutFrm *SwFrm::GetPrevSctLeaf( MakePageType eMakeFtn ) pLayLeaf = pLayLeaf->GetPrevLayoutLeaf(); else if ( bBody && pLayLeaf->IsInDocBody() ) { - if ( pLayLeaf->Lower() ) + // If there is a pLayLeaf has a lower pLayLeaf is the frame we are looking for. + // Exception: pLayLeaf->Lower() is a zombie section frame + const SwFrm* pTmp = pLayLeaf->Lower(); + if ( pTmp && + ( ! pTmp->IsSctFrm() || + ((SwSectionFrm*)pTmp)->GetSection() ) ) break; pPrevLeaf = pLayLeaf; pLayLeaf = pLayLeaf->GetPrevLayoutLeaf(); diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 5bbdf5d615f8..edbf5086c01a 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabfrm.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.32 $ * - * last change: $Author: fme $ $Date: 2002-11-13 09:45:35 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -238,16 +238,11 @@ void SwTabFrm::RegistFlys() |*************************************************************************/ SwTwips SwTabFrm::Split( const SwTwips nCutPos ) { -#ifdef VERTICAL_LAYOUT SWRECTFN( this ) ASSERT( bVert ? nCutPos >= Frm().Left() && nCutPos <= Frm().Left() + Frm().Width() : nCutPos >= Frm().Top() && nCutPos <= Frm().Bottom(), "SplitLine out of table." ); -#else - ASSERT( nCutPos >= Frm().Top() && nCutPos <= Frm().Bottom(), - "SplitLine ausserhalb der Tabelle." ); -#endif //Um die Positionen der Zellen mit der CutPos zu vergleichen muessen sie //ausgehend von der Tabelle nacheinander berechnet werden. Sie koennen @@ -256,22 +251,14 @@ SwTwips SwTabFrm::Split( const SwTwips nCutPos ) SwFrm *pRow = Lower(); if( !pRow ) return 0; -#ifdef VERTICAL_LAYOUT SwTwips nCut = (*fnRect->fnYDiff)( nCutPos, (Frm().*fnRect->fnGetTop)() ); nCut -= (this->*fnRect->fnGetTopMargin)(); SwTwips nRowPos = (pRow->Frm().*fnRect->fnGetHeight)(); -#else - SwTwips nRowPos = Frm().Top() + Prt().Top() + pRow->Frm().Height(); -#endif const BOOL bRepeat = GetTable()->IsHeadlineRepeat(); pRow = pRow->GetNext(); if( pRow && bRepeat ) { -#ifdef VERTICAL_LAYOUT nRowPos += (pRow->Frm().*fnRect->fnGetHeight)(); -#else - nRowPos += pRow->Frm().Height(); -#endif pRow = pRow->GetNext(); } // No break before the first row and, in case of repeated headlines, @@ -279,15 +266,9 @@ SwTwips SwTabFrm::Split( const SwTwips nCutPos ) if( !pRow ) return 0; -#ifdef VERTICAL_LAYOUT while( pRow && nCut >= ( nRowPos + (pRow->Frm().*fnRect->fnGetHeight)() ) ) { nRowPos += (pRow->Frm().*fnRect->fnGetHeight)(); -#else - while ( pRow && nCutPos > (nRowPos + pRow->Frm().Height() - 1) ) - { - nRowPos += pRow->Frm().Height(); -#endif pRow = pRow->GetNext(); } @@ -354,11 +335,7 @@ SwTwips SwTabFrm::Split( const SwTwips nCutPos ) while ( pRow ) { pNxt = pRow->GetNext(); -#ifdef VERTICAL_LAYOUT nRet += (pRow->Frm().*fnRect->fnGetHeight)(); -#else - nRet += pRow->Frm().Height(); -#endif pRow->Remove(); pRow->InsertBehind( pFoll, pPrv ); pRow->_InvalidateAll(); @@ -374,7 +351,6 @@ SwTwips SwTabFrm::Split( const SwTwips nCutPos ) while ( pRow ) { pNxt = pRow->GetNext(); -#ifdef VERTICAL_LAYOUT nRet += (pRow->Frm().*fnRect->fnGetHeight)(); pRow->Remove(); pRow->Paste( pFoll, pPrv ); @@ -385,16 +361,6 @@ SwTwips SwTabFrm::Split( const SwTwips nCutPos ) ASSERT( !bNewFollow || !(pFoll->Frm().*fnRect->fnGetHeight)(), "Dont care about Performance"); Shrink( nRet ); -#else - nRet += pRow->Frm().Height(); - pRow->Remove(); - pRow->Paste( pFoll, pPrv ); - pRow = pNxt; - } - } - ASSERT( !bNewFollow || !pFoll->Frm().Height(), "Dont care about Performance"); - Shrink( nRet PHEIGHT ); -#endif return nRet; } @@ -405,9 +371,7 @@ SwTwips SwTabFrm::Join() if ( !pFoll->IsJoinLocked() ) { -#ifdef VERTICAL_LAYOUT SWRECTFN( this ) -#endif pFoll->Cut(); //Erst ausschneiden um unuetze Benachrichtigungen zu //minimieren. @@ -423,17 +387,11 @@ SwTwips SwTabFrm::Join() while ( pRow ) { pNxt = pRow->GetNext(); -#ifdef VERTICAL_LAYOUT nHeight += (pRow->Frm().*fnRect->fnGetHeight)(); -#else - nHeight += pRow->Frm().Height(); -#endif pRow->Remove(); pRow->_InvalidateAll(); pRow->InsertBehind( this, pPrv ); -#ifdef VERTICAL_LAYOUT pRow->CheckDirChange(); -#endif pPrv = pRow; pRow = pNxt; } @@ -454,9 +412,9 @@ SwTwips SwTabFrm::Join() |*************************************************************************/ void MA_FASTCALL SwInvalidatePositions( SwFrm *pFrm, long nBottom ) { -#ifdef VERTICAL_LAYOUT + // LONG_MAX == nBottom means we have to calculate all + BOOL bAll = LONG_MAX == nBottom; SWRECTFN( pFrm ) -#endif do { pFrm->_InvalidatePos(); pFrm->_InvalidateSize(); @@ -468,32 +426,25 @@ void MA_FASTCALL SwInvalidatePositions( SwFrm *pFrm, long nBottom ) else pFrm->Prepare( PREP_ADJUST_FRM ); pFrm = pFrm->GetNext(); -#ifdef VERTICAL_LAYOUT - } while ( pFrm && (*fnRect->fnYDiff)( (pFrm->Frm().*fnRect->fnGetTop)(), - nBottom ) < 0 ); -#else - } while ( pFrm && pFrm->Frm().Top() < nBottom ); -#endif + } while ( pFrm && + ( bAll || + (*fnRect->fnYDiff)( (pFrm->Frm().*fnRect->fnGetTop)(), nBottom ) < 0 ) ); } BOOL MA_FASTCALL lcl_CalcLowers( SwLayoutFrm *pLay, long nBottom ) { + // LONG_MAX == nBottom means we have to calculate all + BOOL bAll = LONG_MAX == nBottom; BOOL bRet = FALSE; SwCntntFrm *pCnt = pLay->ContainsCntnt(); -#ifdef VERTICAL_LAYOUT SWRECTFN( pLay ) -#endif while ( pCnt && pLay->GetUpper()->IsAnLower( pCnt ) ) { bRet |= !pCnt->IsValid(); pCnt->CalcFlys( FALSE ); pCnt->Calc(); pCnt->GetUpper()->Calc(); -#ifdef VERTICAL_LAYOUT - if( (*fnRect->fnYDiff)((pCnt->Frm().*fnRect->fnGetTop)(), nBottom) > 0 ) -#else - if ( pCnt->Frm().Top() > nBottom ) -#endif + if( ! bAll && (*fnRect->fnYDiff)((pCnt->Frm().*fnRect->fnGetTop)(), nBottom) > 0 ) break; pCnt = pCnt->GetNextCntntFrm(); } @@ -502,6 +453,8 @@ BOOL MA_FASTCALL lcl_CalcLowers( SwLayoutFrm *pLay, long nBottom ) BOOL MA_FASTCALL lcl_InnerCalcLayout( SwFrm *pFrm, long nBottom ) { + // LONG_MAX == nBottom means we have to calculate all + BOOL bAll = LONG_MAX == nBottom; BOOL bRet = FALSE; const SwFrm* pOldUp = pFrm->GetUpper(); SWRECTFN( pFrm ) @@ -516,7 +469,8 @@ BOOL MA_FASTCALL lcl_InnerCalcLayout( SwFrm *pFrm, long nBottom ) } pFrm = pFrm->GetNext(); } while( pFrm && - (*fnRect->fnYDiff)((pFrm->Frm().*fnRect->fnGetTop)(), nBottom) < 0 + ( bAll || + (*fnRect->fnYDiff)((pFrm->Frm().*fnRect->fnGetTop)(), nBottom) < 0 ) && pFrm->GetUpper() == pOldUp ); return bRet; } @@ -540,7 +494,6 @@ void MA_FASTCALL lcl_CalcLayout( SwLayoutFrm *pLay, long nBottom ) void MA_FASTCALL lcl_FirstTabCalc( SwTabFrm *pTab ) { -#ifdef VERTICAL_LAYOUT SWRECTFN( pTab ) if ( !pTab->IsFollow() && !pTab->GetTable()->IsTblComplex() ) { @@ -582,53 +535,6 @@ void MA_FASTCALL lcl_FirstTabCalc( SwTabFrm *pTab ) if ( pTab->GetFmt()->GetDoc()->IsBrowseMode() ) nBottom += pUp->Grow( LONG_MAX, TRUE ); lcl_CalcLowers( (SwLayoutFrm*)pTab->Lower(), nBottom ); -#else - //Ersteinmal koennen wir die Strukturen auf die richtige Groesse - //bringen. - if ( !pTab->IsFollow() && !pTab->GetTable()->IsTblComplex() ) - { - SwLayoutFrm *pRow = (SwLayoutFrm*)pTab->Lower(); - do - { - SwLayoutFrm *pCell = (SwLayoutFrm*)pRow->Lower(); - SwFrm *pCnt = pCell->Lower(); - pCnt->Calc(); - const long nCellHeight = pCell->Frm().Height(); - const long nCellY = pCell->Frm().Top()-1; - const long nCntHeight = pCnt->Frm().Height(); - const long nCntY = pCnt->Frm().Top()-1; - if ( 0 != (pCell = (SwLayoutFrm*)pCell->GetNext()) ) - do - { pCell->Frm().SSize().Height() = - pCell->Prt().SSize().Height() = nCellHeight; - pCell->Frm().Pos().Y() = nCellY; - pCell->_InvalidateAll(); - - pCnt = pCell->Lower(); - pCnt->Frm().SSize().Height() = - pCnt->Prt().SSize().Height() = nCntHeight; - pCnt->Frm().Pos().Y() = nCntY; - pCnt->_InvalidateAll(); - - pCell = (SwLayoutFrm*)pCell->GetNext(); - } while ( pCell ); - - SwTwips nRowTop = pRow->Frm().Top(); - SwTwips nUpBot = pTab->GetUpper()->Frm().Bottom(); - if( nUpBot < nRowTop ) - break; - pRow = (SwLayoutFrm*)pRow->GetNext(); - - } while ( pRow ); - } - //MA 28. Nov. 95: einen weiteren habe ich noch: Es braucht - //nur soweit formatiert werden, wie Platz vorhanden ist. - SwFrm *pUp = pTab->GetUpper(); - long nBottom = pUp->Prt().Bottom() + pUp->Frm().Top(); - if ( pTab->GetFmt()->GetDoc()->IsBrowseMode() ) - nBottom += pUp->Grow( LONG_MAX PHEIGHT, TRUE ); - lcl_CalcLowers( (SwLayoutFrm*)pTab->Lower(), nBottom ); -#endif } void MA_FASTCALL lcl_Recalc( SwTabFrm *pTab, @@ -637,7 +543,6 @@ void MA_FASTCALL lcl_Recalc( SwTabFrm *pTab, { if ( pTab->Lower() ) { -#ifdef VERTICAL_LAYOUT SWRECTFN( pTab ) const SwTwips nOldHeight = (pTab->Frm().*fnRect->fnGetHeight)(); const SwTwips nOldWidth = (pTab->Frm().*fnRect->fnGetWidth)(); @@ -658,25 +563,6 @@ void MA_FASTCALL lcl_Recalc( SwTabFrm *pTab, rNotify.AddWidthOfst( nNew - nOldWidth ); else if ( nOldWidth > nNew ) rNotify.SubtractWidthOfst( nOldWidth - nNew ); -#else - const SwTwips nOldHeight = pTab->Frm().Height(); - const SwTwips nOldWidth = pTab->Frm().Width(); - if ( !pFirstRow ) - { - pFirstRow = (SwLayoutFrm*)pTab->Lower(); - rNotify.SetLowersComplete( TRUE ); - } - ::SwInvalidatePositions( pFirstRow, LONG_MAX ); - ::lcl_CalcLayout( pFirstRow, LONG_MAX ); - if ( nOldHeight < pTab->Frm().Height() ) - rNotify.AddHeightOfst( pTab->Frm().Height() - nOldHeight ); - else if ( nOldHeight > pTab->Frm().Height() ) - rNotify.SubtractHeightOfst( nOldHeight - pTab->Frm().Height() ); - if ( nOldWidth < pTab->Frm().Width() ) - rNotify.AddWidthOfst( pTab->Frm().Width() - nOldWidth ); - else if ( nOldWidth > pTab->Frm().Width() ) - rNotify.SubtractWidthOfst( nOldWidth - pTab->Frm().Width() ); -#endif } } @@ -767,7 +653,7 @@ void SwTabFrm::MakeAll() delete pAccess; bCalcLowers |= pLayout->Resize( pLayout->GetBrowseWidthByTabFrm( *this ), FALSE ); - pAccess= new SwBorderAttrAccess( SwFrm::GetCache(), this ); + pAccess = new SwBorderAttrAccess( SwFrm::GetCache(), this ); pAttrs = pAccess->Get(); } @@ -1146,6 +1032,8 @@ void SwTabFrm::MakeAll() //Follow gleich gueltig gemacht werden. if ( GetFollow() ) { + SWRECTFN( GetFollow() ) + static BYTE nStack = 0; if ( !StackHack::IsLocked() && nStack < 4 ) { @@ -1158,7 +1046,7 @@ void SwTabFrm::MakeAll() pAttrs = pAccess->Get(); ((SwTabFrm*)GetFollow())->SetLowersFormatted(FALSE); ::lcl_CalcLayout((SwLayoutFrm*)GetFollow()->Lower(), - GetFollow()->GetUpper()->Frm().Bottom() ); + (GetFollow()->GetUpper()->Frm().*fnRect->fnGetBottom)() ); if ( !GetFollow()->GetFollow() ) { SwFrm *pNxt = ((SwFrm*)GetFollow())->FindNext(); @@ -1255,7 +1143,6 @@ BOOL SwTabFrm::CalcFlyOffsets( SwTwips& rUpper, const SwFlyFrm* pMyFly = FindFlyFrm(); if ( pPage->GetSortedObjs() ) { -#ifdef VERTICAL_LAYOUT SWRECTFN( this ) long nPrtPos = (Frm().*fnRect->fnGetTop)(); nPrtPos = (*fnRect->fnYInc)( nPrtPos, rUpper ); @@ -1272,9 +1159,10 @@ BOOL SwTabFrm::CalcFlyOffsets( SwTwips& rUpper, const SwRect aFlyRect = pFly->AddSpacesToFrm(); if ( WEIT_WECH != (pFly->Frm().*fnRect->fnGetTop)() && pFly->IsFlyAtCntFrm() && aFlyRect.IsOver( aRect ) && + // OD 25.02.2003 #i9040# - use '<=' instead of '<' (*fnRect->fnYDiff)( (pFly->GetAnchor()->Frm().*fnRect->fnGetBottom)(), - (Frm().*fnRect->fnGetTop)() ) < 0 && + (Frm().*fnRect->fnGetTop)() ) <= 0 && !IsAnLower( pFly ) && !pFly->IsAnLower( this ) && ( !pMyFly || pMyFly->IsAnLower( pFly ) ) && pPage->GetPhyPageNum() >= @@ -1313,58 +1201,6 @@ BOOL SwTabFrm::CalcFlyOffsets( SwTwips& rUpper, } } rUpper = (*fnRect->fnYDiff)( nPrtPos, (Frm().*fnRect->fnGetTop)() ); -#else - long nPrtPos = Frm().Top() + rUpper; - SwRect aRect( Frm() ); - if ( Prt().Top() - rUpper > 0 ) - aRect.SSize().Height() -= Prt().Top() - rUpper; - for ( USHORT i = 0; i < pPage->GetSortedObjs()->Count(); ++i ) - { - SdrObject *pObj = (*pPage->GetSortedObjs())[i]; - if ( pObj->IsWriterFlyFrame() ) - { - SwFlyFrm *pFly = ((SwVirtFlyDrawObj*)pObj)->GetFlyFrm(); - const SwRect aFlyRect = pFly->AddSpacesToFrm(); - if ( WEIT_WECH != pFly->Frm().Top() && - pFly->IsFlyAtCntFrm() && aFlyRect.IsOver( aRect ) && - pFly->GetAnchor()->Frm().Bottom() < Frm().Top() && - !IsAnLower( pFly ) && !pFly->IsAnLower( this ) && - ( !pMyFly || pMyFly->IsAnLower( pFly ) ) && - pPage->GetPhyPageNum() >= - pFly->GetAnchor()->FindPageFrm()->GetPhyPageNum() ) - { - const SwFmtSurround &rSur = pFly->GetFmt()->GetSurround(); - const SwFmtHoriOrient &rHori= pFly->GetFmt()->GetHoriOrient(); - if ( SURROUND_NONE == rSur.GetSurround() ) - { - nPrtPos = Max( nPrtPos, aFlyRect.Bottom() + 1L ); - bInvalidatePrtArea = TRUE; - } - if ( (SURROUND_RIGHT == rSur.GetSurround() || - SURROUND_PARALLEL == rSur.GetSurround())&& - HORI_LEFT == rHori.GetHoriOrient() ) - { - //Der Rahmen kann auch noch einem anderen Rahmen - //ausgewichen sein. - const long nWidth = aFlyRect.Width() + - aFlyRect.Left() - pFly->GetAnchor()->Frm().Left(); - rLeftOffset = Max( rLeftOffset, nWidth ); - bInvalidatePrtArea = TRUE; - } - if ( (SURROUND_LEFT == rSur.GetSurround() || - SURROUND_PARALLEL == rSur.GetSurround())&& - HORI_RIGHT == rHori.GetHoriOrient() ) - { - const long nWidth = aFlyRect.Width() + - pFly->GetAnchor()->Frm().Right() - aFlyRect.Right(); - rRightOffset = Max( rRightOffset, nWidth ); - bInvalidatePrtArea = TRUE; - } - } - } - } - rUpper = nPrtPos - Frm().Top(); -#endif } return bInvalidatePrtArea; @@ -1384,7 +1220,6 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs ) { ASSERT( pAttrs, "TabFrm::Format, pAttrs ist 0." ); -#ifdef VERTICAL_LAYOUT SWRECTFN( this ) if ( !bValidSize ) { @@ -1393,11 +1228,6 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs ) if( nDiff ) (aFrm.*fnRect->fnAddRight)( nDiff ); } -#else - //FixSize einstellen - if ( !bValidSize ) - aFrm.Width( GetUpper()->Prt().Width() ); -#endif //VarSize ist immer die Hoehe. //Fuer den oberen/unteren Rand gelten die selben Regeln wie fuer @@ -1429,13 +1259,8 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs ) //Wenn das Adjustment 0 ist, so werden die Rander anhand des //Randattributes eingestellt. -#ifdef VERTICAL_LAYOUT const SwTwips nOldHeight = (Prt().*fnRect->fnGetHeight)(); const SwTwips nMax = (aFrm.*fnRect->fnGetWidth)(); -#else - const SwTwips nOldHeight = Prt().Height(); - const SwTwips nMax = aFrm.Width(); -#endif SwTwips nLeft = pAttrs->CalcLeftLine(); SwTwips nRight = pAttrs->CalcRightLine(); @@ -1515,7 +1340,8 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs ) nLeft = 0; nLeft += nLeftOffset; } - nRight = pAttrs->CalcRight(); + // OD 23.01.2003 #106895# - add 1st param to <SwBorderAttrs::CalcRight(..)> + nRight = pAttrs->CalcRight( this ); if( nRightOffset ) { if( nRight < 0 ) @@ -1541,26 +1367,12 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs ) default: ASSERT( FALSE, "Ungueltige orientation fuer Table." ); } -#ifdef VERTICAL_LAYOUT (this->*fnRect->fnSetYMargins)( nUpper, nLower ); if( (nMax - MINLAY) < (nLeft + nRight) ) (this->*fnRect->fnSetXMargins)( 0, 0 ); else (this->*fnRect->fnSetXMargins)( nLeft, nRight ); -#else - Prt().Top( nUpper ); - Prt().Height( aFrm.Height() - (nUpper + nLower) ); - if ( (nMax - MINLAY) < (nLeft + nRight) ) - { //Wenn die Raender garnicht passen lasse ich sie lieber gleich weg. - Prt().Left( 0 ); - Prt().Width( nMax ); - } - else - { - Prt().Left( nLeft ); - Prt().Width( nMax - (nLeft + nRight) ); - } -#endif + ViewShell *pSh; if ( bCheckBrowseWidth && GetFmt()->GetDoc()->IsBrowseMode() && GetUpper()->IsPageBodyFrm() && // nur PageBodyFrms, nicht etwa ColBodyFrms @@ -1576,11 +1388,7 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs ) Prt().Width( Min( nWidth, Prt().Width() ) ); } -#ifdef VERTICAL_LAYOUT if ( nOldHeight != (Prt().*fnRect->fnGetHeight)() ) -#else - if ( nOldHeight != Prt().Height() ) -#endif bValidSize = FALSE; } @@ -1592,21 +1400,14 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs ) SwTwips nRemaining = 0, nDiff; SwFrm *pFrm = pLower; while ( pFrm ) -#ifdef VERTICAL_LAYOUT - { nRemaining += (pFrm->Frm().*fnRect->fnGetHeight)(); -#else - { nRemaining += pFrm->Frm().Height(); -#endif + { + nRemaining += (pFrm->Frm().*fnRect->fnGetHeight)(); pFrm = pFrm->GetNext(); } //Jetzt noch die Raender addieren nRemaining += nUpper + nLower; -#ifdef VERTICAL_LAYOUT nDiff = (Frm().*fnRect->fnGetHeight)() - nRemaining; -#else - nDiff = Frm().Height() - nRemaining; -#endif if ( nDiff > 0 ) Shrink( nDiff PHEIGHT ); else if ( nDiff < 0 ) @@ -1621,24 +1422,12 @@ void SwTabFrm::Format( const SwBorderAttrs *pAttrs ) |* Letzte Aenderung MA 23. Sep. 96 |* |*************************************************************************/ -#ifdef VERTICAL_LAYOUT SwTwips SwTabFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) { SWRECTFN( this ) SwTwips nHeight =(Frm().*fnRect->fnGetHeight)(); if( nHeight > 0 && nDist > ( LONG_MAX - nHeight ) ) nDist = LONG_MAX - nHeight; -#else -SwTwips SwTabFrm::GrowFrm( SwTwips nDist, const SzPtr pDirection, - BOOL bTst, BOOL bInfo ) -{ - if( pDirection == pWidth ) - return 0; - - if ( Frm().SSize().*pDirection > 0 && - nDist > (LONG_MAX - Frm().SSize().*pDirection) ) - nDist = LONG_MAX - Frm().SSize().*pDirection; -#endif //Tabelle waechst immer (sie kann ja ggf. aufgespalten werden). if ( !bTst ) @@ -1647,7 +1436,6 @@ SwTwips SwTabFrm::GrowFrm( SwTwips nDist, const SzPtr pDirection, { //Der Upper wird nur soweit wie notwendig gegrowed. In nReal wird erstmal //die bereits zur Verfuegung stehende Strecke bereitgestellt. -#ifdef VERTICAL_LAYOUT SwTwips nReal = (GetUpper()->Prt().*fnRect->fnGetHeight)(); SwFrm *pFrm = GetUpper()->Lower(); while ( pFrm ) @@ -1655,9 +1443,7 @@ SwTwips SwTabFrm::GrowFrm( SwTwips nDist, const SzPtr pDirection, pFrm = pFrm->GetNext(); } -#ifdef ACCESSIBLE_LAYOUT SwRect aOldFrm( Frm() ); -#endif nHeight = (Frm().*fnRect->fnGetHeight)(); (Frm().*fnRect->fnSetHeight)( nHeight + nDist ); if( IsVertical() && !IsReverse() ) @@ -1665,52 +1451,27 @@ SwTwips SwTabFrm::GrowFrm( SwTwips nDist, const SzPtr pDirection, if ( nReal < nDist ) GetUpper()->Grow( nDist - (nReal>0 ? nReal : 0), bTst, bInfo ); -#ifdef ACCESSIBLE_LAYOUT SwRootFrm *pRootFrm = FindRootFrm(); if( pRootFrm && pRootFrm->IsAnyShellAccessible() && pRootFrm->GetCurrShell() ) { pRootFrm->GetCurrShell()->Imp()->MoveAccessibleFrm( this, aOldFrm ); } -#endif } else { ASSERT( !this, "Table without Upper" ); -#ifdef ACCESSIBLE_LAYOUT SwRect aOldFrm( Frm() ); -#endif nHeight = (Frm().*fnRect->fnGetHeight)(); (Frm().*fnRect->fnSetHeight)( nHeight + nDist ); if( IsVertical() && !IsReverse() ) Frm().Pos().X() -= nDist; -#ifdef ACCESSIBLE_LAYOUT SwRootFrm *pRootFrm = FindRootFrm(); if( pRootFrm && pRootFrm->IsAnyShellAccessible() && pRootFrm->GetCurrShell() ) { pRootFrm->GetCurrShell()->Imp()->MoveAccessibleFrm( this, aOldFrm ); } -#endif -#else - SwTwips nReal = GetUpper()->Prt().SSize().*pDirection; - SwFrm *pFrm = GetUpper()->Lower(); - while ( pFrm ) - { nReal -= pFrm->Frm().SSize().*pDirection; - pFrm = pFrm->GetNext(); - } - - Frm().SSize().*pDirection += nDist; - - if ( nReal < nDist ) - GetUpper()->Grow( nDist - (nReal > 0 ? nReal : 0), - pDirection, bTst, bInfo ); - } - else - { - ASSERT( !this, "Table without Upper" ); - Frm().SSize().*pDirection += nDist; -#endif } SwPageFrm *pPage = FindPageFrm(); @@ -2032,7 +1793,6 @@ BOOL SwTabFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, BOOL bHead, BOOL &rReform BOOL bMoveAnyway = FALSE; SwTwips nSpace = 0; -#ifdef VERTICAL_LAYOUT SWRECTFN( this ) if ( !SwFlowFrm::IsMoveBwdJump() ) { @@ -2077,41 +1837,6 @@ BOOL SwTabFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, BOOL bHead, BOOL &rReform nHeight += (Lower()->Frm().*fnRect->fnGetHeight)(); return nHeight <= nSpace; } -#else - if ( !SwFlowFrm::IsMoveBwdJump() && - Abs(pNewUpper->Prt().Width() - GetUpper()->Prt().Width()) < 2 ) - { - if ( FALSE == (bMoveAnyway = BwdMoveNecessary( pOldPage, Frm() ) > 1) ) - { - //Das Rechteck, in dem ich landen wuerde berechenen. - SwRect aRect( pNewUpper->Prt() ); - aRect.Pos() += pNewUpper->Frm().Pos(); - const SwFrm *pPrevFrm = pNewUpper->Lower(); - while ( pPrevFrm ) - { - aRect.Top( pPrevFrm->Frm().Bottom() ); - pPrevFrm = pPrevFrm->GetNext(); - } - bMoveAnyway = BwdMoveNecessary( pNewPage, aRect) > 1; - nSpace = aRect.Height(); - if ( GetFmt()->GetDoc()->IsBrowseMode() ) - nSpace += pNewUpper->Grow( LONG_MAX PHEIGHT, TRUE ); - } - } - else if ( SwFlowFrm::IsMoveBwdJump() || !bLockBackMove ) - bMoveAnyway = TRUE; - - if ( bMoveAnyway ) - return rReformat = TRUE; - else if ( !bLockBackMove ) - { const BOOL bRepeat = GetTable()->IsHeadlineRepeat(); - SwTwips nHeight = bRepeat && Lower()->GetNext() ? - Lower()->GetNext()->Frm().Height() : Lower()->Frm().Height(); - if ( bHead && bRepeat && Lower()->GetNext() ) - nHeight += Lower()->Frm().Height(); - return nHeight <= nSpace; - } -#endif } return FALSE; } @@ -2180,9 +1905,7 @@ void SwTabFrm::Cut() //Erst removen, dann Upper Shrinken. SwLayoutFrm *pUp = GetUpper(); -#ifdef VERTICAL_LAYOUT SWRECTFN( this ) -#endif Remove(); if ( pUp ) { @@ -2197,12 +1920,30 @@ void SwTabFrm::Cut() pSct->_InvalidateSize(); } } -#ifdef VERTICAL_LAYOUT else if( (Frm().*fnRect->fnGetHeight)() ) -#else - else if ( Frm().Height() ) -#endif + { + // OD 24.02.2003 #104992# - unlock section the table frame was in. + // Otherwise, the section will not shrink. + // The section will be locked in this situation, if table is + // converted to text and the table was the only content in the + // section beside a footnote. + // Note: lock state will be restored. + bool bOldLock; + if ( pSct ) + { + bOldLock = pSct->IsColLocked() ? true : false; + pSct->ColUnlock(); + } pUp->Shrink( Frm().Height() PHEIGHT ); + // OD 24.02.2003 #104992# - restore section lock state. + if ( pSct ) + { + if ( bOldLock ) + { + pSct->ColLock(); + } + } + } } if ( pPage && !IsFollow() && pPage->GetUpper() ) @@ -2241,20 +1982,12 @@ void SwTabFrm::Paste( SwFrm* pParent, SwFrm* pSibling ) GetNext()->InvalidatePage( pPage ); } -#ifdef VERTICAL_LAYOUT SWRECTFN( this ) if( (Frm().*fnRect->fnGetHeight)() ) pParent->Grow( (Frm().*fnRect->fnGetHeight)() ); if( (Frm().*fnRect->fnGetWidth)() != (pParent->Prt().*fnRect->fnGetWidth)() ) Prepare( PREP_FIXSIZE_CHG ); -#else - if ( Frm().Height() ) - pParent->Grow( Frm().Height() PHEIGHT ); - - if ( Frm().Width() != pParent->Prt().Width() ) - Prepare( PREP_FIXSIZE_CHG ); -#endif if ( GetPrev() ) { if ( !IsFollow() ) @@ -2286,7 +2019,6 @@ void SwTabFrm::Paste( SwFrm* pParent, SwFrm* pSibling ) } } -#ifdef VERTICAL_LAYOUT /************************************************************************* |* |* SwTabFrm::Prepare() @@ -2300,7 +2032,6 @@ void SwTabFrm::Prepare( const PrepareHint eHint, const void *, BOOL ) if( PREP_BOSS_CHGD == eHint ) CheckDirChange(); } -#endif /************************************************************************* |* @@ -2323,9 +2054,6 @@ SwRowFrm::SwRowFrm( const SwTableLine &rLine ): { SwCellFrm *pNew = new SwCellFrm( *rBoxes[i] ); pNew->InsertBehind( this, pPrev ); -#ifndef VERTICAL_LAYOUT - pNew->bVarHeight = FALSE; -#endif pPrev = pNew; } } @@ -2413,9 +2141,7 @@ void SwRowFrm::MakeAll() |*************************************************************************/ long MA_FASTCALL CalcHeightWidthFlys( const SwFrm *pFrm ) { -#ifdef VERTICAL_LAYOUT SWRECTFN( pFrm ) -#endif long nHeight = 0; const SwFrm* pTmp = pFrm->IsSctFrm() ? ((SwSectionFrm*)pFrm)->ContainsCntnt() : pFrm; @@ -2466,9 +2192,7 @@ SwTwips MA_FASTCALL lcl_CalcMinRowHeight( SwLayoutFrm *pRow ); SwTwips MA_FASTCALL lcl_CalcMinCellHeight( SwLayoutFrm *pCell, const SwBorderAttrs *pAttrs = 0 ) { -#ifdef VERTICAL_LAYOUT SWRECTFN( pCell ) -#endif SwTwips nHeight = 0; SwFrm *pLow = pCell->Lower(); if ( pLow ) @@ -2478,14 +2202,9 @@ SwTwips MA_FASTCALL lcl_CalcMinCellHeight( SwLayoutFrm *pCell, { if( pLow->IsCntntFrm() || pLow->IsSctFrm() ) { -#ifdef VERTICAL_LAYOUT long nLowHeight = (pLow->Frm().*fnRect->fnGetHeight)(); nHeight += nLowHeight; nFlyAdd = Max( 0L, nFlyAdd - nLowHeight ); -#else - nHeight += pLow->Frm().Height(); - nFlyAdd = Max( 0L, nFlyAdd - pLow->Frm().Height() ); -#endif nFlyAdd = Max( nFlyAdd, ::CalcHeightWidthFlys( pLow ) ); } else @@ -2512,14 +2231,9 @@ SwTwips MA_FASTCALL lcl_CalcMinCellHeight( SwLayoutFrm *pCell, SwTwips MA_FASTCALL lcl_CalcMinRowHeight( SwLayoutFrm *pRow ) { -#ifdef VERTICAL_LAYOUT SWRECTFN( pRow ) if ( pRow->HasFixSize() ) return (pRow->Frm().*fnRect->fnGetHeight)(); -#else - if ( pRow->HasFixSize( pHeight ) ) - return pRow->Frm().Height(); -#endif SwTwips nHeight = 0; SwLayoutFrm *pLow = (SwLayoutFrm*)pRow->Lower(); @@ -2538,9 +2252,7 @@ SwTwips MA_FASTCALL lcl_CalcMinRowHeight( SwLayoutFrm *pRow ) void SwRowFrm::Format( const SwBorderAttrs *pAttrs ) { -#ifdef VERTICAL_LAYOUT SWRECTFN( this ) -#endif ASSERT( pAttrs, "SwRowFrm::Format ohne Attrs." ); const BOOL bFix = BFIXHEIGHT; @@ -2560,7 +2272,6 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs ) { bValidSize = TRUE; -#ifdef VERTICAL_LAYOUT #ifndef PRODUCT if ( HasFixSize() ) { @@ -2571,18 +2282,6 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs ) const SwTwips nDiff = (Frm().*fnRect->fnGetHeight)() - (HasFixSize() ? pAttrs->GetSize().Height() : ::lcl_CalcMinRowHeight( this )); -#else -#ifndef PRODUCT - if ( HasFixSize( pHeight ) ) - { - const SwFmtFrmSize &rFrmSize = GetFmt()->GetFrmSize(); - ASSERT( rFrmSize.GetSize().Height() > 0, "Hat ihn" ); - } -#endif - const SwTwips nDiff = Frm().Height() - (HasFixSize( pHeight ) ? - pAttrs->GetSize().Height() : - ::lcl_CalcMinRowHeight( this )); -#endif if ( nDiff ) { BFIXHEIGHT = FALSE; @@ -2596,17 +2295,10 @@ void SwRowFrm::Format( const SwBorderAttrs *pAttrs ) if ( !GetNext() ) { //Der letzte fuellt den verbleibenden Raum im Upper aus. -#ifdef VERTICAL_LAYOUT SwTwips nDiff = (GetUpper()->Prt().*fnRect->fnGetHeight)(); SwFrm *pSibling = GetUpper()->Lower(); do { nDiff -= (pSibling->Frm().*fnRect->fnGetHeight)(); -#else - SwTwips nDiff = GetUpper()->Prt().Height(); - SwFrm *pSibling = GetUpper()->Lower(); - do - { nDiff -= pSibling->Frm().Height(); -#endif pSibling = pSibling->GetNext(); } while ( pSibling ); if ( nDiff > 0 ) @@ -2632,21 +2324,15 @@ void SwRowFrm::AdjustCells( const SwTwips nHeight, const BOOL bHeight ) SwFrm *pFrm = Lower(); if ( bHeight ) { -#ifdef ACCESSIBLE_LAYOUT SwRootFrm *pRootFrm = 0; -#endif -#ifdef VERTICAL_LAYOUT SWRECTFN( this ) while ( pFrm ) { long nDiff = nHeight - (pFrm->Frm().*fnRect->fnGetHeight)(); if( nDiff ) { -#ifdef ACCESSIBLE_LAYOUT SwRect aOldFrm( pFrm->Frm() ); -#endif (pFrm->Frm().*fnRect->fnAddBottom)( nDiff ); -#ifdef ACCESSIBLE_LAYOUT if( !pRootFrm ) pRootFrm = FindRootFrm(); if( pRootFrm && pRootFrm->IsAnyShellAccessible() && @@ -2654,13 +2340,6 @@ void SwRowFrm::AdjustCells( const SwTwips nHeight, const BOOL bHeight ) { pRootFrm->GetCurrShell()->Imp()->MoveAccessibleFrm( pFrm, aOldFrm ); } -#endif -#else - while ( pFrm ) - { if ( pFrm->Frm().Height() != nHeight ) - { - pFrm->Frm().Height( nHeight ); -#endif pFrm->_InvalidatePrt(); } pFrm = pFrm->GetNext(); @@ -2705,7 +2384,6 @@ void SwRowFrm::Cut() |* |*************************************************************************/ -#ifdef VERTICAL_LAYOUT SwTwips SwRowFrm::GrowFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) { @@ -2820,118 +2498,6 @@ SwTwips SwRowFrm::ShrinkFrm( SwTwips nDist, BOOL bTst, BOOL bInfo ) return nReal; } -#else - -SwTwips SwRowFrm::GrowFrm( SwTwips nDist, const SzPtr pDirection, - BOOL bTst, BOOL bInfo ) -{ - const SwTwips nReal = SwLayoutFrm::GrowFrm( nDist, pDirection, bTst, bInfo); - - //Hoehe der Zellen auf den neuesten Stand bringen. - if ( !bTst ) - { - AdjustCells( Prt().SSize().*pDirection + nReal, - pDirection == pHeight ? TRUE : FALSE ); - if ( nReal ) - SetCompletePaint(); - } - return nReal; -} -/************************************************************************* -|* -|* SwRowFrm::ShrinkFrm() -|* -|* Ersterstellung MA 15. Mar. 93 -|* Letzte Aenderung MA 20. Jun. 96 -|* -|*************************************************************************/ -SwTwips SwRowFrm::ShrinkFrm( SwTwips nDist, const SzPtr pDirection, - BOOL bTst, BOOL bInfo ) -{ - BOOL bVariable = - pDirection == pHeight; - if ( HasFixSize( pDirection ) ) - { - AdjustCells( Prt().SSize().*pDirection, bVariable ); - return 0L; - } - - //bInfo wird ggf. vom SwRowFrm::Format auf TRUE gesetzt, hier muss dann - //entsprechend reagiert werden - const BOOL bShrinkAnyway = bInfo; - - //Nur soweit Shrinken, wie es der Inhalt der groessten Zelle zulaesst. - SwTwips nRealDist = nDist; - if ( bVariable ) - { - const SwFmtFrmSize &rSz = GetFmt()->GetFrmSize(); - SwTwips nMinHeight = rSz.GetSizeType() == ATT_MIN_SIZE ? rSz.GetHeight() : 0; - SwLayoutFrm *pCell = (SwLayoutFrm*)Lower(); - if ( nMinHeight < Frm().SSize().*pDirection ) - { - SwLayoutFrm *pCell = (SwLayoutFrm*)Lower(); - while ( pCell ) - { - SwTwips nAct = ::lcl_CalcMinCellHeight( pCell ); - if ( nAct > nMinHeight ) - nMinHeight = nAct; - if ( nMinHeight >= Frm().SSize().*pDirection ) - break; - pCell = (SwLayoutFrm*)pCell->GetNext(); - } - } - if ( (Frm().SSize().*pDirection - nRealDist) < nMinHeight ) - nRealDist = Frm().SSize().*pDirection - nMinHeight; - } - if ( nRealDist < 0 ) - nRealDist = 0; - - SwTwips nReal = nRealDist; - if ( nReal ) - { - if ( !bTst ) - Frm().SSize().*pDirection -= nReal; - - SwTwips nTmp = GetUpper()->Shrink( nReal, pDirection, bTst ); - if ( !bShrinkAnyway && !GetNext() && nTmp != nReal ) - { - //Der letzte bekommt den Rest im Upper und nimmt deshalb - //ggf. Ruecksichten (sonst: Endlosschleife) - if ( !bTst ) - { - nReal -= nTmp; - Frm().SSize().*pDirection += nReal; - } - nReal = nTmp; - } - } - - //Geeignet invalidieren und die Hoehe der Zellen auf den neuesten - //Stand bringen. - if ( !bTst ) - { - if ( nReal ) - { - if ( GetNext() ) - GetNext()->_InvalidatePos(); - _InvalidateAll(); - SetCompletePaint(); - - SwTabFrm *pTab = FindTabFrm(); - if ( pTab->IsFollow() && - (!GetPrev() || - (pTab->GetTable()->IsHeadlineRepeat() && !GetPrev()->GetPrev()))) - { - pTab->FindMaster()->InvalidatePos(); - } - } - AdjustCells( Prt().SSize().*pDirection - nReal, bVariable ); - } - return nReal; -} - - -#endif /************************************************************************* |* @@ -2972,7 +2538,6 @@ SwCellFrm::~SwCellFrm() SwModify* pMod = GetFmt(); if( pMod ) { -#ifdef ACCESSIBLE_LAYOUT // At this stage the lower frames aren't destroyed already, // therfor we have to do a recursive dispose. SwRootFrm *pRootFrm = FindRootFrm(); @@ -2981,7 +2546,7 @@ SwCellFrm::~SwCellFrm() { pRootFrm->GetCurrShell()->Imp()->DisposeAccessibleFrm( this, sal_True ); } -#endif + pMod->Remove( this ); // austragen, if( !pMod->GetDepends() ) delete pMod; // und loeschen @@ -3001,7 +2566,6 @@ BOOL lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, BOOL bInva ) BOOL bRet = FALSE; SwFrm *pFrm = pLay->Lower(); SwPageFrm* pPg = NULL; -#ifdef VERTICAL_LAYOUT SWRECTFN( pLay ) while ( pFrm ) { @@ -3063,95 +2627,26 @@ BOOL lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, BOOL bInva ) (pFrm->Frm().*fnRect->fnGetHeight)() ); pFrm = pFrm->GetNext(); } -#else - while ( pFrm ) - { - if ( pFrm->Frm().Top() != lYStart ) - { - bRet = TRUE; - const long lDiff = lYStart - pFrm->Frm().Top(); - pFrm->Frm().Pos().Y() = lYStart; - pFrm->SetCompletePaint(); - if ( !pFrm->GetNext() ) - pFrm->SetRetouche(); - if( bInva ) - pFrm->Prepare( PREP_POS_CHGD ); - if ( pFrm->IsLayoutFrm() && ((SwLayoutFrm*)pFrm)->Lower() ) - lcl_ArrangeLowers( (SwLayoutFrm*)pFrm, - ((SwLayoutFrm*)pFrm)->Lower()->Frm().Top()+lDiff, bInva ); - if ( pFrm->GetDrawObjs() ) - { - for ( USHORT i = 0; i < pFrm->GetDrawObjs()->Count(); ++i ) - { - SdrObject *pO = (*pFrm->GetDrawObjs())[i]; - if ( pO->IsWriterFlyFrame() ) - { - SwFlyFrm *pFly = ((SwVirtFlyDrawObj*)pO)->GetFlyFrm(); - if ( WEIT_WECH != pFly->Frm().Top() ) - pFly->Frm().Pos().Y() += lDiff; - pFly->GetVirtDrawObj()->_SetRectsDirty(); - if ( pFly->IsFlyInCntFrm() ) - ((SwFlyInCntFrm*)pFly)->AddRefOfst( lDiff ); - else - { - if( !pPg ) - pPg = pLay->FindPageFrm(); - SwPageFrm* pOld = pFly->FindPageFrm(); - if( pPg != pOld ) - pOld->MoveFly( pFly, pPg ); - if( pFly->IsAutoPos() ) - ((SwFlyAtCntFrm*)pFly)->AddLastCharY( lDiff ); - } - if ( ::lcl_ArrangeLowers( pFly, pFly->Frm().Top() + - pFly->Prt().Top(), bInva ) ) - pFly->SetCompletePaint(); - } - else - pO->SetAnchorPos( pFrm->Frm().Pos() ); - } - } - } - // Columns and cells are ordered horizontal, not vertical - if( !pFrm->IsColumnFrm() && !pFrm->IsCellFrm() ) - lYStart += pFrm->Frm().Height(); - pFrm = pFrm->GetNext(); - } -#endif return bRet; } void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) { ASSERT( pAttrs, "CellFrm::Format, pAttrs ist 0." ); -#ifdef VERTICAL_LAYOUT SWRECTFN( this ) if ( !bValidPrtArea ) { bValidPrtArea = TRUE; //Position einstellen. - long nTmp1 = pAttrs->CalcLeft( this ); - long nTmp2 = pAttrs->CalcRight(); - (this->*fnRect->fnSetXMargins)( nTmp1, nTmp2 ); - nTmp1 = pAttrs->CalcTop(); - nTmp2 = pAttrs->CalcBottom(); - (this->*fnRect->fnSetYMargins)( nTmp1, nTmp2 ); + long nLeftSpace = pAttrs->CalcLeft( this ); + // OD 23.01.2003 #106895# - add 1st param to <SwBorderAttrs::CalcRight(..)> + long nRightSpace = pAttrs->CalcRight( this ); + (this->*fnRect->fnSetXMargins)( nLeftSpace, nRightSpace ); + long nTopSpace = pAttrs->CalcTop(); + long nBottomSpace = pAttrs->CalcBottom(); + (this->*fnRect->fnSetYMargins)( nTopSpace, nBottomSpace ); } -#else - if ( !bValidPrtArea ) - { - bValidPrtArea = TRUE; - - //Position einstellen. - aPrt.Left( pAttrs->CalcLeft( this ) ); - aPrt.Top( pAttrs->CalcTop() ); - - //Sizes einstellen; die Groesse gibt der umgebende Frm vor, die - //die Raender werden einfach abgezogen. - aPrt.Width ( aFrm.Width() - (aPrt.Left() + pAttrs->CalcRight()) ); - aPrt.Height( aFrm.Height()- (aPrt.Top() + pAttrs->CalcBottom())); - } -#endif long nRemaining = ::lcl_CalcMinCellHeight( this, pAttrs ); if ( !bValidSize ) { @@ -3178,7 +2673,6 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) ASSERT( nWidth <= nWish, "Zelle breiter als Tabelle." ); ASSERT( nWidth > 0, "Box without width" ); -#ifdef VERTICAL_LAYOUT long nPrtWidth = (pTab->Prt().*fnRect->fnGetWidth)(); if ( nWish != nPrtWidth ) { @@ -3206,31 +2700,6 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) //Jetzt die Hoehe einstellen, sie wird vom Inhalt und den Raendern //bestimmt. const long nDiffHeight = nRemaining - (Frm().*fnRect->fnGetHeight)(); -#else - if ( nWish != pTab->Prt().Width() ) - { - nWidth *= pTab->Prt().Width(); - nWidth /= nWish; - } - } - else - { - ASSERT( pAttrs->GetSize().Width() > 0, "Box without width" ); - nWidth = GetUpper()->Prt().Width(); - SwFrm *pPre = GetUpper()->Lower(); - while ( pPre != this ) - { nWidth -= pPre->Frm().Width(); - pPre = pPre->GetNext(); - } - } - const long nDiff = nWidth - Frm().Width(); - Frm().Width( nWidth ); - Prt().Width( Prt().Width() + nDiff ); - - //Jetzt die Hoehe einstellen, sie wird vom Inhalt und den Raendern - //bestimmt. - const long nDiffHeight = nRemaining - Frm().Height(); -#endif if ( nDiffHeight ) { if ( nDiffHeight > 0 ) @@ -3295,7 +2764,6 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) } } } -#ifdef VERTICAL_LAYOUT long nPrtHeight = (Prt().*fnRect->fnGetHeight)(); if( ( bVertDir && ( nRemaining -= (pAttrs->CalcTop() + pAttrs->CalcBottom())) < nPrtHeight ) || @@ -3304,14 +2772,6 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) { long lTopOfst = 0, nDiff = (Prt().*fnRect->fnGetHeight)() - nRemaining; -#else - if ( (bVertDir && - (nRemaining -= (pAttrs->CalcTop() + pAttrs->CalcBottom())) < Prt().Height()) || - Lower()->Frm().Top() > Frm().Top()+Prt().Top() ) - { - long lTopOfst = 0, - nDiff = Prt().Height() - nRemaining; -#endif if ( nDiff >= 0 ) { if ( bVertDir ) @@ -3322,14 +2782,9 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) case VERT_BOTTOM: lTopOfst = nDiff; break; }; } -#ifdef VERTICAL_LAYOUT long nTmp = (*fnRect->fnYInc)( (this->*fnRect->fnGetPrtTop)(), lTopOfst ); if ( lcl_ArrangeLowers( this, nTmp, !bVertDir ) ) -#else - if ( lcl_ArrangeLowers( this, Frm().Top()+Prt().Top()+lTopOfst, - !bVertDir ) ) -#endif SetCompletePaint(); } } @@ -3339,11 +2794,7 @@ void SwCellFrm::Format( const SwBorderAttrs *pAttrs ) //Ist noch eine alte Ausrichtung beruecksichtigt worden? if ( Lower()->IsCntntFrm() ) { -#ifdef VERTICAL_LAYOUT const long lYStart = (this->*fnRect->fnGetPrtTop)(); -#else - const long lYStart = Frm().Top()+Prt().Top(); -#endif lcl_ArrangeLowers( this, lYStart, TRUE ); } } @@ -3373,12 +2824,8 @@ void SwCellFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew ) if ( VERT_NONE == ((SwFmtVertOrient*)pItem)->GetVertOrient() && Lower()->IsCntntFrm() ) { -#ifdef VERTICAL_LAYOUT SWRECTFN( this ) const long lYStart = (this->*fnRect->fnGetPrtTop)(); -#else - const long lYStart = Frm().Top()+Prt().Top(); -#endif bInva = lcl_ArrangeLowers( this, lYStart, FALSE ); } if ( bInva ) @@ -3388,7 +2835,6 @@ void SwCellFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew ) } } -#ifdef ACCESSIBLE_LAYOUT if( (bAttrSetChg && SFX_ITEM_SET == ((SwAttrSetChg*)pNew)->GetChgSet()->GetItemState( RES_PROTECT, FALSE )) || RES_PROTECT == pNew->Which() ) @@ -3397,8 +2843,6 @@ void SwCellFrm::Modify( SfxPoolItem * pOld, SfxPoolItem * pNew ) if( pSh && pSh->GetLayout()->IsAnyShellAccessible() ) pSh->Imp()->InvalidateAccessibleEditableState( sal_True, this ); } -#endif SwLayoutFrm::Modify( pOld, pNew ); } - diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 6d0ce935bba7..d8e89f10d8c2 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: trvlfrm.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: fme $ $Date: 2002-11-15 15:58:53 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -238,7 +238,6 @@ BOOL SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, { BOOL bRet = FALSE; const SwPageFrm *pPage = this; -#ifdef VERTICAL_LAYOUT Point aStPoint( rPoint ); Point aPoint; while ( !bRet && pPage ) @@ -276,56 +275,6 @@ BOOL SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint, aPoint.X() = nVarA; else if ( nVarB < aPoint.X() ) aPoint.X() = nVarB; -#else - const PtPtr pFix = pFIXPOS; - const PtPtr pVar = pVARPOS; - Point aStPoint( rPoint ); - Point aPoint; - while ( !bRet && pPage ) - { - aPoint = aStPoint; - - //Wenn der Point in der VarRichtung zwischen zwei Seiten liegt - //erhaelt die Seite die dem Point naeher steht den Zuschlag. - SwTwips nTmp = bVarHeight ? pPage->Frm().Top() : - pPage->Frm().Left(); - if ( pPage->GetPrev() ) - { - const SwTwips nPreTmp = bVarHeight ? - pPage->GetPrev()->Frm().Bottom() : - pPage->GetPrev()->Frm().Right(); - if ( (aPoint.*pVar > nPreTmp) && - (aPoint.*pVar < nTmp) && - ((aPoint.*pVar - nPreTmp) >= (nTmp - aPoint.*pVar)) ) - aPoint.*pVar = nTmp; - } - else if ( aPoint.*pVar < nTmp ) - aPoint.*pVar = nTmp; - - nTmp = bVarHeight ? pPage->Frm().Bottom() : pPage->Frm().Right(); - if ( pPage->GetNext() ) - { - const SwTwips nNxtTmp = bVarHeight ? - pPage->GetNext()->Frm().Top() : - pPage->GetNext()->Frm().Left(); - if ( (aPoint.*pVar > nTmp) && - (aPoint.*pVar < nNxtTmp) && - ((nNxtTmp - aPoint.*pVar) >= (aPoint.*pVar - nTmp)) ) - aPoint.*pVar = nTmp; - } - else if ( aPoint.*pVar > nTmp ) - aPoint.*pVar = nTmp; - - //Wenn der Punkt in der Fix-Richtung neben der Seite liegt wird er - //hineingezogen. - const SwTwips nVarA = pPage->Frm().Pos().*pFix; - const SwTwips nVarB = bVarHeight ? pPage->Frm().Right() : - pPage->Frm().Bottom(); - if ( nVarA > aPoint.*pFix ) - aPoint.*pFix = nVarA; - else if ( nVarB < aPoint.*pFix ) - aPoint.*pFix = nVarB; -#endif //Weitere versuche mit der aktuellen Seite nur dann, wenn sich der //Point innerhalb der Seite befindet. @@ -1075,6 +1024,31 @@ BOOL GetFrmInPage( const SwCntntFrm *pCnt, SwWhichPage fnWhichPage, return FALSE; else { + // repeated headlines in tables + if ( pCnt->IsInTab() && fnPosPage == GetFirstSub ) + { + const SwTabFrm* pTab = pCnt->FindTabFrm(); + if ( pTab->IsFollow() && pTab->GetTable()->IsHeadlineRepeat() ) + { + const SwFrm* pTmpFrm = pCnt; + while( !pTmpFrm->IsRowFrm() || !pTmpFrm->GetUpper()->IsTabFrm() ) + pTmpFrm = pTmpFrm->GetUpper(); + + ASSERT( pTmpFrm && pTmpFrm->IsRowFrm(), "No RowFrm available" ) + + if ( ! pTmpFrm->GetPrev() && pTmpFrm->GetNext() ) + { + // We are in the first line of a follow table + // with repeated headings. + // To actually make a "real" move we take the first content + // of the next row + pCnt = ((SwLayoutFrm*)pTmpFrm->GetNext())->ContainsCntnt(); + if ( ! pCnt ) + return FALSE; + } + } + } + SwCntntNode *pCNd = (SwCntntNode*)pCnt->GetNode(); pPam->GetPoint()->nNode = *pCNd; xub_StrLen nIdx; @@ -1570,6 +1544,31 @@ Point SwRootFrm::GetPagePos( USHORT nPageNum ) const return pPage->Frm().Pos(); } +/** get page frame by phyiscal page number + + OD 14.01.2003 #103492# + + @return pointer to the page frame with the given physical page number +*/ +SwPageFrm* SwRootFrm::GetPageByPageNum( sal_uInt16 _nPageNum ) const +{ + for ( const SwPageFrm* pPageFrm = static_cast<const SwPageFrm*>( Lower() ); + pPageFrm && pPageFrm->GetPhyPageNum() < _nPageNum; + pPageFrm = static_cast<const SwPageFrm*>( pPageFrm->GetNext() ) ) + { + // empty body of for-loop + } + + if ( pPageFrm && pPageFrm->GetPhyPageNum() == _nPageNum ) + { + return const_cast<SwPageFrm*>( pPageFrm ); + } + else + { + return 0; + } +} + /************************************************************************* |* |* SwRootFrm::IsDummyPage(USHORT) @@ -2060,11 +2059,15 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode ) SwCrsrMoveState aTmpState( MV_NONE ); aTmpState.b2Lines = sal_True; aTmpState.bNoScroll = sal_True; + aTmpState.nCursorBidiLevel = pStartFrm->IsRightToLeft() ? 1 : 0; + //CntntRects zu Start- und EndFrms. SwRect aStRect, aEndRect; pStartFrm->GetCharRect( aStRect, *pStartPos, &aTmpState ); Sw2LinesPos *pSt2Pos = aTmpState.p2Lines; aTmpState.p2Lines = NULL; + aTmpState.nCursorBidiLevel = pEndFrm->IsRightToLeft() ? 1 : 0; + pEndFrm->GetCharRect ( aEndRect, *pEndPos, &aTmpState ); Sw2LinesPos *pEnd2Pos = aTmpState.p2Lines; @@ -2074,9 +2077,10 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode ) pEndFrm->UnionFrm( sal_True ) ); if( pStartFrm != pEndFrm ) aEndFrm.Intersection( pEndFrm->PaintArea() ); -#ifdef VERTICAL_LAYOUT SWRECTFN( pStartFrm ) - BOOL bR2L = pStartFrm->IsRightToLeft(); + const BOOL bR2L = pStartFrm->IsRightToLeft(); + const BOOL bEndR2L = pEndFrm->IsRightToLeft(); + // If there's no doubleline portion involved or start and end are both // in the same doubleline portion, all works fine, but otherwise // we need the following... @@ -2090,21 +2094,51 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode ) if( pSt2Pos ) { SwRect aTmp( aStRect ); + // BiDi-Portions are swimming against the current. - BOOL bPorR2L = (MT_BIDI == pSt2Pos->nMultiType) ? !bR2L : bR2L; - if( bPorR2L ) - (aTmp.*fnRect->fnSetLeft)( - (pSt2Pos->aPortion.*fnRect->fnGetLeft)() ); + const sal_Bool bPorR2L = ( MT_BIDI == pSt2Pos->nMultiType ) ? + ! bR2L : + bR2L; + + if( MT_BIDI == pSt2Pos->nMultiType && + (pSt2Pos->aPortion2.*fnRect->fnGetWidth)() ) + { + // nested bidi portion + long nRightAbs = (pSt2Pos->aPortion.*fnRect->fnGetRight)(); + nRightAbs -= (pSt2Pos->aPortion2.*fnRect->fnGetLeft)(); + long nLeftAbs = nRightAbs - (pSt2Pos->aPortion2.*fnRect->fnGetWidth)(); + + (aTmp.*fnRect->fnSetRight)( nRightAbs ); + + if ( ! pEnd2Pos || pEnd2Pos->aPortion != pSt2Pos->aPortion ) + { + SwRect aTmp2( pSt2Pos->aPortion ); + (aTmp2.*fnRect->fnSetRight)( nLeftAbs ); + aTmp2.Intersection( aEndFrm ); + Sub( aRegion, aTmp2 ); + } + } else - (aTmp.*fnRect->fnSetRight)( - (pSt2Pos->aPortion.*fnRect->fnGetRight)() ); + { + if( bPorR2L ) + (aTmp.*fnRect->fnSetLeft)( + (pSt2Pos->aPortion.*fnRect->fnGetLeft)() ); + else + (aTmp.*fnRect->fnSetRight)( + (pSt2Pos->aPortion.*fnRect->fnGetRight)() ); + } + if( MT_ROT_90 == pSt2Pos->nMultiType || (pSt2Pos->aPortion.*fnRect->fnGetTop)() == (aTmp.*fnRect->fnGetTop)() ) + { (aTmp.*fnRect->fnSetTop)( (pSt2Pos->aLine.*fnRect->fnGetTop)() ); + } + aTmp.Intersection( aStFrm ); Sub( aRegion, aTmp ); + SwTwips nTmp = (pSt2Pos->aLine.*fnRect->fnGetBottom)(); if( MT_ROT_90 != pSt2Pos->nMultiType && (aStRect.*fnRect->fnBottomDist)( nTmp ) > 0 ) @@ -2124,32 +2158,63 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode ) aTmp.Intersection( aStFrm ); Sub( aRegion, aTmp ); } + aStRect = pSt2Pos->aLine; (aStRect.*fnRect->fnSetLeft)( bR2L ? (pSt2Pos->aPortion.*fnRect->fnGetLeft)() : (pSt2Pos->aPortion.*fnRect->fnGetRight)() ); (aStRect.*fnRect->fnSetWidth)( 1 ); } + if( pEnd2Pos ) { SWRECTFN( pEndFrm ) SwRect aTmp( aEndRect ); - BOOL bEndR2L = pEndFrm->IsRightToLeft(); - BOOL bPorR2L = ( MT_BIDI == pEnd2Pos->nMultiType ) ? - !bEndR2L : bEndR2L; - if( bPorR2L ) - (aTmp.*fnRect->fnSetRight)( - (pEnd2Pos->aPortion.*fnRect->fnGetRight)() ); + + // BiDi-Portions are swimming against the current. + const sal_Bool bPorR2L = ( MT_BIDI == pEnd2Pos->nMultiType ) ? + ! bEndR2L : + bEndR2L; + + if( MT_BIDI == pEnd2Pos->nMultiType && + (pEnd2Pos->aPortion2.*fnRect->fnGetWidth)() ) + { + // nested bidi portion + long nRightAbs = (pEnd2Pos->aPortion.*fnRect->fnGetRight)(); + nRightAbs = nRightAbs - (pEnd2Pos->aPortion2.*fnRect->fnGetLeft)(); + long nLeftAbs = nRightAbs - (pEnd2Pos->aPortion2.*fnRect->fnGetWidth)(); + + (aTmp.*fnRect->fnSetLeft)( nLeftAbs ); + + if ( ! pSt2Pos || pSt2Pos->aPortion != pEnd2Pos->aPortion ) + { + SwRect aTmp2( pEnd2Pos->aPortion ); + (aTmp2.*fnRect->fnSetLeft)( nRightAbs ); + aTmp2.Intersection( aEndFrm ); + Sub( aRegion, aTmp2 ); + } + } else - (aTmp.*fnRect->fnSetLeft)( - (pEnd2Pos->aPortion.*fnRect->fnGetLeft)() ); + { + if ( bPorR2L ) + (aTmp.*fnRect->fnSetRight)( + (pEnd2Pos->aPortion.*fnRect->fnGetRight)() ); + else + (aTmp.*fnRect->fnSetLeft)( + (pEnd2Pos->aPortion.*fnRect->fnGetLeft)() ); + } + if( MT_ROT_90 == pEnd2Pos->nMultiType || (pEnd2Pos->aPortion.*fnRect->fnGetBottom)() == (aEndRect.*fnRect->fnGetBottom)() ) + { (aTmp.*fnRect->fnSetBottom)( (pEnd2Pos->aLine.*fnRect->fnGetBottom)() ); + } + aTmp.Intersection( aEndFrm ); Sub( aRegion, aTmp ); + // The next statement means neither ruby nor rotate(90): if( !( MT_RUBY & pEnd2Pos->nMultiType ) ) { @@ -2171,6 +2236,7 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode ) Sub( aRegion, aTmp ); } } + aEndRect = pEnd2Pos->aLine; (aEndRect.*fnRect->fnSetLeft)( bEndR2L ? (pEnd2Pos->aPortion.*fnRect->fnGetRight)() : @@ -2178,62 +2244,50 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode ) (aEndRect.*fnRect->fnSetWidth)( 1 ); } } -#else - if( pSt2Pos != pEnd2Pos && ( !pSt2Pos || !pEnd2Pos || - pSt2Pos->aPortion != pEnd2Pos->aPortion ) ) + else if( pSt2Pos && pEnd2Pos && + MT_BIDI == pSt2Pos->nMultiType && + MT_BIDI == pEnd2Pos->nMultiType && + pSt2Pos->aPortion == pEnd2Pos->aPortion && + pSt2Pos->aPortion2 != pEnd2Pos->aPortion2 ) { - // If we have a start(end) position inside a doubleline portion - // the surrounded part of the doubleline portion is subtracted - // from the region and the aStRect(aEndRect) is set to the - // end(start) of the doubleline portion. - if( pSt2Pos ) + // This is the ugly special case, where the selection starts and + // ends in the same bidi portion but one start or end is inside a + // nested bidi portion. + + if ( (pSt2Pos->aPortion2.*fnRect->fnGetWidth)() ) { - SwRect aTmp( aStRect.Pos(), - Point( pSt2Pos->aPortion.Right(), aStRect.Bottom() ) ); - if( MT_ROT_90 == pSt2Pos->nMultiType || - pSt2Pos->aPortion.Top() == aTmp.Top() ) - aTmp.Top( pSt2Pos->aLine.Top() ); + SwRect aTmp( aStRect ); + long nRightAbs = (pSt2Pos->aPortion.*fnRect->fnGetRight)(); + nRightAbs -= (pSt2Pos->aPortion2.*fnRect->fnGetLeft)(); + long nLeftAbs = nRightAbs - (pSt2Pos->aPortion2.*fnRect->fnGetWidth)(); + + (aTmp.*fnRect->fnSetRight)( nRightAbs ); aTmp.Intersection( aStFrm ); Sub( aRegion, aTmp ); - if( MT_ROT_90 != pSt2Pos->nMultiType && - aStRect.Bottom() < pSt2Pos->aLine.Bottom() ) - { - aTmp.Top( aTmp.Bottom() ); - aTmp.Bottom( pSt2Pos->aLine.Bottom() ); - if( aStRect.Bottom() < pSt2Pos->aPortion.Bottom() ) - aTmp.Left( pSt2Pos->aPortion.Left() ); - aTmp.Intersection( aStFrm ); - Sub( aRegion, aTmp ); - } - aStRect = SwRect( Point( pSt2Pos->aPortion.Right(), - pSt2Pos->aLine.Top()), Size(1,pSt2Pos->aLine.Height())); + + aStRect = pSt2Pos->aLine; + (aStRect.*fnRect->fnSetLeft)( bR2L ? nRightAbs : nLeftAbs ); + (aStRect.*fnRect->fnSetWidth)( 1 ); } - if( pEnd2Pos ) + + SWRECTFN( pEndFrm ) + if ( (pEnd2Pos->aPortion2.*fnRect->fnGetWidth)() ) { - SwRect aTmp(Point(pEnd2Pos->aPortion.Left(),aEndRect.Top()), - Point( aEndRect.Left() + aEndRect.Width(), - aEndRect.Top() + aEndRect.Height() ) ); - if( MT_ROT_90 == pEnd2Pos->nMultiType || - pEnd2Pos->aPortion.Bottom() == aEndRect.Bottom() ) - aTmp.Bottom( pEnd2Pos->aLine.Bottom() ); + SwRect aTmp( aEndRect ); + long nRightAbs = (pEnd2Pos->aPortion.*fnRect->fnGetRight)(); + nRightAbs -= (pEnd2Pos->aPortion2.*fnRect->fnGetLeft)(); + long nLeftAbs = nRightAbs - (pEnd2Pos->aPortion2.*fnRect->fnGetWidth)(); + + (aTmp.*fnRect->fnSetLeft)( nLeftAbs ); aTmp.Intersection( aEndFrm ); Sub( aRegion, aTmp ); - if( !( MT_RUBY & pEnd2Pos->nMultiType ) && - aEndRect.Top() > pEnd2Pos->aLine.Top() ) - { - aTmp.Bottom( aTmp.Top() ); - aTmp.Top( pEnd2Pos->aLine.Top() ); - if( aEndRect.Top() > pEnd2Pos->aPortion.Top() ) - aTmp.Right( pEnd2Pos->aPortion.Right() ); - aTmp.Intersection( aEndFrm ); - Sub( aRegion, aTmp ); - } - aEndRect = SwRect( Point( pEnd2Pos->aPortion.Left(), - pEnd2Pos->aLine.Top() ), - Size( 1, pEnd2Pos->aLine.Height() ) ); + + aEndRect = pEnd2Pos->aLine; + (aEndRect.*fnRect->fnSetLeft)( bEndR2L ? nLeftAbs : nRightAbs ); + (aEndRect.*fnRect->fnSetWidth)( 1 ); } } -#endif + // The charrect may be outside the paintarea (for cursortravelling) // but the selection has to be restricted to the paintarea if( aStRect.Left() < aStFrm.Left() ) @@ -2255,7 +2309,6 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode ) else if( nTmp > aEndFrm.Right() ) aEndRect.Right( aEndFrm.Right() ); -#ifdef VERTICAL_LAYOUT if( pStartFrm == pEndFrm ) { sal_Bool bSameRotatedOrBidi = pSt2Pos && pEnd2Pos && @@ -2412,7 +2465,6 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode ) //At least the endframe... bVert = pEndFrm->IsVertical(); bRev = pEndFrm->IsReverse(); - bR2L = pEndFrm->IsRightToLeft(); fnRect = bVert ? ( bRev ? fnRectVL2R : fnRectVert ) : ( bRev ? fnRectB2T : fnRectHori ); nTmp = (aEndRect.*fnRect->fnGetTop)(); @@ -2423,147 +2475,13 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, BOOL bIsTblMode ) Sub( aRegion, aSubRect ); } aSubRect = aEndRect; - if( bR2L ) + if( bEndR2L ) (aSubRect.*fnRect->fnSetRight)((aEndFrm.*fnRect->fnGetRight)()); else (aSubRect.*fnRect->fnSetLeft)( (aEndFrm.*fnRect->fnGetLeft)() ); Sub( aRegion, aSubRect ); } -#else - if( pStartFrm == pEndFrm ) - { - sal_Bool bSameRotatedLine = - pSt2Pos && pEnd2Pos && ( 2 & pSt2Pos->nMultiType ) && - pSt2Pos->aPortion == pEnd2Pos->aPortion; - //Fall 1: (Gleicher Frame und gleiche Zeile) - if( aStRect.Top() == aEndRect.Top() || bSameRotatedLine ) - { - Point aTmpSt( aStRect.Pos() ); - Point aTmpEnd( aEndRect.Right(), aEndRect.Bottom() ); - if( bSameRotatedLine && aTmpSt.Y() > aTmpEnd.Y() ) - { - long nTmpY = aTmpEnd.Y(); - aTmpEnd.Y() = aTmpSt.Y(); - aTmpSt.Y() = nTmpY; - } - SwRect aTmp = SwRect( aTmpSt, aTmpEnd ); - // Bug 34888: falls Inhalt selektiert ist, der keinen Platz - // einnimmt (z.B. PostIts,RefMarks, TOXMarks), - // dann mindestens die Breite des Crsr setzen. - if( 1 == aTmp.Width() && pStartPos->nContent.GetIndex() != - pEndPos->nContent.GetIndex() ) - { - OutputDevice* pOut = pSh->GetOut(); - long nCrsrWidth = pOut->GetSettings().GetStyleSettings(). - GetCursorSize(); - aTmp.Width( pOut->PixelToLogic( Size( nCrsrWidth, 0 ) ).Width() ); - } - aTmp.Intersection( aStFrm ); - Sub( aRegion, aTmp ); - } - //Fall 2: (Gleicher Frame ueber mehr als eine Zeile) - else - { - SwTwips lLeft, lRight; - if( pSt2Pos && pEnd2Pos && pSt2Pos->aPortion == pEnd2Pos->aPortion ) - { - lLeft = pSt2Pos->aPortion.Left(); - lRight = pSt2Pos->aPortion.Right(); - } - else - { - lLeft = pStartFrm->Frm().Left() + pStartFrm->Prt().Left(); - lRight = pStartFrm->Frm().Left() + pStartFrm->Prt().Right(); - } - if( lLeft < aStFrm.Left() ) - lLeft = aStFrm.Left(); - if( lRight > aStFrm.Right() ) - lRight = aStFrm.Right(); - //Erste Zeile - Sub( aRegion, SwRect( aStRect.Pos(),Point( lRight, aStRect.Bottom()))); - - //Wenn mindestens ein Twips zwischen Start- und Endzeile liegt, - //so wird halt alles dazwischenliegende mit aufgenommen. - if( (aStRect.Pos().Y()+aStRect.SSize().Height()) != aEndRect.Top() ) - Sub( aRegion, SwRect( Point( lLeft, - (aStRect.Pos().Y()+aStRect.SSize().Height()) ), - Point( lRight, aEndRect.Top()-1 ))); - - //und die letzte Zeile - Sub( aRegion, SwRect( Point( lLeft, aEndRect.Top() ), - Point( aEndRect.Left(), aEndRect.Bottom() ))); - } - } - //Fall 3: (Unterschiedliche Frm's, moeglicherweise auch welche - // dazwischen) - else - { - //Erst den StartFrm verknurpseln... - Sub( aRegion, SwRect( aStRect.Pos(), - Point( aStFrm.Right(), aStRect.Bottom()))); - - if( aStFrm.Bottom() != aStRect.Bottom() ) - Sub( aRegion, SwRect( Point( aStFrm.Left(), - (aStRect.Pos().Y()+aStRect.SSize().Height()) ), - Point( aStFrm.Right(), aStFrm.Bottom() ))); - - //Nun alles dazwischenliegende (kann auch nix sein)... - BOOL bBody = pStartFrm->IsInDocBody(); - const SwCntntFrm *pCntnt = pStartFrm->GetNextCntntFrm(); - SwRect aPrvRect; - -// JP - 24.11.93: -// wie kann man die Schleife noch optimieren, damit nur die Frames, die -// in der VisArea liegen, beachtet werden - - while ( pCntnt != pEndFrm ) - { - if ( pCntnt->IsInFly() ) - { - const SdrObjectPtr pObj = (SdrObject*)pCntnt->FindFlyFrm()->GetVirtDrawObj(); - aSortObjs.Insert( pObj ); - } - - //Wenn ich im DocumentBody war, so beachte ich nur Frm's - //die im Body liegen und umgekehrt. - if ( bBody == pCntnt->IsInDocBody() ) - { - SwRect aCRect( pCntnt->UnionFrm( sal_True ) ); - aCRect.Intersection( pCntnt->PaintArea() ); - if( aCRect.IsOver( aRegion.GetOrigin() )) - { - SwRect aTmp( aPrvRect ); - aTmp.Union( aCRect ); - if ( (aPrvRect.Height() * aPrvRect.Width() + - aCRect.Height() * aCRect.Width()) == - (aTmp.Height() * aTmp.Width()) ) - { - aPrvRect.Union( aCRect ); - } - else - { - if ( aPrvRect.HasArea() ) - Sub( aRegion, aPrvRect ); - aPrvRect = aCRect; - } - } - } - pCntnt = pCntnt->GetNextCntntFrm(); - } - if ( aPrvRect.HasArea() ) - Sub( aRegion, aPrvRect ); - - //Jetzt den EndFrm... - if ( aEndFrm.Top() != aEndRect.Top() ) - Sub( aRegion, SwRect( aEndFrm.Pos(), - Point( aEndFrm.Right(), aEndRect.Top()-1 ) )); - - Sub( aRegion, SwRect( aEndFrm.Pos(), - Point( aEndRect.Left(), aEndRect.Bottom() ))); - - } -#endif // aRegion.Compress( FALSE ); aRegion.Invert(); delete pSt2Pos; diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index e5c0617ab824..412d29d86a43 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: wsfrm.cxx,v $ * - * $Revision: 1.38 $ + * $Revision: 1.39 $ * - * last change: $Author: fme $ $Date: 2002-12-09 10:37:56 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -916,6 +916,15 @@ void SwCntntFrm::Paste( SwFrm* pParent, SwFrm* pSibling) GetPrev()->Prt().Height() + GetPrev()->Prt().Top() ) //Umrandung zu beruecksichtigen? GetPrev()->_InvalidatePrt(); + // OD 18.02.2003 #104989# - force complete paint of previous frame, + // if frame is inserted at the end of a section frame, in order to + // get subsidiary lines repainted for the section. + if ( pParent->IsSctFrm() && !GetNext() ) + { + // force complete paint of previous frame, if new inserted frame + // in the section is the last one. + GetPrev()->SetCompletePaint(); + } GetPrev()->InvalidatePage( pPage ); } } @@ -3287,19 +3296,21 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, SwTwips nWidth = rCol.CalcColWidth( i, nPrtWidth ); if ( i == (nNumCols - 1) ) //Dem Letzten geben wir wie nWidth = nAvail; //immer den Rest. - nWidth -= (pCol->Frm().*fnRect->fnGetWidth)(); - if( nWidth ) + + SwTwips nWidthDiff = nWidth - (pCol->Frm().*fnRect->fnGetWidth)(); + if( nWidthDiff ) { - (pCol->Frm().*fnRect->fnAddBottom)( nWidth ); + (pCol->Frm().*fnRect->fnAddRight)( nWidthDiff ); pCol->_InvalidatePrt(); if ( pCol->GetNext() ) pCol->GetNext()->_InvalidatePos(); } - nWidth = (Prt().*fnRect->fnGetHeight)() - - (pCol->Frm().*fnRect->fnGetHeight)(); - if( nWidth ) + + SwTwips nHeightDiff = (Prt().*fnRect->fnGetHeight)() - + (pCol->Frm().*fnRect->fnGetHeight)(); + if( nHeightDiff ) { - (pCol->Frm().*fnRect->fnAddBottom)( nWidth ); + (pCol->Frm().*fnRect->fnAddBottom)( nHeightDiff ); pCol->_InvalidatePrt(); } pCol->Calc(); @@ -3348,8 +3359,8 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, pLay = (SwLayoutFrm*)pLay->GetNext(); ASSERT( pLay->IsFtnContFrm(),"FtnContainer exspected" ); nInnerHeight += pLay->InnerHeight(); - nInnerHeight = (pLay->Frm().*fnRect->fnGetHeight)() - - (pLay->Prt().*fnRect->fnGetHeight)(); + nInnerHeight += (pLay->Frm().*fnRect->fnGetHeight)() - + (pLay->Prt().*fnRect->fnGetHeight)(); } nInnerHeight -= (pCol->Prt().*fnRect->fnGetHeight)(); if( nInnerHeight > nDiff ) diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx index 691b069848ad..2cc96f1c9420 100644 --- a/sw/source/core/text/frmcrsr.cxx +++ b/sw/source/core/text/frmcrsr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frmcrsr.cxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: fme $ $Date: 2002-12-02 10:28:13 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -95,6 +95,7 @@ #include <pormulti.hxx> // SwMultiPortion #endif +#include <unicode/ubidi.h> #include "frmsh.hxx" #include "txtcfg.hxx" @@ -604,12 +605,6 @@ sal_Bool SwTxtFrm::_GetCrsrOfst(SwPosition* pPos, const Point& rPoint, while( aLine.GetLineNr() > 1 ) aLine.Prev(); - // Set the cursor bidi level to the default level. If the cursor is - // inside a bidi portion, the level is set again inside the - // GetCrsrOfst function. - if ( pCMS ) - ((SwCrsrMoveState*)pCMS)->nCursorBidiLevel = IsRightToLeft() ? 1 : 0; - xub_StrLen nOffset = aLine.GetCrsrOfst( pPos, rPoint, bChgFrm, pCMS ); if( pCMS && pCMS->eState == MV_NONE && aLine.GetEnd() == nOffset ) @@ -954,27 +949,12 @@ sal_Bool SwTxtFrm::_UnitUp( SwPaM *pPam, const SwTwips nOffset, // nPos: the new visual position // bLeft: whether the break iterator has to add or subtract from the // current position -void SwTxtFrm::PrepareVisualMove( xub_StrLen& nPos, BYTE& nCrsrLevel, - sal_Bool& bRight ) +void lcl_VisualMoveRecursion( const SwLineLayout& rCurrLine, xub_StrLen nIdx, + xub_StrLen& nPos, sal_Bool& bRight, + BYTE& nCrsrLevel, BYTE nDefaultDir ) { - if( IsEmpty() || IsHiddenNow() ) - return; - - ((SwTxtFrm*)this)->GetFormatted(); - - SwTxtSizeInfo aInf( (SwTxtFrm*)this ); - SwTxtCursor aLine( ((SwTxtFrm*)this), &aInf ); - - if( nPos ) - aLine.CharCrsrToLine( nPos ); - else - aLine.Top(); - - const SwLineLayout* pCurrLine = aLine.GetCurr(); - const SwLinePortion* pPor = pCurrLine->GetFirstPortion(); + const SwLinePortion* pPor = rCurrLine.GetFirstPortion(); const SwLinePortion* pLast = 0; - const BYTE nDefaultDir = IsRightToLeft() ? 1 : 0; - USHORT nIdx = aLine.GetStart(); // what's the current portion while ( pPor && nIdx + pPor->GetLen() <= nPos ) @@ -984,135 +964,240 @@ void SwTxtFrm::PrepareVisualMove( xub_StrLen& nPos, BYTE& nCrsrLevel, pPor = pPor->GetPortion(); } - xub_StrLen nNewPos = 0; - BYTE nNewCrsrLevel = nCrsrLevel; - sal_Bool bForward = bRight; - if ( bRight ) { - // 1. jump case, at beginning of bidi portion - if ( pPor && pPor->IsMultiPortion() && ((SwMultiPortion*)pPor)->IsBidi() && - nIdx == nPos ) + sal_Bool bRecurse = pPor && pPor->IsMultiPortion() && + ((SwMultiPortion*)pPor)->IsBidi(); + + // 1. special case: at beginning of bidi portion + if ( bRecurse && nIdx == nPos ) { - nNewPos = nPos + pPor->GetLen(); + nPos += pPor->GetLen(); - // enter bidi portion - if ( nCrsrLevel == nDefaultDir ) - { - bForward = sal_False; - nNewCrsrLevel = ((SwBidiPortion*)pPor)->GetLevel(); - } // leave bidi portion - else + if ( nCrsrLevel != nDefaultDir ) { - bForward = sal_True; - nNewCrsrLevel = nDefaultDir; + bRecurse = sal_False; } + else + // special case: + // buffer: abcXYZ123 in LTR paragraph + // view: abc123ZYX + // cursor is between c and X in the buffer and cursor level = 0 + nCrsrLevel++; } - // 2. jump case, at beginning of portion after bidi portion - else if ( pLast && pLast->IsMultiPortion() && ((SwMultiPortion*)pLast)->IsBidi() && - nIdx == nPos ) + // 2. special case: at beginning of portion after bidi portion + else if ( pLast && pLast->IsMultiPortion() && + ((SwMultiPortion*)pLast)->IsBidi() && nIdx == nPos ) { - nNewPos = nPos; - // enter bidi portion if ( nCrsrLevel != nDefaultDir ) { - bForward = sal_False; - nNewCrsrLevel = ((SwBidiPortion*)pLast)->GetLevel(); - } - else - { - bForward = sal_True; - nNewCrsrLevel = nDefaultDir; + bRecurse = sal_True; + nIdx -= pLast->GetLen(); + pPor = pLast; } } - // go backward - else if ( pPor && pPor->IsMultiPortion() && ((SwMultiPortion*)pPor)->IsBidi() ) + // Recursion + if ( bRecurse ) { - nNewPos = nPos; - bForward = sal_False; - nNewCrsrLevel = ((SwBidiPortion*)pPor)->GetLevel(); + const SwLineLayout& rLine = ((SwMultiPortion*)pPor)->GetRoot(); + xub_StrLen nTmpPos = nPos - nIdx; + sal_Bool bTmpForward = ! bRight; + BYTE nTmpCrsrLevel = nCrsrLevel; + lcl_VisualMoveRecursion( rLine, 0, nTmpPos, bTmpForward, + nTmpCrsrLevel, nDefaultDir + 1 ); + + nPos = nTmpPos + nIdx; + bRight = bTmpForward; + nCrsrLevel = nTmpCrsrLevel; } - // go forward - else //if ( pPor && ( ! pPor->IsMultiPortion() || ! ((SwMultiPortion*)pPor)->IsBidi() ) ) + else { - nNewPos = nPos; - bForward = sal_True; - nNewCrsrLevel = nDefaultDir; + bRight = sal_True; + nCrsrLevel = nDefaultDir; } } else { - // 1. jump case, at beginning of bidi portion - if ( pPor && pPor->IsMultiPortion() && ((SwMultiPortion*)pPor)->IsBidi() && - nIdx == nPos ) - { - nNewPos = nPos; + sal_Bool bRecurse = pPor && pPor->IsMultiPortion() && ((SwMultiPortion*)pPor)->IsBidi(); + // 1. special case: at beginning of bidi portion + if ( bRecurse && nIdx == nPos ) + { // leave bidi portion if ( nCrsrLevel == nDefaultDir ) { - bForward = sal_False; - nNewCrsrLevel = nDefaultDir; - } - // enter bidi portion - else - { - bForward = sal_True; - nNewCrsrLevel = ((SwBidiPortion*)pPor)->GetLevel(); + bRecurse = sal_False; } } - // 2. jump case, at beginning of portion after bidi portion - else if ( pLast && pLast->IsMultiPortion() && ((SwMultiPortion*)pLast)->IsBidi() && - nIdx == nPos ) + // 2. special case: at beginning of portion after bidi portion + else if ( pLast && pLast->IsMultiPortion() && + ((SwMultiPortion*)pLast)->IsBidi() && nIdx == nPos ) { - nNewPos = nPos - pLast->GetLen(); + nPos -= pLast->GetLen(); // enter bidi portion - if ( nCrsrLevel != nDefaultDir ) + if ( nCrsrLevel % 2 == nDefaultDir % 2 ) { - bForward = sal_False; - nNewCrsrLevel = nDefaultDir; + bRecurse = sal_True; + nIdx -= pLast->GetLen(); + pPor = pLast; + + // special case: + // buffer: abcXYZ123 in LTR paragraph + // view: abc123ZYX + // cursor is behind 3 in the buffer and cursor level = 2 + if ( nDefaultDir + 2 == nCrsrLevel ) + nPos += pLast->GetLen(); } - else + } + + // go forward + if ( bRecurse ) + { + const SwLineLayout& rLine = ((SwMultiPortion*)pPor)->GetRoot(); + xub_StrLen nTmpPos = nPos - nIdx; + sal_Bool bTmpForward = ! bRight; + BYTE nTmpCrsrLevel = nCrsrLevel; + lcl_VisualMoveRecursion( rLine, 0, nTmpPos, bTmpForward, + nTmpCrsrLevel, nDefaultDir + 1 ); + + // special case: + // buffer: abcXYZ123 in LTR paragraph + // view: abc123ZYX + // cursor is between Z and 1 in the buffer and cursor level = 2 + if ( nTmpPos == pPor->GetLen() && nTmpCrsrLevel == nDefaultDir + 1 ) { - bForward = sal_True; - nNewCrsrLevel = ((SwBidiPortion*)pLast)->GetLevel(); + nTmpPos -= pPor->GetLen(); + nTmpCrsrLevel = nDefaultDir; + bTmpForward = ! bTmpForward; } + + nPos = nTmpPos + nIdx; + bRight = bTmpForward; + nCrsrLevel = nTmpCrsrLevel; } // go backward - else if ( pPor && pPor->IsMultiPortion() && ((SwMultiPortion*)pPor)->IsBidi() ) + else { - nNewPos = nPos; - bForward = sal_True; - nNewCrsrLevel = ((SwBidiPortion*)pPor)->GetLevel(); + bRight = sal_False; + nCrsrLevel = nDefaultDir; } + } +} - // bo forward - else //if ( pPor && ( ! pPor->IsMultiPortion() || ! ((SwMultiPortion*)pPor)->IsBidi() ) ) +void SwTxtFrm::PrepareVisualMove( xub_StrLen& nPos, BYTE& nCrsrLevel, + sal_Bool& bForward, sal_Bool bInsertCrsr ) +{ + if( IsEmpty() || IsHiddenNow() ) + return; + + ((SwTxtFrm*)this)->GetFormatted(); + + SwTxtSizeInfo aInf( (SwTxtFrm*)this ); + SwTxtCursor aLine( ((SwTxtFrm*)this), &aInf ); + + if( nPos ) + aLine.CharCrsrToLine( nPos ); + else + aLine.Top(); + + const SwLineLayout* pLine = aLine.GetCurr(); + const xub_StrLen nStt = aLine.GetStart(); + const xub_StrLen nLen = pLine->GetLen(); + + // We have to distinguish between an insert and overwrite cursor: + // The insert cursor position depends on the cursor level: + // buffer: abcXYZdef in LTR paragraph + // display: abcZYXdef + // If cursor is between c and X in the buffer and cursor level is 0, + // the cursor blinks between c and Z and -> sets the cursor between Z and Y. + // If the cursor level is 1, the cursor blinks between X and d and + // -> sets the cursor between d and e. + // The overwrite cursor simply travels to the next visual character. + if ( bInsertCrsr ) + { + lcl_VisualMoveRecursion( *pLine, nStt, nPos, bForward, + nCrsrLevel, IsRightToLeft() ? 1 : 0 ); + return; + } + + const BYTE nDefaultDir = IsRightToLeft() ? UBIDI_RTL : UBIDI_LTR; + const sal_Bool bVisualRight = ( nDefaultDir == UBIDI_LTR && bForward ) || + ( nDefaultDir == UBIDI_RTL && ! bForward ); + + // + // Bidi functions from icu 2.0 + // + const sal_Unicode* pLineString = GetTxtNode()->GetTxt().GetBuffer(); + pLine += nStt; + + UErrorCode nError = U_ZERO_ERROR; + UBiDi* pBidi = ubidi_openSized( nLen, 0, &nError ); + ubidi_setPara( pBidi, pLineString, nLen, nDefaultDir, NULL, &nError ); + + xub_StrLen nTmpPos; + sal_Bool bOutOfBounds = sal_False; + + if ( nPos < nStt + nLen ) + { + nTmpPos = (xub_StrLen)ubidi_getVisualIndex( pBidi, nPos, &nError ); + + // visual indices are always LTR aligned + if ( bVisualRight ) + { + if ( nTmpPos + 1 < nStt + nLen ) + ++nTmpPos; + else + { + nPos = nDefaultDir == UBIDI_RTL ? 0 : nStt + nLen; + bOutOfBounds = sal_True; + } + } + else { - nNewPos = nPos; - bForward = sal_False; - nNewCrsrLevel = nDefaultDir; + if ( nTmpPos ) + --nTmpPos; + else + { + nPos = nDefaultDir == UBIDI_RTL ? nStt + nLen : 0; + bOutOfBounds = sal_True; + } } } + else + { + nTmpPos = nDefaultDir == UBIDI_LTR ? nPos - 1 : 0; + } - ASSERT( 0 <= nNewPos && ( nNewPos <= GetTxtNode()->GetTxt().Len() || ! bForward ), - "ConvertLogic2Visual failed" ) + if ( ! bOutOfBounds ) + { + nPos = (xub_StrLen)ubidi_getLogicalIndex( pBidi, nTmpPos, &nError ); - nPos = nNewPos; - nCrsrLevel = nNewCrsrLevel; - bRight = bForward; -} + if ( bForward ) + { + if ( nPos ) + --nPos; + else + { + ++nPos; + bForward = ! bForward; + } + } + else + ++nPos; + } + ubidi_close( pBidi ); +} /************************************************************************* * SwTxtFrm::_UnitDown() diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx index d6ccdf242631..56f45c7920f3 100644 --- a/sw/source/core/text/frmform.cxx +++ b/sw/source/core/text/frmform.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frmform.cxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: fme $ $Date: 2002-11-22 15:58:40 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2333,6 +2333,11 @@ void SwTxtFrm::Format( const SwBorderAttrs * ) ChgThisLines(); + // the PrepMustFit should not survive a Format operation + SwParaPortion *pPara = GetPara(); + if ( pPara ) + pPara->SetPrepMustFit( sal_False ); + #ifdef DEBUG // Hier ein Instrumentarium, um ungewoehnlichen Master/Follow-Kombinationen, // insbesondere bei Fussnoten, auf die Schliche zu kommen diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx index 0364f41f42b9..aaf771c979f7 100644 --- a/sw/source/core/text/frmpaint.cxx +++ b/sw/source/core/text/frmpaint.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frmpaint.cxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: fme $ $Date: 2002-12-10 11:05:01 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,6 +80,9 @@ #ifndef _SVX_PGRDITEM_HXX #include <svx/pgrditem.hxx> #endif +#ifndef _SVX_LRSPITEM_HXX //autogen +#include <svx/lrspitem.hxx> +#endif #ifndef _PAGEDESC_HXX #include <pagedesc.hxx> // SwPageDesc #endif @@ -566,7 +569,8 @@ sal_Bool SwTxtFrm::PaintEmpty( const SwRect &rRect, sal_Bool bCheck ) const SwRect aRect; if( bCheck && aTxtFly.IsOn() && aTxtFly.IsAnyObj( aRect ) ) return sal_False; - else if( OUTDEV_WINDOW == pSh->GetOut()->GetOutDevType() ) + else if( OUTDEV_PRINTER != pSh->GetOut()->GetOutDevType() && + ! pSh->GetViewOptions()->IsPDFExport() ) { SwFont *pFnt; const SwTxtNode& rTxtNode = *GetTxtNode(); @@ -617,6 +621,13 @@ sal_Bool SwTxtFrm::PaintEmpty( const SwRect &rRect, sal_Bool bCheck ) const pFnt->Invalidate(); pFnt->ChgPhysFnt( pSh, pSh->GetOut() ); Point aPos = Frm().Pos() + Prt().Pos(); + + const SvxLRSpaceItem &rSpace = + GetTxtNode()->GetSwAttrSet().GetLRSpace(); + + if ( rSpace.GetTxtFirstLineOfst() > 0 ) + aPos.X() += rSpace.GetTxtFirstLineOfst(); + SwSaveClip *pClip; if( IsUndersized() ) { diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 659e5f4c14b5..f1890f35d8fc 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: inftxt.cxx,v $ * - * $Revision: 1.83 $ + * $Revision: 1.84 $ * - * last change: $Author: fme $ $Date: 2002-12-10 09:35:40 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -203,7 +203,8 @@ using namespace ::com::sun::star::beans; // steht im number.cxx extern const sal_Char __FAR_DATA sBulletFntName[]; -extern void MA_FASTCALL SwAlignRect( SwRect &rRect, ViewShell *pSh ); +// OD 24.01.2003 #106593# - no longer needed, included in <frmtool.hxx> +//extern void MA_FASTCALL SwAlignRect( SwRect &rRect, ViewShell *pSh ); #ifndef PRODUCT // Test2: WYSIWYG++ @@ -1650,6 +1651,7 @@ sal_Bool SwTxtFormatInfo::_CheckFtnPortion( SwLineLayout* pCurr ) { bRet = sal_True; SetLineHeight( nHeight ); + SetLineNettoHeight( pCurr->Height() ); break; } pPor = pPor->GetPortion(); @@ -1664,14 +1666,17 @@ sal_Bool SwTxtFormatInfo::_CheckFtnPortion( SwLineLayout* pCurr ) * SwTxtFormatInfo::ScanPortionEnd() *************************************************************************/ xub_StrLen SwTxtFormatInfo::ScanPortionEnd( const xub_StrLen nStart, - const xub_StrLen nEnd, - sal_Bool bSkip ) + const xub_StrLen nEnd ) { cHookChar = 0; const xub_Unicode cTabDec = GetLastTab() ? (sal_Unicode)GetTabDecimal() : 0; xub_StrLen i = nStart; - if ( bSkip && i < nEnd ) - ++i; + + // Removed for i7288. bSkip used to be passed from SwFldPortion::Format + // as IsFollow(). Therefore more than one special character was not + // handled correctly at the beginning of follow fields. +// if ( bSkip && i < nEnd ) +// ++i; for( ; i < nEnd; ++i ) { diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index b7f97bbc6221..3c348554826e 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: inftxt.hxx,v $ * - * $Revision: 1.38 $ + * $Revision: 1.39 $ * - * last change: $Author: fme $ $Date: 2002-11-14 08:55:04 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:40:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -759,8 +759,7 @@ public: // Sucht ab nIdx bis nEnd nach Tabs, TabDec, TXTATR und BRK. // Return: gefundene Position, setzt ggf. cHookChar - xub_StrLen ScanPortionEnd( const xub_StrLen nStart, const xub_StrLen nEnd, - sal_Bool bSkip = sal_False ); + xub_StrLen ScanPortionEnd( const xub_StrLen nStart, const xub_StrLen nEnd ); // friend ostream &operator<<( ostream &rOS, const SwTxtFormatInfo &rInf ); friend SvStream &operator<<( SvStream &rOS, const SwTxtFormatInfo &rInf ); diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx index 5e250674029e..d5a4b2e55cf8 100644 --- a/sw/source/core/text/itrcrsr.cxx +++ b/sw/source/core/text/itrcrsr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: itrcrsr.cxx,v $ * - * $Revision: 1.53 $ + * $Revision: 1.54 $ * - * last change: $Author: fme $ $Date: 2002-12-02 10:28:13 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -516,6 +516,7 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const xub_StrLen nOfst, SwTwips nX = 0; SwTwips nFirst = 0; SwLinePortion *pPor = pCurr->GetFirstPortion(); + SwBidiPortion* pLastBidiPor = 0; SvShorts* pSpaceAdd = pCurr->GetpSpaceAdd(); SvUShorts* pKanaComp = pCurr->GetpKanaComp(); MSHORT nSpaceIdx = 0; @@ -605,8 +606,16 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const xub_StrLen nOfst, nPorHeight = pPor->Height(); nPorAscent = pPor->GetAscent(); } - if ( aInf.GetIdx() + pPor->GetLen() < nOfst + - ( pPor->IsMultiPortion() && !bWidth ? 0 : 1 ) ) + + // If we are behind the portion, we add the portion width to + // nX. Special case: nOfst = aInf.GetIdx() + pPor->GetLen(). + // For common portions (including BidiPortions) we want to add + // the portion width to nX. For MultiPortions, nExtra = 0, + // therefore we go to the 'else' branch and start a recursion. + const BYTE nExtra = pPor->IsMultiPortion() && + ! ((SwMultiPortion*)pPor)->IsBidi() && + ! bWidth ? 0 : 1; + if ( aInf.GetIdx() + pPor->GetLen() < nOfst + nExtra ) { if ( pPor->InSpaceGrp() && nSpaceAdd ) nX += pPor->PrtWidth() + @@ -633,19 +642,29 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const xub_StrLen nOfst, !pPor->GetPortion()->IsMarginPortion() ) ) nX += pPor->PrtWidth(); } - if( pPor->IsMultiPortion() && - ((SwMultiPortion*)pPor)->HasTabulator() ) + if( pPor->IsMultiPortion() ) { - if ( pSpaceAdd ) + if ( ((SwMultiPortion*)pPor)->HasTabulator() ) { - if ( ++nSpaceIdx < pSpaceAdd->Count() ) - nSpaceAdd = (*pSpaceAdd)[nSpaceIdx]; - else - nSpaceAdd = 0; + if ( pSpaceAdd ) + { + if ( ++nSpaceIdx < pSpaceAdd->Count() ) + nSpaceAdd = (*pSpaceAdd)[nSpaceIdx]; + else + nSpaceAdd = 0; + } + + if( pKanaComp && ( nKanaIdx + 1 ) < pKanaComp->Count() ) + ++nKanaIdx; } - if( pKanaComp && ( nKanaIdx + 1 ) < pKanaComp->Count() ) - ++nKanaIdx; + // if we are right behind a BidiPortion, we have to + // hold a pointer to the BidiPortion in order to + // find the correct cursor position, depending on the + // cursor level + if ( ((SwMultiPortion*)pPor)->IsBidi() && + aInf.GetIdx() + pPor->GetLen() == nOfst ) + pLastBidiPor = (SwBidiPortion*)pPor; } aInf.SetIdx( aInf.GetIdx() + pPor->GetLen() ); @@ -666,8 +685,14 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const xub_StrLen nOfst, if( pCMS && pCMS->b2Lines ) { - pCMS->p2Lines = new Sw2LinesPos(); - pCMS->p2Lines->aLine = SwRect(aCharPos, aCharSize); + sal_Bool bRecursion = sal_True; + if ( ! pCMS->p2Lines ) + { + pCMS->p2Lines = new Sw2LinesPos; + pCMS->p2Lines->aLine = SwRect(aCharPos, aCharSize); + bRecursion = sal_False; + } + if( ((SwMultiPortion*)pPor)->HasRotation() ) { if( ((SwMultiPortion*)pPor)->IsRevers() ) @@ -677,18 +702,22 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const xub_StrLen nOfst, } else if( ((SwMultiPortion*)pPor)->IsDouble() ) pCMS->p2Lines->nMultiType = MT_TWOLINE; -#ifdef BIDI else if( ((SwMultiPortion*)pPor)->IsBidi() ) pCMS->p2Lines->nMultiType = MT_BIDI; -#endif else pCMS->p2Lines->nMultiType = MT_RUBY; + SwTwips nTmpWidth = pPor->Width(); if( nSpaceAdd ) nTmpWidth += pPor->CalcSpacing(nSpaceAdd, aInf); - pCMS->p2Lines->aPortion = - SwRect( Point(aCharPos.X() + nX, pOrig->Top()), - Size( nTmpWidth, pPor->Height() ) ); + + SwRect aRect( Point(aCharPos.X() + nX, pOrig->Top() ), + Size( nTmpWidth, pPor->Height() ) ); + + if ( ! bRecursion ) + pCMS->p2Lines->aPortion = aRect; + else + pCMS->p2Lines->aPortion2 = aRect; } // In a multi-portion we use GetCharRect()-function @@ -859,22 +888,6 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const xub_StrLen nOfst, const SwTwips nInsideOfst = pOrig->Pos().X(); pOrig->Pos().X() = nX + nPorWidth - nInsideOfst - pOrig->Width(); - if ( nInsideOfst == nPorWidth ) - { - // logical position is behind multi portion - USHORT nDefaultDir = GetTxtFrm()->IsRightToLeft() ? - 1 : 0; - if ( pCMS && - pCMS->nCursorBidiLevel == nDefaultDir ) - pOrig->Pos().X() += nPorWidth; - - // actually we are not in a bidi portion - if ( pCMS && pCMS->p2Lines ) - { - delete pCMS->p2Lines; - pCMS->p2Lines = 0; - } - } } else pOrig->Pos().X() += nX; @@ -1080,19 +1093,6 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const xub_StrLen nOfst, pOrig->Width( nTmp ); } - if ( pPor->IsMultiPortion() && ((SwMultiPortion*)pPor)->IsBidi() ) - { - // logical position is at beginning of bidi portion - // we determine if the cursor has to blink before or behind - // the bidi portion - USHORT nDefaultDir = GetTxtFrm()->IsRightToLeft() ? 1 : 0; - if ( pCMS->nCursorBidiLevel != nDefaultDir ) - { - pOrig->Pos().X() += pPor->Width() + - pPor->CalcSpacing( nSpaceAdd, aInf ); - } - } - // travel inside field portion? if ( pCMS->pSpecialPos ) { @@ -1102,6 +1102,59 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const xub_StrLen nOfst, } } } + + // special case: We are at the beginning of a BidiPortion or + // directly behind a BidiPortion + if ( pCMS && + ( pLastBidiPor || + ( pPor && + pPor->IsMultiPortion() && + ((SwMultiPortion*)pPor)->IsBidi() ) ) ) + { + // we determine if the cursor has to blink before or behind + // the bidi portion + if ( pLastBidiPor ) + { + const BYTE nPortionLevel = pLastBidiPor->GetLevel(); + + if ( pCMS->nCursorBidiLevel >= nPortionLevel ) + { + // we came from inside the bidi portion, we want to blink + // behind the portion + pOrig->Pos().X() -= pLastBidiPor->Width() + + pLastBidiPor->CalcSpacing( nSpaceAdd, aInf ); + + // Again, there is a special case: logically behind + // the portion can actually mean that the cursor is inside + // the portion. This can happen is the last portion + // inside the bidi portion is a nested bidi portion + SwLineLayout& rLineLayout = + ((SwMultiPortion*)pLastBidiPor)->GetRoot(); + + const SwLinePortion *pLast = rLineLayout.FindLastPortion(); + if ( pLast->IsMultiPortion() ) + { + ASSERT( ((SwMultiPortion*)pLast)->IsBidi(), + "Non-BidiPortion inside BidiPortion" ) + pOrig->Pos().X() += pLast->Width() + + pLast->CalcSpacing( nSpaceAdd, aInf ); + } + } + } + else + { + const BYTE nPortionLevel = ((SwBidiPortion*)pPor)->GetLevel(); + + if ( pCMS->nCursorBidiLevel >= nPortionLevel ) + { + // we came from inside the bidi portion, we want to blink + // behind the portion + pOrig->Pos().X() += pPor->Width() + + pPor->CalcSpacing( nSpaceAdd, aInf ); + } + } + } + pOrig->Pos().X() += nX; if ( pCMS && pCMS->bRealHeight ) @@ -1431,7 +1484,9 @@ xub_StrLen SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint, // Sonst kommen wir nicht mehr in zeichengeb. Rahmen hinein... if( !( nChgNode && pPos && pPor->IsFlyCntPortion() ) ) { - if ( pPor->InFldGrp() ) + if ( pPor->InFldGrp() || + ( pPor->IsMultiPortion() && + ((SwMultiPortion*)pPor)->IsBidi() ) ) { KSHORT nHeight = 0; if( !bFieldInfo ) @@ -1440,8 +1495,9 @@ xub_StrLen SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint, if ( !nHeight || nHeight > nWidth ) nHeight = nWidth; } - if( !((SwFldPortion*)pPor)->HasFollow() && - nWidth - nHeight/2 <= nX ) + if( nWidth - nHeight/2 <= nX && + ( ! pPor->InFldGrp() || + !((SwFldPortion*)pPor)->HasFollow() ) ) ++nCurrStart; } else if ( ( !pPor->IsFlyPortion() || ( pPor->GetPortion() && @@ -1505,12 +1561,7 @@ xub_StrLen SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint, { const BYTE nBidiLevel = ((SwBidiPortion*)pPor)->GetLevel(); aLayoutModeModifier.Modify( nBidiLevel % 2 ); - if ( pCMS ) - ((SwCrsrMoveState*)pCMS)->nCursorBidiLevel = nBidiLevel; } - else if ( pCMS ) - ((SwCrsrMoveState*)pCMS)->nCursorBidiLevel = - GetTxtFrm()->IsRightToLeft() ? 1 : 0; #else SwTxtCursorSave aSave( (SwTxtCursor*)this, (SwMultiPortion*)pPor, nTmpY, nCurrStart, nSpaceAdd ); @@ -1579,6 +1630,10 @@ xub_StrLen SwTxtCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint, nLength = aSizeInf.GetFont()->_GetCrsrOfst( aDrawInf ); + if ( pCMS ) + ((SwCrsrMoveState*)pCMS)->nCursorBidiLevel = + aDrawInf.GetCursorBidiLevel(); + if( bFieldInfo && nLength == pPor->GetLen() && ( ! pPor->GetPortion() || ! pPor->GetPortion()->IsPostItsPortion() ) ) diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index a63c96f7016d..c32327627910 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: itrform2.cxx,v $ * - * $Revision: 1.72 $ + * $Revision: 1.73 $ * - * last change: $Author: fme $ $Date: 2002-12-10 14:44:59 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -675,9 +675,10 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf ) // offset: // 1. Underlined portions due to special underline feature // 2. Right Tab - // 3. Multiportions - // 4. DropCaps - // 5. Grid Mode + // 3. BidiPortions + // 4. other Multiportions + // 5. DropCaps + // 6. Grid Mode else if ( ( ! rInf.GetPaintOfst() || nUnderLineStart < rInf.GetPaintOfst() ) && // 1. Underlined portions nUnderLineStart && @@ -694,11 +695,13 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf ) else if ( ! rInf.GetPaintOfst() && // 2. Right Tab ( ( pPor->InTabGrp() && !pPor->IsTabLeftPortion() ) || - // 3. Multi Portion and 4. Drop Caps - ( ( pPor->IsDropPortion() || pPor->IsMultiPortion() )&& + // 3. BidiPortions + ( pPor->IsMultiPortion() && ((SwMultiPortion*)pPor)->IsBidi() ) || + // 4. Multi Portion and 5. Drop Caps + ( ( pPor->IsDropPortion() || pPor->IsMultiPortion() ) && rInf.GetReformatStart() >= rInf.GetIdx() && rInf.GetReformatStart() <= rInf.GetIdx() + pPor->GetLen() ) - // 5. Grid Mode + // 6. Grid Mode || ( bHasGrid && SW_CJK != pFnt->GetActual() ) ) ) diff --git a/sw/source/core/text/makefile.mk b/sw/source/core/text/makefile.mk index ffa799f33a81..02d9ee595880 100644 --- a/sw/source/core/text/makefile.mk +++ b/sw/source/core/text/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: fme $ $Date: 2002-04-10 06:18:20 $ +# last change: $Author: hr $ $Date: 2003-03-27 15:41:01 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index f2969f4c3e12..7c89bb3813be 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -2,9 +2,9 @@ * * $RCSfile: porfld.cxx,v $ * - * $Revision: 1.34 $ + * $Revision: 1.35 $ * - * last change: $Author: fme $ $Date: 2002-11-18 12:17:03 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -368,7 +368,7 @@ sal_Bool SwFldPortion::Format( SwTxtFormatInfo &rInf ) else { nFullLen = rInf.ScanPortionEnd( rInf.GetIdx(), - rInf.GetIdx() + nOldFullLen, IsFollow() ) - rInf.GetIdx(); + rInf.GetIdx() + nOldFullLen ) - rInf.GetIdx(); if( nFullLen && CH_BREAK == aExpand.GetChar( nFullLen - 1 ) ) --nFullLen; @@ -681,8 +681,33 @@ void SwNumberPortion::Paint( const SwTxtPaintInfo &rInf ) const return; } - // Dies ist eine freizuegige Auslegung der Hintergrundbelegung ... - rInf.DrawViewOpt( *this, POR_NUMBER ); + // calculate the width of the number portion, including follows + const KSHORT nOldWidth = Width(); + USHORT nSumWidth = 0; + USHORT nOffset = 0; + + const SwLinePortion* pTmp = this; + while ( pTmp && pTmp->InNumberGrp() ) + { + nSumWidth += pTmp->Width(); + if ( ((SwNumberPortion*)pTmp)->HasFollow() ) + pTmp = pTmp->GetPortion(); + else + { + nOffset = pTmp->Width() - ((SwNumberPortion*)pTmp)->nFixWidth; + break; + } + } + + // The master portion takes care for painting the background of the + // follow field portions + if ( ! IsFollow() ) + { + SwLinePortion *pThis = (SwLinePortion*)this; + pThis->Width( nSumWidth ); + rInf.DrawViewOpt( *this, POR_NUMBER ); + pThis->Width( nOldWidth ); + } if( aExpand.Len() ) { @@ -697,13 +722,12 @@ void SwNumberPortion::Paint( const SwTxtPaintInfo &rInf ) const SwFontSave aSave( rInf, pFnt ); - if( nFixWidth == Width() ) + if( nFixWidth == Width() && ! HasFollow() ) SwExpandPortion::Paint( rInf ); else { // logisches const: Width wird wieder zurueckgesetzt SwLinePortion *pThis = (SwLinePortion*)this; - const KSHORT nOldWidth = Width(); bPaintSpace = bPaintSpace && nFixWidth < nOldWidth; KSHORT nSpaceOffs = nFixWidth; pThis->Width( nFixWidth ); @@ -714,7 +738,6 @@ void SwNumberPortion::Paint( const SwTxtPaintInfo &rInf ) const else { SwTxtPaintInfo aInf( rInf ); - KSHORT nOffset = nOldWidth - nFixWidth; if( nOffset < nMinDist ) nOffset = 0; else @@ -723,7 +746,7 @@ void SwNumberPortion::Paint( const SwTxtPaintInfo &rInf ) const { nOffset /= 2; if( nOffset < nMinDist ) - nOffset = nOldWidth - nFixWidth - nMinDist; + nOffset = 2 * nOffset - nMinDist; } else nOffset -= nMinDist; diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx index 0fe6b2d45964..f639d9e4ff88 100644 --- a/sw/source/core/text/porfly.cxx +++ b/sw/source/core/text/porfly.cxx @@ -2,9 +2,9 @@ * * $RCSfile: porfly.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: fme $ $Date: 2002-08-27 13:40:00 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -679,7 +679,9 @@ void SwFlyCntPortion::SetBase( const Point &rBase, long nLnAscent, aDiff = Point( -aDiff.Y(), aDiff.X() ); } - pSdrObj->ImpSetAnchorPos( aAnchorBase ); + // There used to be a ImpSetAnchorPos here. Very dangerous + // for group object. + pSdrObj->NbcSetAnchorPos( aAnchorBase ); // #80046# here a Move() is necessary, a NbcMove() is NOT ENOUGH(!) pSdrObj->Move( Size( aDiff.X(), aDiff.Y() ) ); diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx index 080e71edac3a..6a93d0a72c4f 100644 --- a/sw/source/core/text/porlay.cxx +++ b/sw/source/core/text/porlay.cxx @@ -2,9 +2,9 @@ * * $RCSfile: porlay.cxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: fme $ $Date: 2002-12-02 10:28:14 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -566,16 +566,20 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, SwAttrHandler& rAH, return; xub_StrLen nChg = nInvalidityPos; + // STRING_LEN means the data structure is up to date nInvalidityPos = STRING_LEN; + // this is the default direction + nDefaultDir = TEXT_LAYOUT_BIDI_STRONG != rOut.GetLayoutMode() ? + UBIDI_RTL : + UBIDI_LTR; + // counter for script info arrays USHORT nCnt = 0; // counter for compression information arrays USHORT nCntComp = 0; #ifdef BIDI - // counter for direction information arrays - USHORT nCntDir = 0; // counter for kashida array USHORT nCntKash = 0; #endif @@ -694,15 +698,13 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, SwAttrHandler& rAH, aCompType.Remove( nCntComp, nCompRemove ); #ifdef BIDI - // remove invalid entries from direction information arrays - const USHORT nDirRemove = aDirChg.Count(); - aDirChg.Remove( 0, nDirRemove ); - aDirType.Remove( 0, nDirRemove ); - // get the start of the last kashida group - USHORT nLastKashida = 0; - if( nCntKash ) - nLastKashida = GetKashida( nCntKash - 1 ); + USHORT nLastKashida = nChg; + if( nCntKash && i18n::ScriptType::COMPLEX == nScript ) + { + --nCntKash; + nLastKashida = GetKashida( nCntKash ); + } // remove invalid entries from kashida array aKashida.Remove( nCntKash, aKashida.Count() - nCntKash ); @@ -803,7 +805,6 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, SwAttrHandler& rAH, (BYTE)WEAK; } - // // UPDATE THE SCRIPT INFO ARRAYS: // @@ -913,6 +914,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, SwAttrHandler& rAH, while ( aScanner.NextWord() ) { const XubString& rWord = aScanner.GetWord(); + xub_StrLen nIdx = 0; xub_StrLen nKashidaPos = STRING_LEN; xub_Unicode cCh; @@ -1019,41 +1021,71 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, SwAttrHandler& rAH, } while ( TRUE ); -#ifdef BIDI - // Perform Unicode Bidi Algorithm for text direction information - nCnt = 0; - sal_Bool bLatin = sal_False; - sal_Bool bAsian = sal_False; - sal_Bool bComplex = sal_False; - - while( nCnt < CountScriptChg() ) +#ifndef PRODUCT + // check kashida data + long nTmpKashidaPos = -1; + sal_Bool bWrongKash = sal_False; + for ( USHORT i = 0; i < aKashida.Count(); ++i ) { - nScript = GetScriptType( nCnt++ ); - switch ( nScript ) + long nCurrKashidaPos = GetKashida( i ); + if ( nCurrKashidaPos <= nTmpKashidaPos ) { - case i18n::ScriptType::LATIN: - bLatin = sal_True; - break; - case i18n::ScriptType::ASIAN: - bAsian = sal_True; - break; - case i18n::ScriptType::COMPLEX: - bComplex = sal_True; + bWrongKash = sal_True; break; - default: - ASSERT( ! rTxt.Len(), "Wrong script found" ) } + nTmpKashidaPos = nCurrKashidaPos; } + ASSERT( ! bWrongKash, "Kashida array contains wrong data" ) +#endif - // this is the default direction - const BYTE nDefaultDir = TEXT_LAYOUT_BIDI_STRONG != rOut.GetLayoutMode() ? - UBIDI_RTL : - UBIDI_LTR; + // remove invalid entries from direction information arrays + if ( ! bBidiInfoValid ) + { + const USHORT nDirRemove = aDirChg.Count(); + aDirChg.Remove( 0, nDirRemove ); + aDirType.Remove( 0, nDirRemove ); + + // Perform Unicode Bidi Algorithm for text direction information + nCnt = 0; + sal_Bool bLatin = sal_False; + sal_Bool bAsian = sal_False; + sal_Bool bComplex = sal_False; - // do not call the unicode bidi algorithm if not required - if ( UBIDI_LTR == nDefaultDir && ! bComplex ) + while( nCnt < CountScriptChg() ) + { + nScript = GetScriptType( nCnt++ ); + switch ( nScript ) + { + case i18n::ScriptType::LATIN: + bLatin = sal_True; + break; + case i18n::ScriptType::ASIAN: + bAsian = sal_True; + break; + case i18n::ScriptType::COMPLEX: + bComplex = sal_True; + break; + default: + ASSERT( ! rTxt.Len(), "Wrong script found" ) + } + } + + // do not call the unicode bidi algorithm if not required + if ( UBIDI_LTR != nDefaultDir || bComplex ) + UpdateBidiInfo( rTxt ); + } +} + +void SwScriptInfo::UpdateBidiInfo( const String& rTxt ) +{ + if ( bBidiInfoValid ) return; + // remove invalid entries from direction information arrays + const USHORT nDirRemove = aDirChg.Count(); + aDirChg.Remove( 0, nDirRemove ); + aDirType.Remove( 0, nDirRemove ); + // // Bidi functions from icu 2.0 // @@ -1068,6 +1100,8 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, SwAttrHandler& rAH, UTextOffset nStart = 0; UTextOffset nEnd; UBiDiLevel nCurrDir; + // counter for direction information arrays + USHORT nCntDir = 0; for ( USHORT nIdx = 0; nIdx < nCount; ++nIdx ) { @@ -1078,10 +1112,10 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, SwAttrHandler& rAH, } ubidi_close( pBidi ); -#endif - + bBidiInfoValid = sal_True; } + /************************************************************************* * SwScriptInfo::NextScriptChg(..) * returns the position of the next character which belongs to another script @@ -1442,20 +1476,21 @@ USHORT SwScriptInfo::ThaiJustify( const XubString& rTxt, long* pKernArray, * SwScriptInfo::GetScriptInfo() *************************************************************************/ -const SwScriptInfo* SwScriptInfo::GetScriptInfo( const SwTxtNode& rTNd ) +SwScriptInfo* SwScriptInfo::GetScriptInfo( const SwTxtNode& rTNd, + sal_Bool bAllowInvalid ) { SwClientIter aClientIter( (SwTxtNode&)rTNd ); SwClient* pLast = aClientIter.GoStart(); - const SwScriptInfo* pScriptInfo = 0; + SwScriptInfo* pScriptInfo = 0; while( pLast ) { if ( pLast->ISA( SwTxtFrm ) ) { - pScriptInfo = ((SwTxtFrm*)pLast)->GetScriptInfo(); + pScriptInfo = (SwScriptInfo*)((SwTxtFrm*)pLast)->GetScriptInfo(); if ( pScriptInfo ) { - if ( STRING_LEN != pScriptInfo->GetInvalidity() ) + if ( ! bAllowInvalid && STRING_LEN != pScriptInfo->GetInvalidity() ) pScriptInfo = 0; else break; } diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx index 3f5dc5334842..9542d8a2e181 100644 --- a/sw/source/core/text/pormulti.cxx +++ b/sw/source/core/text/pormulti.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pormulti.cxx,v $ * - * $Revision: 1.72 $ + * $Revision: 1.73 $ * - * last change: $Author: fme $ $Date: 2002-12-10 14:44:59 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2307,6 +2307,25 @@ BOOL SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf, if ( ! rMulti.GetLen() ) lcl_TruncateMultiPortion( rMulti, rInf, nStartIdx ); + // If there is a HolePortion at the end of the bidi portion, + // it has to be moved behind the bidi portion. Otherwise + // the visual cursor travelling gets into trouble. + SwLineLayout& aRoot = rMulti.GetRoot(); + SwLinePortion* pPor = aRoot.GetFirstPortion(); + while ( pPor ) + { + if ( pPor->GetPortion() && pPor->GetPortion()->IsHolePortion() ) + { + SwLinePortion* pHolePor = pPor->GetPortion(); + pPor->SetPortion( NULL ); + aRoot.SetLen( aRoot.GetLen() - pHolePor->GetLen() ); + rMulti.SetLen( rMulti.GetLen() - pHolePor->GetLen() ); + rMulti.SetPortion( pHolePor ); + break; + } + pPor = pPor->GetPortion(); + } + pTmp = new SwBidiPortion( nMultiLen + rInf.GetIdx(), ((SwBidiPortion&)rMulti).GetLevel() ); } diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx index b2d800e96f28..7377440cd2c2 100644 --- a/sw/source/core/text/portxt.cxx +++ b/sw/source/core/text/portxt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: portxt.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: fme $ $Date: 2002-10-23 14:54:08 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -420,8 +420,9 @@ sal_Bool SwTxtPortion::_Format( SwTxtFormatInfo &rInf ) else if ( aGuess.BreakPos() >= rInf.GetIdx() && aGuess.BreakPos() != STRING_LEN ) { // case B1 - if( aGuess.HyphWord().is() && ( aGuess.BreakPos() > rInf.GetIdx() || - ( rInf.GetLast() && ! rInf.GetLast()->IsFlyPortion() ) ) ) + if( aGuess.HyphWord().is() && aGuess.BreakPos() > rInf.GetLineStart() + && ( aGuess.BreakPos() > rInf.GetIdx() || + ( rInf.GetLast() && ! rInf.GetLast()->IsFlyPortion() ) ) ) { CreateHyphen( rInf, aGuess ); if ( rInf.GetFly() ) @@ -667,6 +668,7 @@ xub_StrLen SwTxtPortion::GetSpaceCnt( const SwTxtSizeInfo &rInf, ((SwTxtSizeInfo &)rInf).SetOnWin( bOldOnWin ); nCnt += lcl_AddSpace( rInf, &aStr, *this ); + nPos = aStr.Len(); } } else if( !IsDropPortion() ) diff --git a/sw/source/core/text/txtcache.cxx b/sw/source/core/text/txtcache.cxx index 5faa3b49ebfe..574b1fb9e16b 100644 --- a/sw/source/core/text/txtcache.cxx +++ b/sw/source/core/text/txtcache.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtcache.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mh $ $Date: 2001-10-25 17:18:54 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,6 +66,7 @@ #pragma hdrstop #include "errhdl.hxx" +#include "segmentc.hxx" #include "txtcache.hxx" #include "txtfrm.hxx" diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index 4a1c5966c290..c7a5547e2d15 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtfly.cxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: aw $ $Date: 2002-10-30 15:13:25 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1227,8 +1227,6 @@ void SwTxtFly::DrawFlyRect( OutputDevice *pOut, const SwRect &rRect, if( bOn && ( 0 != ( nCount = GetFlyList()->Count() ) ) ) { MSHORT nHellId = pPage->GetShell()->GetDoc()->GetHellId(); - Size aPixelSz = Size( 1, 1 ); - aPixelSz = pOut->PixelToLogic( aPixelSz ); for( MSHORT i = 0; i < nCount; ++i ) { const SdrObject *pTmp = (*pFlyList)[ i ]; @@ -1238,12 +1236,20 @@ void SwTxtFly::DrawFlyRect( OutputDevice *pOut, const SwRect &rRect, ((SwContact*)GetUserCall(pTmp))->GetFmt(); const SwFmtSurround &rSur = pFmt->GetSurround(); - if( ( SURROUND_THROUGHT == rSur.GetSurround() ) ? - pTmp->GetLayer() != nHellId : !rSur.IsContour() ) + // OD 24.01.2003 #106593# - correct clipping of fly frame area. + // Consider that fly frame background/shadow can be transparent + // and <SwAlignRect(..)> fly frame area + const SwFlyFrm *pFly = static_cast<const SwVirtFlyDrawObj*>(pTmp)->GetFlyFrm(); + bool bClipFlyArea = + ( (SURROUND_THROUGHT == rSur.GetSurround()) ? + (pTmp->GetLayer() != nHellId) : !rSur.IsContour() ) && + !pFly->IsBackgroundTransparent() && + !pFly->IsShadowTransparent(); + if ( bClipFlyArea ) { SwRect aFly( pTmp->GetBoundRect() ); - aFly.Left( aFly.Left() - aPixelSz.Width() ); - aFly.Top( aFly.Top() - aPixelSz.Height() ); + // OD 24.01.2003 #106593# + ::SwAlignRect( aFly, pPage->GetShell() ); if( aFly.Width() > 0 && aFly.Height() > 0 ) aRegion -= aFly; } diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index 3d6037e8282a..a217a3e1d0c1 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtfrm.cxx,v $ * - * $Revision: 1.56 $ + * $Revision: 1.57 $ * - * last change: $Author: od $ $Date: 2002-12-10 14:02:47 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -786,6 +786,11 @@ void SwTxtFrm::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew ) Prepare( PREP_CLEAR ); _InvalidatePrt(); SET_WRONG( 0, STRING_LEN, Invalidate ); + SetDerivedR2L( sal_False ); + CheckDirChange(); + // OD 09.12.2002 #105576# - Force complete paint due to existing + // indents. + SetCompletePaint(); InvalidateLineNum(); } return; @@ -1750,7 +1755,8 @@ SwTestFormat::SwTestFormat( SwTxtFrm* pTxtFrm, const SwFrm* pPre, SwTwips nMaxHe (pFrm->Prt().*fnRect->fnGetTop)() - nLower ) ); (pFrm->Prt().*fnRect->fnSetWidth)( (pFrm->Frm().*fnRect->fnGetWidth)() - - ( rAttrs.CalcLeft( pFrm ) + rAttrs.CalcRight() ) ); + // OD 23.01.2003 #106895# - add 1st param to <SwBorderAttrs::CalcRight(..)> + ( rAttrs.CalcLeft( pFrm ) + rAttrs.CalcRight( pFrm ) ) ); pOldPara = pFrm->HasPara() ? pFrm->GetPara() : NULL; pFrm->SetPara( new SwParaPortion(), sal_False ); diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx index e75f1e92a1ff..f2ef21592abc 100644 --- a/sw/source/core/text/txtftn.cxx +++ b/sw/source/core/text/txtftn.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtftn.cxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: od $ $Date: 2002-11-11 09:43:14 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,6 +77,9 @@ #ifndef _TXTFTN_HXX //autogen #include <txtftn.hxx> #endif +#ifndef _FLYFRM_HXX +#include <flyfrm.hxx> +#endif #ifndef _FMTFTN_HXX //autogen #include <fmtftn.hxx> #endif @@ -86,12 +89,18 @@ #ifndef _CHARFMT_HXX //autogen #include <charfmt.hxx> #endif +#ifndef _DFLYOBJ_HXX +#include <dflyobj.hxx> +#endif #ifndef _SVX_BRSHITEM_HXX //autogen #include <svx/brshitem.hxx> #endif #ifndef _SVX_CHARROTATEITEM_HXX #include <svx/charrotateitem.hxx> #endif +#ifndef _SVDOBJ_HXX //autogen +#include <svx/svdobj.hxx> +#endif #ifndef _BREAKIT_HXX #include <breakit.hxx> #endif @@ -973,9 +982,43 @@ SwFtnPortion *SwTxtFormatter::NewFtnPortion( SwTxtFormatInfo &rInf, nLower += nAdd; #endif - //6995: Wir frischen nur auf. Das Connect tut fuer diesen Fall nix - //Brauchbares, sondern wuerde stattdessen fuer diesen Fall meist die - //Ftn wegwerfen und neu erzeugen. + // #i10770#: If there are fly frames anchored at previous paragraphs, + // the deadline should consider their lower borders. + SwFrm* pStartFrm = pFrm->GetUpper()->GetLower(); + ASSERT( pStartFrm, "Upper has no lower" ) + SwTwips nFlyLower = bVert ? LONG_MAX : 0; + while ( pStartFrm != pFrm ) + { + ASSERT( pStartFrm, "Frame chain is broken" ) + if ( pStartFrm->GetDrawObjs() ) + { + const SwDrawObjs &rObjs = *pStartFrm->GetDrawObjs(); + for ( USHORT i = 0; i < rObjs.Count(); ++i ) + { + SdrObject *pO = rObjs[i]; + SwRect aRect( pO->GetBoundRect() ); + + if ( ! pO->IsWriterFlyFrame() || + ((SwVirtFlyDrawObj*)pO)->GetFlyFrm()->IsValid() ) + { + const SwTwips nBottom = (aRect.*fnRect->fnGetBottom)(); + if ( (*fnRect->fnYDiff)( nBottom, nFlyLower ) > 0 ) + nFlyLower = nBottom; + } + } + } + + pStartFrm = pStartFrm->GetNext(); + } + + if ( bVert ) + nLower = Min( nLower, nFlyLower ); + else + nLower = Max( nLower, nFlyLower ); + + //6995: Wir frischen nur auf. Das Connect tut fuer diesen Fall nix + //Brauchbares, sondern wuerde stattdessen fuer diesen Fall meist die + //Ftn wegwerfen und neu erzeugen. if( !rInf.IsQuick() ) pFrm->ConnectFtn( pFtn, nLower ); diff --git a/sw/source/core/text/txtio.cxx b/sw/source/core/text/txtio.cxx index ee23f6fa9a3c..6a96c0b43496 100644 --- a/sw/source/core/text/txtio.cxx +++ b/sw/source/core/text/txtio.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtio.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: fme $ $Date: 2001-10-19 08:38:42 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -100,7 +100,7 @@ // So kann man die Layoutstruktur ausgeben lassen // #define AMA_LAYOUT #ifdef AMA_LAYOUT -#include <stdio.h> // sprintf +#include <stdio.h> #include <stdlib.h> // getenv() #include <flowfrm.hxx> #include <pagefrm.hxx> @@ -290,9 +290,9 @@ void LayOutPut( const SwFrm* pFrm ) // fuer dieses new wird es kein delete geben. pOutName = new char[nLen + strlen(pName) + 3]; if(nLen && (pPath[nLen-1] == '\\') || (pPath[nLen-1] == '/')) - sprintf( pOutName, "%s%s", pPath, pName ); + snprintf( pOutName, sizeof(pOutName), "%s%s", pPath, pName ); else - sprintf( pOutName, "%s/%s", pPath, pName ); + snprintf( pOutName, sizeof(pOutName), "%s/%s", pPath, pName ); } } SvFileStream aStream( pOutName, (bFirstOpen diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx index f4b2fecaadff..660b8b743e66 100644 --- a/sw/source/core/text/txttab.cxx +++ b/sw/source/core/text/txttab.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txttab.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: fme $ $Date: 2002-11-22 12:30:24 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -158,8 +158,10 @@ SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf ) const konvertiert (vgl. rInf.GetTabPos). */ const SwTwips nTabLeft = pFrm->Frm().Left() + - pFrm->GetAttrSet()->GetLRSpace().GetTxtLeft(); - // + KSHORT(pFrm->GetTxtNode()->GetLeftMarginWithNum( sal_True )); + ( pFrm->IsRightToLeft() ? + pFrm->GetAttrSet()->GetLRSpace().GetRight() : + pFrm->GetAttrSet()->GetLRSpace().GetTxtLeft() ); + const SwTwips nLinePos = GetLeftMargin(); const SwTwips nLineTab = nLinePos + nTabPos; SwTwips nRight = Right(); @@ -197,14 +199,11 @@ SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf ) const } SwTwips nCount = nLineTab; nCount -= nTabLeft; - // Bei negativen Werten rundet "/" auf, "%" liefert negative Reste, // bei positiven Werten rundet "/" ab, "%" liefert positvie Reste! - if ( nCount < 0 ) - nCount = 0; - + KSHORT nPlus = nCount < 0 ? 0 : 1; nCount /= nDefTabDist; - nNextPos = ( nCount + 1 ) * nDefTabDist ; + nNextPos = ( nCount + nPlus ) * nDefTabDist ; if( nNextPos + nTabLeft <= nLineTab + 50 ) nNextPos += nDefTabDist; cFill = 0; @@ -458,8 +457,8 @@ void SwTabPortion::Paint( const SwTxtPaintInfo &rInf ) const #ifndef PRODUCT // Wir wollen uns die Fixbreite anzeigen if( rInf.OnWin() && OPTDBG( rInf ) && - !rInf.GetOpt().IsPagePreview() && - !rInf.GetOpt().IsReadonly() && + !rInf.GetOpt().IsPagePreview() && \ + !rInf.GetOpt().IsReadonly() && \ SwViewOption::IsFieldShadings() ) { const KSHORT nWidth = PrtWidth(); diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx index 27f7206c2c6e..9bcdc42a01af 100644 --- a/sw/source/core/tox/txmsrt.cxx +++ b/sw/source/core/tox/txmsrt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txmsrt.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: os $ $Date: 2002-10-30 10:38:39 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -754,7 +754,8 @@ void SwTOXPara::FillText( SwTxtNode& rNd, const SwIndex& rInsPos, USHORT ) const ++nStt; */ pSrc->GetExpandTxt( rNd, &rInsPos, nStt, - nEndIndex == STRING_LEN ? STRING_LEN : nEndIndex - nStt ); + nEndIndex == STRING_LEN ? STRING_LEN : nEndIndex - nStt, + FALSE, FALSE ); } else { @@ -797,12 +798,14 @@ String SwTOXPara::GetURL() const { // dann noch die rel. Nummer davor setzen const SwNumRule& rRule = *pNd->GetDoc()->GetOutlineNumRule(); - for( int n = 0; n <= pNum->GetLevel(); ++n ) - { - int nNum = pNum->GetLevelVal()[ n ]; - nNum -= ( rRule.Get( n ).GetStart() - 1 ); - ( aTxt += String::CreateFromInt32( nNum )) += '.'; - } + const USHORT nCurrLevel = pNum->GetLevel(); + if(nCurrLevel <= MAXLEVEL) + for( int n = 0; n <= nCurrLevel; ++n ) + { + int nNum = pNum->GetLevelVal()[ n ]; + nNum -= ( rRule.Get( n ).GetStart() - 1 ); + ( aTxt += String::CreateFromInt32( nNum )) += '.'; + } } aTxt += ((SwTxtNode*)pNd)->GetExpandTxt(); ( aTxt += cMarkSeperator ).AppendAscii( pMarkToOutline ); diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index fcbe545373b0..08dab4445c88 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fntcache.cxx,v $ * - * $Revision: 1.64 $ + * $Revision: 1.65 $ * - * last change: $Author: fme $ $Date: 2002-12-05 10:06:20 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -746,9 +746,6 @@ BYTE lcl_WhichPunctuation( xub_Unicode cChar ) void SwFntObj::DrawText( SwDrawTextInfo &rInf ) { - - -static sal_Char __READONLY_DATA sDoubleSpace[] = " "; BOOL bPrt = OUTDEV_PRINTER == rInf.GetOut().GetOutDevType(); Font* pTmpFont = bPrt ? pPrtFont : GetScrFont(); @@ -1038,9 +1035,10 @@ static sal_Char __READONLY_DATA sDoubleSpace[] = " "; // handelt, muessen wir zwei ausgeben: if( 1 == rInf.GetLen() ) { - pKernArray[0] = nSpaceAdd; - rInf.GetOut().DrawTextArray( aPos, XubString( sDoubleSpace, - RTL_TEXTENCODING_MS_1252 ), pKernArray, 0, 2 ); + pKernArray[0] = rInf.GetWidth() + nSpaceAdd; + + rInf.GetOut().DrawTextArray( aPos, rInf.GetText(), + pKernArray, rInf.GetIdx(), 1 ); } else { @@ -1248,16 +1246,6 @@ static sal_Char __READONLY_DATA sDoubleSpace[] = " "; xub_Unicode cBulletChar = CH_BULLET; - if ( rInf.GetFont() ) - { - // Some Asian fonts do not have the middot (0xB7), - // others do not have the Asian middot (0xFF65). - // Until we find a better solution we do not paint - // middots with Asian fonts. - if ( SW_CJK == rInf.GetFont()->GetActual() ) - cBulletChar = CH_BLANK; // 0xFF65; - } - for( xub_StrLen i = 0; i < aStr.Len(); ++i ) if( CH_BLANK == aStr.GetChar( i ) ) aStr.SetChar( i, cBulletChar ); @@ -1284,7 +1272,7 @@ static sal_Char __READONLY_DATA sDoubleSpace[] = " "; // im Blocksatz handelt, muessen wir zwei ausgeben: if ( ( nCnt == 1 ) && rInf.GetSpace() && ( cChPrev == CH_BLANK ) ) { - pKernArray[0] = rInf.GetSpace() + rInf.GetKern(); + pKernArray[0] = rInf.GetWidth() + rInf.GetSpace() + rInf.GetKern(); #ifdef BIDI if ( bSwitchL2R ) @@ -1294,8 +1282,8 @@ static sal_Char __READONLY_DATA sDoubleSpace[] = " "; if ( bSwitchH2V ) rInf.GetFrm()->SwitchHorizontalToVertical( aPos ); - rInf.GetOut().DrawTextArray( aPos, XubString( sDoubleSpace, - RTL_TEXTENCODING_MS_1252 ), pKernArray, 0, 2 ); + rInf.GetOut().DrawTextArray( aPos, rInf.GetText(), + pKernArray, rInf.GetIdx(), 1 ); if( bBullet ) rInf.GetOut().DrawTextArray( aPos, *pStr, pKernArray, rInf.GetIdx() ? 1 : 0, 1 ); @@ -1829,10 +1817,10 @@ xub_StrLen SwFntObj::GetCrsrOfst( SwDrawTextInfo &rInf ) rInf.GetpOut()->GetTextArray( rInf.GetText(), pKernArray, rInf.GetIdx(), rInf.GetLen() ); + const SwScriptInfo* pSI = rInf.GetScriptInfo(); if ( rInf.GetFont() && rInf.GetLen() ) { const BYTE nActual = rInf.GetFont()->GetActual(); - const SwScriptInfo* pSI = rInf.GetScriptInfo(); // Kana Compression if ( SW_CJK == nActual && rInf.GetKanaComp() && pSI && pSI->CountCompChg() ) @@ -1968,9 +1956,12 @@ xub_StrLen SwFntObj::GetCrsrOfst( SwDrawTextInfo &rInf ) // step back if position is before the middle of the character if ( nIdx > rInf.GetIdx() && ( nRight > long( rInf.GetOfst() ) ) && ( nRight - rInf.GetOfst() > rInf.GetOfst() - nLeft ) ) - nCnt = nLastIdx - rInf.GetIdx(); + nCnt = nLastIdx - rInf.GetIdx(); // first half else - nCnt = nIdx - rInf.GetIdx(); + nCnt = nIdx - rInf.GetIdx(); // second half + + if ( pSI ) + rInf.SetCursorBidiLevel( pSI->DirType( nLastIdx ) ); delete[] pKernArray; return nCnt; diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx index 663645a0b8dd..7972a16ab20f 100644 --- a/sw/source/core/txtnode/fntcap.cxx +++ b/sw/source/core/txtnode/fntcap.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fntcap.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: fme $ $Date: 2002-06-19 07:43:41 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -90,6 +90,9 @@ #ifndef _BREAKIT_HXX #include <breakit.hxx> #endif +#ifndef _TXTFRM_HXX +#include <txtfrm.hxx> // SwTxtFrm +#endif using namespace ::com::sun::star::i18n; @@ -293,11 +296,25 @@ void SwDoDrawCapital::Do() void SwDoDrawCapital::DrawSpace( Point &rPos ) { static sal_Char __READONLY_DATA sDoubleSpace[] = " "; - const USHORT nDiff = (USHORT)( rInf.GetPos().X() - rPos.X() ); + + long nDiff = rInf.GetPos().X() - rPos.X(); + + Point aPos( rPos ); +#ifdef BIDI + if ( rInf.GetFrm()->IsRightToLeft() ) + { + rInf.GetFrm()->SwitchLTRtoRTL( aPos ); + nDiff = -nDiff; + } +#endif + + if ( rInf.GetFrm()->IsVertical() ) + rInf.GetFrm()->SwitchHorizontalToVertical( aPos ); + if ( nDiff ) { rInf.ApplyAutoColor(); - GetOut()->DrawStretchText( rPos, nDiff, + GetOut()->DrawStretchText( aPos, nDiff, XubString( sDoubleSpace, RTL_TEXTENCODING_MS_1252 ), 0, 2 ); } rPos.X() = rInf.GetPos().X() + rInf.GetWidth(); diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index e20d1ab1828d..56d5eb9d3c7c 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ndtxt.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: od $ $Date: 2002-11-11 09:37:58 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2603,7 +2603,8 @@ XubString SwTxtNode::GetExpandTxt( const xub_StrLen nIdx, const xub_StrLen nLen, } BOOL SwTxtNode::GetExpandTxt( SwTxtNode& rDestNd, const SwIndex* pDestIdx, - xub_StrLen nIdx, xub_StrLen nLen, BOOL bWithNum ) const + xub_StrLen nIdx, xub_StrLen nLen, BOOL bWithNum, + BOOL bWithFtn ) const { if( &rDestNd == this ) return FALSE; @@ -2669,26 +2670,29 @@ BOOL SwTxtNode::GetExpandTxt( SwTxtNode& rDestNd, const SwIndex* pDestIdx, case RES_TXTATR_FTN: { - const SwFmtFtn& rFtn = pHt->GetFtn(); - XubString sExpand; - if( rFtn.GetNumStr().Len() ) - sExpand = rFtn.GetNumStr(); - else if( rFtn.IsEndNote() ) - sExpand = GetDoc()->GetEndNoteInfo().aFmt. - GetNumStr( rFtn.GetNumber() ); - else - sExpand = GetDoc()->GetFtnInfo().aFmt. - GetNumStr( rFtn.GetNumber() ); - if( sExpand.Len() ) + if ( bWithFtn ) { - aDestIdx++; // dahinter einfuegen; - rDestNd.Insert( SvxEscapementItem( - SVX_ESCAPEMENT_SUPERSCRIPT ), - aDestIdx.GetIndex(), - aDestIdx.GetIndex() ); - rDestNd.Insert( sExpand, aDestIdx, INS_EMPTYEXPAND ); - aDestIdx = nInsPos + nAttrStartIdx; - nInsPos += sExpand.Len(); + const SwFmtFtn& rFtn = pHt->GetFtn(); + XubString sExpand; + if( rFtn.GetNumStr().Len() ) + sExpand = rFtn.GetNumStr(); + else if( rFtn.IsEndNote() ) + sExpand = GetDoc()->GetEndNoteInfo().aFmt. + GetNumStr( rFtn.GetNumber() ); + else + sExpand = GetDoc()->GetFtnInfo().aFmt. + GetNumStr( rFtn.GetNumber() ); + if( sExpand.Len() ) + { + aDestIdx++; // dahinter einfuegen; + rDestNd.Insert( SvxEscapementItem( + SVX_ESCAPEMENT_SUPERSCRIPT ), + aDestIdx.GetIndex(), + aDestIdx.GetIndex() ); + rDestNd.Insert( sExpand, aDestIdx, INS_EMPTYEXPAND ); + aDestIdx = nInsPos + nAttrStartIdx; + nInsPos += sExpand.Len(); + } } rDestNd.Erase( aDestIdx, 1 ); --nInsPos; diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index c431f90abbc0..46541b9f3ee7 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -2,9 +2,9 @@ * * $RCSfile: swfont.cxx,v $ * - * $Revision: 1.39 $ + * $Revision: 1.40 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 09:42:08 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -290,9 +290,9 @@ void SwFont::SetVertical( USHORT nDir, const BOOL bVertFormat ) if( nDir != aSub[0].GetOrientation() ) { bFntChg = TRUE; - aSub[0].SetVertical( nDir ); - aSub[1].SetVertical( nDir ); - aSub[2].SetVertical( nDir ); + aSub[0].SetVertical( nDir, bVertFormat ); + aSub[1].SetVertical( nDir, bVertFormat || nDir > 1000 ); + aSub[2].SetVertical( nDir, bVertFormat ); } } diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 9cd61f51517d..88181432f21f 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtedt.cxx,v $ * - * $Revision: 1.37 $ + * $Revision: 1.38 $ * - * last change: $Author: fme $ $Date: 2002-11-07 09:44:25 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,6 +73,7 @@ #include <stdlib.h> // getenv() #include <time.h> // clock() #include "viewsh.hxx" // ViewShell::GetHyphenator + #include <tools/stream.hxx> #endif #ifndef _HINTIDS_HXX @@ -561,8 +562,30 @@ BOOL SwScanner::NextWord() else bStart = FALSE; - nBegin = (xub_StrLen)aBound.startPos; - nLen = aBound.endPos - nBegin; + // restrict boundaries to script boundaries and nEndPos + const USHORT nCurrScript = + pBreakIt->xBreak->getScriptType( rText, nBegin ); + + // restrict word end to next script change position + ASSERT( aBound.endPos >= nBegin, "SwScanner is getting into trouble" ) + XubString aTmpWord = rText.Copy( nBegin, aBound.endPos - nBegin ); + long nScriptEnd = nBegin + + pBreakIt->xBreak->endOfScript( aTmpWord, 0, nCurrScript ); + long nEnd = Min( aBound.endPos, nScriptEnd ); + + // restrict word start to last script change position + long nScriptBegin = aBound.startPos; + if ( aBound.startPos < nBegin ) + { + // search from nBegin backwards until the next script change + aTmpWord = rText.Copy( aBound.startPos, nBegin - aBound.startPos + 1 ); + nScriptBegin = aBound.startPos + + pBreakIt->xBreak->beginOfScript( aTmpWord, nBegin - aBound.startPos, + nCurrScript ); + } + + nBegin = Max( aBound.startPos, nScriptBegin ); + nLen = nEnd - nBegin; if( ! nLen ) return FALSE; @@ -1304,12 +1327,12 @@ void SwLinguStatistik::Flush() // fuer dieses new wird es kein delete geben. pLogName = new char[nLen + strlen(pName) + 3]; if(nLen && (pPath[nLen-1] == '\\') || (pPath[nLen-1] == '/')) - sprintf( pLogName, "%s%s", pPath, pName ); + snprintf( pLogName, sizeof(pLogName), "%s%s", pPath, pName ); else - sprintf( pLogName, "%s/%s", pPath, pName ); + snprintf( pLogName, sizeof(pLogName), "%s/%s", pPath, pName ); } } - SvFileStream aStream( pLogName, (bFirstOpen + SvFileStream aStream( String::CreateFromAscii(pLogName), (bFirstOpen ? STREAM_WRITE | STREAM_TRUNC : STREAM_WRITE )); @@ -1347,7 +1370,7 @@ void SwLinguStatistik::Flush() nWords = nWrong = nAlter = nSynonym = nNoSynonym = nHyphens = nNoHyph = nHyphErr = nSpellTime = nTheTime = nHyphTime = 0; - pThes = NULL; + //pThes = NULL; #endif } diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx index e19576fe1680..e7099d5c023a 100644 --- a/sw/source/core/unocore/swunohelper.cxx +++ b/sw/source/core/unocore/swunohelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: swunohelper.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: jp $ $Date: 2001-10-18 11:42:10 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -255,6 +255,33 @@ BOOL UCB_IsReadOnlyFileName( const String& rURL ) return bIsReadOnly; } +BOOL UCB_IsFile( const String& rURL ) +{ + BOOL bExists = FALSE; + try + { + ::ucb::Content aContent( rURL, STAR_REFERENCE( ucb::XCommandEnvironment )() ); + bExists = aContent.isDocument(); + } + catch (UNO_NMSPC::Exception &) + { + } + return bExists; +} + +BOOL UCB_IsDirectory( const String& rURL ) +{ + BOOL bExists = FALSE; + try + { + ::ucb::Content aContent( rURL, STAR_REFERENCE( ucb::XCommandEnvironment )() ); + bExists = aContent.isFolder(); + } + catch (UNO_NMSPC::Exception &) + { + } + return bExists; +} // get a list of files from the folder of the URL // options: pExtension = 0 -> all, else this specific extension diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index e5804c3f02e5..f6f8739651b0 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unocrsrhelper.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: os $ $Date: 2002-11-05 08:42:07 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -165,6 +165,9 @@ #ifndef _DOC_HXX //autogen #include <doc.hxx> #endif +#ifndef _FCHRFMT_HXX +#include <fchrfmt.hxx> +#endif #ifndef _SVX_FLSTITEM_HXX //autogen #include <svx/flstitem.hxx> #endif @@ -174,6 +177,9 @@ #ifndef _CTRLTOOL_HXX #include <svtools/ctrltool.hxx> #endif +#define _SVSTDARR_USHORTS +#define _SVSTDARR_USHORTSSORT +#include <svtools/svstdarr.hxx> #ifndef _SFX_DOCFILT_HACK_HXX //autogen #include <sfx2/docfilt.hxx> #endif @@ -493,6 +499,67 @@ sal_Bool getCrsrPropertyValue(const SfxItemPropertyMap* pMap eNewState = PropertyState_DEFAULT_VALUE; } break; + case FN_UNO_CHARFMT_SEQUENCE: + { + + SwTxtNode* pTxtNode; + if((pTxtNode = (SwTxtNode*)rPam.GetNode( TRUE )) == rPam.GetNode(FALSE) && + pTxtNode->GetpSwpHints()) + { + USHORT nPaMStart = rPam.GetPoint()->nContent.GetIndex(); + USHORT nPaMEnd = rPam.GetMark() ? rPam.GetMark()->nContent.GetIndex() : nPaMStart; + if(nPaMStart > nPaMEnd) + { + USHORT nTmp = nPaMStart; + nPaMStart = nPaMEnd; + nPaMEnd = nTmp; + } + Sequence< ::rtl::OUString> aCharStyles; + USHORT nCharStylesFound = 0; + SwpHints* pHints = pTxtNode->GetpSwpHints(); + for(USHORT nAttr = 0; nAttr < pHints->GetStartCount(); nAttr++ ) + { + SwTxtAttr* pAttr = pHints->GetStart( nAttr ); + if(pAttr->Which() != RES_TXTATR_CHARFMT) + continue; + USHORT nAttrStart = *pAttr->GetStart(); + USHORT nAttrEnd = *pAttr->GetEnd(); + //check if the attribute touches the selection + if(nAttrEnd > nPaMStart && nAttrStart < nPaMEnd && nAttrEnd > nPaMStart) + { + //check for overlapping + if(nAttrStart > nPaMStart || + nAttrEnd < nPaMEnd) + { + aCharStyles.realloc(0); + eNewState = PropertyState_AMBIGUOUS_VALUE; + break; + } + else + { + //now the attribute should start before or at the selection + //and it should end at the end of the selection or behind + DBG_ASSERT(nAttrStart <= nPaMStart && nAttrEnd >=nPaMEnd, + "attribute overlaps or is outside"); + //now the name of the style has to be added to the sequence + aCharStyles.realloc(aCharStyles.getLength() + 1); + DBG_ASSERT(pAttr->GetCharFmt().GetCharFmt(), "no character format set"); + aCharStyles.getArray()[aCharStyles.getLength() - 1] = + SwStyleNameMapper::GetProgName( + pAttr->GetCharFmt().GetCharFmt()->GetName(), GET_POOLID_CHRFMT); + } + } + + } + if(aCharStyles.getLength()) + eNewState = PropertyState_DIRECT_VALUE; + if(pAny) + (*pAny) <<= aCharStyles; + } + else + eNewState = PropertyState_DEFAULT_VALUE; + } + break; case RES_TXTATR_CHARFMT: // kein break hier! default: bDone = sal_False; @@ -694,6 +761,13 @@ void resetCrsrPropertyValue(const SfxItemPropertyMap* pMap, SwPaM& rPam) case FN_UNO_NUM_RULES: // lcl_setNumberingProperty(aValue, pUnoCrsr); break; + case FN_UNO_CHARFMT_SEQUENCE: + { + SvUShortsSort aWhichIds; + aWhichIds.Insert(RES_TXTATR_CHARFMT); + pDoc->ResetAttr(rPam, sal_True, &aWhichIds); + } + break; } } /* -----------------21.07.98 11:36------------------- diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 64ba2e37357b..74d554d44556 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unodraw.cxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: tl $ $Date: 2002-10-30 13:03:24 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1048,7 +1048,7 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a if(!bDone) throw IllegalArgumentException(); } - else if(RES_OPAQUE == pMap->nWID) + else if(RES_OPAQUE == pMap->nWID) { SvxShape* pSvxShape = GetSvxShape(); DBG_ASSERT(pSvxShape, "No SvxShape found!") @@ -1177,7 +1177,7 @@ uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName) aRet.setValue(&bOpaque, ::getBooleanCppuType()); } } - if(FN_ANCHOR_POSITION == pMap->nWID) + else if(FN_ANCHOR_POSITION == pMap->nWID) { SvxShape* pSvxShape = GetSvxShape(); DBG_ASSERT(pSvxShape, "No SvxShape found!") diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 5f01460de16c..2de8a9764ffe 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unofield.cxx,v $ * - * $Revision: 1.69 $ + * $Revision: 1.70 $ * - * last change: $Author: dvo $ $Date: 2002-11-21 15:31:59 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1309,6 +1309,8 @@ void SwXTextField::attachTextFieldMaster(const uno::Reference< XPropertySet > & if(!m_bIsDescriptor) throw uno::RuntimeException(); uno::Reference< XUnoTunnel > xMasterTunnel(xFieldMaster, uno::UNO_QUERY); + if (!xMasterTunnel.is()) + throw IllegalArgumentException(); SwXFieldMaster* pMaster = (SwXFieldMaster*)xMasterTunnel->getSomething( SwXFieldMaster::getUnoTunnelId()); diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index c739dbcb6a85..660c63817a0b 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoframe.cxx,v $ * - * $Revision: 1.74 $ + * $Revision: 1.75 $ * - * last change: $Author: mib $ $Date: 2002-11-26 12:35:38 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -264,6 +264,10 @@ #include <svx/frmdiritem.hxx> #endif +#include <so3/outplace.hxx> + +// from fefly1.cxx +extern sal_Bool lcl_ChkAndSetNewAnchor( const SwFlyFrm& rFly, SfxItemSet& rSet ); using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -1203,9 +1207,28 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const uno::Any& a SwFrmFmt *pFrmFmt = lcl_GetFrmFmt( aValue, pFmt->GetDoc() ); if( pFrmFmt ) { -// pSh->SetFrmFmt( pStyle->GetFrmFmt() ); UnoActionContext aAction(pFmt->GetDoc()); - pFmt->GetDoc()->SetFrmFmtToFly( *pFmt, *pFrmFmt ); + + // see SwFEShell::SetFrmFmt( SwFrmFmt *pNewFmt, sal_Bool bKeepOrient, Point* pDocPos ) + SwFlyFrm *pFly = 0; + const SwFrmFmt* pFmtXX = pFmt; + if (PTR_CAST(SwFlyFrmFmt, pFmtXX)) + pFly = ((SwFlyFrmFmt*)pFmtXX)->GetFrm(); + SfxItemSet* pSet = 0; + if (pFly) + { + const SfxPoolItem* pItem; + if( SFX_ITEM_SET == pFrmFmt->GetItemState( RES_ANCHOR, sal_False, &pItem )) + { + pSet = new SfxItemSet( pDoc->GetAttrPool(), aFrmFmtSetRange ); + pSet->Put( *pItem ); + if( !::lcl_ChkAndSetNewAnchor( *pFly, *pSet )) + delete pSet, pSet = 0; + } + } + + pFmt->GetDoc()->SetFrmFmtToFly( *pFmt, *pFrmFmt, pSet, FALSE ); + delete pSet; } else throw IllegalArgumentException(); @@ -1440,7 +1463,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) } else if(pFmt) { - if(eType == FLYCNTTYPE_GRF && + if( ((eType == FLYCNTTYPE_GRF) || (eType == FLYCNTTYPE_OLE)) && pCur && ((pCur->nWID >= RES_GRFATR_BEGIN && pCur->nWID < RES_GRFATR_END )|| @@ -2239,10 +2262,14 @@ uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL SwXTextFrame::getTypes( ) ---------------------------------------------------------------------------*/ uno::Sequence< sal_Int8 > SAL_CALL SwXTextFrame::getImplementationId( ) throw(RuntimeException) { - static uno::Sequence< sal_Int8 > aId( 16 ); - static BOOL bInit = FALSE; + vos::OGuard aGuard(Application::GetSolarMutex()); + static Sequence< sal_Int8 > aId( 16 ); + static sal_Bool bInit = sal_False; if(!bInit) - rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); + { + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; + } return aId; } /*-- 11.12.98 15:23:03--------------------------------------------------- @@ -2579,10 +2606,14 @@ uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL ---------------------------------------------------------------------------*/ uno::Sequence< sal_Int8 > SAL_CALL SwXTextGraphicObject::getImplementationId( ) throw(RuntimeException) { - static uno::Sequence< sal_Int8 > aId( 16 ); - static BOOL bInit = FALSE; + vos::OGuard aGuard(Application::GetSolarMutex()); + static Sequence< sal_Int8 > aId( 16 ); + static sal_Bool bInit = sal_False; if(!bInit) - rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); + { + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; + } return aId; } /*-- 11.12.98 16:02:27--------------------------------------------------- @@ -2755,10 +2786,14 @@ uno::Sequence< uno::Type > SAL_CALL SwXTextEmbeddedObject::getTypes( ) throw(Ru ---------------------------------------------------------------------------*/ uno::Sequence< sal_Int8 > SAL_CALL SwXTextEmbeddedObject::getImplementationId( ) throw(RuntimeException) { - static uno::Sequence< sal_Int8 > aId( 16 ); - static BOOL bInit = FALSE; + vos::OGuard aGuard(Application::GetSolarMutex()); + static Sequence< sal_Int8 > aId( 16 ); + static sal_Bool bInit = sal_False; if(!bInit) - rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); + { + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; + } return aId; } /*-- 11.12.98 16:16:54--------------------------------------------------- @@ -2802,6 +2837,8 @@ void SwXTextEmbeddedObject::removeEventListener(const uno::Reference< XEventList -----------------------------------------------------------------------*/ +static uno::Reference< util::XModifyListener > xSwXOLEListener; + uno::Reference< XComponent > SwXTextEmbeddedObject::getEmbeddedObject(void) throw( RuntimeException ) { uno::Reference< XComponent > xRet; @@ -2831,18 +2868,21 @@ uno::Reference< XComponent > SwXTextEmbeddedObject::getEmbeddedObject(void) thr uno::Reference< util::XModifyBroadcaster > xBrdcst(xModel, uno::UNO_QUERY); if( xBrdcst.is() ) { - SwClientIter aIter( *pFmt ); - SwXOLEListener* pListener = (SwXOLEListener*)aIter. - First( TYPE( SwXOLEListener )); - //create a new one if the OLE object doesn't have one already - if( !pListener ) - { - uno::Reference< util::XModifyListener > xOLEListener = new SwXOLEListener(*pFmt, xModel); - xBrdcst->addModifyListener( xOLEListener ); - } + SwXOLEListener* pSwOLEListener = (SwXOLEListener*) + xSwXOLEListener.get(); + if( !pSwOLEListener ) + xSwXOLEListener = pSwOLEListener = new SwXOLEListener; + if( pSwOLEListener->AddOLEFmt( *pFmt ) ) + xBrdcst->addModifyListener( xSwXOLEListener ); } } } + else + { + SvOutPlaceObjectRef xOut( pOleNode->GetOLEObj().GetOleRef() ); + if ( xOut.Is() ) + xRet = xOut->GetUnoComponent(); + } } } return xRet; @@ -2903,41 +2943,16 @@ uno::Reference<container::XNameReplace> SAL_CALL /****************************************************************** * ******************************************************************/ -TYPEINIT1(SwXOLEListener, SwClient); -/* -----------------------------18.01.2002 09:59------------------------------ - - ---------------------------------------------------------------------------*/ -SwXOLEListener::SwXOLEListener( SwFmt& rOLEFmt, uno::Reference< XModel > xOLE) : - SwClient(&rOLEFmt), - xOLEModel(xOLE) -{ -} -/* -----------------------------18.01.2002 09:59------------------------------ - - ---------------------------------------------------------------------------*/ -SwXOLEListener::~SwXOLEListener() -{} void SwXOLEListener::modified( const EventObject& rEvent ) throw( RuntimeException ) { vos::OGuard aGuard(Application::GetSolarMutex()); - SwOLENode* pNd = 0; - SwFmt* pFmt = GetFmt(); - if(pFmt) - {const SwNodeIndex* pIdx = pFmt->GetCntnt().GetCntntIdx(); - if(pIdx) - { - SwNodeIndex aIdx(*pIdx, 1); - SwNoTxtNode* pNoTxt = aIdx.GetNode().GetNoTxtNode(); - pNd = pNoTxt->GetOLENode(); - } - } - if(!pNd) - throw RuntimeException(); - if( !pNd->GetOLEObj().IsOleRef() || - !pNd->GetOLEObj().GetOleRef()->GetProtocol().IsInPlaceActive() ) + SwOLENode* pNd; + sal_uInt16 nFndPos = FindEntry( rEvent, &pNd ); + if( USHRT_MAX != nFndPos && ( !pNd->GetOLEObj().IsOleRef() || + !pNd->GetOLEObj().GetOleRef()->GetProtocol().IsInPlaceActive() )) { // if the OLE-Node is UI-Active do nothing pNd->SetOLESizeInvalid( sal_True ); @@ -2954,27 +2969,156 @@ void SwXOLEListener::disposing( const EventObject& rEvent ) uno::Reference< util::XModifyListener > xListener( this ); + SwOLENode* pNd; + sal_uInt16 nFndPos = FindEntry( rEvent, &pNd ); + if( USHRT_MAX != nFndPos ) + { + SwDepend* pDepend = (SwDepend*)aFmts[ nFndPos ]; + aFmts.Remove( nFndPos, 1 ); - uno::Reference< frame::XModel > xModel( rEvent.Source, uno::UNO_QUERY ); - uno::Reference< util::XModifyBroadcaster > xBrdcst(xModel, uno::UNO_QUERY); + uno::Reference< frame::XModel > xModel( rEvent.Source, uno::UNO_QUERY ); + uno::Reference< util::XModifyBroadcaster > xBrdcst(xModel, uno::UNO_QUERY); - try - { if( xBrdcst.is() ) xBrdcst->removeModifyListener( xListener ); + + delete pDepend; + if( !aFmts.Count() ) + { + // we are the last? + // then can we delete us + xSwXOLEListener = 0; + } } - catch(Exception& rEx) +} +/* --------------------------------------------------------------------------- + + ---------------------------------------------------------------------------*/ +sal_Bool SwXOLEListener::AddOLEFmt( SwFrmFmt& rFmt ) +{ + for( sal_uInt16 n = 0, nCnt = aFmts.Count(); n < nCnt; ++n ) + if( &rFmt == ((SwDepend*)aFmts[ n ])->GetRegisteredIn() ) + return sal_False; // is in the array + + SwDepend* pNew = new SwDepend( this, &rFmt ); + aFmts.Insert( pNew, aFmts.Count() ); + return sal_True; +} +/* --------------------------------------------------------------------------- + + ---------------------------------------------------------------------------*/ +void SwXOLEListener::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew ) +{ + const SwClient* pClient = 0; + + switch( pOld ? pOld->Which() : 0 ) { - DBG_ERROR("OLE Listener couldn't be removed") + case RES_REMOVE_UNO_OBJECT: + case RES_OBJECTDYING: + pClient = (SwClient*)((SwPtrMsgPoolItem *)pOld)->pObject; + break; + + case RES_FMT_CHG: + // wurden wir an das neue umgehaengt und wird das alte geloscht? + if( ((SwFmtChg*)pOld)->pChangedFmt->IsFmtInDTOR() ) + { + pClient = ((SwFmtChg*)pNew)->pChangedFmt; + } + break; + } + + if( pClient ) + { + uno::Reference< util::XModifyListener > xListener( this ); + + SwDepend* pDepend; + for( sal_uInt16 n = 0, nCnt = aFmts.Count(); n < nCnt; ++n ) + { + if( pClient == (pDepend = (SwDepend*)aFmts[ n ])->GetRegisteredIn() ) + { + aFmts.Remove( n, 1 ); + + uno::Reference<frame::XModel> xModel = GetModel( *(SwFmt*)pClient ); + if( xModel.is() ) + { + uno::Reference< util::XModifyBroadcaster > xBrdcst(xModel, uno::UNO_QUERY); + if( xBrdcst.is() ) + xBrdcst->removeModifyListener( xListener ); + } + + delete pDepend; + if( !aFmts.Count() ) + { + // we are the last? + // then can we delete us + xSwXOLEListener = 0; + } + break; + } + } } } /* --------------------------------------------------------------------------- ---------------------------------------------------------------------------*/ -void SwXOLEListener::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew ) +uno::Reference< frame::XModel > SwXOLEListener::GetModel( const SwFmt& rFmt, SwOLENode** ppNd ) const { - ClientModify(this, pOld, pNew); - if(!GetRegisteredIn()) - xOLEModel = 0; + SfxObjectShell* pObjSh = GetObjShell( rFmt, ppNd ); + return pObjSh ? pObjSh->GetBaseModel() : (uno::Reference< frame::XModel >)0; +} +/* --------------------------------------------------------------------------- + + ---------------------------------------------------------------------------*/ +SfxObjectShell* SwXOLEListener::GetObjShell( const SwFmt& rFmt, + SwOLENode** ppNd ) const +{ + SfxObjectShell* pShell = 0; + const SwFmtCntnt& rCnt = rFmt.GetCntnt(); + if( rCnt.GetCntntIdx() ) + { + SwNodeIndex aIdx( *rCnt.GetCntntIdx(), 1 ); + SwOLENode* pOleNode = aIdx.GetNode().GetOLENode(); + if( pOleNode && pOleNode->GetOLEObj().IsOleRef() ) + { + SfxInPlaceObjectRef xIP( pOleNode->GetOLEObj().GetOleRef() ); + if( xIP.Is() ) + pShell = xIP->GetObjectShell(); + } + if( ppNd ) + *ppNd = pOleNode; + } + return pShell; +} +/* --------------------------------------------------------------------------- + + ---------------------------------------------------------------------------*/ +sal_uInt16 SwXOLEListener::FindEntry( const EventObject& rEvent,SwOLENode** ppNd) +{ + sal_uInt16 nRet = USHRT_MAX; + uno::Reference< frame::XModel > xSrch( rEvent.Source, uno::UNO_QUERY ); + + for( sal_uInt16 n = 0, nCnt = aFmts.Count(); n < nCnt; ++n ) + { + SwDepend* pDepend = (SwDepend*)aFmts[ n ]; + SwFrmFmt* pFmt = (SwFrmFmt*)pDepend->GetRegisteredIn(); + if( !pFmt ) + { + ASSERT( pFmt, "wo ist das Format geblieben?" ); + aFmts.Remove( n, 1 ); + delete pDepend; + --n; + --nCnt; + } + else + { + uno::Reference< frame::XModel > xFmt( GetModel( *pFmt, ppNd ), uno::UNO_QUERY); + if( xFmt == xSrch ) + { + nRet = n; + break; + } + } + } + return nRet; } diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx index 1c11e955c517..70d55da7aab9 100644 --- a/sw/source/core/unocore/unoftn.cxx +++ b/sw/source/core/unocore/unoftn.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoftn.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: tl $ $Date: 2002-09-13 12:45:15 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -227,12 +227,13 @@ uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL SwXFootnote::getTypes( ) ---------------------------------------------------------------------------*/ uno::Sequence< sal_Int8 > SAL_CALL SwXFootnote::getImplementationId( ) throw(uno::RuntimeException) { - static uno::Sequence< sal_Int8 > aId( 16 ); - static BOOL bInit = FALSE; + vos::OGuard aGuard(Application::GetSolarMutex()); + static Sequence< sal_Int8 > aId( 16 ); + static sal_Bool bInit = sal_False; if(!bInit) { - rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); - bInit = TRUE; + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; } return aId; } @@ -319,7 +320,7 @@ void SwXFootnote::attachToRange(const uno::Reference< text::XTextRange > & xText aFootNote.SetNumStr(m_sLabel); SfxItemSet aSet(pDoc->GetAttrPool(), RES_TXTATR_FTN, RES_TXTATR_FTN, 0L); aSet.Put(aFootNote); - SwXTextCursor::SetCrsrAttr(aPam, aSet); + SwXTextCursor::SetCrsrAttr(aPam, aSet, 0); pTxtAttr = aPam.GetNode()->GetTxtNode()->GetTxtAttr( aPam.GetPoint()->nContent.GetIndex()-1, RES_TXTATR_FTN ); @@ -460,11 +461,13 @@ uno::Reference< text::XTextCursor > SwXFootnote::createTextCursorByRange( if(pFmt && SwXTextRange::XTextRangeToSwPaM(aPam, aTextPosition)) { const SwTxtFtn* pTxtFtn = pFmt->GetTxtFtn(); -#ifdef DEBUG - const SwStartNode* p1 = aPam.GetNode()->FindFootnoteStartNode(); - const SwNode& rStNode = pTxtFtn->GetStartNode()->GetNode(); -#endif - if(aPam.GetNode()->FindStartNode() == &pTxtFtn->GetStartNode()->GetNode()) + + // skip section nodes to find 'true' start node + const SwNode* pStart = aPam.GetNode()->FindFootnoteStartNode(); + while( pStart->IsSectionNode() ) + pStart = pStart->FindStartNode(); + + if( pStart == &pTxtFtn->GetStartNode()->GetNode()) aRef = (text::XWordCursor*)new SwXTextCursor(this , *aPam.GetPoint(), CURSOR_FOOTNOTE, GetDoc(), aPam.GetMark()); } else diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index 966537b8ed73..1e5003a80aff 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoidx.cxx,v $ * - * $Revision: 1.49 $ + * $Revision: 1.50 $ * - * last change: $Author: os $ $Date: 2002-11-01 15:27:55 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -616,7 +616,13 @@ void SwXDocumentIndex::setPropertyValue(const OUString& rPropertyName, aForm.SetCommaSeparated(lcl_AnyToBool(aValue)); break; case WID_LABEL_CATEGORY : - pTOXBase->SetSequenceName(lcl_AnyToString(aValue)); + { + // convert file-format/API/external programmatic english name + // to internal UI name before usage + String aName( SwStyleNameMapper::GetSpecialExtraUIName( + lcl_AnyToString(aValue) ) ); + pTOXBase->SetSequenceName( aName ); + } break; case WID_LABEL_DISPLAY_TYPE : { @@ -888,8 +894,15 @@ uno::Any SwXDocumentIndex::getPropertyValue(const OUString& rPropertyName) bRet = rForm.IsCommaSeparated(); break; case WID_LABEL_CATEGORY : - aRet <<= OUString(pTOXBase->GetSequenceName()); + { + // convert internal UI name to + // file-format/API/external programmatic english name + // before usage + String aName( SwStyleNameMapper::GetSpecialExtraProgName( + pTOXBase->GetSequenceName() ) ); + aRet <<= OUString( aName ); bBOOL = sal_False; + } break; case WID_LABEL_DISPLAY_TYPE : { @@ -1587,6 +1600,7 @@ void SwXDocumentIndexMark::attachToRange(const Reference< text::XTextRange > & x aMark.SetPrimaryKeyReading(sPrimaryKeyReading); if(sSecondaryKeyReading.Len()) aMark.SetSecondaryKeyReading(sSecondaryKeyReading); + aMark.SetMainEntry(bMainEntry); break; case TOX_USER: case TOX_CONTENT: diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx index c4f57b63e4e5..a01918657d6d 100644 --- a/sw/source/core/unocore/unomap.cxx +++ b/sw/source/core/unocore/unomap.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unomap.cxx,v $ * - * $Revision: 1.146 $ + * $Revision: 1.147 $ * - * last change: $Author: os $ $Date: 2002-11-15 11:17:38 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -399,7 +399,9 @@ void SwUnoPropertyMapProvider::Sort( sal_uInt16 nId ) COMMON_CRSR_PARA_PROPERTIES_FN_ONLY \ COMMON_CRSR_PARA_PROPERTIES_WITHOUT_FN \ COMMON_HYPERLINK_PROPERTIES \ - { SW_PROP_NMID(UNO_NAME_CHAR_STYLE_NAME), RES_TXTATR_CHARFMT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, 0}, + { SW_PROP_NMID(UNO_NAME_CHAR_STYLE_NAME), RES_TXTATR_CHARFMT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, 0},\ + { SW_PROP_NMID(UNO_NAME_CHAR_STYLE_NAMES), FN_UNO_CHARFMT_SEQUENCE, CPPU_E2T(CPPUTYPE_OUSTRINGS), PropertyAttribute::MAYBEVOID, 0}, + #define COMMON_CRSR_PARA_PROPERTIES_2 \ COMMON_CRSR_PARA_PROPERTIES_FN_ONLY \ @@ -667,6 +669,7 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP { SW_PROP_NMID(UNO_NAME_IS_AUTO_UPDATE), FN_UNO_IS_AUTO_UPDATE, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0}, { SW_PROP_NMID(UNO_NAME_DISPLAY_NAME), FN_UNO_DISPLAY_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::READONLY, 0}, { SW_PROP_NMID(UNO_NAME_CATEGORY), FN_UNO_CATEGORY, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE , 0 }, + { SW_PROP_NMID(UNO_NAME_WRITING_MODE), RES_FRAMEDIR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0 }, {0,0,0,0,0} }; aMapArr[nPropertyId] = aParaStyleMap; @@ -679,6 +682,8 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP { SW_PROP_NMID(UNO_NAME_ANCHOR_PAGE_NO), RES_ANCHOR, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, MID_ANCHOR_PAGENUM }, { SW_PROP_NMID(UNO_NAME_ANCHOR_TYPE), RES_ANCHOR, CPPU_E2T(CPPUTYPE_TXTCNTANCHOR), PROPERTY_NONE, MID_ANCHOR_ANCHORTYPE}, { SW_PROP_NMID(UNO_NAME_BACK_COLOR), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR }, + { SW_PROP_NMID(UNO_NAME_BACK_COLOR_R_G_B), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR_R_G_B}, \ + { SW_PROP_NMID(UNO_NAME_BACK_COLOR_TRANSPARENCY), RES_BACKGROUND, CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE ,MID_BACK_COLOR_TRANSPARENCY}, \ // { SW_PROP_NMID(UNO_NAME_CHAIN_NEXT_NAME), RES_CHAIN, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_CHAIN_NEXTNAME}, // { SW_PROP_NMID(UNO_NAME_CHAIN_PREV_NAME), RES_CHAIN, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE ,MID_CHAIN_PREVNAME}, /*not impl*/ { SW_PROP_NMID(UNO_NAME_CLIENT_MAP), RES_URL, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE ,MID_URL_CLIENTMAP }, @@ -1180,6 +1185,8 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP static SfxItemPropertyMap aEmbeddedPropertyMap_Impl[] = { COMMON_FRAME_PROPERTIES + { SW_PROP_NMID(UNO_NAME_SURROUND_CONTOUR), RES_SURROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_SURROUND_CONTOUR }, + { SW_PROP_NMID(UNO_NAME_CONTOUR_OUTSIDE), RES_SURROUND, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, MID_SURROUND_CONTOUROUTSIDE}, { SW_PROP_NMID(UNO_NAME_CONTOUR_POLY_POLYGON), FN_PARAM_COUNTOUR_PP, CPPU_E2T(CPPUTYPE_PNTSEQSEQ), PropertyAttribute::MAYBEVOID, 0 }, { SW_PROP_NMID(UNO_NAME_IS_PIXEL_CONTOUR), FN_UNO_IS_PIXEL_CONTOUR, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0 }, { SW_PROP_NMID(UNO_NAME_IS_AUTOMATIC_CONTOUR), FN_UNO_IS_AUTOMATIC_CONTOUR , CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0 }, @@ -2317,14 +2324,42 @@ const SfxItemPropertyMap* SwUnoPropertyMapProvider::GetPropertyMap(sal_uInt16 nP } break; case PROPERTY_MAP_TEXT : + { static SfxItemPropertyMap aTextMap[] = { _REDLINE_NODE_PROPERTIES {0,0,0,0} }; aMapArr[nPropertyId] = aTextMap; - + } break; + case PROPERTY_MAP_MAILMERGE : + { + static SfxItemPropertyMap aMailMergeMap[] = + { + { SW_PROP_NMID(UNO_NAME_SELECTION), WID_SELECTION, CPPU_E2T(CPPUTYPE_SEQANY), PROPERTY_NONE, 0}, + { SW_PROP_NMID(UNO_NAME_RESULT_SET), WID_RESULT_SET, CPPU_E2T(CPPUTYPE_REFRESULTSET), PROPERTY_NONE, 0}, + { SW_PROP_NMID(UNO_NAME_CONNECTION), WID_CONNECTION, CPPU_E2T(CPPUTYPE_REFCONNECTION), PROPERTY_NONE, 0}, + { SW_PROP_NMID(UNO_NAME_MODEL), WID_MODEL, CPPU_E2T(CPPUTYPE_REFMODEL), PropertyAttribute::READONLY, 0}, + { SW_PROP_NMID(UNO_NAME_DATA_SOURCE_NAME), WID_DATA_SOURCE_NAME, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0}, + { SW_PROP_NMID(UNO_NAME_DATA_COMMAND), WID_DATA_COMMAND, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0}, + { SW_PROP_NMID(UNO_NAME_FILTER), WID_FILTER, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0}, + { SW_PROP_NMID(UNO_NAME_DOCUMENT_URL), WID_DOCUMENT_URL, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0}, + { SW_PROP_NMID(UNO_NAME_OUTPUT_URL), WID_OUTPUT_URL, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0}, + { SW_PROP_NMID(UNO_NAME_DATA_COMMAND_TYPE), WID_DATA_COMMAND_TYPE, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0}, + { SW_PROP_NMID(UNO_NAME_OUTPUT_TYPE), WID_OUTPUT_TYPE, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0}, + { SW_PROP_NMID(UNO_NAME_ESCAPE_PROCESSING), WID_ESCAPE_PROCESSING, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0}, + { SW_PROP_NMID(UNO_NAME_SINGLE_PRINT_JOBS), WID_SINGLE_PRINT_JOBS, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0}, + { SW_PROP_NMID(UNO_NAME_FILE_NAME_FROM_COLUMN), WID_FILE_NAME_FROM_COLUMN, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE, 0}, + { SW_PROP_NMID(UNO_NAME_FILE_NAME_PREFIX), WID_FILE_NAME_PREFIX, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0}, + {0,0,0,0} + }; + aMapArr[nPropertyId] = aMailMergeMap; + } + break; + + default: + DBG_ERROR( "unexpected property map ID" ); } Sort(nPropertyId); } diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 05df943f13c0..7158b79d9f42 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoobj.cxx,v $ * - * $Revision: 1.64 $ + * $Revision: 1.65 $ * - * last change: $Author: cmc $ $Date: 2002-10-16 09:19:02 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -713,6 +713,28 @@ sal_Bool lcl_setCrsrPropertyValue(const SfxItemPropertyMap* pMap, case RES_TXTATR_CHARFMT: lcl_setCharStyle(rPam.GetDoc(), aValue, rSet.GetItemSet() ); break; + case FN_UNO_CHARFMT_SEQUENCE: + { + Sequence<OUString> aCharStyles; + if(aValue >>= aCharStyles) + { + for(sal_Int32 nStyle = 0; nStyle < aCharStyles.getLength(); nStyle++) + { + Any aStyle; + rPam.GetDoc()->StartUndo( UNDO_START ); + aStyle <<= aCharStyles.getConstArray()[nStyle]; + //create a local set and apply each format directly + SfxItemSet aSet(rPam.GetDoc()->GetAttrPool(), RES_TXTATR_CHARFMT, RES_TXTATR_CHARFMT ); + lcl_setCharStyle(rPam.GetDoc(), aStyle, aSet ); + //the first style should replace the current attributes, all other have to be added + SwXTextCursor::SetCrsrAttr(rPam, aSet, nStyle ? CRSR_ATTR_MODE_DONTREPLACE : 0); + rPam.GetDoc()->EndUndo( UNDO_START ); + } + } + else + bRet = sal_False; + } + break; case FN_UNO_PARA_STYLE : lcl_SetTxtFmtColl(aValue, rPam); break; @@ -855,7 +877,7 @@ return bRet; * --------------------------------------------------*/ SwFmtColl* SwXTextCursor::GetCurTxtFmtColl(SwPaM& rPam, BOOL bConditional) { - static const sal_uInt16 nMaxLookup = 255; + static const sal_uInt16 nMaxLookup = 1000; SwFmtColl *pFmt = 0; // if ( GetCrsrCnt() > nMaxLookup ) @@ -1619,10 +1641,21 @@ sal_Bool SwXTextCursor::gotoNextSentence(sal_Bool Expand) throw( uno::RuntimeExc SwUnoCrsr* pUnoCrsr = GetCrsr(); if(pUnoCrsr) { + BOOL bWasEOS = isEndOfSentence(); SwXTextCursor::SelectPam(*pUnoCrsr, Expand); bRet = pUnoCrsr->GoSentence(SwCursor::NEXT_SENT); if(!bRet) bRet = pUnoCrsr->MovePara(fnParaNext, fnParaStart); + + // if at the end of the sentence (i.e. at the space after the '.') + // advance to next word in order for GoSentence to work properly + // next time and have isStartOfSentence return true after this call + if (!pUnoCrsr->IsStartWord()) + { + BOOL bNextWord = pUnoCrsr->GoNextWord(); + if (bWasEOS && !bNextWord) + bRet = sal_False; + } } else throw uno::RuntimeException(); @@ -1943,7 +1976,7 @@ void SwXTextCursor::SetPropertyValue( if(!lcl_setCrsrPropertyValue( pMap, rPaM, aSet, aValue )) rPropSet.setPropertyValue(*pMap, aValue, aSet.GetItemSet( &rPaM ) ); if( aSet.GetItemSetPtr() ) - SwXTextCursor::SetCrsrAttr(rPaM, aSet.GetItemSet() ); + SwXTextCursor::SetCrsrAttr(rPaM, aSet.GetItemSet(), 0 ); } else throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( 0 ) ); diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index 7201cf1c9194..2106a6baeb73 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoobj2.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.32 $ * - * last change: $Author: mib $ $Date: 2002-11-26 14:25:48 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -904,9 +904,11 @@ SwDoc* SwXTextCursor::GetDoc() /*-- 09.12.98 14:19:03--------------------------------------------------- -----------------------------------------------------------------------*/ -void SwXTextCursor::SetCrsrAttr(SwPaM& rPam, const SfxItemSet& rSet, sal_Bool bTableMode) +void SwXTextCursor::SetCrsrAttr(SwPaM& rPam, const SfxItemSet& rSet, USHORT nAttrMode) { sal_uInt16 nFlags = SETATTR_APICALL; + if(nAttrMode & CRSR_ATTR_MODE_DONTREPLACE) + nFlags |= SETATTR_DONTREPLACE; SwDoc* pDoc = rPam.GetDoc(); //StartEndAction UnoActionContext aAction(pDoc); @@ -918,7 +920,7 @@ void SwXTextCursor::SetCrsrAttr(SwPaM& rPam, const SfxItemSet& rSet, sal_Bool bT SwPaM *_pStartCrsr = &rPam; do { - if( _pStartCrsr->HasMark() && ( bTableMode || + if( _pStartCrsr->HasMark() && ( (CRSR_ATTR_MODE_TABLE & nAttrMode) || *_pStartCrsr->GetPoint() != *_pStartCrsr->GetMark() )) pDoc->Insert(*_pStartCrsr, rSet, nFlags ); } while( (_pStartCrsr=(SwPaM *)_pStartCrsr->GetNext()) != &rPam ); @@ -937,7 +939,7 @@ void SwXTextCursor::SetCrsrAttr(SwPaM& rPam, const SfxItemSet& rSet, sal_Bool bT -----------------------------------------------------------------------*/ void SwXTextCursor::GetCrsrAttr(SwPaM& rPam, SfxItemSet& rSet, BOOL bCurrentAttrOnly) { -static const sal_uInt16 nMaxLookup = 255; + static const sal_uInt16 nMaxLookup = 1000; SfxItemSet aSet( *rSet.GetPool(), rSet.GetRanges() ); SfxItemSet *pSet = &rSet; SwPaM *_pStartCrsr = &rPam; diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx index d22db893db7b..0705752a848b 100644 --- a/sw/source/core/unocore/unoport.cxx +++ b/sw/source/core/unocore/unoport.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoport.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: tl $ $Date: 2002-09-26 07:30:11 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -318,7 +318,6 @@ uno::Reference< beans::XPropertySetInfo > SwXTextPortion::getPropertySetInfo(vo xRedlPorRef = SfxItemPropertySet( aSwMapProvider.GetPropertyMap( PROPERTY_MAP_REDLINE_PORTION) ).getPropertySetInfo(); - return (PORTION_REDLINE_START == ePortionType || PORTION_REDLINE_END == ePortionType) ? xRedlPorRef : xTxtPorExtRef; } @@ -531,7 +530,7 @@ void SwXTextPortion::setPropertyValues( if (!pMap) throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + pPropertyNames[nProp], static_cast < cppu::OWeakObject * > ( this ) ); if ( pMap->nFlags & PropertyAttribute::READONLY) - throw PropertyVetoException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + pPropertyNames[nProp], static_cast < cppu::OWeakObject * > ( this ) ); + throw PropertyVetoException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + pPropertyNames[nProp], static_cast < cppu::OWeakObject * > ( this ) ); SwXTextCursor::SetPropertyValue( *pUnoCrsr, aPropSet, sTmp, pValues[nProp], pMap); } diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx index 1f992a277d4d..fb86b6958933 100644 --- a/sw/source/core/unocore/unoportenum.cxx +++ b/sw/source/core/unocore/unoportenum.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoportenum.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: jp $ $Date: 2002-02-01 12:42:16 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -255,7 +255,7 @@ void lcl_InsertRefMarkPortion( if(!bEnd) { rArr.Insert( - new Reference< XTextRange >(pPortion = new SwXTextPortion(*pUnoCrsr, rParent, PORTION_REFMARK_START)), + new Reference< XTextRange >(pPortion = new SwXTextPortion(pUnoCrsr, rParent, PORTION_REFMARK_START)), rArr.Count()); pPortion->SetRefMark(xContent); pPortion->SetCollapsed(pAttr->GetEnd() ? FALSE : TRUE); @@ -263,7 +263,7 @@ void lcl_InsertRefMarkPortion( else { rArr.Insert( - new Reference< XTextRange >(pPortion = new SwXTextPortion(*pUnoCrsr, rParent, PORTION_REFMARK_END)), + new Reference< XTextRange >(pPortion = new SwXTextPortion(pUnoCrsr, rParent, PORTION_REFMARK_END)), rArr.Count()); pPortion->SetRefMark(xContent); } @@ -295,7 +295,7 @@ void lcl_InsertTOXMarkPortion( if(!bEnd) { rArr.Insert( - new Reference< XTextRange >(pPortion = new SwXTextPortion(*pUnoCrsr, rParent, PORTION_TOXMARK_START)), + new Reference< XTextRange >(pPortion = new SwXTextPortion(pUnoCrsr, rParent, PORTION_TOXMARK_START)), rArr.Count()); pPortion->SetTOXMark(xContent); pPortion->SetCollapsed(pAttr->GetEnd() ? FALSE : TRUE); @@ -303,7 +303,7 @@ void lcl_InsertTOXMarkPortion( if(bEnd) { rArr.Insert( - new Reference< XTextRange >(pPortion = new SwXTextPortion(*pUnoCrsr, rParent, PORTION_TOXMARK_END)), + new Reference< XTextRange >(pPortion = new SwXTextPortion(pUnoCrsr, rParent, PORTION_TOXMARK_END)), rArr.Count()); pPortion->SetTOXMark(xContent); } @@ -357,7 +357,7 @@ void lcl_ExportBookmark( if(BKM_TYPE_START == pPtr->nBkmType || BKM_TYPE_START_END == pPtr->nBkmType) { rPortionArr.Insert( - new Reference< XTextRange >(pPortion = new SwXTextPortion(*pUnoCrsr, rParent, PORTION_BOOKMARK_START)), + new Reference< XTextRange >(pPortion = new SwXTextPortion(pUnoCrsr, rParent, PORTION_BOOKMARK_START)), rPortionArr.Count()); pPortion->SetBookmark(pPtr->xBookmark); pPortion->SetCollapsed(BKM_TYPE_START_END == pPtr->nBkmType ? TRUE : FALSE); @@ -366,7 +366,7 @@ void lcl_ExportBookmark( if(BKM_TYPE_END == pPtr->nBkmType) { rPortionArr.Insert( - new Reference< XTextRange >(pPortion = new SwXTextPortion(*pUnoCrsr, rParent, PORTION_BOOKMARK_END)), + new Reference< XTextRange >(pPortion = new SwXTextPortion(pUnoCrsr, rParent, PORTION_BOOKMARK_END)), rPortionArr.Count()); pPortion->SetBookmark(pPtr->xBookmark); } @@ -501,7 +501,7 @@ Reference<XTextRange> lcl_ExportHints(SwpHints* pHints, { pUnoCrsr->Right(1,CRSR_SKIP_CHARS); SwXTextPortion* pPortion; - xRef = pPortion = new SwXTextPortion(*pUnoCrsr, rParent, PORTION_FOOTNOTE); + xRef = pPortion = new SwXTextPortion(pUnoCrsr, rParent, PORTION_FOOTNOTE); Reference<XTextContent> xContent = Reference<XTextContent>( SwXFootnotes::GetObject(*pDoc, pAttr->SwTxtAttr::GetFtn()), @@ -517,7 +517,7 @@ Reference<XTextRange> lcl_ExportHints(SwpHints* pHints, rPortionArr.Insert( new Reference< XTextRange >( pPortion = new SwXTextPortion( - *pUnoCrsr, rParent, PORTION_CONTROL_CHAR)), + pUnoCrsr, rParent, PORTION_CONTROL_CHAR)), rPortionArr.Count()); pPortion->SetControlChar(3); ePortionType = PORTION_TEXT; @@ -530,7 +530,7 @@ Reference<XTextRange> lcl_ExportHints(SwpHints* pHints, rPortionArr.Insert( new Reference< XTextRange >( pPortion = new SwXTextPortion( - *pUnoCrsr, rParent, PORTION_CONTROL_CHAR)), + pUnoCrsr, rParent, PORTION_CONTROL_CHAR)), rPortionArr.Count()); const SwFmtHardBlank& rFmt = pAttr->GetHardBlank(); if(rFmt.GetChar() == '-') @@ -818,7 +818,7 @@ void SwXTextPortionEnumeration::CreatePortions() { lcl_ExportBkmAndRedline(aBkmArr, aRedArr, 0, pUnoCrsr, xParent, aPortionArr); // the paragraph is empty - xRef = new SwXTextPortion(*pUnoCrsr, xParent, ePortionType); + xRef = new SwXTextPortion(pUnoCrsr, xParent, ePortionType); // are there any frames? while(aFrameArr.Count()) { @@ -827,7 +827,7 @@ void SwXTextPortionEnumeration::CreatePortions() { //the previously created portion has to be inserted here aPortionArr.Insert(new Reference<XTextRange>(xRef), aPortionArr.Count()); - xRef = new SwXTextPortion(*pUnoCrsr, xParent, + xRef = new SwXTextPortion(pUnoCrsr, xParent, *(SwFrmFmt*)pCurDepend->GetRegisteredIn()); } delete pCurDepend; @@ -867,7 +867,7 @@ void SwXTextPortionEnumeration::CreatePortions() //ist hier schon ein Rahmen faellig? if(nCurrentIndex == nFirstFrameIndex) { - xRef = new SwXTextPortion(*pUnoCrsr, xParent, + xRef = new SwXTextPortion(pUnoCrsr, xParent, *(SwFrmFmt*)pFirstFrameDepend->GetRegisteredIn()); SwDepend* pCurDepend = aFrameArr.GetObject(0); delete pCurDepend; @@ -913,7 +913,7 @@ void SwXTextPortionEnumeration::CreatePortions() } } if(!xRef.is() && pUnoCrsr->HasMark() ) - xRef = new SwXTextPortion(*pUnoCrsr, xParent, ePortionType); + xRef = new SwXTextPortion(pUnoCrsr, xParent, ePortionType); if(xRef.is()) aPortionArr.Insert(new Reference<XTextRange>(xRef), aPortionArr.Count()); } @@ -960,7 +960,7 @@ void SwXTextPortionEnumeration::CreatePortions() SwDepend* pCurDepend = aFrameArr.GetObject(0); if(pCurDepend->GetRegisteredIn()) { - Reference<XTextRange> xRef = new SwXTextPortion(*pUnoCrsr, xParent, + Reference<XTextRange> xRef = new SwXTextPortion(pUnoCrsr, xParent, *(SwFrmFmt*)pCurDepend->GetRegisteredIn()); aPortionArr.Insert(new Reference<XTextRange>(xRef), aPortionArr.Count()); } diff --git a/sw/source/core/unocore/unoprnms.cxx b/sw/source/core/unocore/unoprnms.cxx index 12160bb3e002..cb2b705efe56 100644 --- a/sw/source/core/unocore/unoprnms.cxx +++ b/sw/source/core/unocore/unoprnms.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoprnms.cxx,v $ * - * $Revision: 1.82 $ + * $Revision: 1.83 $ * - * last change: $Author: os $ $Date: 2002-11-15 11:10:06 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -717,7 +717,22 @@ const SwPropNameTab aPropNameTab = { /* 0635 UNO_NAME_HEADER_DYNAMIC_SPACING */ {MAP_CHAR_LEN("HeaderDynamicSpacing")}, /* 0636 UNO_NAME_FOOTER_DYNAMIC_SPACING */ {MAP_CHAR_LEN("FooterDynamicSpacing")}, /* 0637 UNO_NAME_BASIC_LIBRARIES */ {MAP_CHAR_LEN("BasicLibraries")}, -/* 0638 UNO_NAME_IS_FIXED_LANGUAGE */ {MAP_CHAR_LEN("IsFixedLanguage")} +/* 0638 UNO_NAME_IS_FIXED_LANGUAGE */ {MAP_CHAR_LEN("IsFixedLanguage")}, +/* 0639 UNO_NAME_SELECTION */ {MAP_CHAR_LEN("Selection")}, +/* 0640 UNO_NAME_RESULT_SET */ {MAP_CHAR_LEN("ResultSet")}, +/* 0641 UNO_NAME_CONNECTION */ {MAP_CHAR_LEN("Connection")}, +/* 0642 UNO_NAME_MODEL */ {MAP_CHAR_LEN("Model")}, +/* 0643 UNO_NAME_DATA_SOURCE_NAME */ {MAP_CHAR_LEN("DataSourceName")}, +/* 0644 UNO_NAME_DATA_COMMAND */ {MAP_CHAR_LEN("DataCommand")}, +/* 0645 UNO_NAME_FILTER */ {MAP_CHAR_LEN("Filter")}, +/* 0646 UNO_NAME_DOCUMENT_URL */ {MAP_CHAR_LEN("DocumentURL")}, +/* 0647 UNO_NAME_OUTPUT_URL */ {MAP_CHAR_LEN("OutputURL")}, +/* 0648 UNO_NAME_OUTPUT_TYPE */ {MAP_CHAR_LEN("OutputType")}, +/* 0649 UNO_NAME_ESCAPE_PROCESSING */ {MAP_CHAR_LEN("EscapeProcessing")}, +/* 0650 UNO_NAME_SINGLE_PRINT_JOBS */ {MAP_CHAR_LEN("SinglePrintJobs")}, +/* 0651 UNO_NAME_FILE_NAME_FROM_COLUMN */ {MAP_CHAR_LEN("FileNameFromColumn")}, +/* 0652 UNO_NAME_FILE_NAME_PREFIX */ {MAP_CHAR_LEN("FileNamePrefix")}, +/* 0653 UNO_NAME_CHAR_STYLE_NAMES */ {MAP_CHAR_LEN("CharStyleNames")} }; #ifndef PRODUCT diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx index d2b62c899ed7..c24c8dc77a27 100644 --- a/sw/source/core/unocore/unoredline.cxx +++ b/sw/source/core/unocore/unoredline.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoredline.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: dvo $ $Date: 2002-08-02 10:36:55 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -194,12 +194,12 @@ Sequence<sal_Int8> SwXRedlineText::getImplementationId() throw(RuntimeException) { vos::OGuard aGuard(Application::GetSolarMutex()); - static uno::Sequence< sal_Int8 > aId( 16 ); - static sal_Bool bInit = FALSE; + static Sequence< sal_Int8 > aId( 16 ); + static sal_Bool bInit = sal_False; if(!bInit) { - rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); - bInit = TRUE; + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; } return aId; } @@ -435,12 +435,13 @@ void SwXRedlinePortion::Validate() throw( RuntimeException ) ---------------------------------------------------------------------------*/ uno::Sequence< sal_Int8 > SAL_CALL SwXRedlinePortion::getImplementationId( ) throw(uno::RuntimeException) { - static uno::Sequence< sal_Int8 > aId( 16 ); - static BOOL bInit = FALSE; + vos::OGuard aGuard(Application::GetSolarMutex()); + static Sequence< sal_Int8 > aId( 16 ); + static sal_Bool bInit = sal_False; if(!bInit) { - rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); - bInit = TRUE; + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; } return aId; } @@ -709,11 +710,6 @@ Any SwXRedline::getPropertyValue( const OUString& rPropertyName ) DBG_ASSERT(0, "Empty section in redline portion! (end node immediately follows start node)"); } } - else if(rPropertyName.equalsAsciiL(SW_PROP_NAME(UNO_NAME_START_REDLINE))|| - rPropertyName.equalsAsciiL(SW_PROP_NAME(UNO_NAME_END_REDLINE))) - { - //this will always be empty - redlines at the start or end of a redlined text cannot occur - } else aRet = SwXRedlinePortion::GetPropertyValue(rPropertyName, *pRedline); return aRet; @@ -881,12 +877,12 @@ Sequence<sal_Int8> SwXRedline::getImplementationId() throw(RuntimeException) { vos::OGuard aGuard(Application::GetSolarMutex()); - static uno::Sequence< sal_Int8 > aId( 16 ); - static sal_Bool bInit = FALSE; + static Sequence< sal_Int8 > aId( 16 ); + static sal_Bool bInit = sal_False; if(!bInit) { - rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); - bInit = TRUE; + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; } return aId; } diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx index 9ef88966f9bf..063f2a882f82 100644 --- a/sw/source/core/unocore/unorefmk.cxx +++ b/sw/source/core/unocore/unorefmk.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unorefmk.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: os $ $Date: 2002-12-05 13:29:54 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -190,7 +190,7 @@ void SwXReferenceMark::InsertRefMark(SwPaM& rPam, SwDoc* pDoc) SfxItemSet aSet(pDoc->GetAttrPool(), RES_TXTATR_REFMARK, RES_TXTATR_REFMARK, 0L); aSet.Put(aRefMark); sal_Bool bMark = *rPam.GetPoint() != *rPam.GetMark(); - SwXTextCursor::SetCrsrAttr(rPam, aSet); + SwXTextCursor::SetCrsrAttr(rPam, aSet, 0); if( bMark && *rPam.GetPoint() > *rPam.GetMark()) rPam.Exchange(); diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 9a578cb24ecd..b7b1aa628eb5 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unotbl.cxx,v $ * - * $Revision: 1.71 $ + * $Revision: 1.72 $ * - * last change: $Author: ab $ $Date: 2002-11-11 15:14:34 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -861,12 +861,13 @@ Sequence< uno::Type > SAL_CALL SwXCell::getTypes( ) throw(::com::sun::star::uno ---------------------------------------------------------------------------*/ Sequence< sal_Int8 > SAL_CALL SwXCell::getImplementationId( ) throw(::com::sun::star::uno::RuntimeException) { - static uno::Sequence< sal_Int8 > aId( 16 ); - static BOOL bInit = FALSE; + vos::OGuard aGuard(Application::GetSolarMutex()); + static Sequence< sal_Int8 > aId( 16 ); + static sal_Bool bInit = sal_False; if(!bInit) { - rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); - bInit = TRUE; + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; } return aId; } @@ -1847,7 +1848,7 @@ void SwXTextTableCursor::setPropertyValue(const OUString& rPropertyName, 0L); SwXTextCursor::GetCrsrAttr(pTblCrsr->GetSelRing(), rSet); aPropSet.setPropertyValue(*pMap, aValue, rSet); - SwXTextCursor::SetCrsrAttr(pTblCrsr->GetSelRing(), rSet, sal_True); + SwXTextCursor::SetCrsrAttr(pTblCrsr->GetSelRing(), rSet, CRSR_ATTR_MODE_TABLE); } } } @@ -4952,7 +4953,7 @@ void SwXTableColumns::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( u SwTableLines& rLines = pTable->GetTabLines(); SwTableLine* pLine = rLines.GetObject(0); SwTableBoxes& rBoxes = pLine->GetTabBoxes(); - pTLBox = rBoxes.GetObject(0); + pTLBox = rBoxes.GetObject(rBoxes.Count() - 1); } if(pTLBox) { @@ -4961,6 +4962,12 @@ void SwXTableColumns::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( u UnoActionContext aAction(pFrmFmt->GetDoc()); SwUnoCrsr* pUnoCrsr = pFrmFmt->GetDoc()->CreateUnoCrsr(aPos, sal_True); pUnoCrsr->Move( fnMoveForward, fnGoNode ); + + { + // hier muessen die Actions aufgehoben werden + UnoActionRemoveContext aRemoveContext(pUnoCrsr->GetDoc()); + } + pFrmFmt->GetDoc()->InsertCol(*pUnoCrsr, (sal_uInt16)nCount, bAppend); delete pUnoCrsr; } diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index ef38a8b62f63..4e72c77dd869 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unotext.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: os $ $Date: 2002-05-30 14:46:23 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -330,6 +330,7 @@ void SwXText::insertString(const uno::Reference< XTextRange > & xTextRange, { //hier wird ein PaM angelegt, der vor dem Parameter-PaM liegt, damit der //Text davor eingefuegt wird + UnoActionContext aContext(GetDoc()); const SwPosition* pPos = pCursor ? pCursor->GetCrsr()->Start() : &pRange->GetBookmark()->GetPos(); SwPaM aInsertPam(*pPos); sal_Bool bGroupUndo = GetDoc()->DoesGroupUndo(); @@ -1455,12 +1456,13 @@ uno::Sequence< uno::Type > SwXBodyText::getTypes( ) throw(uno::RuntimeException ---------------------------------------------------------------------------*/ uno::Sequence< sal_Int8 > SwXBodyText::getImplementationId( ) throw(uno::RuntimeException) { - static uno::Sequence< sal_Int8 > aId( 16 ); - static BOOL bInit = FALSE; + vos::OGuard aGuard(Application::GetSolarMutex()); + static Sequence< sal_Int8 > aId( 16 ); + static sal_Bool bInit = sal_False; if(!bInit) { - rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); - bInit = TRUE; + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; } return aId; } @@ -1693,12 +1695,13 @@ uno::Sequence< ::com::sun::star::uno::Type > SwXHeadFootText::getTypes( ) throw ---------------------------------------------------------------------------*/ uno::Sequence< sal_Int8 > SwXHeadFootText::getImplementationId( ) throw(uno::RuntimeException) { - static uno::Sequence< sal_Int8 > aId( 16 ); - static BOOL bInit = FALSE; + vos::OGuard aGuard(Application::GetSolarMutex()); + static Sequence< sal_Int8 > aId( 16 ); + static sal_Bool bInit = sal_False; if(!bInit) { - rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); - bInit = TRUE; + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; } return aId; } diff --git a/sw/source/core/view/makefile.mk b/sw/source/core/view/makefile.mk index d82555c74548..a6851400ef57 100644 --- a/sw/source/core/view/makefile.mk +++ b/sw/source/core/view/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1.1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: hr $ $Date: 2000-09-19 00:08:29 $ +# last change: $Author: hr $ $Date: 2003-03-27 15:41:34 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -92,7 +92,8 @@ CXXFILES = \ viewsh.cxx \ viewpg.cxx \ vnew.cxx \ - vprint.cxx + vprint.cxx \ + pagepreviewlayout.cxx @@ -103,7 +104,8 @@ SLOFILES = \ $(SLO)$/viewsh.obj \ $(SLO)$/viewpg.obj \ $(SLO)$/vnew.obj \ - $(SLO)$/vprint.obj + $(SLO)$/vprint.obj \ + $(SLO)$/pagepreviewlayout.obj # --- Targets ------------------------------------------------------- diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx new file mode 100644 index 000000000000..535006d5f7e4 --- /dev/null +++ b/sw/source/core/view/pagepreviewlayout.cxx @@ -0,0 +1,1424 @@ +#ifndef _PAGEPREVIEWLAYOUT_HXX +#include <pagepreviewlayout.hxx> +#endif +#ifndef _PREVWPAGE_HXX +#include <prevwpage.hxx> +#endif + +#include <algorithm> + +#ifndef _SV_WINDOW_HXX +#include <vcl/window.hxx> +#endif +#ifndef _SV_OUTDEV_HXX +#include <vcl/outdev.hxx> +#endif +#ifndef _SV_MAPMOD_HXX +#include <vcl/mapmod.hxx> +#endif + +#ifndef _ROOTFRM_HXX +#include <rootfrm.hxx> +#endif +#ifndef _PAGEFRM_HXX +#include <pagefrm.hxx> +#endif +#ifndef _VIEWSH_HXX +#include <viewsh.hxx> +#endif +#ifndef _VIEWIMP_HXX +#include <viewimp.hxx> +#endif +#ifndef _VIEWOPT_HXX +#include <viewopt.hxx> +#endif +#ifndef _SWREGION_HXX +#include <swregion.hxx> +#endif +#ifndef _COMCORE_HRC +#include <comcore.hrc> +#endif +// OD 19.02.2003 #107369# - method <SwAlignRect(..)> +#ifndef _FRMTOOL_HXX +#include <frmtool.hxx> +#endif + +// OD 20.02.2003 #107369# - method to update statics for paint +// Note: method defined in '/sw/source/core/layout/paintfrm.cxx' +extern void SwCalcPixStatics( OutputDevice *pOut ); + +// ============================================================================= +// methods to initialize page preview layout +// ============================================================================= +SwPagePreviewLayout::SwPagePreviewLayout( ViewShell& _rParentViewShell, + const SwRootFrm& _rLayoutRootFrm ) + : mnXFree ( 4*142 ), + mnYFree ( 4*142 ), + mrParentViewShell( _rParentViewShell ), + mrLayoutRootFrm ( _rLayoutRootFrm ) +{ + _Clear(); +} + +void SwPagePreviewLayout::_Clear() +{ + mbLayoutInfoValid = mbLayoutSizesValid = mbPaintInfoValid = false; + + maWinSize.Width() = 0; + maWinSize.Height() = 0; + mnCols = mnRows = 0; + // OD 19.02.2003 #107369# + mbLeaveLeftTopBlank = false; + + _ClearPrevwLayoutSizes(); + + mbDoesLayoutRowsFitIntoWindow = false; + mbDoesLayoutColsFitIntoWindow = false; + + mnPaintPhyStartPageNum = 0; + mnPaintStartCol = mnPaintStartRow = 0; + mbNoPageVisible = false; + maPaintStartPageOffset.X() = 0; + maPaintStartPageOffset.Y() = 0; + maPaintPreviewDocOffset.X() = 0; + maPaintPreviewDocOffset.Y() = 0; + maAdditionalPaintOffset.X() = 0; + maAdditionalPaintOffset.Y() = 0; + maPaintedPrevwDocRect.Left() = 0; + maPaintedPrevwDocRect.Top() = 0; + maPaintedPrevwDocRect.Right() = 0; + maPaintedPrevwDocRect.Bottom() = 0; + mnSelectedPageNum = 0; + mpSelectedPageFrm = 0; + _ClearPrevwPageData(); +} + +void SwPagePreviewLayout::_ClearPrevwLayoutSizes() +{ + mnPages = 0; + + maMaxPageSize.Width() = 0; + maMaxPageSize.Height() = 0; + maPreviewDocRect.Left() = maPreviewDocRect.Top() = 0; + maPreviewDocRect.Right() = maPreviewDocRect.Bottom() = 0; + mnColWidth = mnRowHeight = 0; + mnPrevwLayoutWidth = mnPrevwLayoutHeight = 0; +} + +void SwPagePreviewLayout::_ClearPrevwPageData() +{ + for ( std::vector<PrevwPage*>::iterator aPageDelIter = maPrevwPages.begin(); + aPageDelIter != maPrevwPages.end(); + ++aPageDelIter ) + { + delete (*aPageDelIter); + } + maPrevwPages.clear(); +} + +/** calculate page preview layout sizes + + OD 18.12.2002 #103492# + + @author OD +*/ +void SwPagePreviewLayout::_CalcPrevwLayoutSizes() +{ + // calculate maximal page size; calculate also number of pages + + const SwPageFrm* pPage = static_cast<const SwPageFrm*>(mrLayoutRootFrm.Lower()); + while ( pPage ) + { + ++mnPages; + pPage->Calc(); + register const Size& rPageSize = pPage->Frm().SSize(); + if ( rPageSize.Width() > maMaxPageSize.Width() ) + maMaxPageSize.Width() = rPageSize.Width(); + if ( rPageSize.Height() > maMaxPageSize.Height() ) + maMaxPageSize.Height() = rPageSize.Height(); + pPage = static_cast<const SwPageFrm*>(pPage->GetNext()); + } + // calculate and set column width and row height + mnColWidth = maMaxPageSize.Width() + mnXFree; + mnRowHeight = maMaxPageSize.Height() + mnYFree; + + // calculate and set preview layout width and height + mnPrevwLayoutWidth = mnCols * mnColWidth + mnXFree; + mnPrevwLayoutHeight = mnRows * mnRowHeight + mnYFree; + + // calculate document rectangle in preview layout + { + Size aDocSize; + // document width + aDocSize.Width() = mnPrevwLayoutWidth; + + // document height + // determine number of rows needed for <nPages> in preview layout + // OD 19.02.2003 #107369# - use method <GetRowOfPage(..)>. + sal_uInt16 nDocRows = GetRowOfPage( mnPages ); + aDocSize.Height() = nDocRows * maMaxPageSize.Height() + + (nDocRows+1) * mnYFree; + maPreviewDocRect.SetPos( Point( 0, 0 ) ); + maPreviewDocRect.SetSize( aDocSize ); + } +} + +/** init page preview layout + + OD 11.12.2002 #103492# + initialize the page preview settings for a given layout. + side effects: + (1) If parameter <_bCalcScale> is true, mapping mode with calculated + scaling is set at the output device and the zoom at the view options of + the given view shell is set with the calculated scaling. + + @author OD +*/ +bool SwPagePreviewLayout::Init( const sal_uInt16 _nCols, + const sal_uInt16 _nRows, + const Size& _rPxWinSize, + const bool _bCalcScale + ) +{ + // check environment and parameters + { + bool bColsRowsValid = (_nCols != 0) && (_nRows != 0); + ASSERT( bColsRowsValid, "preview layout parameters not correct - preview layout can *not* be initialized" ); + if ( !bColsRowsValid ) + return false; + + bool bPxWinSizeValid = (_rPxWinSize.Width() >= 0) && + (_rPxWinSize.Height() >= 0); + ASSERT( bPxWinSizeValid, "no window size - preview layout can *not* be initialized" ); + if ( !bPxWinSizeValid ) + return false; + } + + // environment and parameters ok + + // clear existing preview settings + _Clear(); + + // set layout information columns and rows + mnCols = _nCols; + mnRows = _nRows; + + _CalcPrevwLayoutSizes(); + + // validate layout information + mbLayoutInfoValid = true; + + if ( _bCalcScale ) + { + // calculate scaling + MapMode aMapMode( MAP_TWIP ); + Size aWinSize = mrParentViewShell.GetOut()->PixelToLogic( _rPxWinSize, aMapMode ); + Fraction aXScale( aWinSize.Width(), mnPrevwLayoutWidth ); + Fraction aYScale( aWinSize.Height(), mnPrevwLayoutHeight ); + if( aXScale < aYScale ) + aYScale = aXScale; + { + // adjust scaling for Drawing layer. + aYScale *= Fraction( 1000, 1 ); + long nNewNuminator = aYScale.operator long(); + if( nNewNuminator < 1 ) + nNewNuminator = 1; + aYScale = Fraction( nNewNuminator, 1000 ); + // propagate scaling as zoom percentage to view options for font cache + _ApplyNewZoomAtViewShell( static_cast<sal_uInt8>(nNewNuminator/10) ); + } + aMapMode.SetScaleY( aYScale ); + aMapMode.SetScaleX( aYScale ); + // set created mapping mode with calculated scaling at output device. + mrParentViewShell.GetOut()->SetMapMode( aMapMode ); + // OD 20.02.2003 #107369# - update statics for paint. + ::SwCalcPixStatics( mrParentViewShell.GetOut() ); + } + + // set window size in twips + maWinSize = mrParentViewShell.GetOut()->PixelToLogic( _rPxWinSize ); + // validate layout sizes + mbLayoutSizesValid = true; + + return true; +} + +/** apply new zoom at given view shell + + OD 11.12.2002 #103492# - implementation of <_ApplyNewZoomAtViewShell> + + @author OD +*/ +void SwPagePreviewLayout::_ApplyNewZoomAtViewShell( sal_uInt8 _aNewZoom ) +{ + SwViewOption aNewViewOptions = *(mrParentViewShell.GetViewOptions()); + if ( aNewViewOptions.GetZoom() != _aNewZoom ) + { + aNewViewOptions.SetZoom( _aNewZoom ); + mrParentViewShell.ApplyViewOptions( aNewViewOptions ); + } +} + +/** method to adjust page preview layout to document changes + + OD 18.12.2002 #103492# + + @author OD +*/ +bool SwPagePreviewLayout::ReInit() +{ + // check environment and parameters + { + bool bLayoutSettingsValid = mbLayoutInfoValid && mbLayoutSizesValid; + ASSERT( bLayoutSettingsValid, + "no valid preview layout info/sizes - no re-init of page preview layout"); + if ( !bLayoutSettingsValid ) + return false; + } + + _ClearPrevwLayoutSizes(); + _CalcPrevwLayoutSizes(); + + return true; +} + +// ============================================================================= +// methods to prepare paint of page preview +// ============================================================================= +/** prepare paint of page preview + + OD 12.12.2002 #103492# + + @author OD +*/ +bool SwPagePreviewLayout::Prepare( const sal_uInt16 _nProposedStartPageNum, + const Point _aProposedStartPos, + const Size& _rPxWinSize, + sal_uInt16& _onStartPageNum, + sal_uInt16& _onStartPageVirtNum, + Rectangle& _orDocPreviewPaintRect, + const bool _bStartWithPageAtFirstCol + ) +{ + sal_uInt16 nProposedStartPageNum = _nProposedStartPageNum; + // check environment and parameters + { + bool bLayoutSettingsValid = mbLayoutInfoValid && mbLayoutSizesValid; + ASSERT( bLayoutSettingsValid, + "no valid preview layout info/sizes - no prepare of preview paint"); + if ( !bLayoutSettingsValid ) + return false; + + bool bStartPageRangeValid = _nProposedStartPageNum <= mnPages; + ASSERT( bStartPageRangeValid, + "proposed start page not existing - no prepare of preview paint"); + if ( !bStartPageRangeValid ) + return false; + + bool bStartPosRangeValid = + _aProposedStartPos.X() >= 0 && _aProposedStartPos.Y() >= 0 && + _aProposedStartPos.X() <= maPreviewDocRect.Right() && + _aProposedStartPos.Y() <= maPreviewDocRect.Bottom(); + ASSERT( bStartPosRangeValid, + "proposed start position out of range - no prepare of preview paint"); + if ( !bStartPosRangeValid ) + return false; + + bool bWinSizeValid = _rPxWinSize.Width() != 0 && _rPxWinSize.Height() != 0; + ASSERT ( bWinSizeValid, "no window size - no prepare of preview paint"); + if ( !bWinSizeValid ) + return false; + + bool bStartInfoValid = _nProposedStartPageNum > 0 || + _aProposedStartPos != Point(0,0); + if ( !bStartInfoValid ) + nProposedStartPageNum = 1; + } + + // environment and parameter ok + + // update window size at preview setting data + maWinSize = mrParentViewShell.GetOut()->PixelToLogic( _rPxWinSize ); + + mbNoPageVisible = false; + if ( nProposedStartPageNum > 0 ) + { + // determine column and row of proposed start page in virtual preview layout + sal_uInt16 nColOfProposed = GetColOfPage( nProposedStartPageNum ); + sal_uInt16 nRowOfProposed = GetRowOfPage( nProposedStartPageNum ); + // determine start page + if ( _bStartWithPageAtFirstCol ) + { + // OD 19.02.2003 #107369# - leaving left-top-corner blank is + // controlled by <mbLeaveLeftTopBlank>. + if ( mbLeaveLeftTopBlank && + ( nProposedStartPageNum == 1 || nRowOfProposed == 1 ) + ) + mnPaintPhyStartPageNum = 1; + else + mnPaintPhyStartPageNum = nProposedStartPageNum - (nColOfProposed-1); + } + else + mnPaintPhyStartPageNum = nProposedStartPageNum; + // set starting column + if ( _bStartWithPageAtFirstCol ) + mnPaintStartCol = 1; + else + mnPaintStartCol = nColOfProposed; + // set starting row + mnPaintStartRow = nRowOfProposed; + // page offset == (-1,-1), indicating no offset and paint of free space. + maPaintStartPageOffset.X() = -1; + maPaintStartPageOffset.Y() = -1; + // virtual preview document offset. + if ( _bStartWithPageAtFirstCol ) + maPaintPreviewDocOffset.X() = 0; + else + maPaintPreviewDocOffset.X() = (nColOfProposed-1) * mnColWidth; + maPaintPreviewDocOffset.Y() = (nRowOfProposed-1) * mnRowHeight; + } + else + { + // determine column and row of proposed start position. + // Note: paint starts at point (0,0) + sal_uInt16 nColOfProposed = + static_cast<sal_uInt16>(_aProposedStartPos.X() / mnColWidth) + 1; + sal_uInt16 nRowOfProposed = + static_cast<sal_uInt16>(_aProposedStartPos.Y() / mnRowHeight) + 1; + // determine start page == page at proposed start position + // OD 19.02.2003 #107369# - leaving left-top-corner blank is + // controlled by <mbLeaveLeftTopBlank>. + if ( mbLeaveLeftTopBlank && + ( nRowOfProposed == 1 && nColOfProposed == 1 ) + ) + mnPaintPhyStartPageNum = 1; + else + { + // OD 19.02.2003 #107369# - leaving left-top-corner blank is + // controlled by <mbLeaveLeftTopBlank>. + mnPaintPhyStartPageNum = (nRowOfProposed-1) * mnCols + nColOfProposed; + if ( mbLeaveLeftTopBlank ) + --mnPaintPhyStartPageNum; + if ( mnPaintPhyStartPageNum > mnPages ) + { + // no page will be visible, because shown part of document + // preview is the last row to the right of the last page + mnPaintPhyStartPageNum = mnPages; + mbNoPageVisible = true; + } + } + // set starting column and starting row + mnPaintStartCol = nColOfProposed; + mnPaintStartRow = nRowOfProposed; + // page offset + maPaintStartPageOffset.X() = + (_aProposedStartPos.X() % mnColWidth) - mnXFree; + maPaintStartPageOffset.Y() = + (_aProposedStartPos.Y() % mnRowHeight) - mnYFree; + // virtual preview document offset. + maPaintPreviewDocOffset = _aProposedStartPos; + } + + // determine additional paint offset, if preview layout fits into window. + _CalcAdditionalPaintOffset(); + + // determine rectangle to be painted from document preview + _CalcDocPrevwPaintRect(); + _orDocPreviewPaintRect = maPaintedPrevwDocRect; + + // OD 20.01.2003 #103492# - shift visible preview document area to the left, + // if on the right is an area left blank. + if ( !mbDoesLayoutColsFitIntoWindow && + maPaintedPrevwDocRect.GetWidth() < maWinSize.Width() ) + { + maPaintedPrevwDocRect.Move( + -(maWinSize.Width() - maPaintedPrevwDocRect.GetWidth()), 0 ); + Prepare( 0, maPaintedPrevwDocRect.TopLeft(), + _rPxWinSize, _onStartPageNum, _onStartPageVirtNum, + _orDocPreviewPaintRect, _bStartWithPageAtFirstCol ); + } + + /* OD 23.01.2003 - deactivate code, but not delete, because probably useful in the future + // OD 20.01.2003 #103492# - shift visible preview document area to the top, + // if on the botton is an area left blank. + if ( maPaintedPrevwDocRect.Bottom() == maPreviewDocRect.Bottom() && + maPaintedPrevwDocRect.GetHeight() < maWinSize.Height() ) + { + if ( mbDoesLayoutRowsFitIntoWindow ) + { + if ( maPaintedPrevwDocRect.GetHeight() < mnPrevwLayoutHeight) + { + maPaintedPrevwDocRect.Move( + 0, -(mnPrevwLayoutHeight - maPaintedPrevwDocRect.GetHeight()) ); + Prepare( 0, maPaintedPrevwDocRect.TopLeft(), + _rPxWinSize, _onStartPageNum, _onStartPageVirtNum, + _orDocPreviewPaintRect, _bStartWithPageAtFirstCol ); + } + } + else + { + maPaintedPrevwDocRect.Move( + 0, -(maWinSize.Height() - maPaintedPrevwDocRect.GetHeight()) ); + Prepare( 0, maPaintedPrevwDocRect.TopLeft(), + _rPxWinSize, _onStartPageNum, _onStartPageVirtNum, + _orDocPreviewPaintRect, _bStartWithPageAtFirstCol ); + } + } + */ + + // determine preview pages - visible pages with needed data for paint and + // accessible pages with needed data. + _CalcPreviewPages(); + + // validate paint data + mbPaintInfoValid = true; + + // return start page + _onStartPageNum = mnPaintPhyStartPageNum; + // return virtual page number of start page + _onStartPageVirtNum = 0; + if ( mnPaintPhyStartPageNum <= mnPages ) + { + const SwPageFrm* pPage = static_cast<const SwPageFrm*>( mrLayoutRootFrm.Lower() ); + while ( pPage && pPage->GetPhyPageNum() < mnPaintPhyStartPageNum ) + { + pPage = static_cast<const SwPageFrm*>( pPage->GetNext() ); + } + if ( pPage ) + _onStartPageVirtNum = pPage->GetVirtPageNum(); + } + return true; +} + +/** calculate additional paint offset + + OD 12.12.2002 #103492# + + @author OD +*/ +void SwPagePreviewLayout::_CalcAdditionalPaintOffset() +{ + if ( mnPrevwLayoutWidth <= maWinSize.Width() && + maPaintStartPageOffset.X() <= 0 ) + { + mbDoesLayoutColsFitIntoWindow = true; + maAdditionalPaintOffset.X() = (maWinSize.Width() - mnPrevwLayoutWidth) / 2; + } + else + { + mbDoesLayoutColsFitIntoWindow = false; + maAdditionalPaintOffset.X() = 0; + } + + if ( mnPrevwLayoutHeight <= maWinSize.Height() && + maPaintStartPageOffset.Y() <= 0 ) + { + mbDoesLayoutRowsFitIntoWindow = true; + maAdditionalPaintOffset.Y() = (maWinSize.Height() - mnPrevwLayoutHeight) / 2; + } + else + { + mbDoesLayoutRowsFitIntoWindow = false; + maAdditionalPaintOffset.Y() = 0; + } +} + +/** calculate painted preview document rectangle + + OD 12.12.2002 #103492# + + @author OD +*/ +void SwPagePreviewLayout::_CalcDocPrevwPaintRect() +{ + Point aTopLeftPos = maPaintPreviewDocOffset; + maPaintedPrevwDocRect.SetPos( aTopLeftPos ); + + Size aSize; + if ( mbDoesLayoutColsFitIntoWindow ) + //aSize.Width() = mnPrevwLayoutWidth; + aSize.Width() = Min( mnPrevwLayoutWidth, + maPreviewDocRect.GetWidth() - aTopLeftPos.X() ); + else + aSize.Width() = Min( maPreviewDocRect.GetWidth() - aTopLeftPos.X(), + maWinSize.Width() - maAdditionalPaintOffset.X() ); + if ( mbDoesLayoutRowsFitIntoWindow ) + //aSize.Height() = mnPrevwLayoutHeight; + aSize.Height() = Min( mnPrevwLayoutHeight, + maPreviewDocRect.GetHeight() - aTopLeftPos.Y() ); + else + aSize.Height() = Min( maPreviewDocRect.GetHeight() - aTopLeftPos.Y(), + maWinSize.Height() - maAdditionalPaintOffset.Y() ); + maPaintedPrevwDocRect.SetSize( aSize ); + long nHTmp = maPaintedPrevwDocRect.GetHeight(); + long nWTmp = maPaintedPrevwDocRect.GetWidth(); +} + +/** calculate preview pages + + OD 12.12.2002 #103492# + + @author OD +*/ +void SwPagePreviewLayout::_CalcPreviewPages() +{ + _ClearPrevwPageData(); + + if ( mbNoPageVisible ) + return; + + // determine start page frame + const SwPageFrm* pStartPage = mrLayoutRootFrm.GetPageByPageNum( mnPaintPhyStartPageNum ); + + // calculate initial paint offset + Point aInitialPaintOffset; + if ( maPaintStartPageOffset != Point( -1, -1 ) ) + aInitialPaintOffset = Point(0,0) - maPaintStartPageOffset; + else + aInitialPaintOffset = Point( mnXFree, mnYFree ); + aInitialPaintOffset += maAdditionalPaintOffset; + + // prepare loop data + const SwPageFrm* pPage = pStartPage; + sal_uInt16 nCurrCol = mnPaintStartCol; + sal_uInt16 nConsideredRows = 0; + Point aCurrPaintOffset = aInitialPaintOffset; + // loop on pages to determine preview background retangles + while ( pPage && + (!mbDoesLayoutRowsFitIntoWindow || nConsideredRows < mnRows) && + aCurrPaintOffset.Y() < maWinSize.Height() + ) + { + pPage->Calc(); + + // consider only pages, which have to be painted. + if ( nCurrCol < mnPaintStartCol ) + { + // calculate data of unvisible page needed for accessibility + PrevwPage* pPrevwPage = new PrevwPage; + Point aCurrAccOffset = aCurrPaintOffset - + Point( (mnPaintStartCol-nCurrCol) * mnColWidth, 0 ); + _CalcPreviewDataForPage( *(pPage), aCurrAccOffset, pPrevwPage ); + pPrevwPage->bVisible = false; + maPrevwPages.push_back( pPrevwPage ); + // continue with next page and next column + pPage = static_cast<const SwPageFrm*>(pPage->GetNext()); + ++nCurrCol; + continue; + } + if ( aCurrPaintOffset.X() < maWinSize.Width() ) + { + // OD 19.02.2003 #107369# - leaving left-top-corner blank is + // controlled by <mbLeaveLeftTopBlank>. + if ( mbLeaveLeftTopBlank && + pPage->GetPhyPageNum() == 1 && mnCols != 1 && nCurrCol == 1 + ) + { + // first page in 2nd column + // --> continue with increased paint offset and next column + aCurrPaintOffset.X() += mnColWidth; + ++nCurrCol; + continue; + } + + // calculate data of visible page + PrevwPage* pPrevwPage = new PrevwPage; + _CalcPreviewDataForPage( *(pPage), aCurrPaintOffset, pPrevwPage ); + pPrevwPage->bVisible = true; + maPrevwPages.push_back( pPrevwPage ); + } + else + { + // calculate data of unvisible page needed for accessibility + PrevwPage* pPrevwPage = new PrevwPage; + _CalcPreviewDataForPage( *(pPage), aCurrPaintOffset, pPrevwPage ); + pPrevwPage->bVisible = false; + maPrevwPages.push_back( pPrevwPage ); + } + + // prepare data for next loop + pPage = static_cast<const SwPageFrm*>(pPage->GetNext()); + aCurrPaintOffset.X() += mnColWidth; + ++nCurrCol; + if ( nCurrCol > mnCols ) + { + ++nConsideredRows; + aCurrPaintOffset.X() = aInitialPaintOffset.X(); + nCurrCol = 1; + aCurrPaintOffset.Y() += mnRowHeight; + } + } +} + +/** determines preview data for a given page and a given preview offset + + OD 13.12.2002 #103492# + + @author OD +*/ +bool SwPagePreviewLayout::_CalcPreviewDataForPage( const SwPageFrm& _rPage, + const Point& _rPrevwOffset, + PrevwPage* _opPrevwPage ) +{ + // page frame + _opPrevwPage->pPage = &_rPage; + // size of page frame + if ( _rPage.IsEmptyPage() ) + { + if ( _rPage.GetPhyPageNum() % 2 == 0 ) + _opPrevwPage->aPageSize = _rPage.GetPrev()->Frm().SSize(); + else + _opPrevwPage->aPageSize = _rPage.GetNext()->Frm().SSize(); + } + else + _opPrevwPage->aPageSize = _rPage.Frm().SSize(); + // position of page in preview window + Point aPrevwWinOffset( _rPrevwOffset ); + if ( _opPrevwPage->aPageSize.Width() < maMaxPageSize.Width() ) + aPrevwWinOffset.X() += ( maMaxPageSize.Width() - _opPrevwPage->aPageSize.Width() ) / 2; + if ( _opPrevwPage->aPageSize.Height() < maMaxPageSize.Height() ) + aPrevwWinOffset.Y() += ( maMaxPageSize.Height() - _opPrevwPage->aPageSize.Height() ) / 2; + _opPrevwPage->aPrevwWinPos = aPrevwWinOffset; + // logic position of page and mapping offset for paint + if ( _rPage.IsEmptyPage() ) + { + _opPrevwPage->aLogicPos = _opPrevwPage->aPrevwWinPos; + _opPrevwPage->aMapOffset = Point( 0, 0 ); + } + else + { + _opPrevwPage->aLogicPos = _rPage.Frm().Pos(); + _opPrevwPage->aMapOffset = _opPrevwPage->aPrevwWinPos - _opPrevwPage->aLogicPos; + } + + return true; +} + +// ============================================================================= +// methods to determine new data for changing the current shown part of the +// document preview. +// ============================================================================= +/** calculate start position for new scale + + OD 12.12.2002 #103492# + + @author OD +*/ +Point SwPagePreviewLayout::GetPreviewStartPosForNewScale( + const Fraction& _aNewScale, + const Fraction& _aOldScale, + const Size& _aNewWinSize ) const +{ + Point aNewPaintStartPos = maPaintedPrevwDocRect.TopLeft(); + if ( _aNewScale < _aOldScale ) + { + // increase paint width by moving start point to left. + if ( mnPrevwLayoutWidth < _aNewWinSize.Width() ) + aNewPaintStartPos.X() = 0; + else if ( maPaintedPrevwDocRect.GetWidth() < _aNewWinSize.Width() ) + { + aNewPaintStartPos.X() -= + (_aNewWinSize.Width() - maPaintedPrevwDocRect.GetWidth()) / 2; + if ( aNewPaintStartPos.X() < 0) + aNewPaintStartPos.X() = 0; + } + + if ( !mbDoesLayoutRowsFitIntoWindow ) + { + // increase paint height by moving start point to top. + if ( mnPrevwLayoutHeight < _aNewWinSize.Height() ) + { + aNewPaintStartPos.Y() = + ( (mnPaintStartRow - 1) * mnRowHeight ); + } + else if ( maPaintedPrevwDocRect.GetHeight() < _aNewWinSize.Height() ) + { + aNewPaintStartPos.Y() -= + (_aNewWinSize.Height() - maPaintedPrevwDocRect.GetHeight()) / 2; + if ( aNewPaintStartPos.Y() < 0) + aNewPaintStartPos.Y() = 0; + } + } + } + else + { + // decrease paint width by moving start point to right + if ( maPaintedPrevwDocRect.GetWidth() > _aNewWinSize.Width() ) + aNewPaintStartPos.X() += + (maPaintedPrevwDocRect.GetWidth() - _aNewWinSize.Width()) / 2; + // decrease paint height by moving start point to bottom + if ( maPaintedPrevwDocRect.GetHeight() > _aNewWinSize.Height() ) + { + aNewPaintStartPos.Y() += + (maPaintedPrevwDocRect.GetHeight() - _aNewWinSize.Height()) / 2; + // check, if new y-position is outside document preview + if ( aNewPaintStartPos.Y() > maPreviewDocRect.Bottom() ) + aNewPaintStartPos.Y() = + Max( 0L, maPreviewDocRect.Bottom() - mnPrevwLayoutHeight ); + } + } + + return aNewPaintStartPos; +} + +/** determines, if page with given page number is visible in preview + + OD 12.12.2002 #103492# + + @author OD +*/ +bool SwPagePreviewLayout::IsPageVisible( const sal_uInt16 _nPageNum ) const +{ + const PrevwPage* pPrevwPage = _GetPrevwPageByPageNum( _nPageNum ); + return pPrevwPage && pPrevwPage->bVisible; +} + +/** calculate data to bring new selected page into view. + + OD 12.12.2002 #103492# + + @author OD +*/ +bool SwPagePreviewLayout::CalcStartValuesForSelectedPageMove( + const sal_Int16 _nHoriMove, + const sal_Int16 _nVertMove, + sal_uInt16& _orNewSelectedPage, + sal_uInt16& _orNewStartPage, + Point& _orNewStartPos ) const +{ + // determine position of current selected page + sal_uInt16 nTmpSelPageNum = mnSelectedPageNum; + // OD 19.02.2003 #107369# - leaving left-top-corner blank is controlled + // by <mbLeaveLeftTopBlank>. + if ( mbLeaveLeftTopBlank ) + { + // Note: consider that left-top-corner is left blank --> +1 + ++nTmpSelPageNum; + } + sal_uInt16 nTmpCol = nTmpSelPageNum % mnCols; + sal_uInt16 nCurrCol = nTmpCol > 0 ? nTmpCol : mnCols; + sal_uInt16 nCurrRow = nTmpSelPageNum / mnCols; + if ( nTmpCol > 0 ) + ++nCurrRow; + + // determine new selected page number + sal_uInt16 nNewSelectedPageNum = mnSelectedPageNum; + { + if ( _nHoriMove != 0 ) + { + if ( (nNewSelectedPageNum + _nHoriMove) < 1 ) + nNewSelectedPageNum = 1; + else if ( (nNewSelectedPageNum + _nHoriMove) > mnPages ) + nNewSelectedPageNum = mnPages; + else + nNewSelectedPageNum += _nHoriMove; + } + if ( _nVertMove != 0 ) + { + if ( (nNewSelectedPageNum + (_nVertMove * mnCols)) < 1 ) + nNewSelectedPageNum = 1; + else if ( (nNewSelectedPageNum + (_nVertMove * mnCols)) > mnPages ) + nNewSelectedPageNum = mnPages; + else + nNewSelectedPageNum += ( _nVertMove * mnCols ); + } + } + + sal_uInt16 nNewStartPage = mnPaintPhyStartPageNum; + Point aNewStartPos = Point(0,0); + + if ( !IsPageVisible( nNewSelectedPageNum ) ) + { + if ( _nHoriMove != 0 && _nVertMove != 0 ) + { + ASSERT( false, "missing implementation for moving preview selected page horizontal AND vertical"); + return false; + } + + // new selected page has to be brought into view considering current + // visible preview. + sal_Int16 nTotalRows = GetRowOfPage( mnPages ); + if ( (_nHoriMove > 0 || _nVertMove > 0) && + mbDoesLayoutRowsFitIntoWindow && + mbDoesLayoutColsFitIntoWindow && // OD 20.02.2003 #107369# - add condition + nCurrRow > nTotalRows - mnRows + ) + // new proposed start page = left-top-corner of last possible + // preview page. + nNewStartPage = (nTotalRows - mnRows) * mnCols + 1; + // OD 19.02.2003 #107369# - leaving left-top-corner blank is controlled + // by <mbLeaveLeftTopBlank>. + if ( mbLeaveLeftTopBlank ) + { + // Note: decrease new proposed start page number by one, + // because of blank left-top-corner + --nNewStartPage; + } + else + // new proposed start page = new selected page. + nNewStartPage = nNewSelectedPageNum; + } + + _orNewSelectedPage = nNewSelectedPageNum; + _orNewStartPage = nNewStartPage; + _orNewStartPos = aNewStartPos; + + return true; +} + +/** checks, if given position is inside a shown document page + + OD 17.12.2002 #103492# + + @author OD +*/ +struct PrevwPosInsidePagePred +{ + const Point mnPrevwPos; + PrevwPosInsidePagePred( const Point _nPrevwPos ) : mnPrevwPos( _nPrevwPos ) {}; + bool operator() ( const PrevwPage* _pPrevwPage ) + { + if ( _pPrevwPage->bVisible ) + { + Rectangle aPrevwPageRect( _pPrevwPage->aPrevwWinPos, _pPrevwPage->aPageSize ); + return aPrevwPageRect.IsInside( mnPrevwPos ) ? true : false; + } + else + return false; + } +}; + +bool SwPagePreviewLayout::IsPrevwPosInDocPrevwPage( const Point _aPrevwPos, + Point& _orDocPos, + bool& _obPosInEmptyPage, + sal_uInt16& _onPageNum ) const +{ + bool bIsPosInsideDoc; + + // initialize variable parameter values. + _orDocPos.X() = 0; + _orDocPos.Y() = 0; + _obPosInEmptyPage = false; + _onPageNum = 0; + + std::vector<PrevwPage*>::const_iterator aFoundPrevwPageIter = + std::find_if( maPrevwPages.begin(), maPrevwPages.end(), + PrevwPosInsidePagePred( _aPrevwPos ) ); + + if ( aFoundPrevwPageIter == maPrevwPages.end() ) + // given preview position outside a document page. + bIsPosInsideDoc = false; + else + { + _onPageNum = (*aFoundPrevwPageIter)->pPage->GetPhyPageNum(); + if ( (*aFoundPrevwPageIter)->pPage->IsEmptyPage() ) + { + // given preview position inside an empty page + bIsPosInsideDoc = false; + _obPosInEmptyPage = true; + } + else + { + // given preview position inside a normal page + bIsPosInsideDoc = true; + _orDocPos = _aPrevwPos - + (*aFoundPrevwPageIter)->aPrevwWinPos + + (*aFoundPrevwPageIter)->aLogicPos; + } + } + + return bIsPosInsideDoc; +} + +/** determine window page scroll amount + + OD 17.12.2002 #103492# + + @author OD +*/ +SwTwips SwPagePreviewLayout::GetWinPagesScrollAmount( + const sal_Int16 _nWinPagesToScroll ) const +{ + SwTwips nScrollAmount; + if ( mbDoesLayoutRowsFitIntoWindow ) + { + nScrollAmount = (mnPrevwLayoutHeight - mnYFree) * _nWinPagesToScroll; + } + else + nScrollAmount = _nWinPagesToScroll * maPaintedPrevwDocRect.GetHeight(); + + // OD 19.02.2003 #107369# - check, if preview layout size values are valid. + // If not, the checks for an adjustment of the scroll amount aren't useful. + if ( mbLayoutSizesValid ) + { + if ( (maPaintedPrevwDocRect.Top() + nScrollAmount) <= 0 ) + nScrollAmount = -maPaintedPrevwDocRect.Top(); + + // OD 14.02.2003 #107369# - correct scroll amount + if ( nScrollAmount > 0 && + maPaintedPrevwDocRect.Bottom() == maPreviewDocRect.Bottom() + ) + { + nScrollAmount = 0; + } + else + { + while ( (maPaintedPrevwDocRect.Top() + nScrollAmount + mnYFree) >= maPreviewDocRect.GetHeight() ) + { + nScrollAmount -= mnRowHeight; + } + } + } + + return nScrollAmount; +} + +/** determine window preview page the page with the given number is on. + + OD 17.01.2003 #103492# + + @author OD + + @param _nPageNum + input parameter - physical page number of page, for which the preview + window page number has to be calculated. + + @return number of preview window page the page with the given physical + page number is on +*/ +sal_uInt16 SwPagePreviewLayout::GetWinPageNumOfPage( sal_uInt16 _nPageNum ) const +{ + ASSERT( PreviewLayoutValid(), "PagePreviewLayout not valid" ); + { + ASSERT( _nPageNum <= mnPages, + "parameter <_nPageNum> out of range - SwPagePreviewLayout::GetWinPageNumOfPage() will return 0!" ); + if ( _nPageNum > mnPages ) + return 0; + } + + // OD 19.02.2003 #107369# - leaving left-top-corner blank is controlled + // by <mbLeaveLeftTopBlank>. + if ( mbLeaveLeftTopBlank ) + { + // Note: increase given physical page number by one, because left-top-corner + // in the preview layout is left blank. + ++_nPageNum; + } + + sal_uInt16 nPagesPerWinPage = mnRows * mnCols; + + sal_uInt16 nWinPageNum = (_nPageNum) / nPagesPerWinPage; + if ( ( (_nPageNum) % nPagesPerWinPage ) > 0 ) + ++nWinPageNum; + + return nWinPageNum; +} + +// ============================================================================= +// methods to paint page preview layout +// ============================================================================= +/** paint prepared preview + + OD 12.12.2002 #103492# + + @author OD +*/ +bool SwPagePreviewLayout::Paint( const Rectangle _aOutRect ) const +{ + // check environment and parameters + { + if ( !mrParentViewShell.GetWin() && + !mrParentViewShell.GetOut()->GetConnectMetaFile() ) + return false; + + ASSERT( mbPaintInfoValid, + "invalid preview settings - no paint of preview" ); + if ( !mbPaintInfoValid ) + return false; + } + + // environment and parameter ok + + OutputDevice* pOutputDev = mrParentViewShell.GetOut(); + + // prepare paint + if ( maPrevwPages.size() > 0 ) + { + mrParentViewShell.Imp()->bFirstPageInvalid = FALSE; + mrParentViewShell.Imp()->pFirstVisPage = + const_cast<SwPageFrm*>(maPrevwPages[0]->pPage); + } + + // paint preview background + { + SwRegionRects aPreviewBackgrdRegion( _aOutRect ); + // calculate preview background rectangles + for ( std::vector<PrevwPage*>::const_iterator aPageIter = maPrevwPages.begin(); + aPageIter != maPrevwPages.end(); + ++aPageIter ) + { + if ( (*aPageIter)->bVisible ) + { + aPreviewBackgrdRegion -= + SwRect( (*aPageIter)->aPrevwWinPos, (*aPageIter)->aPageSize ); + } + } + // paint preview background rectangles + mrParentViewShell._PaintDesktop( aPreviewBackgrdRegion ); + } + + // prepare data for paint of pages + const Rectangle aPxOutRect( pOutputDev->LogicToPixel( _aOutRect ) ); + + MapMode aMapMode( pOutputDev->GetMapMode() ); + MapMode aSavedMapMode = aMapMode; + + Font* pEmptyPgFont = 0; + + Color aEmptyPgShadowBorderColor = SwViewOption::GetFontColor(); + + for ( std::vector<PrevwPage*>::const_iterator aPageIter = maPrevwPages.begin(); + aPageIter != maPrevwPages.end(); + ++aPageIter ) + { + if ( !(*aPageIter)->bVisible ) + continue; + + Rectangle aPageRect( (*aPageIter)->aLogicPos, (*aPageIter)->aPageSize ); + aMapMode.SetOrigin( (*aPageIter)->aMapOffset ); + pOutputDev->SetMapMode( aMapMode ); + Rectangle aPxPaintRect = pOutputDev->LogicToPixel( aPageRect ); + if ( aPxOutRect.IsOver( aPxPaintRect) ) + { + if ( (*aPageIter)->pPage->IsEmptyPage() ) + { + const Color aRetouche( mrParentViewShell.Imp()->GetRetoucheColor() ); + if( pOutputDev->GetFillColor() != aRetouche ) + pOutputDev->SetFillColor( aRetouche ); + pOutputDev->SetLineColor(); // OD 20.02.2003 #107369# - no line color + // OD 20.02.2003 #107369# - use aligned page rectangle + { + SwRect aTmpPageRect( aPageRect ); + ::SwAlignRect( aTmpPageRect, &mrParentViewShell); + aPageRect = aTmpPageRect.SVRect(); + } + pOutputDev->DrawRect( aPageRect ); + // paint empty page text + if( !pEmptyPgFont ) + { + pEmptyPgFont = new Font; + pEmptyPgFont->SetSize( Size( 0, 80 * 20 )); // == 80 pt + pEmptyPgFont->SetWeight( WEIGHT_BOLD ); + pEmptyPgFont->SetStyleName( aEmptyStr ); + pEmptyPgFont->SetName( String::CreateFromAscii( + RTL_CONSTASCII_STRINGPARAM( "Helvetica" )) ); + pEmptyPgFont->SetFamily( FAMILY_SWISS ); + pEmptyPgFont->SetTransparent( TRUE ); + pEmptyPgFont->SetColor( COL_GRAY ); + } + Font aOldFont( pOutputDev->GetFont() ); + pOutputDev->SetFont( *pEmptyPgFont ); + pOutputDev->DrawText( aPageRect, SW_RESSTR( STR_EMPTYPAGE ), + TEXT_DRAW_VCENTER | + TEXT_DRAW_CENTER | + TEXT_DRAW_CLIP ); + pOutputDev->SetFont( aOldFont ); + // paint shadow and border for empty page + // OD 19.02.2003 #107369# - use new method to paint page border and + // shadow + (*aPageIter)->pPage->PaintBorderAndShadow( aPageRect, &mrParentViewShell ); + } + else + { + mrParentViewShell.aVisArea = aPageRect; + aPxPaintRect.Intersection( aPxOutRect ); + Rectangle aPaintRect = pOutputDev->PixelToLogic( aPxPaintRect ); + mrParentViewShell.Paint( aPaintRect ); + } + if ( (*aPageIter)->pPage->GetPhyPageNum() == mnSelectedPageNum ) + { + _PaintSelectMarkAtPage( (*aPageIter) ); + } + } + } + + // update at accessiblilty interface + mrParentViewShell.Imp()->UpdateAccessiblePreview( + maPrevwPages, + aMapMode.GetScaleX(), + mrLayoutRootFrm.GetPageByPageNum( mnSelectedPageNum ), + maWinSize ); + + delete pEmptyPgFont; + pOutputDev->SetMapMode( aSavedMapMode ); + mrParentViewShell.aVisArea.Clear(); + + return true; +} + +/** repaint pages on page preview + + OD 18.12.2002 #103492# + + @author OD +*/ +void SwPagePreviewLayout::Repaint( const Rectangle _aInvalidCoreRect ) const +{ + // check environment and parameters + { + if ( !mrParentViewShell.GetWin() && + !mrParentViewShell.GetOut()->GetConnectMetaFile() ) + return; + + ASSERT( mbPaintInfoValid, + "invalid preview settings - no paint of preview" ); + if ( !mbPaintInfoValid ) + return; + } + + // environment and parameter ok + + // prepare paint + if ( maPrevwPages.size() > 0 ) + { + mrParentViewShell.Imp()->bFirstPageInvalid = FALSE; + mrParentViewShell.Imp()->pFirstVisPage = + const_cast<SwPageFrm*>(maPrevwPages[0]->pPage); + } + + // invalidate visible pages, which overlap the invalid core rectangle + for ( std::vector<PrevwPage*>::const_iterator aPageIter = maPrevwPages.begin(); + aPageIter != maPrevwPages.end(); + ++aPageIter ) + { + if ( !(*aPageIter)->bVisible ) + continue; + + Rectangle aPageRect( (*aPageIter)->aLogicPos, (*aPageIter)->aPageSize ); + if ( _aInvalidCoreRect.IsOver( aPageRect ) ) + { + aPageRect.Intersection( _aInvalidCoreRect ); + Rectangle aInvalidPrevwRect = aPageRect; + aInvalidPrevwRect.SetPos( aInvalidPrevwRect.TopLeft() - + (*aPageIter)->aLogicPos + + (*aPageIter)->aPrevwWinPos ); + mrParentViewShell.GetWin()->Invalidate( aInvalidPrevwRect ); + } + } +} + +/** paint selection mark at page + + OD 17.12.2002 #103492# + + @author OD +*/ +const void SwPagePreviewLayout::_PaintSelectMarkAtPage( + const PrevwPage* _aSelectedPrevwPage ) const +{ + OutputDevice* pOutputDev = mrParentViewShell.GetOut(); + MapMode aMapMode( pOutputDev->GetMapMode() ); + // save mapping mode of output device + MapMode aSavedMapMode = aMapMode; + // save fill and line color of output device + Color aFill( pOutputDev->GetFillColor() ); + Color aLine( pOutputDev->GetLineColor() ); + + // determine selection mark color + Color aSelPgLineColor(COL_LIGHTBLUE); + const StyleSettings& rSettings = + mrParentViewShell.GetWin()->GetSettings().GetStyleSettings(); + if ( rSettings.GetHighContrastMode() ) + aSelPgLineColor = rSettings.GetHighlightTextColor(); + + // set needed mapping mode at output device + aMapMode.SetOrigin( _aSelectedPrevwPage->aMapOffset ); + pOutputDev->SetMapMode( aMapMode ); + + // calculate page rectangle in pixel coordinates + SwRect aPageRect( _aSelectedPrevwPage->aLogicPos, + _aSelectedPrevwPage->aPageSize ); + // OD 19.02.2003 #107369# - use aligned page rectangle, as it is used for + // page border and shadow paint - see <SwPageFrm::PaintBorderAndShadow(..)> + ::SwAlignRect( aPageRect, &mrParentViewShell); + Rectangle aPxPageRect = pOutputDev->LogicToPixel( aPageRect.SVRect() ); + + // draw two rectangle + // OD 19.02.2003 #107369# - adjust position of select mark rectangle + Rectangle aRect( aPxPageRect.Left(), aPxPageRect.Top(), + aPxPageRect.Right(), aPxPageRect.Bottom() ); + aRect = pOutputDev->PixelToLogic( aRect ); + pOutputDev->SetFillColor(); // OD 20.02.2003 #107369# - no fill color + pOutputDev->SetLineColor( aSelPgLineColor ); + pOutputDev->DrawRect( aRect ); + // OD 19.02.2003 #107369# - adjust position of select mark rectangle + aRect = Rectangle( aPxPageRect.Left()+1, aPxPageRect.Top()+1, + aPxPageRect.Right()-1, aPxPageRect.Bottom()-1 ); + aRect = pOutputDev->PixelToLogic( aRect ); + pOutputDev->DrawRect( aRect ); + + // reset fill and line color of output device + pOutputDev->SetFillColor( aFill ); + pOutputDev->SetLineColor( aLine ); + + // reset mapping mode of output device + pOutputDev->SetMapMode( aSavedMapMode ); +} + +/** paint to mark new selected page + + OD 17.12.2002 #103492# + Perform paint for current selected page in order to unmark it. + Set new selected page and perform paint to mark this page. + + @author OD +*/ +void SwPagePreviewLayout::MarkNewSelectedPage( const sal_uInt16 _nSelectedPage ) +{ + sal_uInt16 nOldSelectedPageNum = mnSelectedPageNum; + mnSelectedPageNum = _nSelectedPage; + + // re-paint for current selected page in order to umark it. + const PrevwPage* pOldSelectedPrevwPage = _GetPrevwPageByPageNum( nOldSelectedPageNum ); + if ( pOldSelectedPrevwPage && pOldSelectedPrevwPage->bVisible ) + { + // OD 20.02.2003 #107369# - invalidate only areas of selection mark. + SwRect aPageRect( pOldSelectedPrevwPage->aPrevwWinPos, + pOldSelectedPrevwPage->aPageSize ); + ::SwAlignRect( aPageRect, &mrParentViewShell); + OutputDevice* pOutputDev = mrParentViewShell.GetOut(); + Rectangle aPxPageRect = pOutputDev->LogicToPixel( aPageRect.SVRect() ); + // invalidate top mark line + Rectangle aInvalPxRect( aPxPageRect.Left(), aPxPageRect.Top(), + aPxPageRect.Right(), aPxPageRect.Top()+1 ); + mrParentViewShell.GetWin()->Invalidate( pOutputDev->PixelToLogic( aInvalPxRect ) ); + // invalidate right mark line + aInvalPxRect = Rectangle( aPxPageRect.Right()-1, aPxPageRect.Top(), + aPxPageRect.Right(), aPxPageRect.Bottom() ); + mrParentViewShell.GetWin()->Invalidate( pOutputDev->PixelToLogic( aInvalPxRect ) ); + // invalidate bottom mark line + aInvalPxRect = Rectangle( aPxPageRect.Left(), aPxPageRect.Bottom()-1, + aPxPageRect.Right(), aPxPageRect.Bottom() ); + mrParentViewShell.GetWin()->Invalidate( pOutputDev->PixelToLogic( aInvalPxRect ) ); + // invalidate left mark line + aInvalPxRect = Rectangle( aPxPageRect.Left(), aPxPageRect.Top(), + aPxPageRect.Left()+1, aPxPageRect.Bottom() ); + mrParentViewShell.GetWin()->Invalidate( pOutputDev->PixelToLogic( aInvalPxRect ) ); + } + + // re-paint for new selected page in order to mark it. + const PrevwPage* pNewSelectedPrevwPage = _GetPrevwPageByPageNum( _nSelectedPage ); + if ( pNewSelectedPrevwPage && pNewSelectedPrevwPage->bVisible ) + _PaintSelectMarkAtPage( pNewSelectedPrevwPage ); +} + + +// ============================================================================= +// helper methods +// ============================================================================= +/** get preview page by physical page number + + OD 17.12.2002 #103492# + + @author OD +*/ +struct EqualsPageNumPred +{ + const sal_uInt16 mnPageNum; + EqualsPageNumPred( const sal_uInt16 _nPageNum ) : mnPageNum( _nPageNum ) {}; + bool operator() ( const PrevwPage* _pPrevwPage ) + { + return _pPrevwPage->pPage->GetPhyPageNum() == mnPageNum; + } +}; + +const PrevwPage* SwPagePreviewLayout::_GetPrevwPageByPageNum( const sal_uInt16 _nPageNum ) const +{ + std::vector<PrevwPage*>::const_iterator aFoundPrevwPageIter = + std::find_if( maPrevwPages.begin(), maPrevwPages.end(), + EqualsPageNumPred( _nPageNum ) ); + + if ( aFoundPrevwPageIter == maPrevwPages.end() ) + return 0; + else + return (*aFoundPrevwPageIter); +} + +/** determine row the page with the given number is in + + OD 17.01.2003 #103492# + + @author OD +*/ +sal_uInt16 SwPagePreviewLayout::GetRowOfPage( sal_uInt16 _nPageNum ) const +{ + // OD 19.02.2003 #107369# - leaving left-top-corner blank is controlled + // by <mbLeaveLeftTopBlank>. + if ( mbLeaveLeftTopBlank ) + { + // Note: increase given physical page number by one, because left-top-corner + // in the preview layout is left blank. + ++_nPageNum; + } + + sal_uInt16 nRow = (_nPageNum) / mnCols; + if ( ( (_nPageNum) % mnCols ) > 0 ) + ++nRow; + + return nRow; +} + +/** determine column the page with the given number is in + + OD 17.01.2003 #103492# + + @author OD +*/ +sal_uInt16 SwPagePreviewLayout::GetColOfPage( sal_uInt16 _nPageNum ) const +{ + // OD 19.02.2003 #107369# - leaving left-top-corner blank is controlled + // by <mbLeaveLeftTopBlank>. + if ( mbLeaveLeftTopBlank ) + { + // Note: increase given physical page number by one, because left-top-corner + // in the preview layout is left blank. + ++_nPageNum; + } + + sal_uInt16 nCol = (_nPageNum) % mnCols; + if ( nCol == 0 ) + nCol = mnCols; + + return nCol; +} + +Size SwPagePreviewLayout::GetMaxPageSize() const +{ + ASSERT( PreviewLayoutValid(), "PagePreviewLayout not valid" ); + return maMaxPageSize; +} + +Size SwPagePreviewLayout::GetPrevwDocSize() const +{ + ASSERT( PreviewLayoutValid(), "PagePreviewLayout not valid" ); + return maPreviewDocRect.GetSize(); +} + +/** get size of a preview page by its physical page number + + OD 15.01.2003 #103492# + + @author OD +*/ +Size SwPagePreviewLayout::GetPrevwPageSizeByPageNum( sal_uInt16 _nPageNum ) const +{ + const PrevwPage* pPrevwPage = _GetPrevwPageByPageNum( _nPageNum ); + if ( pPrevwPage ) + { + return pPrevwPage->aPageSize; + } + else + { + return Size( 0, 0 ); + } +} diff --git a/sw/source/core/view/scrrect.cxx b/sw/source/core/view/scrrect.cxx index 89438b152ed0..d4a76989d3c8 100644 --- a/sw/source/core/view/scrrect.cxx +++ b/sw/source/core/view/scrrect.cxx @@ -2,9 +2,9 @@ * * $RCSfile: scrrect.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: os $ $Date: 2002-12-05 13:29:56 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,6 +80,10 @@ #ifndef _SCRRECT_HXX #include <scrrect.hxx> // SwScrollRect, SwScrollRects #endif +// OD 18.02.2003 #107562# - <SwAlignRect> for <ViewShell::Scroll()> +#ifndef _FRMTOOL_HXX +#include <frmtool.hxx> +#endif #ifndef _TOOLS_DEBUG_HXX //autogen #include <tools/debug.hxx> #endif @@ -175,10 +179,8 @@ void ViewShell::Scroll() //- Bei einem pos. Ofst muss von hinten nach vorn gescrollt werden. //- Bei einem neg. Ofst muss von vorn nach hinten gescrollt werden. BOOL bPositive = (*pScrollRects)[0]->GetOffs() > 0; -#ifdef VERTICAL_LAYOUT if( (*pScrollRects)[0]->IsVertical() ) bPositive = !bPositive; -#endif int i = bPositive ? pScrollRects->Count()-1 : 0; for ( ; bPositive ? i >= 0 : i < (int)pScrollRects->Count(); @@ -192,7 +194,6 @@ void ViewShell::Scroll() bPositive ? --j : ++j ) { const SwStripes& rStripes = *rScroll[j]; -#ifdef VERTICAL_LAYOUT if( rScroll.IsVertical() ) { Rectangle aRectangle( rStripes.GetY() - @@ -200,10 +201,13 @@ void ViewShell::Scroll() rStripes.GetMin(), rStripes.GetY() + rScroll.GetOffs(), rStripes.GetMax() ); - GetWin()->Scroll( -rScroll.GetOffs(), 0, aRectangle, - SCROLL_CHILDREN); + // OD 18.02.2003 #107562# - align rectangle for scrolling + SwRect aAlignedScrollRect( aRectangle ); + ::SwAlignRect( aAlignedScrollRect, this ); + GetWin()->Scroll( -rScroll.GetOffs(), 0, + aAlignedScrollRect.SVRect(), + SCROLL_CHILDREN ); SwRect aRect( aRectangle ); - /// ??? Imp()->ScrolledRect( aRect, -rScroll.GetOffs() ); if ( bPositive ) aRect.Right( aRect.Left() + rScroll.GetOffs()-1 ); @@ -212,14 +216,17 @@ void ViewShell::Scroll() Imp()->AddPaintRect( aRect ); } else -#endif { Rectangle aRectangle( rStripes.GetMin(), rStripes.GetY() - rScroll.GetOffs(), rStripes.GetRight(), rStripes.GetBottom() - rScroll.GetOffs() ); - GetWin()->Scroll( 0, rScroll.GetOffs(), aRectangle, - SCROLL_CHILDREN); + // OD 18.02.2003 #107562# - use aligned rectangle for scrolling + SwRect aAlignedScrollRect( aRectangle ); + ::SwAlignRect( aAlignedScrollRect, this ); + GetWin()->Scroll( 0, rScroll.GetOffs(), + aAlignedScrollRect.SVRect(), + SCROLL_CHILDREN ); SwRect aRect( aRectangle ); Imp()->ScrolledRect( aRect, rScroll.GetOffs() ); if ( bPositive ) @@ -274,18 +281,15 @@ void SwViewImp::AddScrollRect( const SwFrm *pFrm, const SwRect &rRect, { ASSERT( nOffs != 0, "Scrollen ohne Ofst." ); SwRect aRect( rRect ); -#ifdef VERTICAL_LAYOUT BOOL bVert = pFrm->IsVertical(); if( bVert ) aRect.Pos().X() += nOffs; else -#endif aRect.Pos().Y() -= nOffs; if( aRect.IsOver( pSh->VisArea() ) ) { ASSERT( pSh->GetWin(), "Scrolling without outputdevice" ); aRect._Intersection( pSh->VisArea() ); -#ifdef VERTICAL_LAYOUT SwStripes *pStr; if ( !pScrollRects ) pScrollRects = new SwScrollAreas; @@ -313,17 +317,6 @@ void SwViewImp::AddScrollRect( const SwFrm *pFrm, const SwRect &rRect, pScrollRects->InsertCol( SwScrollColumn( pFrm->Frm().Left(), pFrm->Frm().Width(), nOffs, bVert ), pStr ); } -#else - aRect.Pos().Y() += nOffs; - SwStripes *pStripes = new SwStripes( aRect ); - if( pFrm->IsTxtFrm() ) - ((SwTxtFrm*)pFrm)->CriticalLines(*pSh->GetWin(), *pStripes, nOffs); - else - pStripes->Insert( SwStripe( aRect.Top(), aRect.Height() ), 0 ); - if ( !pScrollRects ) - pScrollRects = new SwScrollAreas; - pScrollRects->InsertCol( SwScrollColumn(pFrm->Frm(),nOffs), pStripes ); -#endif } else AddPaintRect( rRect ); @@ -385,7 +378,6 @@ void SwViewImp::FlushScrolledArea() while( nCnt ) { SwStripes* pStripes = (*pScroll)[--nCnt]; -#ifdef VERTICAL_LAYOUT if( pScroll->IsVertical() ) { SwRect aRect( 0, pStripes->GetMin(), 0, pStripes->GetWidth() ); @@ -397,7 +389,6 @@ void SwViewImp::FlushScrolledArea() AddPaintRect( aRect ); } } -#endif { SwRect aRect( pStripes->GetMin(), 0, pStripes->GetWidth(), 0 ); for( USHORT i = 0; i < pStripes->Count(); ++i ) @@ -440,7 +431,6 @@ BOOL SwViewImp::_FlushScrolledArea( SwRect& rRect ) SwStripes* pStripes = (*pScroll)[--j]; if( pStripes->Count() ) { -#ifdef VERTICAL_LAYOUT if( pScroll->IsVertical() ) { SwRect aRect( pStripes->GetY() - pStripes->GetHeight(), @@ -464,7 +454,6 @@ BOOL SwViewImp::_FlushScrolledArea( SwRect& rRect ) } } else -#endif { SwRect aRect( pStripes->GetMin(), pStripes->GetY(), pStripes->GetWidth(), pStripes->GetHeight() ); @@ -550,16 +539,11 @@ IMPL_LINK( SwViewImp, RefreshScrolledHdl, Timer *, EMPTYARG ) SwStripes* pStripes = pScroll->GetObject(0); ASSERT( pStripes->Count() > 1, "Empty scrollstripes" ); const SwStripe &rStripe = pStripes->GetObject(1); -#ifdef VERTICAL_LAYOUT SwRect aTmpRect = pScroll->IsVertical() ? SwRect( rStripe.GetY() - rStripe.GetHeight(), pScroll->GetX(), rStripe.GetHeight(), pScroll->GetWidth() ) : SwRect( pScroll->GetX(), rStripe.GetY(), pScroll->GetWidth(), rStripe.GetHeight() ); -#else - SwRect aTmpRect( pScroll->GetX(), rStripe.GetY(), - pScroll->GetWidth(), rStripe.GetHeight() ); -#endif if( aTmpRect.IsOver( aRect ) ) { SwSaveHdl aSaveHdl( this ); @@ -620,7 +604,6 @@ void SwViewImp::_ScrolledRect( const SwRect& rRect, long nOffs ) SwStripes* pStripes = (*pScroll)[0]; if( pStripes->Count() ) { -#ifdef VERTICAL_LAYOUT SwRect aRect = pScroll->IsVertical() ? SwRect( pStripes->GetY() - pStripes->GetHeight(), pStripes->GetMin(), pStripes->GetHeight(), @@ -628,16 +611,11 @@ void SwViewImp::_ScrolledRect( const SwRect& rRect, long nOffs ) SwRect( pStripes->GetMin(), pStripes->GetY(), pStripes->GetWidth(), pStripes->GetHeight() ); -#else - SwRect aRect( pStripes->GetMin(), pStripes->GetY(), - pStripes->GetWidth(), pStripes->GetHeight() ); -#endif if( rRect.IsOver( aRect ) ) { BOOL bRecalc = FALSE; for( USHORT nI = pStripes->Count(); nI; ) { -#ifdef VERTICAL_LAYOUT if( pScroll->IsVertical() ) { long nWidth = (*pStripes)[--nI].GetHeight(); @@ -645,7 +623,6 @@ void SwViewImp::_ScrolledRect( const SwRect& rRect, long nOffs ) aRect.Width( nWidth ); } else -#endif { aRect.Top( (*pStripes)[--nI].GetY() ); aRect.Height( (*pStripes)[nI].GetHeight() ); @@ -657,11 +634,7 @@ void SwViewImp::_ScrolledRect( const SwRect& rRect, long nOffs ) } } if( bRecalc ) -#ifdef VERTICAL_LAYOUT pStripes->Recalc( pScroll->IsVertical() ); -#else - pStripes->Recalc(); -#endif } } } @@ -841,22 +814,16 @@ void SwViewImp::RefreshScrolledArea( SwRect &rRect ) SwStripes* pStripes = (*pScroll)[--j]; if( pStripes->Count() ) { -#ifdef VERTICAL_LAYOUT SwRect aRect = pScroll->IsVertical() ? SwRect( pStripes->GetY() - pStripes->GetHeight(), pStripes->GetMin(), pStripes->GetHeight(), pStripes->GetWidth() ) : SwRect( pStripes->GetMin(), pStripes->GetY(), pStripes->GetWidth(), pStripes->GetHeight() ); -#else - SwRect aRect( pStripes->GetMin(), pStripes->GetY(), - pStripes->GetWidth(), pStripes->GetHeight() ); -#endif if( rRect.IsOver( aRect ) ) { for( USHORT nI = pStripes->Count(); nI; ) { -#ifdef VERTICAL_LAYOUT if( pScroll->IsVertical() ) { long nWidth = (*pStripes)[--nI].GetHeight(); @@ -864,7 +831,6 @@ void SwViewImp::RefreshScrolledArea( SwRect &rRect ) aRect.Width( nWidth ); } else -#endif { aRect.Top( (*pStripes)[--nI].GetY() ); aRect.Height( (*pStripes)[nI].GetHeight() ); @@ -905,11 +871,7 @@ void SwViewImp::RefreshScrolledArea( SwRect &rRect ) } } -#ifdef VERTICAL_LAYOUT SwStripes& SwStripes::Plus( const SwStripes& rOther, BOOL bVert ) -#else -SwStripes& SwStripes::operator+=( const SwStripes& rOther ) -#endif { if( !Count() ) { @@ -925,7 +887,6 @@ SwStripes& SwStripes::operator+=( const SwStripes& rOther ) ChkMin( rOther.GetMin() ); ChkMax( rOther.GetMax() ); USHORT nStart = 0; -#ifdef VERTICAL_LAYOUT if( bVert ) for( USHORT nIdx = 0; nIdx < nCnt; ++nIdx ) { @@ -970,7 +931,6 @@ SwStripes& SwStripes::operator+=( const SwStripes& rOther ) } } else -#endif for( USHORT nIdx = 0; nIdx < nCnt; ++nIdx ) { const SwStripe& rAdd = rOther[ nIdx ]; @@ -1017,16 +977,11 @@ SwStripes& SwStripes::operator+=( const SwStripes& rOther ) return *this; } -#ifdef VERTICAL_LAYOUT BOOL SwStripes::Recalc( BOOL bVert ) -#else -BOOL SwStripes::Recalc() -#endif { if( !Count() ) return TRUE; Y() = GetObject(0).GetY(); -#ifdef VERTICAL_LAYOUT if( bVert ) { long nTmpMin = GetObject(0).GetY() - GetObject(0).Height(); @@ -1041,7 +996,6 @@ BOOL SwStripes::Recalc() Height() = GetY() - nTmpMin; } else -#endif { long nTmpMax = GetObject(0).GetY() + GetObject(0).Height(); for( USHORT nIdx = 1; nIdx < Count(); ) @@ -1063,33 +1017,20 @@ BOOL SwScrollArea::Compress() return TRUE; for( USHORT nIdx = Count() - 1; nIdx > 0; --nIdx ) { -#ifdef VERTICAL_LAYOUT GetObject(0)->Plus( *GetObject(nIdx), IsVertical() ); -#else - *GetObject(0) += *GetObject(nIdx); -#endif delete GetObject( nIdx ); Remove( nIdx, 1 ); } ClrOffs(); -#ifdef VERTICAL_LAYOUT return GetObject(0)->Recalc( IsVertical() ); -#else - return GetObject(0)->Recalc(); -#endif } void SwScrollArea::Add( SwScrollArea *pScroll ) { ASSERT( pScroll->Count() == 1, "Missing scrollarea compression 2" ); ASSERT( Count() == 1, "Missing scrollarea compression 3" ); -#ifdef VERTICAL_LAYOUT GetObject(0)->Plus( *pScroll->GetObject(0), IsVertical() ); GetObject(0)->Recalc( IsVertical() ); -#else - *GetObject(0) += *pScroll->GetObject(0); - GetObject(0)->Recalc(); -#endif delete pScroll->GetObject( 0 ); pScroll->Remove( (USHORT)0, 1 ); delete pScroll; @@ -1120,7 +1061,6 @@ void SwScrollArea::SmartInsert( SwStripes* pStripes ) { ASSERT( pStripes, "Insert empty scrollstripe?" ); BOOL bNotInserted = TRUE; -#ifdef VERTICAL_LAYOUT if( IsVertical() ) for( USHORT nIdx = 0; nIdx < Count() && bNotInserted; ) { @@ -1146,32 +1086,29 @@ void SwScrollArea::SmartInsert( SwStripes* pStripes ) } } else -#endif - for( USHORT nIdx = 0; nIdx < Count() && bNotInserted; ) - { - SwStripes* pTmp = GetObject( nIdx++ ); - if( pTmp->GetY() + pTmp->GetHeight() == pStripes->GetY() ) - { - pTmp->Height() += pStripes->GetHeight(); - pTmp->ChkMin( pStripes->GetMin() ); - pTmp->ChkMax( pStripes->GetMax() ); - if( pStripes->Count() ) - pTmp->Insert( (SwStripeArr*)pStripes, pTmp->Count(), 0 ); - bNotInserted = FALSE; - } - else if( pTmp->GetY() == pStripes->GetY() + pStripes->GetHeight() ) + for( USHORT nIdx = 0; nIdx < Count() && bNotInserted; ) { - pTmp->Height() += pStripes->GetHeight(); - pTmp->Y() = pStripes->GetY(); - pTmp->ChkMin( pStripes->GetMin() ); - pTmp->ChkMax( pStripes->GetMax() ); - if( pStripes->Count() ) - pTmp->Insert( (SwStripeArr*)pStripes, 0, 0 ); - bNotInserted = FALSE; + SwStripes* pTmp = GetObject( nIdx++ ); + if( pTmp->GetY() + pTmp->GetHeight() == pStripes->GetY() ) + { + pTmp->Height() += pStripes->GetHeight(); + pTmp->ChkMin( pStripes->GetMin() ); + pTmp->ChkMax( pStripes->GetMax() ); + if( pStripes->Count() ) + pTmp->Insert( (SwStripeArr*)pStripes, pTmp->Count(), 0 ); + bNotInserted = FALSE; + } + else if( pTmp->GetY() == pStripes->GetY() + pStripes->GetHeight() ) + { + pTmp->Height() += pStripes->GetHeight(); + pTmp->Y() = pStripes->GetY(); + pTmp->ChkMin( pStripes->GetMin() ); + pTmp->ChkMax( pStripes->GetMax() ); + if( pStripes->Count() ) + pTmp->Insert( (SwStripeArr*)pStripes, 0, 0 ); + bNotInserted = FALSE; + } } - } if( !bNotInserted || !Insert( pStripes ) ) delete pStripes; } - - diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx index 19bc15f78d7e..bcaa357af414 100644 --- a/sw/source/core/view/viewimp.cxx +++ b/sw/source/core/view/viewimp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewimp.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: od $ $Date: 2002-12-06 16:25:21 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,8 +79,8 @@ #include "swregion.hxx" #include "dflyobj.hxx" #include "dview.hxx" -#ifndef _SVX_COLORCFG_HXX -#include <svx/colorcfg.hxx> +#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX +#include <svtools/colorcfg.hxx> #endif #ifndef _SHL_HXX #include <tools/shl.hxx> @@ -97,6 +97,11 @@ #endif #endif +// OD 12.12.2002 #103492# +#ifndef _PAGEPREVIEWLAYOUT_HXX +#include <pagepreviewlayout.hxx> +#endif + /************************************************************************* |* |* SwViewImp::Init() @@ -173,8 +178,8 @@ SwViewImp::SwViewImp( ViewShell *pParent ) : pSdrPageView( 0 ), pDrawView( 0 ), nRestoreActions( 0 ), - // OD 04.12.2002 #103492# - mpCurrPreviewData( 0 ) + // OD 12.12.2002 #103492# + mpPgPrevwLayout( 0 ) #ifdef ACCESSIBLE_LAYOUT ,pAccMap( 0 ) #endif @@ -204,8 +209,8 @@ SwViewImp::~SwViewImp() delete pAccMap; #endif - // OD 04.12.2002 #103492# - delete mpCurrPreviewData; + // OD 12.12.2002 #103492# + delete mpPgPrevwLayout; //JP 29.03.96: nach ShowPage muss auch HidePage gemacht werden!!! if( pDrawView ) @@ -395,6 +400,19 @@ Color SwViewImp::GetRetoucheColor() const return aRet; } +/** create page preview layout + + OD 12.12.2002 #103492# + + @author OD +*/ +void SwViewImp::InitPagePreviewLayout() +{ + ASSERT( pSh->GetLayout(), "no layout - page preview layout can not be created."); + if ( pSh->GetLayout() ) + mpPgPrevwLayout = new SwPagePreviewLayout( *pSh, *(pSh->GetLayout()) ); +} + #ifdef ACCESSIBLE_LAYOUT void SwViewImp::UpdateAccessible() { @@ -503,17 +521,15 @@ void SwViewImp::InvalidateAccessibleRelationSet( const SwFlyFrm *pMaster, } while ( pTmp != pVSh ); } -void SwViewImp::UpdateAccessiblePreview( sal_uInt8 nRow, sal_uInt8 nColumn, - sal_Int16 nStartPage, - const Size& rPageSize, - const Point& rFreePoint, - const Fraction& rScale, - sal_uInt16 nSelectedPage ) +// OD 15.01.2003 #103492# - method signature change due to new page preview functionality +void SwViewImp::UpdateAccessiblePreview( const std::vector<PrevwPage*>& _rPrevwPages, + const Fraction& _rScale, + const SwPageFrm* _pSelectedPageFrm, + const Size& _rPrevwWinSize ) { if( IsAccessible() ) - GetAccessibleMap().UpdatePreview( nRow, nColumn, nStartPage, - rPageSize, rFreePoint, rScale, - nSelectedPage ); + GetAccessibleMap().UpdatePreview( _rPrevwPages, _rScale, + _pSelectedPageFrm, _rPrevwWinSize ); } void SwViewImp::InvalidateAccessiblePreViewSelection( sal_uInt16 nSelPage ) diff --git a/sw/source/core/view/viewpg.cxx b/sw/source/core/view/viewpg.cxx index fb0d8da3a3f0..0dfc9e75c195 100644 --- a/sw/source/core/view/viewpg.cxx +++ b/sw/source/core/view/viewpg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewpg.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: fme $ $Date: 2002-12-10 10:22:14 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -125,1492 +125,38 @@ #ifndef _COMCORE_HRC #include <comcore.hrc> #endif -// OD 05.12.2002 #103492# -#include <algorithm> const SwTwips nXFree = 4*142; // == 0.25 cm * 4 const SwTwips nYFree = 4*142; static USHORT nPrevViewXFreePix = 0; static USHORT nPrevViewYFreePix = 0; -SwPageFrm* lcl_GetSttPage( BYTE& rRow, BYTE& rCol, USHORT& rSttPage, - const SwRootFrm* pRoot ) +// OD 12.12.2002 #103492# +SwPagePreviewLayout* ViewShell::PagePreviewLayout() { - USHORT nCalcSttPg = rSttPage; - if( nCalcSttPg ) - --nCalcSttPg; - if( !rCol ) - ++rCol; - if( !rRow ) - ++rRow; - - // suche die Start-Seite - SwPageFrm *pSttPage = (SwPageFrm*)pRoot->Lower(), *pPrevPage = pSttPage; - while( pSttPage && nCalcSttPg ) - { - pPrevPage = pSttPage; - pSttPage = (SwPageFrm*)pSttPage->GetNext(); - --nCalcSttPg; - } - - // keine Seiten mehr ?? - if( !pSttPage ) - { - pSttPage = pPrevPage; - rSttPage -= nCalcSttPg; // das sind die tatsaechlichen - if( 1 == (rSttPage & 1 )) // eine rechte Seite? - ++rSttPage; // dann sorge dafuer das sie rechts steht - - // dann dem Wunsch entsprechend Rueckwaerts - for( USHORT n = rRow * rCol; n && pSttPage; --n ) - { - pPrevPage = pSttPage; - pSttPage = (SwPageFrm*)pSttPage->GetPrev(); - --rSttPage; - } - if( !pSttPage ) - { - pSttPage = pPrevPage; - rSttPage = 1; - } - } - return pSttPage; + return Imp()->PagePreviewLayout(); } -USHORT ViewShell::CalcPreViewPage( - const Size& rWinSize, // auf diese Size die Scalierung errechnen - USHORT& rRowCol, // Zeilen/Spalten (Row im Hi, Col im LowByte!) - USHORT nSttPage, // Start ab dieser Seite, eine gueltige ?? - Size& rMaxSize, // MaxSize einer Seite - USHORT& rVirtPageNo, // virtuelle SeitenNummer - USHORT nAccSelPage ) // selected page for accessibility -{ - const SwRootFrm* pRoot = GetLayout(); - ASSERT( pRoot, "Wo ist mein Layout?" ); - - // ohne Win-Size ist nichts los - if( !rWinSize.Width() || !rWinSize.Height() ) - return 0; - - // von allen Seiten die Size holen. Das Max entscheidet - // ueber die Scalierung. (So macht es WW) - register SwTwips nMaxRowSz = 0, nMaxColSz = 0; - register USHORT nCalcSttPg = nSttPage; - if( nCalcSttPg ) - --nCalcSttPg; - - BYTE nRow = BYTE(rRowCol >> 8), nCol = BYTE(rRowCol & 0xff); - if( !nCol ) - ++nCol; - if( !nRow ) - ++nRow; - - // suche bestimme die Max-Breite - register SwPageFrm *pSttPage = (SwPageFrm*)pRoot->Lower(), - *pPrevPage = pSttPage; - while( pSttPage && nCalcSttPg ) - { - pSttPage->Calc(); - register Size& rSize = pSttPage->Frm().SSize(); - if( nMaxColSz < rSize.Width() ) - nMaxColSz = rSize.Width(); - if( nMaxRowSz < rSize.Height() ) - nMaxRowSz = rSize.Height(); - pPrevPage = pSttPage; - pSttPage = (SwPageFrm*)pSttPage->GetNext(); - --nCalcSttPg; - } - - // keine Seiten mehr ?? - if( !pSttPage ) - { - pSttPage = pPrevPage; - nSttPage -= nCalcSttPg; // das sind die tatsaechlichen -#if OLD -// hiermit stimmt die Errechnung der vir. PageNo nicht !! - if( 1 == (nSttPage & 1 )) // eine rechte Seite? - ++nSttPage; // dann sorge dafuer das sie rechts steht - - // dann dem Wunsch entsprechend Rueckwaerts - for( USHORT n = nRow * nCol; n && pSttPage; --n ) - { - pPrevPage = pSttPage; - pSttPage = (SwPageFrm*)pSttPage->GetPrev(); - --nSttPage; - } -#else - USHORT n = nRow * nCol; - if( 1 == (nSttPage & 1 )) // eine rechte Seite? - --n; // dann sorge dafuer das sie rechts steht - - // dann dem Wunsch entsprechend Rueckwaerts - for( ; n && pSttPage; --n ) - { - pPrevPage = pSttPage; - pSttPage = (SwPageFrm*)pSttPage->GetPrev(); - --nSttPage; - } -#endif - if( !pSttPage ) - { - pSttPage = pPrevPage; - nSttPage = 0; - } - rVirtPageNo = pPrevPage->GetVirtPageNum(); - } - else // dann haben wir unsere StartSeite, - // also weiter und das Max bestimmen - { - rVirtPageNo = pSttPage->GetVirtPageNum(); - while( pSttPage ) - { - pSttPage->Calc(); - register Size& rSize = pSttPage->Frm().SSize(); - if( nMaxColSz < rSize.Width() ) - nMaxColSz = rSize.Width(); - if( nMaxRowSz < rSize.Height() ) - nMaxRowSz = rSize.Height(); - pSttPage = (SwPageFrm*)pSttPage->GetNext(); - } - } - - rMaxSize.Height() = nMaxRowSz; - rMaxSize.Width() = nMaxColSz; - rRowCol = (nRow << 8) + nCol; // und wieder returnen - - // Jetzt die Scalierung incl. der gewuenschten Zwischenraueme errechnen - nMaxColSz = nCol * nMaxColSz; - nMaxRowSz = nRow * nMaxRowSz; - - MapMode aMapMode( MAP_TWIP ); - // falls die Abstaende zwischen den Seiten noch nicht berechnet wurden - if( !nPrevViewXFreePix || !nPrevViewYFreePix ) - { - Size aTmpSz( nXFree, nYFree ); - aTmpSz = GetOut()->LogicToPixel( aTmpSz, aMapMode ); - nPrevViewXFreePix = USHORT( aTmpSz.Width() ); - nPrevViewYFreePix = USHORT( aTmpSz.Height() ); - } - Size aSz( rWinSize.Width() - ((nCol+1) * nPrevViewXFreePix), - rWinSize.Height() - ( (nRow+1) * nPrevViewYFreePix ) ); - aSz = GetOut()->PixelToLogic( aSz, aMapMode ); - Fraction aScX( aSz.Width(), nMaxColSz ); - Fraction aScY( aSz.Height(), nMaxRowSz ); - if( aScX < aScY ) - aScY = aScX; - - { - // fuer Drawing, damit diese ihre Objecte vernuenftig Painten - // koennen, auf "glatte" Prozentwerte setzen - aScY *= Fraction( 1000, 1 ); - long nTmp = (long)aScY; - if( 1 < nTmp ) - --nTmp; - else - nTmp = 1; - aScY = Fraction( nTmp, 1000 ); - if( pOpt ) // fuer den Font-Cache die - pOpt->SetZoom( USHORT(nTmp / 10)); // Options mitpflegen! - } - aMapMode.SetScaleY( aScY ); - aMapMode.SetScaleX( aScY ); - -#ifdef ACCESSIBLE_LAYOUT - if( USHRT_MAX == nAccSelPage ) - nAccSelPage = nSttPage; - else if(nAccSelPage < nSttPage || nAccSelPage > nSttPage + (nRow * nCol) ) - nAccSelPage = nSttPage ? nSttPage : 1; - - Imp()->UpdateAccessiblePreview( nRow, nCol, nSttPage, rMaxSize, - GetPreviewFreePix(), aScY, nAccSelPage ); -#endif - - // was machen wir, wenn der MapMode unter einer - // gewissen Schwelle (z.B. 10% (WW6)) ist ??? - - GetOut()->SetMapMode( aMapMode ); - return nSttPage; -} -#ifdef ACCESSIBLE_LAYOUT void ViewShell::ShowPreViewSelection( sal_uInt16 nSelPage ) { Imp()->InvalidateAccessiblePreViewSelection( nSelPage ); } -#endif - -void ViewShell::PreViewPage( - const Rectangle& rRect, // Paint-Rect von Windows - USHORT nRowCol, // Anzahl Zeilen/Spalten - USHORT nSttPage, // Start ab dieser Seite, eine gueltige ?? - const Size& rPageSize, // MaxSize einer Seite - sal_uInt16 nSelectedPage ) // Page to be highlighted -{ - if( !GetWin() && !GetOut()->GetConnectMetaFile() ) - return; //Fuer den Drucker tun wir hier nix - - SET_CURR_SHELL( this ); - - const SwRootFrm* pRoot = GetLayout(); - ASSERT( pRoot, "Wo ist mein Layout?" ); - - BYTE nRow = BYTE(nRowCol >> 8), nCol = BYTE(nRowCol & 0xff); - SwPageFrm* pSttPage = ::lcl_GetSttPage( nRow, nCol, nSttPage, pRoot ); - - // damit auch die Seiten im Paint angezeigt werden, gleich die richtigen - // Werte setzen! (siehe auch Bug 24575) - Imp()->bFirstPageInvalid = FALSE; - Imp()->pFirstVisPage = pSttPage; - - const Rectangle aPixRect( GetOut()->LogicToPixel( rRect ) ); - - MapMode aMapMode( GetOut()->GetMapMode() ); - MapMode aCalcMapMode( aMapMode ); - aCalcMapMode.SetOrigin( Point() ); - - SwRegionRects aRegion( rRect );//fuer die Wiese - - Point aFreePt( nPrevViewXFreePix, nPrevViewYFreePix ); - aFreePt = GetOut()->PixelToLogic( aFreePt, aCalcMapMode ); - Point aCalcPt( aFreePt ); - long nPageHeight = aFreePt.Y() + rPageSize.Height()+1; - SwPageFrm* pPage = pSttPage; - - // erstmal die Wiese - // Sonderbehandlung fuer die erste Seite - // JP 19.08.98: aber nur wenn sie mehrspaltig angezeigt wird - int bFirstPg = !nSttPage && 1 != nCol; - - for( BYTE nCntRow = 0; pPage && nCntRow < nRow; ++nCntRow ) - { - aCalcPt.X() = aFreePt.X(); - for( BYTE nCntCol = 0; pPage && nCntCol < nCol; ++nCntCol ) - { - pPage->Calc(); - - // Sonderbehandlung fuer 1. Seite, ist immer eine rechte - if( bFirstPg ) - { - bFirstPg = FALSE; - aCalcPt.X() += pPage->Frm().Width()+1 + aFreePt.X(); - continue; - } - - if( pPage->IsEmptyPage() ) - { - aRegion -= SwRect( aCalcPt, rPageSize ); - aCalcPt.X() += rPageSize.Width()+1 + aFreePt.X(); - } - else - { - aRegion -= SwRect( aCalcPt, pPage->Frm().SSize() ); - aCalcPt.X() += pPage->Frm().Width()+1 + aFreePt.X(); - } - pPage = (SwPageFrm*)pPage->GetNext(); - } - aCalcPt.Y() += nPageHeight; - } - GetOut()->SetMapMode( aCalcMapMode ); - _PaintDesktop( aRegion ); - - // und dann das Dokument - bFirstPg = !nSttPage && 1 != nCol; - aCalcPt = aFreePt; - pPage = pSttPage; - Font* pEmptyPgFont = 0; - nSelectedPage -= nSttPage; - Color aLineColor(COL_LIGHTBLUE); - DBG_ASSERT(pWin, "no window available") - const StyleSettings& rSettings = GetWin()->GetSettings().GetStyleSettings(); - if(rSettings.GetHighContrastMode()) - aLineColor = rSettings.GetHighlightTextColor(); - const Color& rColor = SwViewOption::GetFontColor(); - for( nCntRow = 0; pPage && nCntRow < nRow; ++nCntRow ) - { - aCalcPt.X() = aFreePt.X(); - for( BYTE nCntCol = 0; pPage && nCntCol < nCol; ++nCntCol ) - { - // Sonderbehandlung fuer 1. Seite, ist immer eine rechte - if( bFirstPg ) - { - bFirstPg = FALSE; - aCalcPt.X() += pPage->Frm().Width()+1 + aFreePt.X(); - nSelectedPage--; - continue; - } - - Rectangle aPageRect; - - if( pPage->IsEmptyPage() ) - { - Rectangle aRect( aCalcPt, rPageSize ); - - aMapMode.SetOrigin( Point(0,0) ); - GetOut()->SetMapMode( aMapMode ); - - const Color aRetouche( Imp()->GetRetoucheColor() ); - - if( GetOut()->GetFillColor() != aRetouche ) - GetOut()->SetFillColor( aRetouche ); - - GetOut()->DrawRect( aRect ); - - if( !pEmptyPgFont ) - { - pEmptyPgFont = new Font; - pEmptyPgFont->SetSize( Size( 0, 80 * 20 )); // == 80 pt - pEmptyPgFont->SetWeight( WEIGHT_BOLD ); - pEmptyPgFont->SetStyleName( aEmptyStr ); - pEmptyPgFont->SetName( String::CreateFromAscii( - RTL_CONSTASCII_STRINGPARAM( "Helvetica" )) ); - pEmptyPgFont->SetFamily( FAMILY_SWISS ); - pEmptyPgFont->SetTransparent( TRUE ); - pEmptyPgFont->SetColor( COL_GRAY ); - } - Font aOldFont( GetOut()->GetFont() ); - GetOut()->SetFont( *pEmptyPgFont ); - GetOut()->DrawText( aRect, SW_RESSTR( STR_EMPTYPAGE ), - TEXT_DRAW_VCENTER | - TEXT_DRAW_CENTER | - TEXT_DRAW_CLIP ); - GetOut()->SetFont( aOldFont ); - aPageRect = GetOut()->LogicToPixel( aRect ); - - aCalcPt.X() += rPageSize.Width()+1 + aFreePt.X(); - } - else - { - aVisArea = pPage->Frm(); - - Point aPos( aCalcPt ); - aPos -= aVisArea.Pos(); - - aMapMode.SetOrigin( aPos ); - GetOut()->SetMapMode( aMapMode ); - - Rectangle aSVRect( GetOut()->LogicToPixel( aVisArea.SVRect() ) ); - aPageRect = aSVRect; - if( aPixRect.IsOver( aSVRect ) ) - { - aSVRect.Intersection( aPixRect ); - aSVRect = GetOut()->PixelToLogic( aSVRect ); - - Paint( aSVRect ); - } - aCalcPt.X() += pPage->Frm().Width()+1 + aFreePt.X(); - } - - Rectangle aShadow( aPageRect.Left()+2, aPageRect.Bottom()+1, - aPageRect.Right()+2, aPageRect.Bottom()+2 ); - Color aFill( GetOut()->GetFillColor() ); - Color aLine( GetOut()->GetLineColor() ); - GetOut()->SetFillColor( rColor ); - GetOut()->SetLineColor( rColor ); - aShadow = GetOut()->PixelToLogic( aShadow ); - GetOut()->DrawRect( aShadow ); - aShadow.Left() = aPageRect.Right() + 1; - aShadow.Right() = aShadow.Left() + 1; - aShadow.Top() = aPageRect.Top() + 2; - aShadow.Bottom() = aPageRect.Bottom(); - aShadow = GetOut()->PixelToLogic( aShadow ); - GetOut()->DrawRect( aShadow ); - aShadow = GetOut()->PixelToLogic( aPageRect ); - GetOut()->SetFillColor( Color( COL_TRANSPARENT ) ); - GetOut()->DrawRect( aShadow ); - if( !nSelectedPage ) - { - aShadow.Right() = aPageRect.Right() - 1; - aShadow.Left() = aPageRect.Left() + 1; - aShadow.Top() = aPageRect.Top() + 1; - aShadow.Bottom() = aPageRect.Bottom() - 1; - aShadow = GetOut()->PixelToLogic( aShadow ); - GetOut()->SetFillColor( Color( COL_TRANSPARENT ) ); - GetOut()->SetLineColor( aLineColor ); - GetOut()->DrawRect( aShadow ); - aShadow.Right() = aPageRect.Right() - 2; - aShadow.Left() = aPageRect.Left() + 2; - aShadow.Top() = aPageRect.Top() + 2; - aShadow.Bottom() = aPageRect.Bottom() - 2; - aShadow = GetOut()->PixelToLogic( aShadow ); - GetOut()->DrawRect( aShadow ); - } - GetOut()->SetFillColor( aFill ); - GetOut()->SetLineColor( aLine ); - - pPage = (SwPageFrm*)pPage->GetNext(); - nSelectedPage--; - } - aCalcPt.Y() += nPageHeight; - } - - delete pEmptyPgFont; - GetOut()->SetMapMode( aCalcMapMode ); - aVisArea.Clear(); // verhinder internes Painten !! -} - -/** init page preview layout - new method, replacing <CalcPreViewPage> - - OD 27.11.2002 #103492# - initialize the page preview settings for a given layout. - side effects: - (1) data struture for current preview settings are initialized and set. - (2) if parameter <_bCalcScale> is true, mapping mode with calculated - scaling is set at the output device and the zoom at the view options is - set with the calculated scaling. - - @author OD - - @param _nCols - input parameter - initial number of page columns in the preview. - - @param _nRows - input parameter - initial number of page rows in the preview. - - @param _orMaxPageSize - output parameter - maximal size in width and height of all pages - - @param _orPreviewDocSize - output parameter - size of the document in the proposed preview layout - included the spacing between the pages. - - @param _bCalcScale - input parameter - control, if method should calculate the needed - scaling for the proposed preview layout for the given window size - and sets the scaling at the output device and the view options. - - @param _pPxWinSize - input parameter - window size in which the preview will be displayed and - for which the scaling will be calculated. - - @return boolean, indicating, if preview layout is successful initialized. -*/ -bool ViewShell::InitPreviewLayout( const sal_uInt16 _nCols, - const sal_uInt16 _nRows, - Size& _orMaxPageSize, - Size& _orPreviewDocSize, - const bool _bCalcScale, - const Size* _pPxWinSize - ) -{ - const SwRootFrm* pRootFrm = GetLayout(); - // check environment and parameters - { - ASSERT( pRootFrm, "No layout - preview layout can *not* be initialized" ); - if ( !pRootFrm ) - return false; - - bool bColsRowsValid = (_nCols != 0) && (_nRows != 0); - ASSERT( bColsRowsValid, "preview layout parameters not correct - preview layout can *not* be initialized" ); - if ( !bColsRowsValid ) - return false; - - bool bPxWinSizeValid = _pPxWinSize && - (_pPxWinSize->Width() != 0) && (_pPxWinSize->Height() != 0); - ASSERT( bPxWinSizeValid, "no window size - preview layout can *not* be initialized" ); - if ( !bPxWinSizeValid ) - return false; - } - - // environment and parameters ok - - // clear existing preview settings - Imp()->CurrPrevwData()->Clear(); - - // set layout information at preview settings - Imp()->CurrPrevwData()->nCols = _nCols; - Imp()->CurrPrevwData()->nRows = _nRows; - - // calculate maximal page size; calculate also number of pages - const SwPageFrm* pPage = static_cast<const SwPageFrm*>(pRootFrm->Lower()); - register Size aMaxPageSize( 0,0 ); - register sal_uInt16 nPages = 0; - while ( pPage ) - { - ++nPages; - pPage->Calc(); - register const Size& rPageSize = pPage->Frm().SSize(); - if ( rPageSize.Width() > aMaxPageSize.Width() ) - aMaxPageSize.Width() = rPageSize.Width(); - if ( rPageSize.Height() > aMaxPageSize.Height() ) - aMaxPageSize.Height() = rPageSize.Height(); - pPage = static_cast<const SwPageFrm*>(pPage->GetNext()); - } - // set maximal page size, column width and row height at preview settings - Imp()->CurrPrevwData()->aMaxPageSize = aMaxPageSize; - Imp()->CurrPrevwData()->nColWidth = aMaxPageSize.Width() + nXFree; - Imp()->CurrPrevwData()->nRowHeight = aMaxPageSize.Height() + nYFree; - - // set number of pages at preview settings - Imp()->CurrPrevwData()->nPages = nPages; - // validate layout information - Imp()->CurrPrevwData()->bLayoutInfoValid = true; - - // return calculated maximal size in width and height of all pages - _orMaxPageSize = Imp()->CurrPrevwData()->aMaxPageSize; - - // calculate document size in preview layout and set it at preview settings - { - // document width - Imp()->CurrPrevwData()->aPreviewDocSize.Width() = - _nCols * aMaxPageSize.Width() + (_nCols+1) * nXFree; - - // document height - // determine number of rows needed for <nPages> in preview layout - // <nPages + 1>, because top-left-corner of preview layout is left free. - sal_uInt16 nDocRows = (nPages + 1) / _nCols; - if ( ( (nPages + 1) % _nCols ) > 0 ) - ++nDocRows; - Imp()->CurrPrevwData()->aPreviewDocSize.Height() = - nDocRows * aMaxPageSize.Height() + (nDocRows+1) * nYFree; - } - // return calculated document size in preview layout - _orPreviewDocSize = Imp()->CurrPrevwData()->aPreviewDocSize; - - if ( _bCalcScale ) - { - // calculate scaling - SwTwips nInitLayoutWidth = _nCols * aMaxPageSize.Width() + - (_nCols+1) * nXFree; - SwTwips nInitLayoutHeight = _nRows * aMaxPageSize.Height() + - (_nRows+1) * nYFree; - MapMode aMapMode( MAP_TWIP ); - Size aWinSize = GetOut()->PixelToLogic( *(_pPxWinSize), aMapMode ); - Fraction aXScale( aWinSize.Width(), nInitLayoutWidth ); - Fraction aYScale( aWinSize.Height(), nInitLayoutHeight ); - if( aXScale < aYScale ) - aYScale = aXScale; - { - // adjust scaling for Drawing layer. - aYScale *= Fraction( 1000, 1 ); - long nNewNuminator = aYScale.operator long(); - if( nNewNuminator < 1 ) - nNewNuminator = 1; - aYScale = Fraction( nNewNuminator, 1000 ); - // propagate scaling as zoom percentation to view option for font cache - if( pOpt ) - pOpt->SetZoom( USHORT(nNewNuminator / 10)); - } - aMapMode.SetScaleY( aYScale ); - aMapMode.SetScaleX( aYScale ); - // set created mapping mode with calculated scaling at output device. - GetOut()->SetMapMode( aMapMode ); - } - - // set window size in twips at preview settings - Imp()->CurrPrevwData()->aWinSize = - GetOut()->PixelToLogic( *(_pPxWinSize) ); - // validate layout sizes - Imp()->CurrPrevwData()->bLayoutSizesValid = true; - - return true; -} - -/** calculate visible pages and further needed data for current preview settings - - OD 04.12.2002 #103492# - - @author OD -*/ -void ViewShell::_CalcVisiblePagesForPreview() -{ - // determine start page frame - const SwRootFrm* pRootFrm = GetLayout(); - ASSERT( pRootFrm, "No layout - no prepare of preview paint"); - sal_uInt16 nStartPageNum = Imp()->CurrPrevwData()->nPaintPhyStartPageNum; - const SwPageFrm* pStartPage = static_cast<const SwPageFrm*>( pRootFrm->Lower() ); - while ( pStartPage && pStartPage->GetPhyPageNum() < nStartPageNum ) - { - pStartPage = static_cast<const SwPageFrm*>( pStartPage->GetNext() ); - } - - // get necessary preview layout data - sal_uInt16 nCols = Imp()->CurrPrevwData()->nCols; - sal_uInt16 nRows = Imp()->CurrPrevwData()->nRows; - bool bDoesLayoutFits = Imp()->CurrPrevwData()->bDoesLayoutRowsFitIntoWindow; - SwTwips nColWidth = Imp()->CurrPrevwData()->nColWidth; - SwTwips nRowHeight = Imp()->CurrPrevwData()->nRowHeight; - Size aMaxPageSize = Imp()->CurrPrevwData()->aMaxPageSize; - Size aPrevwWinSize = Imp()->CurrPrevwData()->aWinSize; - sal_uInt16 nStartCol = Imp()->CurrPrevwData()->nPaintStartCol; - - // calculate initial paint offset - Point aInitialPaintOffset; - if ( Imp()->CurrPrevwData()->aPaintStartPageOffset != Point( -1, -1 ) ) - { - aInitialPaintOffset = Point(0,0) - Imp()->CurrPrevwData()->aPaintStartPageOffset; - } - else - aInitialPaintOffset = Point( nXFree, nYFree ); - aInitialPaintOffset += Imp()->CurrPrevwData()->aAdditionalPaintOffset; - - // prepare loop data - Imp()->CurrPrevwData()->aVisPages.clear(); - const SwPageFrm* pPage = pStartPage; - sal_uInt16 nCurrCol = nStartCol; - sal_uInt16 nConsideredRows = 0; - Point aCurrPaintOffset = aInitialPaintOffset; - // loop on pages to determine preview background retangles - while ( pPage && - (!bDoesLayoutFits || nConsideredRows < nRows) && - //aCurrPaintOffset.X() < aPrevwWinSize.Width() && - aCurrPaintOffset.Y() < aPrevwWinSize.Height() - ) - { - pPage->Calc(); // don't know, if necessary. - - // consider only pages, which have to be painted. - if ( nCurrCol < nStartCol ) - { - // continue with next page and next column - pPage = static_cast<const SwPageFrm*>(pPage->GetNext()); - ++nCurrCol; - continue; - } - if ( aCurrPaintOffset.X() < aPrevwWinSize.Width() ) - { - if ( pPage->GetPhyPageNum() == 1 && nCols != 1 && nCurrCol == 1) - { - // first page always in 2nd column - // --> continue with increased paint offset and next column - aCurrPaintOffset.X() += nColWidth; - ++nCurrCol; - continue; - } - - // calculate data of visible page - PrevwVisiblePage aVisPage; - // page frame - aVisPage.pPage = pPage; - // size of page frame - if ( pPage->IsEmptyPage() ) - { - if ( pPage->GetPhyPageNum() % 2 == 0 ) - aVisPage.aPageSize = pPage->GetPrev()->Frm().SSize(); - else - aVisPage.aPageSize = pPage->GetNext()->Frm().SSize(); - } - else - aVisPage.aPageSize = pPage->Frm().SSize(); - // position of page in preview window - Point aPrevwWinOffset( aCurrPaintOffset ); - if ( aVisPage.aPageSize.Width() < aMaxPageSize.Width() ) - aPrevwWinOffset.X() += ( aMaxPageSize.Width() - aVisPage.aPageSize.Width() ) / 2; - if ( aVisPage.aPageSize.Height() < aMaxPageSize.Height() ) - aPrevwWinOffset.Y() += ( aMaxPageSize.Height() - aVisPage.aPageSize.Height() ) / 2; - aVisPage.aPrevwWinPos = aPrevwWinOffset; - // logic position of page and mapping offset for paint - if ( pPage->IsEmptyPage() ) - { - aVisPage.aLogicPos = aVisPage.aPrevwWinPos; - aVisPage.aMapOffset = Point( 0, 0 ); - } - else - { - aVisPage.aLogicPos = pPage->Frm().Pos(); - aVisPage.aMapOffset = aVisPage.aPrevwWinPos - aVisPage.aLogicPos; - } - - Imp()->CurrPrevwData()->aVisPages.push_back( aVisPage ); - } - - // prepare data for next loop - pPage = static_cast<const SwPageFrm*>(pPage->GetNext()); - aCurrPaintOffset.X() += nColWidth; - ++nCurrCol; - if ( nCurrCol > nCols ) - { - ++nConsideredRows; - aCurrPaintOffset.X() = aInitialPaintOffset.X(); - nCurrCol = 1; - aCurrPaintOffset.Y() += nRowHeight; - } - } -}; - -/** prepare paint of page preview - - With the valid preview layout settings - calculated and set by method - <InitPreviewLayout> - the paint of a specific part of the virtual - preview document is prepared. The corresponding part is given by either - a start page (parameter <_nProposedStartPageNum>) or a absolute position - (parameter <_aProposedStartPoint>). - The accessibility preview will also be updated via a corresponding - method call. - - @author OD - - @param _nProposedStartPageNum [0..<number of document pages>] - input parameter - proposed number of page, which should be painted in - the left-top-corner in the current output device. - - @param _nProposedStartPos [(0,0)..<PreviewDocumentSize>] - input parameter - proposed absolute position in the virtual preview - document, which should be painted in the left-top-corner in the current - output device. - - @param _onStartPageNum - output parameter - physical number of page, which will be painted in the - left-top-corner in the current output device. - - @param _onStartPageVirtNum - output parameter - virtual number of page, which will be painted in the - left-top-corner in the current output device. - - @param _orDocPreviewPaintRect - output parameter - rectangle of preview document, which will be painted. - - @return boolean, indicating, if prepare of preview paint was successful. -*/ -extern void lcl_CalcAdditionalPaintOffset( CurrentPreviewData* _pPrevwData ); -extern void lcl_CalcDocPrevwPaintRect( const CurrentPreviewData* _pPrevwData, - Rectangle& _orDocPrevwPaintRect ); - -bool ViewShell::PreparePreviewPaint( const sal_uInt16 _nProposedStartPageNum, - const Point _aProposedStartPos, - const Size* _pPxWinSize, - sal_uInt16& _onStartPageNum, - sal_uInt16& _onStartPageVirtNum, - Rectangle& _orDocPreviewPaintRect, - const bool _bPaintPageAtFirstCol - ) -{ - sal_uInt16 nProposedStartPageNum = _nProposedStartPageNum; - const SwRootFrm* pRootFrm = GetLayout(); - // check environment and parameters - { - ASSERT( pRootFrm, "No layout - no prepare of preview paint"); - if ( !pRootFrm ) - return false; - - bool bLayoutSettingsValid = Imp()->CurrPrevwData()->bLayoutInfoValid && - Imp()->CurrPrevwData()->bLayoutSizesValid; - ASSERT( bLayoutSettingsValid, - "no valid preview layout info/sizes - no prepare of preview paint"); - if ( !bLayoutSettingsValid ) - return false; - - bool bStartPageRangeValid = - _nProposedStartPageNum <= Imp()->CurrPrevwData()->nPages; - ASSERT( bStartPageRangeValid, - "proposed start page not existing - no prepare of preview paint"); - if ( !bStartPageRangeValid ) - return false; - - bool bStartPosRangeValid = - _aProposedStartPos.X() <= Imp()->CurrPrevwData()->aPreviewDocSize.Width() && - _aProposedStartPos.Y() <= Imp()->CurrPrevwData()->aPreviewDocSize.Height(); - ASSERT( bStartPosRangeValid, - "proposed start position out of range - no prepare of preview paint"); - if ( !bStartPosRangeValid ) - return false; - - bool bWinSizeValid = _pPxWinSize->Width() != 0 && _pPxWinSize->Height() != 0; - ASSERT ( bWinSizeValid, "no window size - no prepare of preview paint"); - if ( !bWinSizeValid ) - return false; - - bool bStartInfoValid = _nProposedStartPageNum > 0 || - _aProposedStartPos != Point(0,0); - if ( !bStartInfoValid ) - nProposedStartPageNum = 1; - } - - // environment and parameter ok - - // update window size at preview setting data - Imp()->CurrPrevwData()->aWinSize = GetOut()->PixelToLogic( *(_pPxWinSize) ); - - // get preview setting data - sal_uInt16 nCols = Imp()->CurrPrevwData()->nCols; - sal_uInt16 nRows = Imp()->CurrPrevwData()->nRows; - sal_uInt16 nPages = Imp()->CurrPrevwData()->nPages; - sal_uInt16 nColWidth = static_cast<sal_uInt16>(Imp()->CurrPrevwData()->nColWidth); - sal_uInt16 nRowHeight = static_cast<sal_uInt16>(Imp()->CurrPrevwData()->nRowHeight); - - sal_uInt16 nStartPageNum, nColOfProposed, nStartCol, nRowOfProposed; - Point aStartPageOffset; - Point aPreviewDocOffset; - if ( nProposedStartPageNum > 0 ) - { - // determine column and row of proposed start page in virtual preview layout - sal_uInt16 nTmpCol = (nProposedStartPageNum+1) % nCols; - nColOfProposed = nTmpCol ? nTmpCol : nCols; - sal_uInt16 nTmpRow = (nProposedStartPageNum+1) / nCols; - nRowOfProposed = nTmpCol ? nTmpRow+1 : nTmpRow; - // determine start page - if ( _bPaintPageAtFirstCol ) - { - if ( nProposedStartPageNum == 1 || nRowOfProposed == 1 ) - nStartPageNum = 1; - else - nStartPageNum = nProposedStartPageNum - (nColOfProposed-1); - } - else - nStartPageNum = nProposedStartPageNum; - // set starting column - if ( _bPaintPageAtFirstCol ) - nStartCol = 1; - else - nStartCol = nColOfProposed; - // page offset == (-1,-1), indicating no offset and paint of free space. - aStartPageOffset.X() = -1; - aStartPageOffset.Y() = -1; - // virtual preview document offset. - if ( _bPaintPageAtFirstCol ) - aPreviewDocOffset.X() = 0; - else - { - if ( nColOfProposed == 1) - aPreviewDocOffset.X() = 0; - else - aPreviewDocOffset.X() = (nColOfProposed-1) * nColWidth + 1; - } - if ( nRowOfProposed == 1) - aPreviewDocOffset.Y() = 0; - else - aPreviewDocOffset.Y() = (nRowOfProposed-1) * nRowHeight + 1; - } - else - { - // determine column and row of proposed start position - if ( _aProposedStartPos.X() == 0 ) - nColOfProposed = 1; - else - { - sal_uInt16 nTmpCol = _aProposedStartPos.X() / nColWidth; - nColOfProposed = - (_aProposedStartPos.X() % nColWidth) ? nTmpCol+1 : nTmpCol; - } - if ( _aProposedStartPos.Y() == 0 ) - nRowOfProposed = 1; - else - { - sal_uInt16 nTmpRow = _aProposedStartPos.Y() / nRowHeight; - nRowOfProposed = - (_aProposedStartPos.Y() % nRowHeight) ? nTmpRow+1 : nTmpRow; - } - // determine start page == page at proposed start position - if ( nRowOfProposed == 1 && nColOfProposed == 1 ) - nStartPageNum = 1; - else - nStartPageNum = (nRowOfProposed-1) * nCols + (nColOfProposed-1); - // set starting column - nStartCol = nColOfProposed; -// NOTE: <nStartPageNum> can be greater than <nPages> - consider case later - // page offset - aStartPageOffset.X() = (_aProposedStartPos.X() % nColWidth) - nXFree; - aStartPageOffset.Y() = (_aProposedStartPos.Y() % nRowHeight) - nYFree; - // virtual preview document offset. - aPreviewDocOffset = _aProposedStartPos; - } - - // set paint data at preview settings - Imp()->CurrPrevwData()->nPaintPhyStartPageNum = nStartPageNum; - Imp()->CurrPrevwData()->nPaintStartCol = nStartCol; - Imp()->CurrPrevwData()->nPaintStartRow = nRowOfProposed; - Imp()->CurrPrevwData()->aPaintStartPageOffset = aStartPageOffset; - Imp()->CurrPrevwData()->aPaintPreviewDocOffset = aPreviewDocOffset; - - // determine additional paint offset, if preview layout fits into window. - lcl_CalcAdditionalPaintOffset( Imp()->CurrPrevwData() ); - - // determine rectangle to be painted from document preview - lcl_CalcDocPrevwPaintRect( Imp()->CurrPrevwData(), _orDocPreviewPaintRect ); - Imp()->CurrPrevwData()->aPaintedPrevwDocRect = _orDocPreviewPaintRect; - - // determine pages, which are visible in the preview, and calculate needed - // paint data - _CalcVisiblePagesForPreview(); - - // validate paint data - Imp()->CurrPrevwData()->bPaintInfoValid = true; - - // return start page - _onStartPageNum = nStartPageNum; - // return virtual page number of start page - _onStartPageVirtNum = 0; - if ( nStartPageNum <= nPages ) - { - const SwPageFrm* pPage = static_cast<const SwPageFrm*>( pRootFrm->Lower() ); - while ( pPage && pPage->GetPhyPageNum() < nStartPageNum ) - { - pPage = static_cast<const SwPageFrm*>( pPage->GetNext() ); - } - if ( pPage ) - _onStartPageVirtNum = pPage->GetVirtPageNum(); - } - - return true; -}; - -void lcl_CalcAdditionalPaintOffset( CurrentPreviewData* _pPrevwData ) -{ - Size aWinSize = _pPrevwData->aWinSize; - - SwTwips nPrevwLayoutHeight = - _pPrevwData->nRows * _pPrevwData->nRowHeight + nYFree; - if ( nPrevwLayoutHeight <= aWinSize.Height() && - _pPrevwData->aPaintStartPageOffset.Y() <= 0 ) - { - _pPrevwData->bDoesLayoutRowsFitIntoWindow = true; - _pPrevwData->aAdditionalPaintOffset.Y() = - (aWinSize.Height() - nPrevwLayoutHeight) / 2; - } - else - { - _pPrevwData->bDoesLayoutRowsFitIntoWindow = false; - _pPrevwData->aAdditionalPaintOffset.Y() = 0; - } - - SwTwips nPrevwLayoutWidth = - _pPrevwData->nCols * _pPrevwData->nColWidth + nXFree; - if ( nPrevwLayoutWidth <= aWinSize.Width() && - _pPrevwData->aPaintStartPageOffset.X() <= 0 ) - { - _pPrevwData->bDoesLayoutColsFitIntoWindow = true; - _pPrevwData->aAdditionalPaintOffset.X() = - (aWinSize.Width() - nPrevwLayoutWidth) / 2; - } - else - { - _pPrevwData->bDoesLayoutColsFitIntoWindow = false; - _pPrevwData->aAdditionalPaintOffset.X() = 0; - } - -} - -void lcl_CalcDocPrevwPaintRect( const CurrentPreviewData* _pPrevwData, - Rectangle& _orDocPrevwPaintRect ) -{ - Point aTopLeftPos = _pPrevwData->aPaintPreviewDocOffset; - _orDocPrevwPaintRect.SetPos( aTopLeftPos ); - - Size aSize; - aSize.Width() = Min( _pPrevwData->aPreviewDocSize.Width() - - aTopLeftPos.X(), - _pPrevwData->aWinSize.Width() - - _pPrevwData->aAdditionalPaintOffset.X() ); - if ( _pPrevwData->bDoesLayoutRowsFitIntoWindow ) - aSize.Height() = _pPrevwData->nRows * _pPrevwData->nRowHeight + nYFree; - else - aSize.Height() = Min( _pPrevwData->aPreviewDocSize.Height() - - aTopLeftPos.Y(), - _pPrevwData->aWinSize.Height() - - _pPrevwData->aAdditionalPaintOffset.Y() ); - _orDocPrevwPaintRect.SetSize( aSize ); -} - -/** property <DoesPreviewLayoutRowsFitIntoWin> of current preview layout - - OD 03.12.2002 #103492# - - @author OD - - @return boolean, indicating that the rows of the current preview layout - fit into the current window size. -*/ -bool ViewShell::DoesPreviewLayoutRowsFitIntoWindow() -{ - ASSERT( IsPreView(), "method <ViewShell::DoesPreviewLayoutRowsFitIntoWindow called for a non-preview view shell" ); - if ( !IsPreView() ) - return false; - - return Imp()->CurrPrevwData()->bDoesLayoutRowsFitIntoWindow; -} - -/** property <DoesPreviewLayoutColsFitIntoWin> of current preview layout - - OD 03.12.2002 #103492# - - @author OD - - @return boolean, indicating that the columns of the current preview layout - fit into the current window size. -*/ -bool ViewShell::DoesPreviewLayoutColsFitIntoWindow() -{ - ASSERT( IsPreView(), "method <ViewShell::DoesPreviewLayoutColsFitIntoWindow called for a non-preview view shell" ); - if ( !IsPreView() ) - return false; - - return Imp()->CurrPrevwData()->bDoesLayoutColsFitIntoWindow; -} -/** calculate start position for new scaling - - OD 04.12.2002 #103492# - - @author OD - - @return Point, start position for new scale -*/ -Point ViewShell::GetPreviewStartPosForNewScale( const Fraction& _aNewScale, - const Fraction& _aOldScale, - const Size& _aNewWinSize ) -{ - ASSERT( IsPreView(), "method <ViewShell::GetPreviewStartPosForNewScale called for a non-preview view shell" ); - if ( !IsPreView() ) - return Point(0,0); - - const Rectangle aPaintedPrevwDocRect = - Imp()->CurrPrevwData()->aPaintedPrevwDocRect; - Point aNewPaintStartPos = aPaintedPrevwDocRect.TopLeft(); - if ( _aNewScale < _aOldScale ) - { - // increase paint width by moving start point to left. - SwTwips nPrevwLayoutWidth = nXFree + - Imp()->CurrPrevwData()->nCols * Imp()->CurrPrevwData()->nColWidth; - if ( nPrevwLayoutWidth < _aNewWinSize.Width() ) - { - aNewPaintStartPos.X() = 0; - } - else if ( aPaintedPrevwDocRect.GetWidth() < _aNewWinSize.Width() ) - { - aNewPaintStartPos.X() -= (_aNewWinSize.Width() - aPaintedPrevwDocRect.GetWidth()) / 2; - if ( aNewPaintStartPos.X() < 0) - aNewPaintStartPos.X() = 0; - } - - if ( !Imp()->CurrPrevwData()->bDoesLayoutRowsFitIntoWindow ) - { - // increase paint height by moving start point to top. - SwTwips nPrevwLayoutHeight = nYFree + - Imp()->CurrPrevwData()->nRows * Imp()->CurrPrevwData()->nRowHeight; - if ( nPrevwLayoutHeight < _aNewWinSize.Height() ) - { - if ( Imp()->CurrPrevwData()->nPaintStartRow == 1) - aNewPaintStartPos.Y() = 0; - else - aNewPaintStartPos.Y() = - ( (Imp()->CurrPrevwData()->nPaintStartRow - 1) * - Imp()->CurrPrevwData()->nRowHeight - ) + 1; - } - else if ( aPaintedPrevwDocRect.GetHeight() < _aNewWinSize.Height() ) - { - aNewPaintStartPos.Y() -= (_aNewWinSize.Height() - aPaintedPrevwDocRect.GetHeight()) / 2; - if ( aNewPaintStartPos.Y() < 0) - aNewPaintStartPos.Y() = 0; - } - } - } - else - { - // decrease paint width by moving start point to right - if ( aPaintedPrevwDocRect.GetWidth() > _aNewWinSize.Width() ) - aNewPaintStartPos.X() += (aPaintedPrevwDocRect.GetWidth() - _aNewWinSize.Width()) / 2; - // decrease paint height by moving start point to bottom - if ( aPaintedPrevwDocRect.GetHeight() > _aNewWinSize.Height() ) - aNewPaintStartPos.Y() += (aPaintedPrevwDocRect.GetHeight() - _aNewWinSize.Height()) / 2; - } - return aNewPaintStartPos; -} - -/** prepares re-paint of preview to bring new selected page into view. - OD 06.12.2002 #103492# +/** adjust view options for page preview - @author OD + OD 09.01.2003 #i6467# */ -bool ViewShell::MovePreviewSelectedPage( const sal_uInt16 _nCurrSelectedPage, - const sal_Int16 _nHoriMove, - const sal_Int16 _nVertMove, - sal_uInt16& _orNewSelectedPage, - sal_uInt16& _orNewStartPage, - Point& _orNewStartPos ) +void ViewShell::AdjustOptionsForPagePreview( const SwPrtOptions &_rPrintOptions ) { - ASSERT( IsPreView(), "method <ViewShell::MovePreviewSelectedPage called for a non-preview view shell" ); if ( !IsPreView() ) - return false;; - - // check parameters - { - bool bCurrSelectedPageNumValid = _nCurrSelectedPage > 0 && - _nCurrSelectedPage <= Imp()->CurrPrevwData()->nPages; - ASSERT( bCurrSelectedPageNumValid, "current selected page number out of range" ); - if ( !bCurrSelectedPageNumValid ) - return false; - } - - // get needed preview layout data - sal_uInt16 nCols = Imp()->CurrPrevwData()->nCols; - sal_uInt16 nRows = Imp()->CurrPrevwData()->nRows; - sal_uInt16 nPages = Imp()->CurrPrevwData()->nPages; - - // determine position of current selected page - sal_uInt16 nTmpCol = (_nCurrSelectedPage+1) % nCols; - sal_uInt16 nCurrCol = nTmpCol > 0 ? nTmpCol : nCols; - sal_uInt16 nCurrRow = (_nCurrSelectedPage+1) / nCols; - if ( nTmpCol > 0 ) - ++nCurrRow; - - // determine new selected page number - sal_uInt16 nNewSelectedPageNum = _nCurrSelectedPage; - { - if ( _nHoriMove != 0 ) - { - if ( (nNewSelectedPageNum + _nHoriMove) < 1 ) - nNewSelectedPageNum = 1; - else if ( (nNewSelectedPageNum + _nHoriMove) > nPages ) - nNewSelectedPageNum = nPages; - else - nNewSelectedPageNum += _nHoriMove; - } - if ( _nVertMove != 0 ) - { - if ( (nNewSelectedPageNum + (_nVertMove * nCols)) < 1 ) - nNewSelectedPageNum = 1; - else if ( (nNewSelectedPageNum + (_nVertMove * nCols)) > nPages ) - nNewSelectedPageNum = nPages; - else - nNewSelectedPageNum += ( _nVertMove * nCols ); - } - } - - sal_uInt16 nNewStartPage = Imp()->CurrPrevwData()->nPaintPhyStartPageNum; - Point aNewStartPos = Point(0,0); - - if ( !IsPageVisibleInCurrPreview( nNewSelectedPageNum ) ) { - if ( _nHoriMove != 0 && _nVertMove != 0 ) - { - ASSERT( false, "missing implementation for moving preview selected page horizontal AND vertical"); - return false; - } - - // new selected page has to be brought into view considering current - // visible preview. - // determine position of current selected page - sal_uInt16 nTmpCol = (nNewSelectedPageNum+1) % nCols; - sal_uInt16 nNewCol = nTmpCol > 0 ? nTmpCol : nCols; - sal_uInt16 nNewRow = (nNewSelectedPageNum+1) / nCols; - if ( nTmpCol > 0 ) - ++nNewRow; - - if ( _nHoriMove != 0 && _nVertMove == 0 ) - { - nNewStartPage = nNewSelectedPageNum; - } - else if ( _nHoriMove == 0 && _nVertMove != 0 ) - { - sal_Int16 nTotalRows = (nPages+1) / nCols; - if ( (nPages+1) % nCols > 0 ) - ++nTotalRows; - if ( _nVertMove > 0 && - Imp()->CurrPrevwData()->bDoesLayoutRowsFitIntoWindow && - nCurrRow > nTotalRows - nRows - ) - nNewStartPage = (nTotalRows - nRows) * nCols; - else - nNewStartPage = nNewSelectedPageNum; - } - } - - _orNewSelectedPage = nNewSelectedPageNum; - ShowPreViewSelection( nNewSelectedPageNum ); - _orNewStartPage = nNewStartPage; - _orNewStartPos = aNewStartPos; - - return true; -} - -/** determines, if page with given page number is visible in preview - - OD 05.12.2002 #103492# - - @author OD - - @return boolean, indicating, if page with given page number is visible - in preview -*/ -// predicate (unary function) for stl-algorithm "find_if" needed for method -// <ViewShell::IsPageVisibleInCurrPreview>. -struct EqualsPageNumPred -{ - const sal_uInt16 mnPageNum; - EqualsPageNumPred( const sal_uInt16 _nPageNum ) : mnPageNum( _nPageNum ) {}; - bool operator() ( const PrevwVisiblePage& _rVisPage ) - { - return _rVisPage.pPage->GetPhyPageNum() == mnPageNum; - } -}; -bool ViewShell::IsPageVisibleInCurrPreview( const sal_uInt16 _nPageNum ) -{ - ASSERT( IsPreView(), "method <ViewShell::IsPageVisibleInCurrPreview called for a non-preview view shell" ); - if ( !IsPreView() ) - return false; - - PrevwVisiblePageConstIter aFoundVisPageIter = - std::find_if( Imp()->CurrPrevwData()->aVisPages.begin(), - Imp()->CurrPrevwData()->aVisPages.end(), - EqualsPageNumPred( _nPageNum ) ); - - bool bPageVisibleInPrevw = - aFoundVisPageIter != Imp()->CurrPrevwData()->aVisPages.end(); - - return bPageVisibleInPrevw; -} - -/** helper method for <ViewShell::PaintPreview(..)> - - OD 03.12.2002 #103492# - - @author OD -*/ -void lcl_CalcPrevwBackgrd( const PrevwVisiblePages _aVisPages, - SwRegionRects& _orPrevwBackgrdRegion ) -{ - PrevwVisiblePageConstIter aPageIter = _aVisPages.begin(); - while ( aPageIter != _aVisPages.end() ) - { - _orPrevwBackgrdRegion -= - SwRect( (*aPageIter).aPrevwWinPos, (*aPageIter).aPageSize ); - ++aPageIter; - } -} -/** paint prepared preview - - OD 28.11.2002 #103492# - - @author OD - - @param _nSelectedPageNum - input parameter - physical number of page, which should be painted as - selected by am extra border in color COL_LIGHTBLUE. - - @param _aOutRect - input parameter - Twip rectangle of window, which should be painted. - - @return boolean, indicating, if paint of preview was performed -*/ -bool ViewShell::PaintPreview( const sal_uInt16 _nSelectedPageNum, - const Rectangle _aOutRect ) -{ - const SwRootFrm* pRootFrm = GetLayout(); - // check environment and parameters - { - ASSERT( pRootFrm, "No layout - no paint of preview" ); - if ( !pRootFrm ) - return false; - - ASSERT( Imp()->CurrPrevwData()->bPaintInfoValid, - "invalid preview settings - no paint of preview" ); - if ( !Imp()->CurrPrevwData()->bPaintInfoValid ) - return false; - } - - // environment and parameter ok - - if ( !GetWin() && !GetOut()->GetConnectMetaFile() ) - return false;; - - SET_CURR_SHELL( this ); - - // prepare paint - if ( Imp()->CurrPrevwData()->aVisPages.size() > 0 ) - { - Imp()->bFirstPageInvalid = FALSE; - Imp()->pFirstVisPage = - const_cast<SwPageFrm*>(Imp()->CurrPrevwData()->aVisPages[0].pPage); - } - - // paint preview background - { - SwRegionRects aPreviewBackgrdRegion( _aOutRect ); - // calculate preview background rectangles - PrevwVisiblePageConstIter aPageIter = - Imp()->CurrPrevwData()->aVisPages.begin(); - while ( aPageIter != Imp()->CurrPrevwData()->aVisPages.end() ) - { - aPreviewBackgrdRegion -= - SwRect( (*aPageIter).aPrevwWinPos, (*aPageIter).aPageSize ); - ++aPageIter; - } - // paint preview background rectangles - _PaintDesktop( aPreviewBackgrdRegion ); - } - - // prepare data for paint of pages - const Rectangle aPxOutRect( GetOut()->LogicToPixel( _aOutRect ) ); - MapMode aMapMode( GetOut()->GetMapMode() ); - MapMode aSavedMapMode = aMapMode; - - Font* pEmptyPgFont = 0; - - Color aSelPgLineColor(COL_LIGHTBLUE); - const StyleSettings& rSettings = GetWin()->GetSettings().GetStyleSettings(); - if ( rSettings.GetHighContrastMode() ) - aSelPgLineColor = rSettings.GetHighlightTextColor(); - - Color aEmptyPgShadowBorderColor = SwViewOption::GetFontColor(); - - { - PrevwVisiblePageConstIter aPageIter = - Imp()->CurrPrevwData()->aVisPages.begin(); - while ( aPageIter != Imp()->CurrPrevwData()->aVisPages.end() ) - { - Rectangle aPageRect( (*aPageIter).aLogicPos, (*aPageIter).aPageSize ); - aMapMode.SetOrigin( (*aPageIter).aMapOffset ); - GetOut()->SetMapMode( aMapMode ); - Rectangle aPxPageRect = GetOut()->LogicToPixel( aPageRect ); - if ( (*aPageIter).pPage->IsEmptyPage() ) - { - const Color aRetouche( Imp()->GetRetoucheColor() ); - if( GetOut()->GetFillColor() != aRetouche ) - GetOut()->SetFillColor( aRetouche ); - GetOut()->DrawRect( aPageRect ); - // paint empty page text - if( !pEmptyPgFont ) - { - pEmptyPgFont = new Font; - pEmptyPgFont->SetSize( Size( 0, 80 * 20 )); // == 80 pt - pEmptyPgFont->SetWeight( WEIGHT_BOLD ); - pEmptyPgFont->SetStyleName( aEmptyStr ); - pEmptyPgFont->SetName( String::CreateFromAscii( - RTL_CONSTASCII_STRINGPARAM( "Helvetica" )) ); - pEmptyPgFont->SetFamily( FAMILY_SWISS ); - pEmptyPgFont->SetTransparent( TRUE ); - pEmptyPgFont->SetColor( COL_GRAY ); - } - Font aOldFont( GetOut()->GetFont() ); - GetOut()->SetFont( *pEmptyPgFont ); - GetOut()->DrawText( aPageRect, SW_RESSTR( STR_EMPTYPAGE ), - TEXT_DRAW_VCENTER | - TEXT_DRAW_CENTER | - TEXT_DRAW_CLIP ); - GetOut()->SetFont( aOldFont ); - // paint shadow and border for empty page - Color aFill( GetOut()->GetFillColor() ); - Color aLine( GetOut()->GetLineColor() ); - GetOut()->SetFillColor( aEmptyPgShadowBorderColor ); - GetOut()->SetLineColor( aEmptyPgShadowBorderColor ); - // bottom shadow - Rectangle aRect( aPxPageRect.Left()+2, aPxPageRect.Bottom()+1, - aPxPageRect.Right()+2, aPxPageRect.Bottom()+2 ); - aRect = GetOut()->PixelToLogic( aRect ); - GetOut()->DrawRect( aRect ); - // right shadow - aRect.Left() = aPxPageRect.Right() + 1; - aRect.Right() = aRect.Left() + 1; - aRect.Top() = aPxPageRect.Top() + 2; - aRect.Bottom() = aPxPageRect.Bottom(); - aRect = GetOut()->PixelToLogic( aRect ); - GetOut()->DrawRect( aRect ); - // border - aRect = GetOut()->PixelToLogic( aPxPageRect ); - GetOut()->SetFillColor( Color( COL_TRANSPARENT ) ); - GetOut()->DrawRect( aRect ); - GetOut()->SetFillColor( aFill ); - GetOut()->SetLineColor( aLine ); - } - else - { - aVisArea = aPageRect; - Rectangle aPxPaintRect = aPxPageRect; - if ( aPxOutRect.IsOver( aPxPaintRect) ) - { - aPxPaintRect.Intersection( aPxOutRect ); - Rectangle aPaintRect = GetOut()->PixelToLogic( aPxPaintRect ); - Paint( aPaintRect ); - } - } - if ( (*aPageIter).pPage->GetPhyPageNum() == _nSelectedPageNum ) - { - Color aFill( GetOut()->GetFillColor() ); - Color aLine( GetOut()->GetLineColor() ); - Rectangle aRect( aPxPageRect.Left()+1, aPxPageRect.Top()+1, - aPxPageRect.Right()-1, aPxPageRect.Bottom()-1 ); - aRect = GetOut()->PixelToLogic( aRect ); - GetOut()->SetFillColor( Color( COL_TRANSPARENT ) ); - GetOut()->SetLineColor( aSelPgLineColor ); - GetOut()->DrawRect( aRect ); - aRect = Rectangle( aPxPageRect.Left()+2, aPxPageRect.Top()+2, - aPxPageRect.Right()-2, aPxPageRect.Bottom()-2 ); - aRect = GetOut()->PixelToLogic( aRect ); - GetOut()->DrawRect( aRect ); - GetOut()->SetFillColor( aFill ); - GetOut()->SetLineColor( aLine ); - } - - ++aPageIter; - } + ASSERT( false, "view shell doesn't belongs to a page preview - no adjustment of its view options"); + return; } - delete pEmptyPgFont; - GetOut()->SetMapMode( aSavedMapMode ); - aVisArea.Clear(); + PrepareForPrint( _rPrintOptions ); - return true; -} - -void ViewShell::RepaintCoreRect( - const SwRect& rRect, // Paint-Rect der Core - USHORT nRowCol, // Anzahl Zeilen/Spalten - USHORT nSttPage, // Start ab dieser Seite, eine gueltige ?? - const Size& rPageSize ) // MaxSize einer Seite -{ - if( !GetWin() && !GetOut()->GetConnectMetaFile() ) - return; //Fuer den Drucker tun wir hier nix - - SET_CURR_SHELL( this ); - - const SwRootFrm* pRoot = GetLayout(); - ASSERT( pRoot, "Wo ist mein Layout?" ); - - BYTE nRow = BYTE(nRowCol >> 8), nCol = BYTE(nRowCol & 0xff); - SwPageFrm* pSttPage = ::lcl_GetSttPage( nRow, nCol, nSttPage, pRoot ); - - // damit auch die Seiten im Paint angezeigt werden, gleich die richtigen - // Werte setzen! (siehe auch Bug 24575) - Imp()->bFirstPageInvalid = FALSE; - Imp()->pFirstVisPage = pSttPage; - -// const Rectangle aPixRect( GetOut()->LogicToPixel( rRect ) ); - - MapMode aMapMode( GetOut()->GetMapMode() ); - MapMode aCalcMapMode( aMapMode ); - aCalcMapMode.SetOrigin( Point() ); - - Point aFreePt( nPrevViewXFreePix, nPrevViewYFreePix ); - aFreePt = GetOut()->PixelToLogic( aFreePt, aCalcMapMode ); - Point aCalcPt( aFreePt ); - long nPageHeight = aFreePt.Y() + rPageSize.Height()+1; - SwPageFrm* pPage = pSttPage; - - // Sonderbehandlung fuer die erste Seite - // JP 19.08.98: aber nur wenn sie mehrspaltig angezeigt wird - int bFirstPg = !nSttPage && 1 != nCol; - for( BYTE nCntRow = 0; pPage && nCntRow < nRow; ++nCntRow ) - { - aCalcPt.X() = aFreePt.X(); - for( BYTE nCntCol = 0; pPage && nCntCol < nCol; ++nCntCol ) - { - // Sonderbehandlung fuer 1. Seite, ist immer eine rechte - if( bFirstPg ) - { - bFirstPg = FALSE; - aCalcPt.X() += pPage->Frm().Width()+1 + aFreePt.X(); - continue; - } - - SwRect aTmpRect( pPage->Frm() ); - if( rRect.IsOver( aTmpRect )) - { - Point aPos( aCalcPt ); - aPos -= aTmpRect.Pos(); - - aMapMode.SetOrigin( aPos ); - - aTmpRect._Intersection( rRect ); - Rectangle aSVRect( GetOut()-> - LogicToLogic( aTmpRect.SVRect(), &aMapMode, &aCalcMapMode ) ); - GetWin()->Invalidate( aSVRect ); - } - aCalcPt.X() += pPage->Frm().Width()+1 + aFreePt.X(); - pPage = (SwPageFrm*)pPage->GetNext(); - } - aCalcPt.Y() += nPageHeight; - } - - aVisArea.Clear(); // verhinder internes Painten !! + return; } // und jetzt mal raus auf den Drucker @@ -2243,100 +789,3 @@ void ViewShell::PrintProspect( SwPrtOptions& rOptions, } pFntCache->Flush(); } - - -BOOL ViewShell::IsPreViewDocPos( - Point& rDocPt, // DocPos die bestimmt und auf - // Layout Korrdination einer View umge- - // rechnet werden soll - USHORT nRowCol, // Zeilen/Spalten (Row im Hi, Col im LowByte!) - USHORT nSttPage, // Start ab dieser Seite, eine gueltige ?? - const Size& rPageSize // (Max)Size einer Seite - ) -{ -#ifdef DEBUG - ASSERT( false, "ViewShell::IsPreViewDocPos called [Debug-Assertion by OD]"); -#endif - BOOL bRet = FALSE; - SET_CURR_SHELL( this ); - - const SwRootFrm* pRoot = GetLayout(); - ASSERT( pRoot, "Wo ist mein Layout?" ); - - BYTE nRow = BYTE(nRowCol >> 8), nCol = BYTE(nRowCol & 0xff); - SwPageFrm* pSttPage = ::lcl_GetSttPage( nRow, nCol, nSttPage, pRoot ); - - MapMode aMapMode( GetOut()->GetMapMode() ); - MapMode aCalcMapMode( aMapMode ); - aCalcMapMode.SetOrigin( Point() ); - - Point aFreePt( nPrevViewXFreePix, nPrevViewYFreePix ); - aFreePt = GetOut()->PixelToLogic( aFreePt, aCalcMapMode ); - Point aCalcPt( aFreePt ); - long nPageHeight = aFreePt.Y() + rPageSize.Height()+1; - SwPageFrm* pPage = pSttPage; - - // Sonderbehandlung fuer die erste Seite - // JP 19.08.98: aber nur wenn sie mehrspaltig angezeigt wird - int bFirstPg = !nSttPage && 1 != nCol; - - for( BYTE nCntRow = 0; pPage && nCntRow < nRow; ++nCntRow ) - { - aCalcPt.X() = aFreePt.X(); - for( BYTE nCntCol = 0; pPage && nCntCol < nCol; ++nCntCol ) - { - // Sonderbehandlung fuer 1. Seite, ist immer eine rechte - if( bFirstPg ) - { - bFirstPg = FALSE; - aCalcPt.X() += pPage->Frm().Width()+1 + aFreePt.X(); - continue; - } - - if( pPage->IsEmptyPage() ) - aCalcPt.X() += rPageSize.Width()+1 + aFreePt.X(); - else - { - SwRect aPgRect( aCalcPt, pPage->Frm().SSize() ); - if( aPgRect.IsInside( rDocPt )) - { - // dann den richtigen Point errechnen: - Point aOffset( rDocPt ); - aOffset -= aCalcPt; - aOffset += pPage->Frm().Pos(); - rDocPt = aOffset; - bRet = TRUE; - break; - } - aCalcPt.X() += pPage->Frm().Width()+1 + aFreePt.X(); - } - pPage = (SwPageFrm*)pPage->GetNext(); - } - if( bRet ) - break; - - aCalcPt.Y() += nPageHeight; - } - return bRet; -} - -Size ViewShell::GetPagePreViewPrtMaxSize() const -{ - Size aMaxSize; - register const SwFrm *pSttPage = GetLayout()->Lower(); - while( pSttPage ) - { - register const Size& rSize = pSttPage->Frm().SSize(); - if( aMaxSize.Width() < rSize.Width() ) - aMaxSize.Width() = rSize.Width(); - if( aMaxSize.Height() < rSize.Height() ) - aMaxSize.Height() = rSize.Height(); - pSttPage = pSttPage->GetNext(); - } - return aMaxSize; -} - -Point ViewShell::GetPreviewFreePix() const -{ - return Point( nPrevViewXFreePix, nPrevViewYFreePix ); -} diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index d7dcd42c8e8b..a383606bb05f 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewsh.cxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: fme $ $Date: 2002-12-06 09:31:26 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -169,8 +169,8 @@ #include <accmap.hxx> #endif #endif -#ifndef _SVX_COLORCFG_HXX -#include <svx/colorcfg.hxx> +#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX +#include <svtools/colorcfg.hxx> #endif #ifndef INCLUDED_SVTOOLS_ACCESSIBILITYOPTIONS_HXX #include <svtools/accessibilityoptions.hxx> @@ -181,6 +181,10 @@ #ifndef _STATSTR_HRC #include <statstr.hrc> #endif +// OD 14.01.2003 #103492# +#ifndef _PAGEPREVIEWLAYOUT_HXX +#include <pagepreviewlayout.hxx> +#endif BOOL ViewShell::bLstAct = FALSE; ShellResource *ViewShell::pShellRes = 0; @@ -1057,16 +1061,22 @@ void ViewShell::VisPortChgd( const SwRect &rRect) const SwTwips nRight = aBoth.Right(); SwTwips nMinLeft = LONG_MAX; SwTwips nMaxRight= 0; - const nShadow = GetOut()->PixelToLogic( Size( 2, 0 ) ).Width(); while ( pPage && !((pPage->Frm().Top() > nBottom) || (pPage->Frm().Left() > nRight))) { if ( pPage->Frm().IsOver( aBoth ) ) { - if( pPage->Frm().Left() < nMinLeft ) - nMinLeft = pPage->Frm().Left(); - long nPageRight = pPage->Frm().Right() + nShadow; + // OD 12.02.2003 #i9719#, #105645# - consider new border + // and shadow width + const nBorderWidth = + GetOut()->PixelToLogic( Size( pPage->BorderPxWidth(), 0 ) ).Width(); + const nShadowWidth = + GetOut()->PixelToLogic( Size( pPage->ShadowPxWidth(), 0 ) ).Width(); + sal_Int16 nPageLeft = pPage->Frm().Left() - nBorderWidth; + if( nPageLeft < nMinLeft ) + nMinLeft = nPageLeft; + sal_Int16 nPageRight = pPage->Frm().Right() + nBorderWidth + nShadowWidth; if( nPageRight > nMaxRight ) nMaxRight = nPageRight; //Zus. auf die Zeichenobjekte abgleichen. @@ -1406,8 +1416,12 @@ void ViewShell::PaintDesktop( const SwRect &rRect ) void ViewShell::_PaintDesktop( const SwRegionRects &rRegion ) { GetOut()->Push( PUSH_FILLCOLOR ); + // OD 14.02.2003 #107424# - no longer needed, because color configuration + // is loaded in constructor of <SwModule>. + /* //make sure the color configuration has been loaded SW_MOD()->GetColorConfig(); + */ GetOut()->SetFillColor( SwViewOption::GetAppBackgroundColor()); for ( USHORT i = 0; i < rRegion.Count(); ++i ) GetOut()->DrawRect( rRegion[i].SVRect() ); @@ -2124,10 +2138,8 @@ void ViewShell::SetReadonlyOption(BOOL bSet) } else if ( GetWin() ) GetWin()->Invalidate(); -#ifdef ACCESSIBLE_LAYOUT if( Imp()->IsAccessible() ) Imp()->InvalidateAccessibleEditableState( sal_False ); -#endif } } /* -----------------------------2002/07/31 17:06------------------------------ @@ -2197,7 +2209,6 @@ BOOL ViewShell::IsNewLayout() const return GetLayout()->IsNewLayout(); } -#ifdef ACCESSIBLE_LAYOUT ::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessible > ViewShell::CreateAccessible() { @@ -2219,13 +2230,7 @@ BOOL ViewShell::IsNewLayout() const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessible > -ViewShell::CreateAccessiblePreview( sal_uInt8 nRow, - sal_uInt8 nColumn, - sal_uInt16 nStartPage, - const Size& rPageSize, - const Point& rFreePoint, - const Fraction& rScale, - sal_uInt16 nSelectedPage ) +ViewShell::CreateAccessiblePreview() { using ::com::sun::star::uno::Reference; using ::drafts::com::sun::star::accessibility::XAccessible; @@ -2237,10 +2242,16 @@ ViewShell::CreateAccessiblePreview( sal_uInt8 nRow, ASSERT( pDoc->GetRootFrm(), "no layout, no access" ); ASSERT( GetWin(), "no window, no access" ); - if( pDoc->GetRootFrm() && GetWin() ) + // OD 15.01.2003 #103492# - add condition <IsPreView()> + if ( IsPreView() && pDoc->GetRootFrm() && GetWin() ) + { + // OD 14.01.2003 #103492# - adjustment for new method signature return Imp()->GetAccessibleMap().GetDocumentPreview( - nRow, nColumn, nStartPage, rPageSize, rFreePoint, rScale, - nSelectedPage ); + PagePreviewLayout()->maPrevwPages, + GetWin()->GetMapMode().GetScaleX(), + pDoc->GetRootFrm()->GetPageByPageNum( PagePreviewLayout()->mnSelectedPageNum ), + PagePreviewLayout()->maWinSize ); + } return NULL; } @@ -2249,7 +2260,6 @@ void ViewShell::InvalidateAccessibleFocus() if( Imp()->IsAccessible() ) Imp()->GetAccessibleMap().InvalidateFocus(); } -#endif /* -----------------------------06.05.2002 13:23------------------------------ diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx index 99d711ba463d..e20582ec8163 100644 --- a/sw/source/core/view/vnew.cxx +++ b/sw/source/core/view/vnew.cxx @@ -2,9 +2,9 @@ * * $RCSfile: vnew.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: od $ $Date: 2002-12-06 16:23:56 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -224,9 +224,11 @@ ViewShell::ViewShell( SwDoc& rDocument, Window *pWindow, bEndActionByVirDev = FALSE; bPaintWorks = bEnableSmooth = TRUE; bPreView = 0 !=( VSHELLFLAG_ISPREVIEW & nFlags ); - // OD 04.12.2002 #103492# if ( bPreView ) - pImp->InitPreviewData(); + { + // OD 12.12.2002 #103492# - init page preview layout + pImp->InitPagePreviewLayout(); + } pDoc->AddLink(); pOutput = pOut; @@ -279,9 +281,9 @@ ViewShell::ViewShell( ViewShell& rShell, Window *pWindow, bPaintInProgress = bViewLocked = bInEndAction = bFrameView = bEndActionByVirDev = FALSE; bPreView = 0 !=( VSHELLFLAG_ISPREVIEW & nFlags ); - // OD 04.12.2002 #103492# + // OD 12.12.2002 #103492# if ( bPreView ) - pImp->InitPreviewData(); + pImp->InitPagePreviewLayout(); SET_CURR_SHELL( this ); diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx index 53f6aed47a04..2c363d089eed 100644 --- a/sw/source/core/view/vprint.cxx +++ b/sw/source/core/view/vprint.cxx @@ -2,9 +2,9 @@ * * $RCSfile: vprint.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: tl $ $Date: 2002-11-14 10:34:44 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1189,6 +1189,11 @@ BOOL ViewShell::Prt( SwPrtOptions& rOptions, SfxProgress& rProgress, pShell->CalcPagesForPrint( (USHORT)aPages.Max(), &rProgress, pStr, nMergeAct, nMergeCnt ); + // Some field types, can require a valid layout + // (expression fields in tables). For these we do an UpdateFlds + // here after calculation of the pages. + pShell->UpdateFlds(TRUE); + if( ! pShell->Imp()->IsStopPrt() && (pPDFOut || rOptions.GetJobName().Len() || pPrt->IsJobActive()) ) { @@ -1385,39 +1390,54 @@ BOOL ViewShell::Prt( SwPrtOptions& rOptions, SfxProgress& rProgress, ( (bRightPg && rOptions.bPrintRightPage) || (!bRightPg && rOptions.bPrintLeftPage) ) ) { - if ( bSetPrt && pLastPageDesc != pStPage->GetPageDesc() ) + if ( bSetPrt ) { - pLastPageDesc = pStPage->GetPageDesc(); - BOOL bLandScp = pLastPageDesc->GetLandscape(); + // check for empty page + const SwPageFrm* pFormatPage = NULL; - if(bSetPaperBin ) // Schacht einstellen. - pPrt->SetPaperBin( pStPage->GetFmt()-> - GetPaperBin().GetValue() ); - if (bSetPaperSz ) + // for empty pages, take the format of the partner + // page + if ( pStPage->IsEmptyPage() ) { - Size aSize = pStPage->Frm().SSize(); - if ( bLandScp && bSetOrient ) - { - long nWidth = aSize.Width(); - aSize.Width() = aSize.Height(); - aSize.Height() = nWidth; - } - Paper ePaper = SvxPaperInfo::GetSvPaper(aSize,MAP_TWIP,TRUE); - if ( PAPER_USER == ePaper ) - pPrt->SetPaperSizeUser( aSize ); + if ( bRightPg ) + pFormatPage = (SwPageFrm*)pStPage->GetNext(); else - pPrt->SetPaper( ePaper ); + pFormatPage = (SwPageFrm*)pStPage->GetPrev(); } - if (bSetOrient ) + + if ( ! pFormatPage ) + pFormatPage = pStPage; + + if ( pLastPageDesc != pFormatPage->GetPageDesc() ) { - // Orientation einstellen: Breiter als Hoch - // -> Landscape, sonst -> Portrait. - if( bLandScp ) - pPrt->SetOrientation(ORIENTATION_LANDSCAPE); - else - pPrt->SetOrientation(ORIENTATION_PORTRAIT); + pLastPageDesc = pFormatPage->GetPageDesc(); + + const BOOL bLandScp = + pFormatPage->GetPageDesc()->GetLandscape(); + + if( bSetPaperBin ) // Schacht einstellen. + pPrt->SetPaperBin( pFormatPage->GetFmt()-> + GetPaperBin().GetValue() ); + + if (bSetOrient ) + { + // Orientation einstellen: Breiter als Hoch + // -> Landscape, sonst -> Portrait. + if( bLandScp ) + pPrt->SetOrientation(ORIENTATION_LANDSCAPE); + else + pPrt->SetOrientation(ORIENTATION_PORTRAIT); + } + if (bSetPaperSz ) + { + Size aSize = pStPage->Frm().SSize(); + + // Let VCL decide which printer paper should be used for printing + pPrt->SetPaperSizeUser( aSize ); + } } } + // Wenn PostIts nach Seite gedruckt werden sollen, // jedoch Reverse eingestellt ist ... if( rOptions.bPrintReverse && @@ -1623,10 +1643,10 @@ BOOL ViewShell::Prt( SwPrtOptions& rOptions, SfxProgress& rProgress, -void ViewShell::PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, +void ViewShell::PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, SwPrtOptions& rOptions, OutputDevice* pOleOut, const Rectangle& rRect ) { - //Wir brauchen eine Shell fuer das Drucken. Entweder hat das Doc schon + //Wir brauchen eine Shell fuer das Drucken. Entweder hat das Doc schon //eine, dann legen wir uns eine neue Sicht an, oder das Doc hat noch //keine, dann erzeugen wir die erste Sicht. ViewShell *pSh; @@ -1637,6 +1657,7 @@ void ViewShell::PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, { SET_CURR_SHELL( pSh ); + pSh->PrepareForPrint( rOptions ); pSh->SetPrtFormatOption( TRUE ); SwRect aSwRect( rRect ); @@ -1765,7 +1786,7 @@ SwDrawViewSave::~SwDrawViewSave() } - +// OD 09.01.2003 #i6467# - method also called for page preview void ViewShell::PrepareForPrint( const SwPrtOptions &rOptions ) { // Viewoptions fuer den Drucker setzen @@ -1780,15 +1801,32 @@ void ViewShell::PrepareForPrint( const SwPrtOptions &rOptions ) { SdrView *pDrawView = GetDrawView(); FASTBOOL bDraw = rOptions.bPrintDraw; - pDrawView->SetLineDraftPrn( !bDraw ); - pDrawView->SetFillDraftPrn( !bDraw ); - pDrawView->SetGrafDraftPrn( !bDraw ); - pDrawView->SetTextDraftPrn( !bDraw ); + // OD 09.01.2003 #i6467# - consider, if view shell belongs to page preview + if ( !IsPreView() ) + { + pDrawView->SetLineDraftPrn( !bDraw ); + pDrawView->SetFillDraftPrn( !bDraw ); + pDrawView->SetGrafDraftPrn( !bDraw ); + pDrawView->SetTextDraftPrn( !bDraw ); + } + else + { + pDrawView->SetLineDraft( !bDraw ); + pDrawView->SetFillDraft( !bDraw ); + pDrawView->SetGrafDraft( !bDraw ); + pDrawView->SetTextDraft( !bDraw ); + } String sLayerNm; sLayerNm.AssignAscii(RTL_CONSTASCII_STRINGPARAM("Controls" )); - pDrawView->SetLayerPrintable( sLayerNm, rOptions.bPrintControl ); + // OD 09.01.2003 #i6467# - consider, if view shell belongs to page preview + if ( !IsPreView() ) + { + pDrawView->SetLayerPrintable( sLayerNm, rOptions.bPrintControl ); + } + else + { + pDrawView->SetLayerVisible( sLayerNm, rOptions.bPrintControl ); + } } } - - diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx index f6954fdb6099..940a1baa7193 100644 --- a/sw/source/filter/ascii/parasc.cxx +++ b/sw/source/filter/ascii/parasc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: parasc.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: hbrinkm $ $Date: 2002-12-04 14:51:35 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,6 +59,8 @@ * ************************************************************************/ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ + #ifdef PCH #include "filt_pch.hxx" #endif @@ -135,409 +137,6 @@ #define ASC_BUFFLEN 4096 - -#ifdef ASYNCHRON - -class _SvLockBytes -{ - AutoTimer aTimer; - SvStream& rIn; - - ULONG nDataRead; - Link aCallDataRead; - - DECL_STATIC_LINK( _SvLockBytes, DataRead, Timer* ); - -public: - _SvLockBytes( SvStream& rInput, const Link& rCallBack ); - ~_SvLockBytes(); - - ErrCode ReadAt( ULONG nPos, void* pArr, ULONG nCount, ULONG* pReadCnt ); - - SvStream& GetStream() const { return rIn; } -}; - - -// client vom Standard SwPageDesc. Wird dieser geloescht, dann -// der Reader auch beendet werden!! -class SwAsynchLoader : public SvRefBase, public SwClient -{ -protected: - - SwDoc* pDoc; - SwPaM* pPam; - - BOOL bInCall; - _SvLockBytes* pLoader; - - DECL_STATIC_LINK( SwAsynchLoader, NewData, _SvLockBytes* ); - -protected: - virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew ); - virtual ~SwAsynchLoader(); - - virtual ULONG NextData() = 0; - -public: - SwAsynchLoader( SvStream& rIn, const SwPaM& rCrsr ); - - ULONG CallParser(); -}; - -SV_DECL_REF(SwAsynchLoader) -SV_IMPL_REF(SwAsynchLoader) - - -class SwASCIIParser : public SwAsynchLoader -{ - char* pArr, *pStt, *pEnd, *pLastStt; - - long nLineLen; - ULONG nError, nReadCnt, nFileSize; - - const SwAsciiOptions& rOpt; - char cLastCRLF; - - virtual ULONG NextData(); - -protected: - virtual ~SwASCIIParser(); - -public: - SwASCIIParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn, - int bReadNewDoc, const SwAsciiOptions& rOpts); -}; - -SV_DECL_REF(SwASCIIParser) -SV_IMPL_REF(SwASCIIParser) - - -// Aufruf fuer die allg. Reader-Schnittstelle -ULONG AsciiReader::Read( SwDoc &rDoc, SwPaM &rPam, const String & ) -{ - if( !pStrm ) - { - ASSERT( !this, "ASCII-Read ohne Stream" ); - return ERR_SWG_READ_ERROR; - } - - //JP 18.01.96: Alle Ueberschriften sind normalerweise ohne - // Kapitelnummer. Darum hier explizit abschalten - // weil das Default jetzt wieder auf AN ist. - if( !bInsertMode ) - Reader::SetNoOutlineNum( rDoc ); - - SwASCIIParserRef xParser( new SwASCIIParser( &rDoc, rPam, *pStrm, - !bInsertMode, eCodeSet )); - ULONG nRet = xParser->CallParser(); - // nach dem Lesen sofort wieder defaulten - eCodeSet = GetSystemCharSet(); - return ERRCODE_IO_PENDING == nRet ? 0 : nRet; -} - - -/* */ - -SwASCIIParser::SwASCIIParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn, - int bReadNewDoc, CharSet eSrc ) - : SwAsynchLoader( rIn, rCrsr ), - eCodeSet( eSrc ) -{ - pArr = new char [ ASC_BUFFLEN + 1 ]; - - pStt = pEnd = pLastStt = pArr; - - cLastCRLF = 0; - nLineLen = 0; - nError = 0; - nReadCnt = 0; - - rIn.Seek(STREAM_SEEK_TO_END); - rIn.ResetError(); - - nFileSize = rIn.Tell(); - rIn.Seek(STREAM_SEEK_TO_BEGIN); - rIn.ResetError(); - -} - -SwASCIIParser::~SwASCIIParser() -{ - delete pArr; -} - - -ULONG SwASCIIParser::NextData() -{ - SvStream& rInput = pLoader->GetStream(); - do { - if( pStt >= pEnd ) - { - if( pLastStt != pStt ) - { - pDoc->Insert( *pPam, pLastStt, eCodeSet ); - pLastStt = pStt; - } - - // lese einen neuen Block ein - ULONG lGCount; - - if (SVSTREAM_OK != rInput.GetError() || 0 != ( nError = pLoader-> - ReadAt( nReadCnt, pArr, ASC_BUFFLEN, &lGCount )) || - ( rInput.IsEof() && !lGCount )) - { - if( ERRCODE_IO_PENDING != nError || !lGCount ) - break; // aus der WHILE-Schleife heraus - } - - pEnd = pArr + lGCount; - nReadCnt += lGCount; - *pEnd = 0; - pStt = pLastStt = pArr; - - ::SetProgressState( nReadCnt, pDoc->GetDocShell() ); - - if( cLastCRLF ) - { - if( ( 0x0a == *pStt && 0x0d == cLastCRLF ) || - ( 0x0d == *pStt && 0x0a == cLastCRLF )) - pLastStt = ++pStt; - cLastCRLF = 0; - nLineLen = 0; - // JP 03.04.96: das letze am Ende nehmen wir nicht - if( !rInput.IsEof() || !(pEnd == pStt || - ( !*pEnd && pEnd == pStt+1 ) ) ) - pDoc->SplitNode( *pPam->GetPoint() ); - } - } - - BOOL bIns = TRUE, bSplitNode = FALSE; - switch( *pStt ) - { - case 0: - pEnd = pStt; - bIns = FALSE; - break; - - case 0x0a: - bIns = FALSE; - *pStt = 0; - if( ++pStt == pEnd ) - cLastCRLF = 0x0a; - else - { - if( 0x0d == *pStt ) - pStt++; - // JP 03.04.96: das letze am Ende nehmen wir nicht - if( !rInput.IsEof() || !(pEnd == pStt || - ( !*pEnd && pEnd == pStt+1 ) ) ) - bSplitNode = TRUE; - } - break; - - case 0x0d: - bIns = FALSE; - *pStt = 0; - if( ++pStt == pEnd ) - cLastCRLF = 0x0d; - else - { - if( 0x0a == *pStt ) - pStt++; - // JP 03.04.96: das letze am Ende nehmen wir nicht - if( !rInput.IsEof() || !(pEnd == pStt || - ( !*pEnd && pEnd == pStt+1 ) ) ) - bSplitNode = TRUE; - } - break; - - case '\t': break; - - case 0x0c: - { - // dann mal einen harten Seitenumbruch einfuegen - *pStt++ = 0; - if( nLineLen ) - pDoc->Insert( *pPam, pLastStt, eCodeSet ); - pDoc->SplitNode( *pPam->GetPoint() ); - pDoc->Insert( *pPam, SvxFmtBreakItem( - SVX_BREAK_PAGE_BEFORE )); - pLastStt = pStt; - nLineLen = 0; - bIns = FALSE; - } - break; - - case 0x1a: - if( nReadCnt == nFileSize && pStt+1 == pEnd ) - *pStt = 0; - else - *pStt = '#'; // Ersatzdarstellung - break; - - default: - - if( (BYTE)' ' > (BYTE)*pStt ) - // Ctrl-Zchn gefunden ersetze durch '#' - *pStt = '#'; - } - - if( bIns ) - { - if( ( nLineLen >= MAX_ASCII_PARA - 100 ) && - ( ( *pStt == ' ' ) || ( nLineLen >= MAX_ASCII_PARA - 1 ) ) ) - { - char c = *pStt; - *pStt = 0; - pDoc->Insert( *pPam, pLastStt, eCodeSet ); - pDoc->SplitNode( *pPam->GetPoint() ); - pLastStt = pStt; - nLineLen = 0; - *pStt = c; - } - ++pStt; - ++nLineLen; - } - else if( bSplitNode ) - { - // es wurde ein CR/LF erkannt, also speichere den Text - pDoc->Insert( *pPam, pLastStt, eCodeSet ); - pDoc->SplitNode( *pPam->GetPoint() ); - pLastStt = pStt; - nLineLen = 0; - } - } while( TRUE ); - - return nError; -} - - -/* */ - -SwAsynchLoader::SwAsynchLoader( SvStream& rIn, const SwPaM& rCrsr ) - : SwClient( 0 ) -{ - bInCall = FALSE; - pDoc = (SwDoc*)rCrsr.GetDoc(); - pPam = new SwPaM( pDoc, *rCrsr.GetPoint() ); - - SwPageDesc& rDesc = pDoc->_GetPageDesc( 0 ); - rDesc.Add( this ); - - pLoader = new _SvLockBytes( rIn, - STATIC_LINK( this, SwAsynchLoader, NewData ) ); -} - -SwAsynchLoader::~SwAsynchLoader() -{ - delete pPam; - delete pLoader; -} - -void SwAsynchLoader::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew ) -{ - switch( pOld ? pOld->Which() : pNew ? pNew->Which() : 0 ) - { - case RES_OBJECTDYING: - if( ((SwPtrMsgPoolItem *)pOld)->pObject == pRegisteredIn ) - { - // dann uns selbst beenden - pRegisteredIn->Remove( this ); - ReleaseRef(); // ansonsten sind wir fertig! - } - break; - } -} - -IMPL_STATIC_LINK( SwAsynchLoader, NewData, _SvLockBytes*, p ) -{ - ULONG nRet = 0; - if( !pThis->bInCall ) // kein mehrfaches Aufrufen - { - pThis->bInCall = TRUE; - - BOOL bModify = pThis->pDoc->IsModified(); - nRet = pThis->NextData(); - if( !bModify ) - pThis->pDoc->ResetModified(); - - if( ERRCODE_IO_PENDING != nRet ) - pThis->ReleaseRef(); // ansonsten sind wir fertig! - - pThis->bInCall = FALSE; - } - - return nRet; -} - - -ULONG SwAsynchLoader::CallParser() -{ - bInCall = TRUE; - AddRef(); - ULONG nRet = NextData(); - if( ERRCODE_IO_PENDING != nRet ) - ReleaseRef(); // ansonsten sind wir fertig! - - // Sind wir im Pending-Status, wird ueber den Callback "geidelt" bis - // alles gelesen ist oder ein Fehler aufgetreten ist! - - // Was passiert dann ??? - - bInCall = FALSE; - return nRet; -} - -/* */ - -_SvLockBytes::_SvLockBytes( SvStream& rInput, const Link& rCallback ) - : rIn( rInput ), aCallDataRead( rCallback ) -{ - nDataRead = 0; - - aTimer.SetTimeout( 1000 ); // jede Sekunde 100 Zeichen lesen - aTimer.SetTimeoutHdl( STATIC_LINK( this, _SvLockBytes, DataRead )); - aTimer.Start(); -} - -_SvLockBytes::~_SvLockBytes() -{ - aTimer.Stop(); -} - -ErrCode _SvLockBytes::ReadAt( ULONG nPos, void* pArr, ULONG nCount, - ULONG* pReadCnt ) -{ - ErrCode nRet = 0; - if( nPos + nCount > nDataRead ) - { - nCount = nDataRead - nPos; - nRet = ERRCODE_IO_PENDING; - } - - if( nCount ) - { - rIn.Seek( nPos ); - *pReadCnt = rIn.Read( pArr, nCount ); - } - else - *pReadCnt = 0; - return rIn.GetError() ? rIn.GetError() - : ( rIn.IsEof() ? 0 : nRet ); -} - -IMPL_STATIC_LINK( _SvLockBytes, DataRead, Timer*, pTimer ) -{ - pThis->nDataRead += 100; - pThis->aCallDataRead.Call( pThis ); - - return 0; -} - -/* */ - -#else - class SwASCIIParser { SwDoc* pDoc; @@ -548,7 +147,7 @@ class SwASCIIParser SfxItemSet* pItemSet; long nFileSize; USHORT nScript; - BOOL bNewDoc; + bool bNewDoc; ULONG ReadChars(); void InsertText( const String& rStr ); @@ -612,7 +211,7 @@ SwASCIIParser::SwASCIIParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn, } if( rOpt.GetFontName().Len() ) { - BOOL bDelete = FALSE; + bool bDelete = false; const SfxFont* pFnt = 0; if( pDoc->GetPrt() ) pFnt = pDoc->GetPrt()->GetFontByName( rOpt.GetFontName() ); @@ -620,7 +219,7 @@ SwASCIIParser::SwASCIIParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn, if( !pFnt ) { pFnt = new SfxFont( FAMILY_DONTKNOW, rOpt.GetFontName() ); - bDelete = TRUE; + bDelete = true; } SvxFontItem aFont( pFnt->GetFamily(), pFnt->GetName(), aEmptyStr, pFnt->GetPitch(), pFnt->GetCharSet() ); @@ -662,6 +261,17 @@ ULONG SwASCIIParser::CallParser() nSttCntnt = pPam->GetPoint()->nContent.GetIndex(); } + SwTxtFmtColl *pColl = 0; + + if (bNewDoc) + { + pColl = pDoc->GetTxtCollFromPoolSimple(RES_POOLCOLL_HTML_PRE, false); + if (!pColl) + pColl = pDoc->GetTxtCollFromPoolSimple(RES_POOLCOLL_STANDARD,false); + if (pColl) + pDoc->SetTxtFmtColl(*pPam, pColl); + } + ULONG nError = ReadChars(); if( pItemSet ) @@ -686,40 +296,39 @@ ULONG SwASCIIParser::CallParser() { if( bNewDoc ) { - // Using the pool defaults for the font causes significant - // trouble for the HTML filter, because it is not able - // to export the pool defaults (or to be more precice: - // the HTML filter is not able to detect whether a pool - // default has changed or not. Even a comparison with the - // HTMLi template does not work, because the defaults are - // not copied when a new doc is created. The result of - // comparing pool defaults therfor would be that the - // defaults are exported always if the have changed for - // text documents in general. That's not sensible, as well - // as it is not sensible to export them always. - SwTxtFmtColl *pColl = 0; - sal_uInt16 aWhichIds[4] = { RES_CHRATR_FONT, - RES_CHRATR_CJK_FONT, - RES_CHRATR_CTL_FONT, - 0 }; - sal_uInt16 *pWhichIds = aWhichIds; - const SfxPoolItem *pItem; - while( *pWhichIds ) + if (pColl) { - if( SFX_ITEM_SET == pItemSet->GetItemState( *pWhichIds, - sal_False, - &pItem ) ) + // Using the pool defaults for the font causes significant + // trouble for the HTML filter, because it is not able + // to export the pool defaults (or to be more precice: + // the HTML filter is not able to detect whether a pool + // default has changed or not. Even a comparison with the + // HTMLi template does not work, because the defaults are + // not copied when a new doc is created. The result of + // comparing pool defaults therfor would be that the + // defaults are exported always if the have changed for + // text documents in general. That's not sensible, as well + // as it is not sensible to export them always. + sal_uInt16 aWhichIds[4] = + { + RES_CHRATR_FONT, RES_CHRATR_CJK_FONT, + RES_CHRATR_CTL_FONT, 0 + }; + sal_uInt16 *pWhichIds = aWhichIds; + while (*pWhichIds) { - if( !pColl ) - pColl = pDoc->GetTxtCollFromPoolSimple - ( RES_POOLCOLL_STANDARD, FALSE ); - pColl->SetAttr( *pItem ); - pItemSet->ClearItem( *pWhichIds ); + const SfxPoolItem *pItem; + if (SFX_ITEM_SET == pItemSet->GetItemState(*pWhichIds, + false, &pItem)) + { + pColl->SetAttr( *pItem ); + pItemSet->ClearItem( *pWhichIds ); + } + ++pWhichIds; } - ++pWhichIds; } - if( pItemSet->Count() ) - pDoc->SetDefault( *pItemSet ); + if (pItemSet->Count()) + pDoc->SetDefault(*pItemSet); } else if( pInsPam ) { @@ -829,7 +438,8 @@ ULONG SwASCIIParser::ReadChars() ( RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_DEFAULT | RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT | - RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT + RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT | + RTL_TEXTTOUNICODE_FLAGS_GLOBAL_SIGNATURE ), &nInfo, &nCntBytes ); @@ -875,35 +485,35 @@ ULONG SwASCIIParser::ReadChars() } } - BOOL bIns = TRUE, bSplitNode = FALSE; + bool bIns = true, bSplitNode = false; switch( *pStt ) { //JP 12.11.2001: task 94636 - don't ignore all behind the zero character, // change it to the default "control character" // case 0: // pEnd = pStt; -// bIns = FALSE; +// bIns = false ; // break; case 0x0a: if( LINEEND_LF == pUseMe->GetParaFlags() ) { - bIns = FALSE; + bIns = false; *pStt = 0; ++pStt; // JP 03.04.96: das letze am Ende nehmen wir nicht if( !rInput.IsEof() || pEnd != pStt ) - bSplitNode = TRUE; + bSplitNode = true; } break; case 0x0d: if( LINEEND_LF != pUseMe->GetParaFlags() ) { - bIns = FALSE; + bIns = false; *pStt = 0; ++pStt; - BOOL bChkSplit = FALSE; + bool bChkSplit = false; if( LINEEND_CRLF == pUseMe->GetParaFlags() ) { if( pStt == pEnd ) @@ -911,15 +521,15 @@ ULONG SwASCIIParser::ReadChars() else if( 0x0a == *pStt ) { ++pStt; - bChkSplit = TRUE; + bChkSplit = true; } } else - bChkSplit = TRUE; + bChkSplit = true; // JP 03.04.96: das letze am Ende nehmen wir nicht if( bChkSplit && ( !rInput.IsEof() || pEnd != pStt )) - bSplitNode = TRUE; + bSplitNode = true; } break; @@ -938,7 +548,7 @@ ULONG SwASCIIParser::ReadChars() SVX_BREAK_PAGE_BEFORE )); pLastStt = pStt; nLineLen = 0; - bIns = FALSE; + bIns = false; } break; @@ -983,7 +593,7 @@ ULONG SwASCIIParser::ReadChars() pLastStt = pStt; nLineLen = 0; } - } while( TRUE ); + } while(true); if( hConverter ) { @@ -1002,6 +612,4 @@ void SwASCIIParser::InsertText( const String& rStr ) nScript |= pBreakIt->GetAllScriptsOfText( rStr ); } - -#endif - +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx index 92423f1b210b..e590db76f459 100644 --- a/sw/source/filter/basflt/fltini.cxx +++ b/sw/source/filter/basflt/fltini.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fltini.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: cmc $ $Date: 2002-10-31 12:39:39 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -376,28 +376,24 @@ ULONG StgReader::OpenMainStream( SvStorageStreamRef& rRef, USHORT& rBuffSize ) ULONG Sw3Reader::Read( SwDoc &rDoc, SwPaM &rPam, const String & ) { ULONG nRet; - if( pStg ) + if( pStg && pIO ) { - Sw3Io aSw3Io( rDoc ); - if( bOrganizerMode ) - nRet = aSw3Io.LoadStyles( pStg ); - else + // TRUE: Vorlagen ueberschreiben + pIO->SetReadOptions( aOpt,TRUE ); + if( !bInsertMode ) { - // TRUE: Vorlagen ueberschreiben - aSw3Io.SetReadOptions( aOpt,TRUE ); - if( !bInsertMode ) - { - // Im Laden-Modus darf der PaM-Content-Teil nicht - // in den Textbereich zeigen (Nodes koennen geloescht werden) - rPam.GetBound( TRUE ).nContent.Assign( 0, 0 ); - rPam.GetBound( FALSE ).nContent.Assign( 0, 0 ); - } - nRet = aSw3Io.Load( pStg, bInsertMode ? &rPam : 0 ); + // Im Laden-Modus darf der PaM-Content-Teil nicht + // in den Textbereich zeigen (Nodes koennen geloescht werden) + rPam.GetBound( TRUE ).nContent.Assign( 0, 0 ); + rPam.GetBound( FALSE ).nContent.Assign( 0, 0 ); } + nRet = pIO->Load( pStg, bInsertMode ? &rPam : 0 ); + aOpt.ResetAllFmtsOnly(); + pIO->SetReadOptions( aOpt, TRUE ); } else { - ASSERT( !this, "Sw3-Read ohne Storage" ); + ASSERT( !this, "Sw3-Read ohne Storage und/oder IO-System" ); nRet = ERR_SWG_READ_ERROR; } return nRet; @@ -415,10 +411,8 @@ USHORT Sw3Reader::GetSectionList( SfxMedium& rMedium, if( pFlt && pFlt->GetVersion() ) aStg->SetVersion( (long)pFlt->GetVersion() ); - { - Sw3Io aSw3Io; - aSw3Io.GetSectionList( &aStg, rStrings ); - } + if( pIO ) + pIO->GetSectionList( &aStg, rStrings ); return rStrings.Count(); } @@ -426,13 +420,21 @@ USHORT Sw3Reader::GetSectionList( SfxMedium& rMedium, ULONG Sw3Writer::WriteStorage() { ULONG nRet; + if( pIO ) + { + // der gleiche Storage -> Save, sonst SaveAs aufrufen + if( !bSaveAs ) + nRet = pIO->Save( pOrigPam, bWriteAll ); + else + nRet = pIO->SaveAs( pStg, pOrigPam, bWriteAll ); - // der gleiche Storage -> Save, sonst SaveAs aufrufen - Sw3Io aSw3Io( *pDoc ); - if( bOrganizerMode ) - nRet = aSw3Io.SaveStyles( pStg ); + pIO = 0; // nach dem Schreiben ist der Pointer ungueltig !! + } else - nRet = aSw3Io.SaveAs( pStg, pOrigPam, bWriteAll ); + { + ASSERT( !this, "Sw3-Writer ohne IO-System" ) + nRet = ERR_SWG_WRITE_ERROR; + } return nRet; } @@ -916,7 +918,6 @@ void CalculateFlySize( SfxItemSet& rFlySet, SwNodeIndex& rAnchor, } /* */ - struct CharSetNameMap { rtl_TextEncoding eCode; @@ -1002,6 +1003,7 @@ const CharSetNameMap *GetCharSetNameMap() IMPLENTRY(ISO_2022_JP), IMPLENTRY(ISO_2022_CN), IMPLENTRY(KOI8_R), + IMPLENTRY(KOI8_U), IMPLENTRY(UTF7), IMPLENTRY(UTF8), IMPLENTRY(ISO_8859_10), @@ -1307,6 +1309,7 @@ static String NameFromLanguage(LanguageType nLang) return String::CreateFromAscii(pRet); } + // for the automatic conversion (mail/news/...) // The user data contains the options for the ascii import/export filter. // The format is: diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx index 637a5fdd46ad..6a7fd522b949 100644 --- a/sw/source/filter/basflt/shellio.cxx +++ b/sw/source/filter/basflt/shellio.cxx @@ -2,9 +2,9 @@ * * $RCSfile: shellio.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: hbrinkm $ $Date: 2002-12-04 15:14:21 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -201,6 +201,11 @@ ULONG SwReader::Read( const Reader& rOptions ) GetDoc(); + // am Sw3-Reader noch den pIo-Pointer "loeschen" + if( po == ReadSw3 && pDoc->GetDocShell() && + ((Sw3Reader*)po)->GetSw3Io() != pDoc->GetDocShell()->GetIoSystem() ) + ((Sw3Reader*)po)->SetSw3Io( pDoc->GetDocShell()->GetIoSystem() ); + // waehrend des einlesens kein OLE-Modified rufen Link aOLELink( pDoc->GetOle2Link() ); pDoc->SetOle2Link( Link() ); @@ -465,15 +470,18 @@ ULONG SwReader::Read( const Reader& rOptions ) } if(bUpdate) { + SfxMedium* pMedium = pDoc->GetDocShell()->GetMedium(); + SfxFrame* pFrm = pMedium ? pMedium->GetLoadTargetFrame() : 0; + Window* pDlgParent = pFrm ? &pFrm->GetWindow() : 0; if( pDoc->GetRootFrm() && !pDoc->GetEditShell( &pVSh ) && !pVSh ) { ViewShell aVSh( *pDoc, 0, 0 ); SET_CURR_SHELL( &aVSh ); - pDoc->GetLinkManager().UpdateAllLinks( bAskUpdate , TRUE, FALSE ); + pDoc->GetLinkManager().UpdateAllLinks( bAskUpdate , TRUE, FALSE, pDlgParent ); } else - pDoc->GetLinkManager().UpdateAllLinks( bAskUpdate, TRUE, FALSE ); + pDoc->GetLinkManager().UpdateAllLinks( bAskUpdate, TRUE, FALSE, pDlgParent ); } } @@ -488,6 +496,9 @@ ULONG SwReader::Read( const Reader& rOptions ) if( pCrsr ) // das Doc ist jetzt modifiziert pDoc->SetModified(); + if( po == ReadSw3 ) // am Sw3-Reader noch den pIo-Pointer "loeschen" + ((Sw3Reader*)po)->SetSw3Io( 0 ); + po->SetReadUTF8( FALSE ); po->SetBlockMode( FALSE ); po->SetOrganizerMode( FALSE ); diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 6c43b78a2af2..884c0dc9ea52 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: htmlatr.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: hbrinkm $ $Date: 2002-12-04 15:25:18 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -354,6 +354,14 @@ void SwHTMLWriter::OutAndSetDefList( USHORT nNewLvl ) // eventuell muss erst mal eine Liste aufgemacht werden if( nDefListLvl < nNewLvl ) { + // output </pre> for the previous(!) pararagraph, if required. + // Preferable, the <pre> is exported by OutHTML_SwFmtOff for the + // previous paragraph already, but that's not possible, because a very + // deep look at the next paragraph (this one) is required to figure + // out that a def list starts here. + + ChangeParaToken( 0 ); + // entsprechend dem Level-Unterschied schreiben! for( USHORT i=nDefListLvl; i<nNewLvl; i++ ) { diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx index 29edf7bb5c77..195a182f9a4a 100644 --- a/sw/source/filter/html/htmlbas.cxx +++ b/sw/source/filter/html/htmlbas.cxx @@ -2,9 +2,9 @@ * * $RCSfile: htmlbas.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: os $ $Date: 2001-09-28 06:27:53 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -170,7 +170,7 @@ void SwHTMLParser::EndScript() // Ausser StarBasic und unbenutzem JavaScript jedes Script oder den // Modulnamen in einem Feld merken merken - if( bInsSrcIntoFld ) + if( bInsSrcIntoFld && !bIgnoreHTMLComments ) { SwScriptFieldType *pType = (SwScriptFieldType*)pDoc->GetSysFldType( RES_SCRIPTFLD ); diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx index e1b8d81dd4b6..7fae34471223 100644 --- a/sw/source/filter/html/htmlfly.cxx +++ b/sw/source/filter/html/htmlfly.cxx @@ -2,9 +2,9 @@ * * $RCSfile: htmlfly.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: mib $ $Date: 2002-11-21 13:11:50 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -98,6 +98,9 @@ #ifndef _GOODIES_IMAPOBJ_HXX #include <svtools/imapobj.hxx> #endif +#ifndef _OFA_HTMLCFG_HXX //autogen +#include <offmgr/htmlcfg.hxx> +#endif #ifndef _XOUTBMP_HXX //autogen #include <svx/xoutbmp.hxx> @@ -403,6 +406,9 @@ USHORT SwHTMLWriter::GuessFrmType( const SwFrmFmt& rFrmFmt, void SwHTMLWriter::CollectFlyFrms() { + ASSERT( HTML_CFG_MAX+1 == MAX_BROWSERS, + "number of browser configurations has changed" ); + BYTE nSz = (BYTE)Min( pDoc->GetSpzFrmFmts()->Count(), USHORT(255) ); SwPosFlyFrms aFlyPos( nSz, nSz ); pDoc->GetAllFlyFmts( aFlyPos, bWriteAll ? 0 : pCurPam, TRUE ); diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx index 3b8c2346f81c..a6e6166a059a 100644 --- a/sw/source/filter/html/htmlfly.hxx +++ b/sw/source/filter/html/htmlfly.hxx @@ -2,9 +2,9 @@ * * $RCSfile: htmlfly.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:55 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -125,7 +125,7 @@ enum SwHTMLFrmType const USHORT MAX_FRMTYPES = HTML_FRMTYPE_END; -const USHORT MAX_BROWSERS = 5; +const USHORT MAX_BROWSERS = 4; extern BYTE aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS]; extern BYTE aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS]; diff --git a/sw/source/filter/html/htmlflyt.cxx b/sw/source/filter/html/htmlflyt.cxx index ee8f2f272ad5..0cff3aa7d54e 100644 --- a/sw/source/filter/html/htmlflyt.cxx +++ b/sw/source/filter/html/htmlflyt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: htmlflyt.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: os $ $Date: 2001-09-28 06:27:53 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,7 +75,6 @@ BYTE aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] = // Textrahmen mit Tabelle TE(TBLNODE, BEFORE, NONE), // HTML 3.2 TE(DIV, PREFIX, NONE), // IE 4 - TE(TBLNODE, BEFORE, NONE), // Netscape 3 TE(DIV, PREFIX, NONE), // SW TE(DIV, PREFIX, NONE) // Netscape 4! }, @@ -83,7 +82,6 @@ BYTE aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] = // Textrahmen mit Tabelle und Ueberschrift TE(TBLNODE, BEFORE, NONE), // HTML 3.2 TE(DIV, PREFIX, NONE), // IE 4 - TE(TBLNODE, BEFORE, NONE), // Netscape 3 TE(DIV, PREFIX, NONE), // SW TE(DIV, PREFIX, NONE) // Netscape 4 }, @@ -91,7 +89,6 @@ BYTE aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] = // spaltiger Rahmen TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(GRFFRM, PREFIX, NONE), // IE 4 - TE(MULTICOL,BEFORE, NONE), // Netscape 3 TE(MULTICOL,PREFIX, NONE), // SW TE(MULTICOL,PREFIX, DIV) // Netscape 4 }, @@ -99,7 +96,6 @@ BYTE aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] = // leerer Textreahmen TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(DIV, PREFIX, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // Netscape 3 TE(DIV, PREFIX, NONE), // SW TE(DIV, PREFIX, NONE) // Netscape 4 }, @@ -107,7 +103,6 @@ BYTE aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] = // sonstiger Textreahmen TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(DIV, PREFIX, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // Netscape 3 TE(DIV, PREFIX, NONE), // SW TE(DIV, PREFIX, NONE) // Netscape 4 }, @@ -115,7 +110,6 @@ BYTE aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] = // Grafik-Node TE(GRFNODE, INSIDE, NONE), // HTML 3.2 TE(GRFNODE, PREFIX, NONE), // IE 4 - TE(GRFNODE, INSIDE, NONE), // Netscape 3 TE(GRFNODE, PREFIX, NONE), // SW TE(GRFNODE, PREFIX, SPAN) // Netscape 4 }, @@ -123,7 +117,6 @@ BYTE aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] = // Plugin TE(OLENODE, INSIDE, NONE), // HTML 3.2 TE(OLENODE, PREFIX, NONE), // IE 4 - TE(OLENODE, INSIDE, NONE), // Netscape 3 TE(OLENODE, PREFIX, NONE), // SW TE(OLENODE, PREFIX, SPAN) // Netscape 4 }, @@ -131,7 +124,6 @@ BYTE aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] = // Applet TE(OLENODE, INSIDE, NONE), // HTML 3.2 TE(OLENODE, PREFIX, NONE), // IE 4 - TE(OLENODE, INSIDE, NONE), // Netscape 3 TE(OLENODE, PREFIX, NONE), // SW TE(OLENODE, PREFIX, SPAN) // Netscape 4 }, @@ -139,7 +131,6 @@ BYTE aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] = // Floating-Frame TE(OLEGRF, INSIDE, NONE), // HTML 3.2 TE(OLENODE, PREFIX, NONE), // IE 4 - TE(OLEGRF, INSIDE, NONE), // Netscape 3 TE(OLENODE, PREFIX, NONE), // SW TE(OLEGRF, PREFIX, SPAN) // Netscape 4 }, @@ -147,7 +138,6 @@ BYTE aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] = // sonstige OLE-Objekte TE(OLEGRF, INSIDE, NONE), // HTML 3.2 TE(OLEGRF, PREFIX, NONE), // IE 4 - TE(OLEGRF, INSIDE, NONE), // Netscape 3 TE(OLEGRF, PREFIX, NONE), // SW TE(OLEGRF, PREFIX, SPAN) // Netscape 4 }, @@ -155,7 +145,6 @@ BYTE aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] = // Laufschrift TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(AMARQUEE,PREFIX, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // Netscape 3 TE(AMARQUEE,PREFIX, NONE), // SW TE(GRFFRM, PREFIX, SPAN) // Netscape 4 }, @@ -163,7 +152,6 @@ BYTE aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] = // Controls TE(CONTROL, INSIDE, NONE), // HTML 3.2 TE(CONTROL, PREFIX, NONE), // IE 4 - TE(CONTROL, INSIDE, NONE), // Netscape 3 TE(CONTROL, PREFIX, NONE), // SW // Netscape schaltet FORM bei Controls in abs.-pos. SPAN aus. TE(CONTROL, INSIDE, NONE) // Netscape 4 @@ -172,7 +160,6 @@ BYTE aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] = // sonstige Zeichen-Objekte TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(GRFFRM, PREFIX, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // Netscape 3 TE(GRFFRM, PREFIX, NONE), // SW TE(GRFFRM, PREFIX, SPAN) // Netscape 4 } @@ -184,7 +171,6 @@ BYTE aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] = // Textrahmen mit Tabelle TE(TBLNODE, BEFORE, NONE), // HTML 3.2 TE(TBLNODE, BEFORE, NONE), // IE 4 - TE(TBLNODE, BEFORE, NONE), // Netscape 3 TE(TBLNODE, BEFORE, NONE), // SW TE(TBLNODE, BEFORE, NONE) // Netscape 4 }, @@ -192,7 +178,6 @@ BYTE aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] = // Textrahmen mit Tabelle und Ueberschrift TE(TBLNODE, BEFORE, NONE), // HTML 3.2 TE(DIV, BEFORE, NONE), // IE 4 - TE(TBLNODE, BEFORE, NONE), // Netscape 3 TE(DIV, BEFORE, NONE), // SW TE(TBLNODE, BEFORE, NONE) // Netscape 4 }, @@ -200,7 +185,6 @@ BYTE aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] = // spaltiger Rahmen TE(GRFFRM, BEFORE, NONE), // HTML 3.2 TE(GRFFRM, BEFORE, NONE), // IE 4 - TE(MULTICOL,BEFORE, NONE), // Netscape 3 TE(MULTICOL,BEFORE, NONE), // SW TE(MULTICOL,BEFORE, DIV) // Netscape 4 }, @@ -208,7 +192,6 @@ BYTE aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] = // leerer Textreahmen TE(GRFFRM, BEFORE, NONE), // HTML 3.2 TE(DIV, BEFORE, NONE), // IE 4 - TE(SPACER, BEFORE, NONE), // Netscape 3 TE(SPACER, BEFORE, NONE), // SW TE(SPACER, BEFORE, NONE) // Netscape 4 }, @@ -216,7 +199,6 @@ BYTE aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] = // sonstiger Textreahmen TE(GRFFRM, BEFORE, NONE), // HTML 3.2 TE(DIV, BEFORE, NONE), // IE 4 - TE(GRFFRM, BEFORE, NONE), // Netscape 3 TE(DIV, BEFORE, NONE), // SW TE(DIV, BEFORE, NONE) // Netscape 4 }, @@ -224,7 +206,6 @@ BYTE aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] = // Grafik-Node TE(GRFNODE, BEFORE, NONE), // HTML 3.2 TE(GRFNODE, BEFORE, NONE), // IE 4 - TE(GRFNODE, BEFORE, NONE), // Netscape 3 TE(GRFNODE, BEFORE, NONE), // SW TE(GRFNODE, BEFORE, NONE) // Netscape 4 }, @@ -232,7 +213,6 @@ BYTE aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] = // Plugin TE(OLENODE, BEFORE, NONE), // HTML 3.2 TE(OLENODE, BEFORE, NONE), // IE 4 - TE(OLENODE, BEFORE, NONE), // Netscape 3 TE(OLENODE, BEFORE, NONE), // SW TE(OLENODE, BEFORE, NONE) // Netscape 4 }, @@ -240,7 +220,6 @@ BYTE aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] = // Applet TE(OLENODE, BEFORE, NONE), // HTML 3.2 TE(OLENODE, BEFORE, NONE), // IE 4 - TE(OLENODE, BEFORE, NONE), // Netscape 3 TE(OLENODE, BEFORE, NONE), // SW TE(OLENODE, BEFORE, NONE) // Netscape 4 }, @@ -248,7 +227,6 @@ BYTE aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] = // Floating-Frame TE(OLEGRF, BEFORE, NONE), // HTML 3.2 TE(OLENODE, BEFORE, NONE), // IE 4 - TE(OLEGRF, BEFORE, NONE), // Netscape 3 TE(OLENODE, BEFORE, NONE), // SW TE(OLEGRF, BEFORE, NONE) // Netscape 4 }, @@ -256,7 +234,6 @@ BYTE aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] = // sonstige OLE-Objekte TE(OLEGRF, BEFORE, NONE), // HTML 3.2 TE(OLEGRF, BEFORE, NONE), // IE 4 - TE(OLEGRF, BEFORE, NONE), // Netscape 3 TE(OLEGRF, BEFORE, NONE), // SW TE(OLEGRF, BEFORE, NONE) // Netscape 4 }, @@ -265,7 +242,6 @@ BYTE aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] = // die LAufschrift an der richtigen Stelle erscheint TE(GRFFRM, BEFORE, NONE), // HTML 3.2 TE(AMARQUEE,BEFORE, NONE), // IE 4 - TE(GRFFRM, BEFORE, NONE), // Netscape 3 TE(AMARQUEE,BEFORE, NONE), // SW TE(GRFFRM, BEFORE, NONE) // Netscape 4 }, @@ -273,7 +249,6 @@ BYTE aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] = // Controls TE(CONTROL, INSIDE, NONE), // HTML 3.2 TE(CONTROL, BEFORE, NONE), // IE 4 - TE(CONTROL, INSIDE, NONE), // Netscape 3 TE(CONTROL, BEFORE, NONE), // SW // hier koennte man einen Container draus machen (Import fehlt) TE(CONTROL, BEFORE, NONE) // Netscape 4 @@ -282,7 +257,6 @@ BYTE aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] = // sonstige Zeichen-Objekte TE(GRFFRM, BEFORE, NONE), // HTML 3.2 TE(GRFFRM, BEFORE, NONE), // IE 4 - TE(GRFFRM, BEFORE, NONE), // Netscape 3 TE(GRFFRM, BEFORE, NONE), // SW TE(GRFFRM, BEFORE, NONE) // Netscape 4 } @@ -292,31 +266,15 @@ BYTE aHTMLOutFrmParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] = { { // Textrahmen mit Tabelle -#if 0 - TE(TBLNODE, BEFORE, NONE), // HTML 3.2 - TE(TBLNODE, BEFORE, NONE), // IE 4 - TE(TBLNODE, BEFORE, NONE), // Netscape 3 - TE(TBLNODE, BEFORE, NONE), // SW - TE(TBLNODE, BEFORE, NONE) // Netscape 4 -#endif TE(TBLNODE, INSIDE, NONE), // HTML 3.2 TE(TBLNODE, INSIDE, NONE), // IE 4 - TE(TBLNODE, INSIDE, NONE), // Netscape 3 TE(TBLNODE, INSIDE, NONE), // SW TE(TBLNODE, INSIDE, NONE) // Netscape 4 }, { // Textrahmen mit Tabelle und Ueberschrift -#if 0 - TE(TBLNODE, BEFORE, NONE), // HTML 3.2 - TE(DIV, BEFORE, NONE), // IE 4 - TE(TBLNODE, BEFORE, NONE), // Netscape 3 - TE(DIV, BEFORE, NONE), // SW - TE(DIV, BEFORE, NONE) // Netscape 4 -#endif TE(TBLNODE, INSIDE, NONE), // HTML 3.2 TE(SPAN, INSIDE, NONE), // IE 4 - TE(TBLNODE, INSIDE, NONE), // Netscape 3 TE(SPAN, INSIDE, NONE), // SW TE(SPAN, INSIDE, NONE) // Netscape 4 }, @@ -324,7 +282,6 @@ BYTE aHTMLOutFrmParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] = // spaltiger Rahmen TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(GRFFRM, INSIDE, NONE), // IE 4 - TE(MULTICOL,INSIDE, NONE), // Netscape 3 TE(MULTICOL,INSIDE, NONE), // SW TE(MULTICOL,INSIDE, SPAN) // Netscape 4 }, @@ -332,7 +289,6 @@ BYTE aHTMLOutFrmParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] = // leerer Textreahmen TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(SPAN, INSIDE, NONE), // IE 4 - TE(SPACER, INSIDE, NONE), // Netscape 3 TE(SPACER, INSIDE, NONE), // SW TE(SPACER, INSIDE, NONE) // Netscape 4 }, @@ -340,7 +296,6 @@ BYTE aHTMLOutFrmParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] = // sonstiger Textreahmen TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(SPAN, INSIDE, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // Netscape 3 TE(SPAN, INSIDE, NONE), // SW TE(SPAN, INSIDE, NONE) // Netscape 4 }, @@ -348,7 +303,6 @@ BYTE aHTMLOutFrmParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] = // Grafik-Node TE(GRFNODE, INSIDE, NONE), // HTML 3.2 TE(GRFNODE, INSIDE, NONE), // IE 4 - TE(GRFNODE, INSIDE, NONE), // Netscape 3 TE(GRFNODE, INSIDE, NONE), // SW TE(GRFNODE, INSIDE, NONE) // Netscape 4 }, @@ -356,7 +310,6 @@ BYTE aHTMLOutFrmParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] = // Plugin TE(OLENODE, INSIDE, NONE), // HTML 3.2 TE(OLENODE, INSIDE, NONE), // IE 4 - TE(OLENODE, INSIDE, NONE), // Netscape 3 TE(OLENODE, INSIDE, NONE), // SW TE(OLENODE, INSIDE, NONE) // Netscape 4 }, @@ -364,7 +317,6 @@ BYTE aHTMLOutFrmParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] = // Applet TE(OLENODE, INSIDE, NONE), // HTML 3.2 TE(OLENODE, INSIDE, NONE), // IE 4 - TE(OLENODE, INSIDE, NONE), // Netscape 3 TE(OLENODE, INSIDE, NONE), // SW TE(OLENODE, INSIDE, NONE) // Netscape 4 }, @@ -372,7 +324,6 @@ BYTE aHTMLOutFrmParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] = // Floating-Frame TE(OLEGRF, INSIDE, NONE), // HTML 3.2 TE(OLENODE, INSIDE, NONE), // IE 4 - TE(OLEGRF, INSIDE, NONE), // Netscape 3 TE(OLENODE, INSIDE, NONE), // SW TE(OLEGRF, INSIDE, NONE) // Netscape 4 }, @@ -380,7 +331,6 @@ BYTE aHTMLOutFrmParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] = // sonstige OLE-Objekte TE(OLEGRF, INSIDE, NONE), // HTML 3.2 TE(OLEGRF, INSIDE, NONE), // IE 4 - TE(OLEGRF, INSIDE, NONE), // Netscape 3 TE(OLEGRF, INSIDE, NONE), // SW TE(OLEGRF, INSIDE, NONE) // Netscape 4 }, @@ -388,7 +338,6 @@ BYTE aHTMLOutFrmParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] = // Laufschrift TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(AMARQUEE,INSIDE, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // Netscape 3 TE(AMARQUEE,INSIDE, NONE), // SW TE(GRFFRM, INSIDE, NONE) // Netscape 4 }, @@ -396,7 +345,6 @@ BYTE aHTMLOutFrmParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] = // Controls TE(CONTROL, INSIDE, NONE), // HTML 3.2 TE(CONTROL, INSIDE, NONE), // IE 4 - TE(CONTROL, INSIDE, NONE), // Netscape 3 TE(CONTROL, INSIDE, NONE), // SW // hier koennte man einen Container draus machen (Import fehlt) TE(CONTROL, INSIDE, NONE) // Netscape 4 @@ -405,7 +353,6 @@ BYTE aHTMLOutFrmParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] = // sonstige Zeichen-Objekte TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(GRFFRM, INSIDE, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // Netscape 3 TE(GRFFRM, INSIDE, NONE), // SW TE(GRFFRM, INSIDE, NONE) // Netscape 4 } @@ -417,7 +364,6 @@ BYTE aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] = // Textrahmen mit Tabelle TE(TBLNODE, BEFORE, NONE), // HTML 3.2 TE(SPAN, INSIDE, NONE), // IE 4 - TE(TBLNODE, BEFORE, NONE), // Netscape 3 TE(SPAN, INSIDE, NONE), // SW TE(SPAN, INSIDE, NONE) // Netscape 4 }, @@ -425,7 +371,6 @@ BYTE aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] = // Textrahmen mit Tabelle und Ueberschrift TE(TBLNODE, BEFORE, NONE), // HTML 3.2 TE(SPAN, INSIDE, NONE), // IE 4 - TE(TBLNODE, BEFORE, NONE), // Netscape 3 TE(SPAN, INSIDE, NONE), // SW TE(SPAN, INSIDE, NONE) // Netscape 4 }, @@ -433,7 +378,6 @@ BYTE aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] = // spaltiger Rahmen TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(GRFFRM, INSIDE, NONE), // IE 4 - TE(MULTICOL,BEFORE, NONE), // Netscape 3 TE(MULTICOL,INSIDE, NONE), // SW TE(MULTICOL,INSIDE, SPAN) // Netscape 4 }, @@ -441,7 +385,6 @@ BYTE aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] = // leerer Textreahmen TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(SPAN, INSIDE, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // Netscape 3 TE(SPAN, INSIDE, NONE), // SW TE(SPAN, INSIDE, NONE) // Netscape 4 }, @@ -449,7 +392,6 @@ BYTE aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] = // sonstiger Textreahmen TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(SPAN, INSIDE, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // Netscape 3 TE(SPAN, INSIDE, NONE), // SW TE(SPAN, INSIDE, NONE) // Netscape 4 }, @@ -457,7 +399,6 @@ BYTE aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] = // Grafik-Node TE(GRFNODE, INSIDE, NONE), // HTML 3.2 TE(GRFNODE, INSIDE, NONE), // IE 4 - TE(GRFNODE, INSIDE, NONE), // Netscape 3 TE(GRFNODE, INSIDE, NONE), // SW TE(GRFNODE, INSIDE, SPAN) // Netscape 4 }, @@ -465,7 +406,6 @@ BYTE aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] = // Plugin TE(OLENODE, INSIDE, NONE), // HTML 3.2 TE(OLENODE, INSIDE, NONE), // IE 4 - TE(OLENODE, INSIDE, NONE), // Netscape 3 TE(OLENODE, INSIDE, NONE), // SW TE(OLENODE, INSIDE, SPAN) // Netscape 4 }, @@ -473,7 +413,6 @@ BYTE aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] = // Applet TE(OLENODE, INSIDE, NONE), // HTML 3.2 TE(OLENODE, INSIDE, NONE), // IE 4 - TE(OLENODE, INSIDE, NONE), // Netscape 3 TE(OLENODE, INSIDE, NONE), // SW TE(OLENODE, INSIDE, SPAN) // Netscape 4 }, @@ -481,7 +420,6 @@ BYTE aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] = // Floating-Frame TE(OLEGRF, INSIDE, NONE), // HTML 3.2 TE(OLENODE, INSIDE, NONE), // IE 4 - TE(OLEGRF, INSIDE, NONE), // Netscape 3 TE(OLENODE, INSIDE, NONE), // SW TE(OLEGRF, INSIDE, SPAN) // Netscape 4 }, @@ -489,7 +427,6 @@ BYTE aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] = // sonstige OLE-Objekte TE(OLEGRF, INSIDE, NONE), // HTML 3.2 TE(OLEGRF, INSIDE, NONE), // IE 4 - TE(OLEGRF, INSIDE, NONE), // Netscape 3 TE(OLEGRF, INSIDE, NONE), // SW TE(OLEGRF, INSIDE, SPAN) // Netscape 4 }, @@ -497,7 +434,6 @@ BYTE aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] = // Laufschrift TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(AMARQUEE,INSIDE, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // Netscape 3 TE(AMARQUEE,INSIDE, NONE), // SW TE(GRFFRM, INSIDE, SPAN) // Netscape 4 }, @@ -505,7 +441,6 @@ BYTE aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] = // Controls TE(CONTROL, INSIDE, NONE), // HTML 3.2 TE(CONTROL, INSIDE, NONE), // IE 4 - TE(CONTROL, INSIDE, NONE), // Netscape 3 TE(CONTROL, INSIDE, NONE), // SW // Netscape schaltet FORM bei Controls in abs.-pos. SPAN aus. TE(CONTROL, INSIDE, NONE) // Netscape 4 @@ -514,7 +449,6 @@ BYTE aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] = // sonstige Zeichen-Objekte TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(GRFFRM, INSIDE, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // Netscape 3 TE(GRFFRM, INSIDE, NONE), // SW TE(GRFFRM, INSIDE, SPAN) // Netscape 4 } @@ -526,7 +460,6 @@ BYTE aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] = // Textrahmen mit Tabelle TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(GRFFRM, INSIDE, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // Netscape 3 TE(GRFFRM, INSIDE, NONE), // SW TE(GRFFRM, INSIDE, NONE) // Netscape 4 }, @@ -534,7 +467,6 @@ BYTE aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] = // Textrahmen mit Tabelle und Ueberschrift TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(GRFFRM, INSIDE, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // Netscape 3 TE(GRFFRM, INSIDE, NONE), // SW TE(GRFFRM, INSIDE, NONE) // Netscape 4 }, @@ -542,7 +474,6 @@ BYTE aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] = // spaltiger Rahmen TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(GRFFRM, INSIDE, NONE), // IE 4 - TE(MULTICOL,INSIDE, NONE), // Netscape 3 TE(MULTICOL,INSIDE, NONE), // SW TE(MULTICOL,INSIDE, NONE) // Netscape 4 }, @@ -550,7 +481,6 @@ BYTE aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] = // leerer Textreahmen TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(GRFFRM, INSIDE, NONE), // IE 4 - TE(SPACER, INSIDE, NONE), // Netscape 3 TE(SPACER, INSIDE, NONE), // SW TE(SPACER, INSIDE, NONE) // Netscape 4 }, @@ -558,7 +488,6 @@ BYTE aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] = // sonstiger Textreahmen TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(GRFFRM, INSIDE, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // Netscape 3 TE(GRFFRM, INSIDE, NONE), // SW TE(GRFFRM, INSIDE, NONE) // Netscape 4 }, @@ -566,7 +495,6 @@ BYTE aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] = // Grafik-Node TE(GRFNODE, INSIDE, NONE), // HTML 3.2 TE(GRFNODE, INSIDE, NONE), // IE 4 - TE(GRFNODE, INSIDE, NONE), // Netscape 3 TE(GRFNODE, INSIDE, NONE), // SW TE(GRFNODE, INSIDE, NONE) // Netscape 4 }, @@ -574,7 +502,6 @@ BYTE aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] = // Plugin TE(OLENODE, INSIDE, NONE), // HTML 3.2 TE(OLENODE, INSIDE, NONE), // IE 4 - TE(OLENODE, INSIDE, NONE), // Netscape 3 TE(OLENODE, INSIDE, NONE), // SW TE(OLENODE, INSIDE, NONE) // Netscape 4 }, @@ -582,7 +509,6 @@ BYTE aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] = // Applet TE(OLENODE, INSIDE, NONE), // HTML 3.2 TE(OLENODE, INSIDE, NONE), // IE 4 - TE(OLENODE, INSIDE, NONE), // Netscape 3 TE(OLENODE, INSIDE, NONE), // SW TE(OLENODE, INSIDE, NONE) // Netscape 4 }, @@ -590,7 +516,6 @@ BYTE aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] = // Floating-Frame TE(OLEGRF, INSIDE, NONE), // HTML 3.2 TE(OLENODE, INSIDE, NONE), // IE 4 - TE(OLEGRF, INSIDE, NONE), // Netscape 3 TE(OLENODE, INSIDE, NONE), // SW TE(OLEGRF, INSIDE, NONE) // Netscape 4 }, @@ -598,7 +523,6 @@ BYTE aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] = // sonstige OLE-Objekte TE(OLEGRF, INSIDE, NONE), // HTML 3.2 TE(OLEGRF, INSIDE, NONE), // IE 4 - TE(OLEGRF, INSIDE, NONE), // Netscape 3 TE(OLEGRF, INSIDE, NONE), // SW TE(OLEGRF, INSIDE, NONE) // Netscape 4 }, @@ -607,7 +531,6 @@ BYTE aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] = // der Inhalt an der richtigen Stelle erscheint TE(MARQUEE, INSIDE, NONE), // HTML 3.2 TE(MARQUEE, INSIDE, NONE), // IE 4 - TE(MARQUEE, INSIDE, NONE), // Netscape 3 TE(MARQUEE, INSIDE, NONE), // SW TE(MARQUEE, INSIDE, NONE) // Netscape 4 }, @@ -615,7 +538,6 @@ BYTE aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] = // Controls TE(CONTROL, INSIDE, NONE), // HTML 3.2 TE(CONTROL, INSIDE, NONE), // IE 4 - TE(CONTROL, INSIDE, NONE), // Netscape 3 TE(CONTROL, INSIDE, NONE), // SW TE(CONTROL, INSIDE, NONE) // Netscape 4 }, @@ -623,7 +545,6 @@ BYTE aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] = // sonstige Zeichen-Objekte TE(GRFFRM, INSIDE, NONE), // HTML 3.2 TE(GRFFRM, INSIDE, NONE), // IE 4 - TE(GRFFRM, INSIDE, NONE), // Netscape 3 TE(GRFFRM, INSIDE, NONE), // SW TE(GRFFRM, INSIDE, NONE) // Netscape 4 } diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 7de0965b7120..1cede3a4decb 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -2,9 +2,9 @@ * * $RCSfile: htmlform.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: od $ $Date: 2002-09-03 15:02:20 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -741,7 +741,7 @@ void SwHTMLImageWatcher::complete( sal_Int32 Status, } } -void SwHTMLImageWatcher::disposing(const lang::EventObject& evt) +void SwHTMLImageWatcher::disposing(const lang::EventObject& evt) throw ( ::com::sun::star::uno::RuntimeException) { Reference< awt::XImageConsumer > xTmp; diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 9ba9284928ae..bf6111ee131b 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: htmlgrin.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: mib $ $Date: 2002-11-21 13:11:48 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,6 +80,9 @@ #ifndef _SFXSTRITEM_HXX #include <svtools/stritem.hxx> #endif +#ifndef _SVX_FHGTITEM_HXX //autogen +#include <svx/fhgtitem.hxx> +#endif #ifndef _SVX_LRSPITEM_HXX //autogen #include <svx/lrspitem.hxx> #endif @@ -703,7 +706,6 @@ IMAGE_SETEVENT: Size aGrfSz( 0, 0 ); BOOL bSetTwipSize = TRUE; // Twip-Size am Node setzen? BOOL bChangeFrmSize = FALSE; // Frame-Format nachtraeglich anpassen? - BOOL bGrfSzValid = FALSE; // aGrfSz enthaelt die Grafik-Groesse BOOL bRequestGrfNow = FALSE; BOOL bSetScaleImageMap = FALSE; BYTE nPrcWidth = 0, nPrcHeight = 0; @@ -711,104 +713,46 @@ IMAGE_SETEVENT: if( !nWidth || !nHeight ) { // Es fehlt die Breite oder die Hoehe - - // JP 28.05.96: dann suche doch mal in unserem QuickDraw-Cache, ob - // die Groesse dieser Grafik schon vorhanden ist. - bGrfSzValid = -#ifdef NEW_GRFOBJ - FindGrfSizeFromCache( sGrfNm, aGrfSz ) -#else - FALSE; -#endif - ; - // Wenn die Grfik in einer Tabelle steht, wird sie gleich // angefordert, damit sie eventuell schon da ist, bevor die // Tabelle layoutet wird. - if( !bGrfSzValid && pTable!=0 && !nWidth ) + if( pTable!=0 && !nWidth ) { bRequestGrfNow = TRUE; IncGrfsThatResizeTable(); } - if( bGrfSzValid && aGrfSz.Width() && aGrfSz.Height() ) + // Die Groesse des Rahmens wird nachtraeglich gesetzt + bChangeFrmSize = TRUE; + aGrfSz = aTwipSz; + if( !nWidth && !nHeight ) { - // wir haben eine Groesse und koenen sie setzen - if( !nWidth && !nHeight ) - { - // Hoehe und Breite fehlen - aTwipSz = aGrfSz; - } - else if( nWidth ) + aTwipSz.Width() = HTML_DFLT_IMG_WIDTH; + aTwipSz.Height() = HTML_DFLT_IMG_HEIGHT; + } + else if( nWidth ) + { + // eine %-Angabe + if( bPrcWidth ) { - // nur die Breite fehlt - if( bPrcWidth ) - { - // %-Breite uebernehmen und Hoehe skalieren - nPrcWidth = (BYTE)nWidth; - nPrcHeight = 255; - } - else - { - // Breite uebernehmen und Hoehe berechnen - aTwipSz.Height() = (aGrfSz.Height() * aTwipSz.Width()) - / aGrfSz.Width(); - } + nPrcWidth = (BYTE)nWidth; + nPrcHeight = 255; } - else if( nHeight ) + else { - // nur die Hoehe fehlt - if( bPrcHeight ) - { - // %-Hoehe lassen und Breite skalieren - nPrcHeight = (BYTE)nHeight; - nPrcWidth = 255; - } - else - { - // Hoehe uebernehmen und Breite berechnen - aTwipSz.Width() = (aGrfSz.Width() * aTwipSz.Height()) - / aGrfSz.Height(); - } + aTwipSz.Height() = HTML_DFLT_IMG_HEIGHT; } } - else + else if( nHeight ) { - // wir haben keine Groesse gefunden (und sind in keiner - // Tabelle oder haben zumindest die Breite der Grafik) - - // Die Groesse des Rahmens wird nachtraeglich gesetzt - bChangeFrmSize = TRUE; - aGrfSz = aTwipSz; - if( !nWidth && !nHeight ) + if( bPrcHeight ) { - aTwipSz.Width() = HTML_DFLT_IMG_WIDTH; - aTwipSz.Height() = HTML_DFLT_IMG_HEIGHT; + nPrcHeight = (BYTE)nHeight; + nPrcWidth = 255; } - else if( nWidth ) - { - // eine %-Angabe - if( bPrcWidth ) - { - nPrcWidth = (BYTE)nWidth; - nPrcHeight = 255; - } - else - { - aTwipSz.Height() = HTML_DFLT_IMG_HEIGHT; - } - } - else if( nHeight ) + else { - if( bPrcHeight ) - { - nPrcHeight = (BYTE)nHeight; - nPrcWidth = 255; - } - else - { - aTwipSz.Width() = HTML_DFLT_IMG_WIDTH; - } + aTwipSz.Width() = HTML_DFLT_IMG_WIDTH; } } } @@ -816,14 +760,6 @@ IMAGE_SETEVENT: { // Breite und Hoehe wurden angegeben und brauchen nicht gesetzt // zu werden - bGrfSzValid = -#ifdef NEW_GRFOBJ - FindGrfSizeFromCache( sGrfNm, aGrfSz ) -#else - FALSE; -#endif - ; - bSetTwipSize = FALSE; if( bPrcWidth ) @@ -850,31 +786,8 @@ IMAGE_SETEVENT: if( pImgMap ) { SwFmtURL aURL; aURL.SetMap( pImgMap );//wird kopieiert - if( bGrfSzValid ) - { - BOOL bScale = FALSE; - - Fraction aScaleX( 1, 1 ), aScaleY( 1, 1); - if( !nPrcWidth && aGrfSz.Width() && aTwipSz.Width() && - aGrfSz.Width() != aTwipSz.Width() ) - { - aScaleX = Fraction( aGrfSz.Width(), aTwipSz.Width() ); - bScale = TRUE; - } - - if( !nPrcHeight && aGrfSz.Height() && aTwipSz.Height() && - aGrfSz.Height() != aTwipSz.Height() ) - { - aScaleY = Fraction( aGrfSz.Height(), aTwipSz.Height() ); - bScale = TRUE; - } - - if( bScale ) - aURL.GetMap()->Scale( aScaleX, aScaleY ); - } - else - bSetScaleImageMap = !nPrcWidth || !nPrcHeight; + bSetScaleImageMap = !nPrcWidth || !nPrcHeight; aFrmSet.Put( aURL ); } else @@ -887,8 +800,7 @@ IMAGE_SETEVENT: // die Grafik muss beim SetTwipSize skaliert werden, wenn // wir keine Groesse am Node gesetzt haben oder die Groesse // nicht der Grafikgroesse entsprach. - bSetScaleImageMap = !bSetTwipSize || !bGrfSzValid || - !nPrcWidth || !nPrcHeight; + bSetScaleImageMap = sal_True; } } @@ -950,7 +862,7 @@ IMAGE_SETEVENT: if( bSetTwipSize ) pGrfNd->SetTwipSize( aGrfSz ); - pGrfNd->SetChgTwipSize( bChangeFrmSize ); + pGrfNd->SetChgTwipSize( bChangeFrmSize, bChangeFrmSize ); if( bSetScaleImageMap ) pGrfNd->SetScaleImageMap( TRUE ); @@ -1175,13 +1087,31 @@ void SwHTMLParser::InsertBodyOptions() SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() ); SvxCSS1PropertyInfo aPropInfo; String aDummy; - ParseStyleOptions( aDummy, aDummy, aStyle, aItemSet, aPropInfo, 0, &aDir ); + ParseStyleOptions( aStyle, aDummy, aDummy, aItemSet, aPropInfo, 0, &aDir ); // Ein par Attribute muessen an der Seitenvorlage gesetzt werden, // und zwar die, die nicht vererbit werden pCSS1Parser->SetPageDescAttrs( bSetBrush ? &aBrushItem : 0, &aItemSet ); + const SfxPoolItem *pItem; + static USHORT aWhichIds[3] = { RES_CHRATR_FONTSIZE, + RES_CHRATR_CJK_FONTSIZE, + RES_CHRATR_CTL_FONTSIZE }; + for( USHORT i=0; i<3; i++ ) + { + if( SFX_ITEM_SET == aItemSet.GetItemState( aWhichIds[i], FALSE, + &pItem ) && + static_cast <const SvxFontHeightItem * >(pItem)->GetProp() != 100) + { + sal_uInt32 nHeight = + ( aFontHeights[2] * + static_cast <const SvxFontHeightItem * >(pItem)->GetProp() ) / 100; + SvxFontHeightItem aNewItem( nHeight, 100, aWhichIds[i] ); + aItemSet.Put( aNewItem ); + } + } + // alle noch uebrigen Optionen koennen an der Standard-Vorlage // gesetzt werden und gelten dann automatisch als defaults pCSS1Parser->GetTxtCollFromPool( RES_POOLCOLL_STANDARD ) diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 489d0cbe2859..fd489fb2a8a4 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -2,9 +2,9 @@ * * $RCSfile: htmltab.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: mib $ $Date: 2002-11-21 13:11:49 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -968,9 +968,24 @@ void HTMLTableRow::Shrink( sal_uInt16 nCells ) { ASSERT( nCells < pCells->Count(), "Anzahl Zellen falsch" ); -#ifdef DEBUG + // The colspan of empty cells at the end has to be fixed to the new + // number of cells. + sal_uInt16 i=nCells; sal_uInt16 nEnd = pCells->Count(); - for( sal_uInt16 i=nCells; i<nEnd; i++ ) + while( i ) + { + HTMLTableCell *pCell = (*pCells)[--i]; + if( !pCell->GetContents() ) + { + ASSERT( pCell->GetColSpan() == nEnd - i, + "invalid col span for empty cell at row end" ); + pCell->SetColSpan( nCells-i); + } + else + break; + } +#ifdef DEBUG + for( i=nCells; i<nEnd; i++ ) { HTMLTableCell *pCell = (*pCells)[i]; ASSERT( pCell->GetRowSpan() == 1, diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index 38ff3d31614e..1b429f91e8f8 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -2,9 +2,9 @@ * * $RCSfile: htmltabw.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: mib $ $Date: 2002-11-21 13:11:50 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -757,7 +757,8 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, SwHoriOrient eAlign, sOut += sHTML_table; sal_uInt16 nOldDirection = rWrt.nDirection; - rWrt.nDirection = rWrt.GetHTMLDirection( pFrmFmt->GetAttrSet() ); + if( pFrmFmt ) + rWrt.nDirection = rWrt.GetHTMLDirection( pFrmFmt->GetAttrSet() ); if( rWrt.bOutFlyFrame || nOldDirection != rWrt.nDirection ) { rWrt.Strm() << sOut.GetBuffer(); diff --git a/sw/source/filter/html/makefile.mk b/sw/source/filter/html/makefile.mk index c616410904d0..7a24784c0a9c 100644 --- a/sw/source/filter/html/makefile.mk +++ b/sw/source/filter/html/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: obo $ $Date: 2002-10-10 14:04:54 $ +# last change: $Author: hr $ $Date: 2003-03-27 15:41:50 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 4003b42f4186..1b2f9ac4e255 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -2,9 +2,9 @@ * * $RCSfile: wrthtml.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: hbrinkm $ $Date: 2002-12-04 15:33:05 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1096,7 +1096,9 @@ sal_uInt16 SwHTMLWriter::OutHeaderAttrs() const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs ) { ByteString sOut( sHTML_doctype ); - (sOut += ' ') += sHTML_doctype32; + (sOut += ' ') += + (HTML_CFG_HTML32==nExportMode ? sHTML_doctype32 + : sHTML_doctype40); HTMLOutFuncs::Out_AsciiTag( Strm(), sOut.GetBuffer() ); // baue den Vorspann diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx index d20bfd9517de..0e028d7172d3 100644 --- a/sw/source/filter/inc/fltshell.hxx +++ b/sw/source/filter/inc/fltshell.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fltshell.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: cmc $ $Date: 2002-11-18 13:47:19 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -671,5 +671,6 @@ public: BOOL GetCaseVersalien(); }; +void UpdatePageDescs(SwDoc &rDoc, sal_uInt16 nInPageDescOffset); #endif diff --git a/sw/source/filter/rtf/rtfatr.cxx b/sw/source/filter/rtf/rtfatr.cxx index a3a89530bcfa..f9993dc43688 100644 --- a/sw/source/filter/rtf/rtfatr.cxx +++ b/sw/source/filter/rtf/rtfatr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: rtfatr.cxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: cmc $ $Date: 2002-12-04 12:07:34 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,6 +59,8 @@ * ************************************************************************/ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ + /* * Dieses File enthaelt alle Ausgabe-Funktionen des RTF-Writers; * fuer alle Nodes, Attribute, Formate und Chars. @@ -941,6 +943,9 @@ RTFEndPosLst::~RTFEndPosLst() int RTFEndPosLst::Insert( const SfxPoolItem& rAttr, xub_StrLen nStt, xub_StrLen nEnd ) { + if (rAttr.Which() == RES_TXTATR_INETFMT) + return false; + if( nStt == nEnd ) return FALSE; @@ -1082,12 +1087,14 @@ void RTFEndPosLst::EndAttrs( xub_StrLen nStrPos ) for( USHORT nAttr = rAttrs.Count(); nAttr; ) switch( rAttrs[ --nAttr ]->Which() ) { +#if 0 case RES_TXTATR_INETFMT: // Hyperlinks werden als Felder geschrieben, aber der // "FieldResult" steht als Text im TextNode. Also muss // bei diesen Attributen am Ende 2 Klammern stehen! rWrt.Strm() << "}}"; break; +#endif case RES_TXTATR_CJK_RUBY: rWrt.Strm() << ")}{" << sRTF_FLDRSLT << " }}"; @@ -1294,6 +1301,82 @@ void OutRTF_SwRTL(SwRTFWriter& rWrt, const SwTxtNode *pNd) OutSvxFrmDir(rWrt, SvxFrameDirectionItem(eDir)); } +static Writer& OutRTF_SwTxtINetFmt( Writer& rWrt, const SfxPoolItem& rHt ) +{ + const SwFmtINetFmt& rURL = (const SwFmtINetFmt&)rHt; + SwRTFWriter& rRTFWrt = (SwRTFWriter&)rWrt; + if( rURL.GetValue().Len() ) + { + rWrt.Strm() << '{' << sRTF_FIELD << '{' << sRTF_IGNORE + << sRTF_FLDINST << " HYPERLINK "; + + String sURL( rURL.GetValue() ); + if( INET_MARK_TOKEN != sURL.GetChar(0) ) + { + INetURLObject aTmp( INetURLObject::AbsToRel( sURL ) ); + sURL = aTmp.GetURLNoMark( INetURLObject::DECODE_UNAMBIGUOUS); +/* if( INET_PROT_FILE == aTmp.GetProtocol() ) + { + // WW97 wollen keine FILE-URL haben, sondern einen normalen + // Dateinamen. Aber ab WW2000 kennen sie FileURLs. + sURL = aTmp.GetFull(); + } +*/ rWrt.Strm() << '\"'; + RTFOutFuncs::Out_String( rWrt.Strm(), sURL, DEF_ENCODING, + rRTFWrt.bWriteHelpFmt ) << "\" "; + sURL = aTmp.GetMark(); + } + + if( sURL.Len() ) + { + rWrt.Strm() << "\\\\l \""; + sURL.Erase( 0, 1 ); + RTFOutFuncs::Out_String( rWrt.Strm(), sURL, DEF_ENCODING, + rRTFWrt.bWriteHelpFmt ) << "\" "; + } + + if( rURL.GetTargetFrame().Len() ) + { + rWrt.Strm() << "\\\\t \""; + RTFOutFuncs::Out_String( rWrt.Strm(), rURL.GetTargetFrame(), + DEF_ENCODING, rRTFWrt.bWriteHelpFmt ) << "\" "; + } + + rWrt.Strm() << "}{" << sRTF_FLDRSLT << ' '; + rRTFWrt.bOutFmtAttr = FALSE; + + // und dann noch die Attributierung ausgeben + const SwCharFmt* pFmt; + const SwTxtINetFmt* pTxtAtr = rURL.GetTxtINetFmt(); + if( pTxtAtr && 0 != ( pFmt = pTxtAtr->GetCharFmt() )) + OutRTF_SwFmt( rWrt, *pFmt ); + } + return rWrt; +} + +void HandleHyperlinks(Writer& rWrt, const SwpHints* pTxtAttrs, xub_StrLen nPos) +{ + USHORT nCount = pTxtAttrs ? pTxtAttrs->Count() : 0; + for(USHORT i = 0; i < nCount; ++i ) + { + const SwTxtAttr* pHt = (*pTxtAttrs)[i]; + const SfxPoolItem &rItem = pHt->GetAttr(); + if (rItem.Which() == RES_TXTATR_INETFMT) + { + const xub_StrLen* pEnd; + if (nPos == *pHt->GetStart()) + OutRTF_SwTxtINetFmt(rWrt, rItem); + if (0 != ( pEnd = pHt->GetEnd() ) && nPos == *pEnd) + { + // Hyperlinks werden als Felder geschrieben, aber der + // "FieldResult" // steht als Text im TextNode. Also muss bei + // diesen Attributen am // Ende 2 Klammern stehen! + rWrt.Strm() << "}}"; + } + } + } +} + static Writer& OutRTF_SwTxtNode( Writer& rWrt, SwCntntNode& rNode ) { SwTxtNode * pNd = &((SwTxtNode&)rNode); @@ -1488,6 +1571,8 @@ static Writer& OutRTF_SwTxtNode( Writer& rWrt, SwCntntNode& rNode ) rRTFWrt.bTxtAttr = TRUE; rRTFWrt.bOutFmtAttr = FALSE; + HandleHyperlinks(rWrt, pNd->GetpSwpHints(), nStrPos); + if( nAttrPos < nCntAttr && *pHt->GetStart() == nStrPos && nStrPos != nEnde ) { @@ -2764,59 +2849,6 @@ static Writer& OutRTF_SwNoLinebreakHere( Writer& rWrt, const SfxPoolItem& ) } #endif -static Writer& OutRTF_SwTxtINetFmt( Writer& rWrt, const SfxPoolItem& rHt ) -{ - const SwFmtINetFmt& rURL = (const SwFmtINetFmt&)rHt; - SwRTFWriter& rRTFWrt = (SwRTFWriter&)rWrt; - if( rURL.GetValue().Len() ) - { - rWrt.Strm() << '{' << sRTF_FIELD << '{' << sRTF_IGNORE - << sRTF_FLDINST << " HYPERLINK "; - - String sURL( rURL.GetValue() ); - if( INET_MARK_TOKEN != sURL.GetChar(0) ) - { - INetURLObject aTmp( INetURLObject::AbsToRel( sURL ) ); - sURL = aTmp.GetURLNoMark( INetURLObject::DECODE_UNAMBIGUOUS); -/* if( INET_PROT_FILE == aTmp.GetProtocol() ) - { - // WW97 wollen keine FILE-URL haben, sondern einen normalen - // Dateinamen. Aber ab WW2000 kennen sie FileURLs. - sURL = aTmp.GetFull(); - } -*/ rWrt.Strm() << '\"'; - RTFOutFuncs::Out_String( rWrt.Strm(), sURL, DEF_ENCODING, - rRTFWrt.bWriteHelpFmt ) << "\" "; - sURL = aTmp.GetMark(); - } - - if( sURL.Len() ) - { - rWrt.Strm() << "\\\\l \""; - sURL.Erase( 0, 1 ); - RTFOutFuncs::Out_String( rWrt.Strm(), sURL, DEF_ENCODING, - rRTFWrt.bWriteHelpFmt ) << "\" "; - } - - if( rURL.GetTargetFrame().Len() ) - { - rWrt.Strm() << "\\\\t \""; - RTFOutFuncs::Out_String( rWrt.Strm(), rURL.GetTargetFrame(), - DEF_ENCODING, rRTFWrt.bWriteHelpFmt ) << "\" "; - } - - rWrt.Strm() << "}{" << sRTF_FLDRSLT << ' '; - rRTFWrt.bOutFmtAttr = FALSE; - - // und dann noch die Attributierung ausgeben - const SwCharFmt* pFmt; - const SwTxtINetFmt* pTxtAtr = rURL.GetTxtINetFmt(); - if( pTxtAtr && 0 != ( pFmt = pTxtAtr->GetCharFmt() )) - OutRTF_SwFmt( rWrt, *pFmt ); - } - return rWrt; -} - static Writer& OutRTF_SwTxtCharFmt( Writer& rWrt, const SfxPoolItem& rHt ) { const SwFmtCharFmt& rChrFmt = (const SwFmtCharFmt&)rHt; @@ -3017,6 +3049,9 @@ static Writer& OutRTF_SwFmtLRSpace( Writer& rWrt, const SfxPoolItem& rHt ) rWrt.Strm() << sRTF_LI; rWrt.OutLong( rLR.GetTxtLeft() ) << sRTF_RI; rWrt.OutLong( rLR.GetRight() ); + rWrt.Strm() << sRTF_LIN; + rWrt.OutLong( rLR.GetTxtLeft() ) << sRTF_RIN; + rWrt.OutLong( rLR.GetRight() ); rWrt.Strm() << sRTF_FI; rWrt.OutLong( rLR.GetTxtFirstLineOfst() ); } @@ -4123,4 +4158,4 @@ SwNodeFnTab aRTFNodeFnTab = { /* RES_OLENODE */ OutRTF_SwOLENode }; - +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/rtf/rtffld.cxx b/sw/source/filter/rtf/rtffld.cxx index 11f3236f673f..c6c43c2e09a2 100644 --- a/sw/source/filter/rtf/rtffld.cxx +++ b/sw/source/filter/rtf/rtffld.cxx @@ -2,9 +2,9 @@ * * $RCSfile: rtffld.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: mmaher $ $Date: 2002-12-02 17:26:54 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,6 +59,8 @@ * ************************************************************************/ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ + #ifdef PRECOMPILED #include "filt_pch.hxx" #endif @@ -176,19 +178,19 @@ static RTF_FLD_TYPES _WhichFld( String& rName, String& rNext ) { // Strings sind PascalStrings; Laenge steht an 1. Stellen, dadurch wird // sich der Aufruf von strlen erspart!!! - sal_Char __READONLY_DATA sTOC[]= "\3toc"; - sal_Char __READONLY_DATA sIMPORT[]= "\6import"; - sal_Char __READONLY_DATA sINDEX[]= "\5index"; - sal_Char __READONLY_DATA sSYMBOL[]= "\6symbol"; - sal_Char __READONLY_DATA sPAGE[]= "\4page"; - sal_Char __READONLY_DATA sNUMPAGES[]= "\x8numpages"; - sal_Char __READONLY_DATA sDATE[]= "\4date"; - sal_Char __READONLY_DATA sTIME[]= "\4time"; - sal_Char __READONLY_DATA sDATA[]= "\4data"; - sal_Char __READONLY_DATA sMERGEFLD[]= "\10mergefield"; - sal_Char __READONLY_DATA sIMPORT2[]= "\16includepicture"; - sal_Char __READONLY_DATA sHYPERLINK[]= "\x9hyperlink"; - sal_Char __READONLY_DATA sEQ[]= "\2eq"; + sal_Char __READONLY_DATA sTOC[]= "\x03""toc"; + sal_Char __READONLY_DATA sIMPORT[]= "\x06""import"; + sal_Char __READONLY_DATA sINDEX[]= "\x05""index"; + sal_Char __READONLY_DATA sSYMBOL[]= "\x06""symbol"; + sal_Char __READONLY_DATA sPAGE[]= "\x04""page"; + sal_Char __READONLY_DATA sNUMPAGES[]= "\x08""numpages"; + sal_Char __READONLY_DATA sDATE[]= "\x04""date"; + sal_Char __READONLY_DATA sTIME[]= "\x04""time"; + sal_Char __READONLY_DATA sDATA[]= "\x04""data"; + sal_Char __READONLY_DATA sMERGEFLD[]= "\x0A""mergefield"; + sal_Char __READONLY_DATA sIMPORT2[]= "\x0E""includepicture"; + sal_Char __READONLY_DATA sHYPERLINK[]= "\x09""hyperlink"; + sal_Char __READONLY_DATA sEQ[]= "\x02""eq"; struct _Dummy_RTF_FLD_TYPES { @@ -247,27 +249,24 @@ static RTF_FLD_TYPES _WhichFld( String& rName, String& rNext ) static USHORT CheckNumberFmtStr( const String& rNStr ) { - // zur Kontrolle, falls jemand meint, neue Werte zufuegen zu muessen -#define NUMBERTAB_SZ 8 - sal_Char __READONLY_DATA - sNType0[] = "\10ALPHABETIC", /* CHARS_UPPER_LETTER*/ - sNType1[] = "\10alphabetic", /* CHARS_LOWER_LETTER*/ - sNType2[] = "\5ROMAN", /* ROMAN_UPPER */ - sNType3[] = "\5roman", /* ROMAN_LOWER */ - sNType4[] = "\6ARABIC", /* ARABIC */ - sNType5[] = "\4NONE", /* NUMBER_NONE */ - sNType6[] = "\4CHAR", /* CHAR_SPECIAL */ - sNType7[] = "\4PAGE"; /* PAGEDESC */ - static const sal_Char* __READONLY_DATA aNumberTypeTab[ NUMBERTAB_SZ ] = + const static sal_Char* aNumberTypeTab[] = { - sNType0, sNType1, sNType2, sNType3, sNType4, - sNType5, sNType6, sNType7 + "\x0A""ALPHABETIC", /* CHARS_UPPER_LETTER*/ + "\x0A""alphabetic", /* CHARS_LOWER_LETTER*/ + "\x05""ROMAN", /* ROMAN_UPPER */ + "\x05""roman", /* ROMAN_LOWER */ + "\x06""ARABIC", /* ARABIC */ + "\x04""NONE", /* NUMBER_NONE */ + "\x04""CHAR", /* CHAR_SPECIAL */ + "\x04""PAGE" /* PAGEDESC */ }; + ASSERT(sizeof(aNumberTypeTab) / sizeof(sal_Char *) + >= SVX_NUM_PAGEDESC - SVX_NUM_CHARS_UPPER_LETTER, "impossible"); - for( USHORT n = SVX_NUM_CHARS_UPPER_LETTER; n <= SVX_NUM_PAGEDESC; n++ ) + for (USHORT n = SVX_NUM_CHARS_UPPER_LETTER; n <= SVX_NUM_PAGEDESC; ++n) { - const sal_Char* pCmp = aNumberTypeTab[ n ]; + const sal_Char* pCmp = aNumberTypeTab[n - SVX_NUM_CHARS_UPPER_LETTER]; int nLen = *pCmp++; if( rNStr.EqualsAscii( pCmp, 0, nLen )) return 2 <= n ? n : (n + SVX_NUM_CHARS_UPPER_LETTER_N); @@ -365,7 +364,7 @@ xub_StrLen lcl_FindEndBracket( const String& rStr ) void lcl_ScanEquationField( const String& rStr, RTF_EquationData& rData, sal_Unicode nSttKey ) { - int nSubSupFlag; + int nSubSupFlag(0); RtfFieldSwitch aRFS( rStr ); while( !aRFS.IsAtEnd() ) { @@ -936,8 +935,10 @@ void SwRTFParser::ReadField() String sFieldStr, sFieldNm; BYTE cCh; - while( nOpenBrakets && IsParserWorking() ) - switch( GetNextToken() ) + int nToken; + while (nOpenBrakets && IsParserWorking()) + { + switch (nToken = GetNextToken()) { case '}': { @@ -965,13 +966,9 @@ void SwRTFParser::ReadField() } sFieldStr.Erase(); } - else if( RTFFLD_UNKNOWN == nRet ) // FieldResult wurde eingelesen + else if (RTFFLD_UNKNOWN == nRet) { - // der String ist der Wert vom Feld -// sFieldStr.Insert( '"', 0 ); -// sFieldStr.Insert( '"' ); - - // besorge mal das Feld: + // FieldResult wurde eingelesen SwTxtNode* pTxtNd = pPam->GetPoint()->nNode.GetNode().GetTxtNode(); SwTxtAttr* pFldAttr = pTxtNd->GetTxtAttr( pPam->GetPoint()->nContent.GetIndex()-1 ); @@ -1109,14 +1106,17 @@ INSINGLECHAR: sFieldStr.Insert( sTmp, 3 ); } break; + default: + SvxRTFParser::NextToken( nToken ); + break; + } } - if( RTFFLD_IMPORT == nRet && sFieldNm.Len() ) - { - // Grafik einfuegen + // Grafik einfuegen + if (RTFFLD_IMPORT == nRet && sFieldNm.Len()) InsPicture( sFieldNm ); - } SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet } +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/rtf/rtffly.cxx b/sw/source/filter/rtf/rtffly.cxx index e25ec129fccd..b6f76a26f51c 100644 --- a/sw/source/filter/rtf/rtffly.cxx +++ b/sw/source/filter/rtf/rtffly.cxx @@ -2,9 +2,9 @@ * * $RCSfile: rtffly.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: cmc $ $Date: 2002-07-18 09:41:38 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -176,6 +176,9 @@ #ifndef _FLTINI_HXX #include <fltini.hxx> #endif +#ifndef __SGI_STL_VECTOR +#include <vector> +#endif #define ANCHOR(p) ((SwFmtAnchor*)p) @@ -333,7 +336,7 @@ void SwRTFParser::SetFlysInDoc() { // !! von Oben abarbeiten, CntntPos ist kein Index ! SwNodes & rNds = pDoc->GetNodes(); - SvPtrarr aPrevFmts( 255 < aFlyArr.Count() ? aFlyArr.Count() : 255 ); + ::std::vector <SwFlyFrmFmt*> aPrevFmts; SwFrmFmt* pParent = pDoc->GetFrmFmtFromPool( RES_POOLFRM_FRAME ); for( USHORT n = 0; n < aFlyArr.Count(); ++n ) { @@ -564,8 +567,8 @@ void SwRTFParser::SetFlysInDoc() // the prev position { ULONG nSttNd = pSttNd->GetIndex(), - nEndNd = pSttNd->EndOfSectionIndex(); - for( USHORT nPrevFmts = aPrevFmts.Count(); nPrevFmts; ) + nEndNd = pSttNd->EndOfSectionIndex(); + for( USHORT nPrevFmts = aPrevFmts.size(); nPrevFmts; ) { SwFmt* pTmpFmt = (SwFmt*)aPrevFmts[ --nPrevFmts ]; const SwFmtAnchor& rAn = pTmpFmt->GetAnchor(); @@ -577,12 +580,11 @@ void SwRTFParser::SetFlysInDoc() pTmpFmt->SetAttr( aAnchor ); } else - // then forget it - aPrevFmts.Remove( nPrevFmts, 1 ); + // then forget it + aPrevFmts.erase( aPrevFmts.begin()+nPrevFmts, aPrevFmts.begin()+nPrevFmts+1); } - void* p = (void*)pFmt; - aPrevFmts.Insert( p, aPrevFmts.Count() ); + aPrevFmts.push_back(pFmt); } } delete pFlySave; @@ -1062,6 +1064,13 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet ) pFlySave->nDropAnchor = nDropCapAnchor; pFlySave->nDropLines = nDropCapLines; } + if (nFlyArrCnt >0){ + SwFlySave* pFlySavePrev = aFlyArr[nFlyArrCnt-1]; + if (pFlySave->nSttNd.GetIndex() < pFlySavePrev->nEndNd.GetIndex()) + { + pFlySavePrev->nEndNd=pFlySave->nSttNd; + } + } aFlyArr.Insert( pFlySave, nFlyArrCnt++ ); } } @@ -1465,20 +1474,18 @@ void SwRTFParser::_SetPictureSize( const SwNoTxtNode& rNd, void SwRTFParser::GetPageSize( Size& rSize ) { - const SwFrmFmt& rPgFmt = pDoc->GetPageDesc(nAktPageDesc).GetMaster(); + ASSERT(!maSegments.empty(), "not possible"); - const SwFmtFrmSize& rSz = rPgFmt.GetFrmSize(); - const SvxLRSpaceItem& rLR = rPgFmt.GetLRSpace(); - const SvxULSpaceItem& rUL = rPgFmt.GetULSpace(); - const SwFmtCol& rCol = rPgFmt.GetCol(); + const rtfSection &rSect = maSegments.back(); - rSize.Width() = rSz.GetWidth() - rLR.GetLeft() - rLR.GetRight(); - rSize.Height() = rSz.GetHeight() - rUL.GetUpper() - rUL.GetLower(); + rSize.Width() = rSect.maPageInfo.mnPgwsxn - rSect.maPageInfo.mnMarglsxn - rSect.maPageInfo.mnMargrsxn; + rSize.Height() = rSect.maPageInfo.mnPghsxn - rSect.maPageInfo.mnMargtsxn - rSect.maPageInfo.mnMargbsxn; - if( 1 < rCol.GetNumCols() ) + long nCols = rSect.NoCols(); + if (1 < nCols) { - rSize.Width() /= rCol.GetNumCols(); - rSize.Height() /= rCol.GetNumCols(); + rSize.Width() /= nCols; + rSize.Height() /= nCols; } } diff --git a/sw/source/filter/rtf/rtfnum.cxx b/sw/source/filter/rtf/rtfnum.cxx index 6375a26fdaf5..177de0b38ed6 100644 --- a/sw/source/filter/rtf/rtfnum.cxx +++ b/sw/source/filter/rtf/rtfnum.cxx @@ -2,9 +2,9 @@ * * $RCSfile: rtfnum.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: jp $ $Date: 2001-05-28 10:55:33 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -802,7 +802,7 @@ const Font* SwRTFParser::FindFontOfItem( const SvxFontItem& rItem ) const } -void SwRTFParser::ReadNumSecLevel( int nToken ) +SwNumRule *SwRTFParser::ReadNumSecLevel( int nToken ) { // lese die \pnseclvl - Gruppe // nTokenValue gibt schon den richtigen Level vor 1 - 9! @@ -835,7 +835,7 @@ void SwRTFParser::ReadNumSecLevel( int nToken ) default: SkipGroup(); - return ; + return 0; } } @@ -1102,6 +1102,7 @@ NUMATTR_SETUNDERLINE: } SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet + return pCurRule; } diff --git a/sw/source/filter/rtf/rtftbl.cxx b/sw/source/filter/rtf/rtftbl.cxx index e1ccd06a21de..bd40ed97443f 100644 --- a/sw/source/filter/rtf/rtftbl.cxx +++ b/sw/source/filter/rtf/rtftbl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: rtftbl.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: os $ $Date: 2002-12-10 14:30:11 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,6 +58,9 @@ * * ************************************************************************/ + +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ + #ifdef PRECOMPILED #include "filt_pch.hxx" #endif @@ -138,6 +141,67 @@ class SwShareBoxFmts; extern void _DeleteBox( SwTable& rTbl, SwTableBox* pBox, SwUndo* = 0, BOOL = TRUE, const BOOL = TRUE, SwShareBoxFmts* = 0 ); +struct Row +{ + bool mbUseLeftRowPad, mbUseRightRowPad, mbUseTopRowPad, mbUseBottomRowPad; + long mnLeftRowPad, mnRightRowPad, mnTopRowPad, mnBottomRowPad; + USHORT mnBrdDist; + Row() : + mbUseLeftRowPad(false), mbUseRightRowPad(false), + mbUseTopRowPad(false), mbUseBottomRowPad(false), + mnLeftRowPad(0), mnRightRowPad(0), mnTopRowPad(0), mnBottomRowPad(0), + mnBrdDist(MIN_BORDER_DIST) + {} +}; + +static void SetRowBorder(SfxItemSet& rSet, const Row &rRow) +{ +#if 1 + SvxBoxItem aBox((const SvxBoxItem&)rSet.Get(RES_BOX, false)); + aBox.SetDistance(rRow.mbUseLeftRowPad ? rRow.mnLeftRowPad : rRow.mnBrdDist, + BOX_LINE_LEFT); + + aBox.SetDistance(rRow.mbUseRightRowPad ? rRow.mnRightRowPad : rRow.mnBrdDist, + BOX_LINE_RIGHT); + + aBox.SetDistance(rRow.mbUseTopRowPad ? rRow.mnTopRowPad : 0, + BOX_LINE_TOP); + + aBox.SetDistance(rRow.mbUseBottomRowPad ? rRow.mnBottomRowPad : 0, + BOX_LINE_BOTTOM); + + rSet.Put(aBox); +#else + const SfxPoolItem* pItem; + if (SFX_ITEM_SET == rSet.GetItemState(RES_BOX, FALSE, &pItem)) + { + SvxBoxItem aBox( *(SvxBoxItem*)pItem ); + aBox.SetDistance(rRow.mbUseLeftRowPad ? rRow.mnLeftRowPad : rRow.mnBrdDist, + BOX_LINE_LEFT); + + aBox.SetDistance(rRow.mbUseRightRowPad ? rRow.mnRightRowPad : rRow.mnBrdDist, + BOX_LINE_RIGHT); + + aBox.SetDistance(rRow.mbUseTopRowPad ? rRow.mnTopRowPad : 0, + BOX_LINE_TOP); + + aBox.SetDistance(rRow.mbUseBottomRowPad ? rRow.mnBottomRowPad : 0, + BOX_LINE_BOTTOM); + + rSet.Put(aBox); + } +#endif +} + +void rtfSections::PrependedInlineNode(const SwPosition &rPos, + const SwNode &rNode) +{ + ASSERT(!maSegments.empty(), + "should not be possible, must be at least one segment"); + if ((!maSegments.empty()) && (maSegments.back().maStart == rPos.nNode)) + maSegments.back().maStart = SwNodeIndex(rNode); +} + void SwRTFParser::ReadTable( int nToken ) { nInsTblRow = USHRT_MAX; @@ -191,10 +255,7 @@ void SwRTFParser::ReadTable( int nToken ) SwHoriOrient eAdjust = HORI_LEFT; // default fuer Tabellen SwTwips nLSpace = 0; - USHORT nBrdDist = MIN_BORDER_DIST; - bool bUseLeftRowPad = false, bUseRightRowPad = false, - bUseTopRowPad = false, bUseBottomRowPad = false; - long nLeftRowPad = 0, nRightRowPad = 0, nTopRowPad = 0, nBottomRowPad = 0; + Row aRow; bool bUseLeftCellPad = false, bUseRightCellPad = false, bUseTopCellPad = false, bUseBottomCellPad = false; @@ -209,37 +270,33 @@ void SwRTFParser::ReadTable( int nToken ) BOOL bHeadlineRepeat = FALSE; SvxFrameDirection eDir = FRMDIR_HORI_LEFT_TOP; -#ifdef SET_TRGAPH - SvxLRSpaceItem aLR; -#endif - int bWeiter = TRUE; do { switch( nToken ) { case RTF_TRPADDFL: - bUseLeftRowPad = (nTokenValue == 3) ? true : false; + aRow.mbUseLeftRowPad = (nTokenValue == 3) ? true : false; break; case RTF_TRPADDFT: - bUseTopRowPad = (nTokenValue == 3) ? true : false; + aRow.mbUseTopRowPad = (nTokenValue == 3) ? true : false; break; case RTF_TRPADDFR: - bUseRightRowPad = (nTokenValue == 3) ? true : false; + aRow.mbUseRightRowPad = (nTokenValue == 3) ? true : false; break; case RTF_TRPADDFB: - bUseBottomRowPad = (nTokenValue == 3) ? true : false; + aRow.mbUseBottomRowPad = (nTokenValue == 3) ? true : false; break; case RTF_TRPADDL: - nLeftRowPad = nTokenValue; + aRow.mnLeftRowPad = nTokenValue; break; case RTF_TRPADDT: - nTopRowPad = nTokenValue; + aRow.mnTopRowPad = nTokenValue; break; case RTF_TRPADDR: - nRightRowPad = nTokenValue; + aRow.mnRightRowPad = nTokenValue; break; case RTF_TRPADDB: - nBottomRowPad = nTokenValue; + aRow.mnBottomRowPad = nTokenValue; break; case RTF_CLPADFL: @@ -298,13 +355,7 @@ void SwRTFParser::ReadTable( int nToken ) } else { - // Platz zwischen den Spalten angeben und ist - // diese auch kleiner als die Breite der Box -#ifdef SET_TRGAPH - if( aLR.GetLeft() && 2L * aLR.GetLeft() < nSize ) - pBoxFmt->SetAttr( aLR ); - aLR.SetLeft( 0 ); aLR.SetRight( 0 ); -#endif + SetRowBorder((SfxItemSet&)pBoxFmt->GetAttrSet(), aRow); aBoxFmts.Insert( pBoxFmt, aBoxFmts.Count() ); pBoxFmt = pDoc->MakeTableBoxFmt(); } @@ -327,6 +378,65 @@ void SwRTFParser::ReadTable( int nToken ) if (bUseTopCellPad) aBox.SetDistance(nTopCellPad, BOX_LINE_LEFT); + + /*#106415# The Cell Borders are now balanced on import to + improve the layout of tables. + */ + + if ( aBoxFmts.Count()>1) + { + + SwTableBoxFmt* prevpFmt = aBoxFmts[ aBoxFmts.Count()-2 ]; + SvxBoxItem prevaBox(prevpFmt->GetBox()); + USHORT prevWidthRight=0; + USHORT currWidthLeft=0; + const SvxBorderLine* brdrline ; + if(prevaBox.GetRight()) + { + brdrline=prevaBox.GetRight(); + prevWidthRight = brdrline->GetOutWidth(); + } + if(aBox.GetLeft()) + { + brdrline=aBox.GetLeft(); + currWidthLeft = brdrline->GetOutWidth(); + + } + if(currWidthLeft >0 || prevWidthRight >0 ) + { + USHORT newBorderWidth=(currWidthLeft+prevWidthRight)/2 ; + if(newBorderWidth /2 ==DEF_LINE_WIDTH_0 ) + { + newBorderWidth =DEF_LINE_WIDTH_0; + } + else if(newBorderWidth /2 >=(DEF_LINE_WIDTH_4-DEF_LINE_WIDTH_3)) + { + newBorderWidth =DEF_LINE_WIDTH_4; + } + else if(newBorderWidth /2 >=(DEF_LINE_WIDTH_3-DEF_LINE_WIDTH_2)) + { + newBorderWidth =DEF_LINE_WIDTH_3; + } + else if(newBorderWidth /2>=(DEF_LINE_WIDTH_2-DEF_LINE_WIDTH_1)) + { + newBorderWidth =DEF_LINE_WIDTH_2; + } + else if(newBorderWidth /2>=(DEF_LINE_WIDTH_1 - DEF_LINE_WIDTH_0) ) + { + newBorderWidth =DEF_LINE_WIDTH_1; + } + else + { + newBorderWidth =DEF_LINE_WIDTH_0; + } + const SvxBorderLine newbrdrline(0, newBorderWidth,0,0); + aBox.SetLine(&newbrdrline,BOX_LINE_LEFT); + prevaBox.SetLine(&newbrdrline,BOX_LINE_RIGHT); + prevpFmt->SetAttr(prevaBox); + } + + } + pFmt->SetAttr(aBox); bUseLeftCellPad = false; @@ -337,13 +447,7 @@ void SwRTFParser::ReadTable( int nToken ) break; case RTF_TRGAPH: - { - nBrdDist = (USHORT)nTokenValue; -#ifdef SET_TRGAPH - aLR.SetLeft( USHORT( nTokenValue )); - aLR.SetRight( USHORT( nTokenValue )); -#endif - } + aRow.mnBrdDist = (USHORT)nTokenValue; break; case RTF_TRQL: eAdjust = HORI_LEFT; break; @@ -403,40 +507,11 @@ void SwRTFParser::ReadTable( int nToken ) if( aMergeBoxes[ nBoxCnt ] ) break; - const SfxPoolItem* pItem; SfxItemSet& rSet = (SfxItemSet&)pBoxFmt->GetAttrSet(); ReadBorderAttr( nToken, rSet, TRUE ); - if (SFX_ITEM_SET == rSet.GetItemState(RES_BOX, FALSE, &pItem)) - { - SvxBoxItem aBox( *(SvxBoxItem*)pItem ); -#if 1 - aBox.SetDistance(bUseLeftRowPad ? nLeftRowPad : nBrdDist, - BOX_LINE_LEFT); - - aBox.SetDistance(bUseRightRowPad ? nRightRowPad : nBrdDist, - BOX_LINE_RIGHT); - - aBox.SetDistance(bUseTopRowPad ? nTopRowPad : 0, - BOX_LINE_TOP); - - aBox.SetDistance(bUseBottomRowPad ? nBottomRowPad : 0, - BOX_LINE_BOTTOM); - - rSet.Put(aBox); -#else - BOOL bChg = FALSE; - for (int nLn = 0; nLn < 4; ++nLn) - { - if( aBox.GetLine( nLn ) && !aBox.GetDistance( nLn ) ) - { - aBox.SetDistance( 2 > nLn ? 18 : nBrdDist, nLn ); - bChg = TRUE; - } - } - if (bChg) - rSet.Put( aBox ); +#if 0 + SetRowBorder(aRow); #endif - } } else if( RTF_TABLEDEF != (nToken & ~(0xff | RTF_SWGDEFS)) ) { @@ -638,6 +713,12 @@ void SwRTFParser::ReadTable( int nToken ) GetIndex() - 5 ]->GetTableNode(); ASSERT( pTableNode, "Wo ist mein TabellenNode?" ); + if (pTableNode) + { + maSegments.PrependedInlineNode(*pPam->GetPoint(), + *pTableNode); + } + SwTableLines& rLns = pTableNode->GetTable().GetTabLines(); pNewLine = rLns[ rLns.Count()-1 ]; @@ -882,5 +963,4 @@ void SwRTFParser::CheckInsNewTblLine() } } - - +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index feda53718702..7b3a904bcb79 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -2,9 +2,9 @@ * * $RCSfile: swparrtf.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: cmc $ $Date: 2002-12-06 16:21:55 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifdef PRECOMPILED @@ -115,6 +114,9 @@ #ifndef _SVX_FRMDIRITEM_HXX #include <svx/frmdiritem.hxx> #endif +#ifndef _SVX_HYZNITEM_HXX +#include <svx/hyznitem.hxx> +#endif #ifndef _FMTPDSC_HXX //autogen #include <fmtpdsc.hxx> @@ -227,6 +229,13 @@ #ifndef _SHELLRES_HXX // for the pagedescname from the ShellRes #include <shellres.hxx> #endif +#ifndef _SW_HF_EAT_SPACINGITEM_HXX +#include <hfspacingitem.hxx> +#endif + +#ifndef _FLTSHELL_HXX +#include <fltshell.hxx> +#endif #ifndef _SWSWERROR_H #include <swerror.h> @@ -287,8 +296,9 @@ ULONG RtfReader::Read( SwDoc &rDoc,SwPaM &rPam, const String &) } SwRTFParser::SwRTFParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn, - int bReadNewDoc ) + int bReadNewDoc ) : SvxRTFParser( pD->GetAttrPool(), rIn, bReadNewDoc ), + maSegments(*this), pDoc( pD ), pTableNode( 0 ), pOldTblNd( 0 ), nAktBox( 0 ), nNewNumSectDef( USHRT_MAX ), nAktPageDesc( 0 ), nAktFirstPageDesc( 0 ), @@ -302,7 +312,7 @@ SwRTFParser::SwRTFParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn, { mbIsFootnote = mbReadNoTbl = bReadSwFly = bSwPageDesc = bStyleTabValid = bInPgDscTbl = bNewNumList = false; - bFirstContinue = bFirstDocControl = true; + bFirstContinue = true; pPam = new SwPaM( *rCrsr.GetPoint() ); SetInsPos( SwxPosition( pPam ) ); @@ -331,6 +341,18 @@ SvParserState SwRTFParser::CallParser() return SvxRTFParser::CallParser(); } +bool lcl_UsedPara(SwPaM &rPam) +{ + const SwCntntNode* pCNd; + const SwAttrSet* pSet; + if( rPam.GetPoint()->nContent.GetIndex() || + ( 0 != ( pCNd = rPam.GetCntntNode()) && + 0 != ( pSet = pCNd->GetpSwAttrSet()) && + ( SFX_ITEM_SET == pSet->GetItemState( RES_BREAK, FALSE ) || + SFX_ITEM_SET == pSet->GetItemState( RES_PAGEDESC, FALSE )))) + return true; + return false; +} void SwRTFParser::Continue( int nToken ) { @@ -381,17 +403,11 @@ void SwRTFParser::Continue( int nToken ) if( SVPAR_PENDING == GetStatus() ) return ; // weiter gehts beim naechsten mal - // Laufbalken bei asynchronen Call nicht einschalten !!! - ::EndProgress( pDoc->GetDocShell() ); - + // JP 13.08.98: TabellenUmrandungen optimieren - Bug 53525 + for( USHORT n = aTblFmts.Count(); n; ) { - // JP 13.08.98: TabellenUmrandungen optimieren - Bug 53525 - for( USHORT n = aTblFmts.Count(); n; ) - { - SwTable* pTbl = SwTable::FindTable( (SwFrmFmt*)aTblFmts[ --n ] ); - if( pTbl ) - pTbl->GCBorderLines(); - } + if (SwTable* pTbl = SwTable::FindTable( (SwFrmFmt*)aTblFmts[ --n ] )) + pTbl->GCBorderLines(); } pRelNumRule->SetNumRelSpaces( *pDoc ); @@ -472,6 +488,10 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( FALSE ).nNode.GetIndex() ) delete pRegionEndIdx, pRegionEndIdx = 0; } + sal_uInt16 nPageDescOffset = pDoc->GetPageDescCnt(); + maSegments.InsertSegments(IsNewDoc()); + UpdatePageDescs(*pDoc, nPageDescOffset); + if( aFlyArr.Count() ) SetFlysInDoc(); @@ -487,7 +507,7 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( FALSE ).nNode.GetIndex() ) if( pTmp->IsCntntNode() && !pTmp->FindTableNode() ) DelLastNode(); } - else if( 0 != ( pAktNd = pDoc->GetNodes()[ nNodeIdx ]->GetTxtNode()) ) + else if (0 != (pAktNd = pDoc->GetNodes()[nNodeIdx]->GetTxtNode())) { if( pAktNd->CanJoinNext( &pPos->nNode )) { @@ -507,7 +527,6 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( FALSE ).nNode.GetIndex() ) } } } - // nun noch das SplitNode vom Ende aufheben else if( !IsNewDoc() ) { @@ -547,6 +566,479 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( FALSE ).nNode.GetIndex() ) delete pSttNdIdx, pSttNdIdx = 0; delete pRegionEndIdx, pRegionEndIdx = 0; RemoveUnusedNumRules(); + + // Laufbalken bei asynchronen Call nicht einschalten !!! + ::EndProgress( pDoc->GetDocShell() ); +} + +bool rtfSections::SetCols(SwFrmFmt &rFmt, const rtfSection &rSection, + USHORT nNettoWidth) +{ + //sprmSCcolumns - Anzahl der Spalten - 1 + USHORT nCols = rSection.NoCols(); + + if (nCols < 2) + return false; // keine oder bloedsinnige Spalten + + SwFmtCol aCol; // Erzeuge SwFmtCol + + //sprmSDxaColumns - Default-Abstand 1.25 cm + USHORT nColSpace = rSection.StandardColSeperation(); + +#if 0 + // sprmSLBetween + if (rSection.maSep.fLBetween) + { + aCol.SetLineAdj( COLADJ_TOP ); // Line + aCol.SetLineHeight( 100 ); + aCol.SetLineColor( Color( COL_BLACK )); + aCol.SetLineWidth( 1 ); + } +#endif + aCol.Init( nCols, nColSpace, nNettoWidth ); + + // not SFEvenlySpaced + if (rSection.maPageInfo.maColumns.size()) + { + aCol._SetOrtho(false); + USHORT nWishWidth = 0, nHalfPrev = 0; + for (USHORT n = 0, i = 0; n < rSection.maPageInfo.maColumns.size(); n += 2, ++i ) + { + SwColumn* pCol = aCol.GetColumns()[ i ]; + pCol->SetLeft( nHalfPrev ); + USHORT nSp = rSection.maPageInfo.maColumns[ n+1 ]; + nHalfPrev = nSp / 2; + pCol->SetRight( nSp - nHalfPrev ); + pCol->SetWishWidth(rSection.maPageInfo.maColumns[ n ] + + pCol->GetLeft() + pCol->GetRight()); + nWishWidth += pCol->GetWishWidth(); + } + aCol.SetWishWidth( nWishWidth ); + } + + rFmt.SetAttr(aCol); + return true; +} + +void rtfSections::SetPage(SwPageDesc &rInPageDesc, SwFrmFmt &rFmt, + const rtfSection &rSection, bool bIgnoreCols) +{ + // 1. Orientierung + rInPageDesc.SetLandscape(rSection.IsLandScape()); + + // 2. Papiergroesse + SwFmtFrmSize aSz(rFmt.GetFrmSize()); + aSz.SetWidth(rSection.GetPageWidth()); + aSz.SetHeight(rSection.GetPageHeight()); + rFmt.SetAttr(aSz); + + rFmt.SetAttr( + SvxLRSpaceItem(rSection.GetPageLeft(), rSection.GetPageRight())); + + if (!bIgnoreCols) + { + SetCols(rFmt, rSection, rSection.GetPageWidth() - + rSection.GetPageLeft() - rSection.GetPageRight()); + } +} + +void rtfSections::GetPageULData(const rtfSection &rSection, bool bFirst, + rtfSections::wwULSpaceData& rData) +{ + short nWWUp = rSection.maPageInfo.mnMargtsxn; + short nWWLo = rSection.maPageInfo.mnMargbsxn; + short nWWHTop = rSection.maPageInfo.mnHeadery; + short nWWFBot = rSection.maPageInfo.mnFootery; + +#if 0 + /* + If there is gutter in 97+ and the dop says put it on top then get the + gutter distance and set it to the top margin. When we are "two pages + in one" the gutter is put at the top of odd pages, and bottom of + even pages, something we cannot do. So we will put it on top of all + pages, that way the pages are at least the right size. + */ + if ( mrReader.pWDop->doptypography.f2on1 || + (!mrReader.bVer67 && mrReader.pWDop->iGutterPos && + rSection.maSep.fRTLGutter) + ) + { + nWWUp += rSection.maSep.dzaGutter; + } +#endif + + if (bFirst) + { + if ( + rSection.mpTitlePage && + SFX_ITEM_SET == rSection.mpTitlePage->GetMaster().GetItemState(RES_HEADER) + ) + { + rData.bHasHeader = true; + } + } + else + { + if (rSection.mpPage && + ( + SFX_ITEM_SET == rSection.mpPage->GetMaster().GetItemState(RES_HEADER) + || rSection.mpPage->GetLeft().GetItemState(RES_HEADER) + ) + ) + { + rData.bHasHeader = true; + } + } + + if( rData.bHasHeader ) + { + rData.nSwUp = nWWHTop; // Header -> umrechnen + rData.nSwHLo = nWWUp - nWWHTop; + + if (rData.nSwHLo < MM50) + rData.nSwHLo = MM50; + } + else // kein Header -> Up einfach uebernehmen + rData.nSwUp = nWWUp; + + if (bFirst) + { + if ( + rSection.mpTitlePage && + SFX_ITEM_SET == rSection.mpTitlePage->GetMaster().GetItemState(RES_FOOTER) + ) + { + rData.bHasFooter = true; + } + } + else + { + if (rSection.mpPage && + ( + SFX_ITEM_SET == rSection.mpPage->GetMaster().GetItemState(RES_FOOTER) + || rSection.mpPage->GetLeft().GetItemState(RES_FOOTER) + ) + ) + { + rData.bHasFooter = true; + } + } + + if( rData.bHasFooter ) + { + rData.nSwLo = nWWFBot; // Footer -> Umrechnen + rData.nSwFUp = nWWLo - nWWFBot; + + if (rData.nSwFUp < MM50) + rData.nSwFUp = MM50; + } + else // kein Footer -> Lo einfach uebernehmen + rData.nSwLo = nWWLo; +} + +void rtfSections::SetPageULSpaceItems(SwFrmFmt &rFmt, + rtfSections::wwULSpaceData& rData) +{ + if (rData.bHasHeader) // ... und Header-Lower setzen + { + //Kopfzeilenhoehe minimal sezten + if (SwFrmFmt* pHdFmt = (SwFrmFmt*)rFmt.GetHeader().GetHeaderFmt()) + { + pHdFmt->SetAttr(SwFmtFrmSize(ATT_MIN_SIZE, 0, rData.nSwHLo)); + SvxULSpaceItem aHdUL(pHdFmt->GetULSpace()); + aHdUL.SetLower(rData.nSwHLo - MM50); + pHdFmt->SetAttr(aHdUL); + pHdFmt->SetAttr(SwHeaderAndFooterEatSpacingItem( + RES_HEADER_FOOTER_EAT_SPACING, true)); + } + } + + if (rData.bHasFooter) // ... und Footer-Upper setzen + { + if (SwFrmFmt* pFtFmt = (SwFrmFmt*)rFmt.GetFooter().GetFooterFmt()) + { + pFtFmt->SetAttr(SwFmtFrmSize(ATT_MIN_SIZE, 0, rData.nSwFUp)); + SvxULSpaceItem aFtUL(pFtFmt->GetULSpace()); + aFtUL.SetUpper(rData.nSwFUp - MM50); + pFtFmt->SetAttr(aFtUL); + pFtFmt->SetAttr(SwHeaderAndFooterEatSpacingItem( + RES_HEADER_FOOTER_EAT_SPACING, true)); + } + } + + SvxULSpaceItem aUL(rData.nSwUp, rData.nSwLo); // Page-UL setzen + rFmt.SetAttr(aUL); +} + +void rtfSections::SetSegmentToPageDesc(const rtfSection &rSection, + bool bTitlePage, bool bIgnoreCols) +{ + SwPageDesc &rPage = bTitlePage ? *rSection.mpTitlePage : *rSection.mpPage; + +// SetNumberingType(rSection, rPage); + + SwFrmFmt &rFmt = rPage.GetMaster(); +// mrReader.SetDocumentGrid(rFmt, rSection); + + wwULSpaceData aULData; + GetPageULData(rSection, bTitlePage, aULData); + SetPageULSpaceItems(rFmt, aULData); + + SetPage(rPage, rFmt, rSection, bIgnoreCols); +} + +void rtfSections::CopyFrom(const SwPageDesc &rFrom, SwPageDesc &rDest) +{ + UseOnPage ePage = rFrom.ReadUseOn(); + rDest.WriteUseOn(ePage); + mrReader.pDoc->CopyHeader(rFrom.GetMaster(), rDest.GetMaster()); + mrReader.pDoc->CopyHeader(rFrom.GetLeft(), rDest.GetLeft()); + mrReader.pDoc->CopyFooter(rFrom.GetMaster(), rDest.GetMaster()); + mrReader.pDoc->CopyFooter(rFrom.GetLeft(), rDest.GetLeft()); +} + +void rtfSections::SetHdFt(rtfSection &rSection) +{ + ASSERT(rSection.mpPage, "makes no sense to call without a main page"); + if (rSection.mpPage && rSection.maPageInfo.mpPageHdFt) + CopyFrom(*rSection.maPageInfo.mpPageHdFt, *rSection.mpPage); + + if (rSection.mpTitlePage && rSection.maPageInfo.mpTitlePageHdFt) + CopyFrom(*rSection.maPageInfo.mpTitlePageHdFt, *rSection.mpTitlePage); +} + +SwSectionFmt *rtfSections::InsertSection(SwPaM& rMyPaM, rtfSection &rSection) +{ + SwSection aSection(CONTENT_SECTION, mrReader.pDoc->GetUniqueSectionName()); + + SfxItemSet aSet( mrReader.pDoc->GetAttrPool(), aFrmFmtSetRange ); + + sal_uInt8 nRTLPgn = maSegments.empty() ? 0 : maSegments.back().IsBiDi(); + aSet.Put(SvxFrameDirectionItem( + nRTLPgn ? FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP)); + +#if 0 + if (2 == mrReader.pWDop->fpc) + aSet.Put( SwFmtFtnAtTxtEnd(FTNEND_ATTXTEND)); + if (0 == mrReader.pWDop->epc) + aSet.Put( SwFmtEndAtTxtEnd(FTNEND_ATTXTEND)); +#endif + + rSection.mpSection = mrReader.pDoc->Insert( rMyPaM, aSection, &aSet ); + ASSERT(rSection.mpSection, "section not inserted!"); + if (!rSection.mpSection) + return 0; + + SwPageDesc *pPage = 0; + mySegrIter aEnd = maSegments.rend(); + for (mySegrIter aIter = maSegments.rbegin(); aIter != aEnd; ++aIter) + { + if (pPage = aIter->mpPage) + break; + } + + ASSERT(pPage, "no page outside this section!"); + + if (!pPage) + pPage = &mrReader.pDoc->_GetPageDesc(0); + + if (!pPage) + return 0; + + SwFrmFmt& rFmt = pPage->GetMaster(); + const SwFmtFrmSize& rSz = rFmt.GetFrmSize(); + const SvxLRSpaceItem& rLR = rFmt.GetLRSpace(); + SwTwips nWidth = rSz.GetWidth(); + long nLeft = rLR.GetTxtLeft(); + long nRight = rLR.GetRight(); + + SwSectionFmt *pFmt = rSection.mpSection->GetFmt(); + ASSERT(pFmt, "impossible"); + if (!pFmt) + return 0; + SetCols(*pFmt, rSection, (USHORT)(nWidth - nLeft - nRight) ); + +#if 0 + //Set the columns to be UnBalanced if compatability option is set + if (mrReader.pWDop->fNoColumnBalance ) + { + SwSectionFmt *pFmt = rSection.mpSection->GetFmt(); + pFmt->SetAttr(SwFmtNoBalancedColumns(true)); + } +#endif + + return pFmt; +} + +void rtfSections::InsertSegments(bool bNewDoc) +{ + sal_uInt16 nDesc(0); + mySegIter aEnd = maSegments.end(); + mySegIter aStart = maSegments.begin(); + for (mySegIter aIter = aStart; aIter != aEnd; ++aIter) + { + mySegIter aNext = aIter+1; + + bool bInsertSection = aIter != aStart ? aIter->IsContinous() : false; + + if (!bInsertSection) + { + /* + If a cont section follow this section then we won't be + creating a page desc with 2+ cols as we cannot host a one + col section in a 2+ col pagedesc and make it look like + word. But if the current section actually has columns then + we are forced to insert a section here as well as a page + descriptor. + */ + + /* + Note for the future: + If we want to import "protected sections" the here is + where we would also test for that and force a section + insertion if that was true. + */ + bool bIgnoreCols = false; + if (aNext != aEnd && aNext->IsContinous()) + { + bIgnoreCols = true; + if (aIter->NoCols() > 1) + bInsertSection = true; + } + + if (aIter->HasTitlePage()) + { + if (bNewDoc && aIter == aStart) + { + aIter->mpTitlePage = + mrReader.pDoc->GetPageDescFromPool(RES_POOLPAGE_FIRST); + } + else + { + USHORT nPos = mrReader.pDoc->MakePageDesc( + ViewShell::GetShellRes()->GetPageDescName(nDesc) + , 0, false); + aIter->mpTitlePage = &mrReader.pDoc->_GetPageDesc(nPos); + } + ASSERT(aIter->mpTitlePage, "no page!"); + if (!aIter->mpTitlePage) + continue; + + SetSegmentToPageDesc(*aIter, true, bIgnoreCols); + } + + if (bNewDoc && aIter == aStart) + { + aIter->mpPage = + mrReader.pDoc->GetPageDescFromPool(RES_POOLPAGE_STANDARD); + } + else + { + USHORT nPos = mrReader.pDoc->MakePageDesc( + ViewShell::GetShellRes()->GetPageDescName(nDesc, + false, aIter->HasTitlePage()), + aIter->mpTitlePage, false); + aIter->mpPage = &mrReader.pDoc->_GetPageDesc(nPos); + } + ASSERT(aIter->mpPage, "no page!"); + if (!aIter->mpPage) + continue; + + SetHdFt(*aIter); + + if (aIter->mpTitlePage) + SetSegmentToPageDesc(*aIter, true, bIgnoreCols); + SetSegmentToPageDesc(*aIter, false, bIgnoreCols); + + SwFmtPageDesc aPgDesc(aIter->HasTitlePage() ? + aIter->mpTitlePage : aIter->mpPage); + + if (aIter->mpTitlePage) + aIter->mpTitlePage->SetFollow(aIter->mpPage); + + if (aIter->PageRestartNo()) + aPgDesc.SetNumOffset(aIter->PageStartAt()); + + /* + If its a table here, apply the pagebreak to the table + properties, otherwise we add it to the para at this + position + */ + if (aIter->maStart.GetNode().IsTableNode()) + { + SwTable& rTable = + aIter->maStart.GetNode().GetTableNode()->GetTable(); + SwFrmFmt* pApply = rTable.GetFrmFmt(); + ASSERT(pApply, "impossible"); + if (pApply) + pApply->SetAttr(aPgDesc); + } + else + { + SwPosition aPamStart(aIter->maStart); + aPamStart.nContent.Assign( + aIter->maStart.GetNode().GetCntntNode(), 0); + SwPaM aPage(aPamStart); + + mrReader.pDoc->Insert(aPage, aPgDesc); + } + ++nDesc; + } + + SwTxtNode* pTxtNd = 0; + if (bInsertSection) + { + SwPaM aSectPaM(*mrReader.pPam); + SwNodeIndex aAnchor(aSectPaM.GetPoint()->nNode); + if (aNext != aEnd) + { + aAnchor = aNext->maStart; + aSectPaM.GetPoint()->nNode = aAnchor; + aSectPaM.GetPoint()->nContent.Assign( + aNext->maStart.GetNode().GetCntntNode(), 0); + aSectPaM.Move(fnMoveBackward); + } + + const SwPosition* pPos = aSectPaM.GetPoint(); + const SwTxtNode* pSttNd = + mrReader.pDoc->GetNodes()[ pPos->nNode ]->GetTxtNode(); + const SwTableNode* pTableNd = pSttNd ? pSttNd->FindTableNode() : 0; + if (pTableNd) + { + pTxtNd = + mrReader.pDoc->GetNodes().MakeTxtNode(aAnchor, + mrReader.pDoc->GetTxtCollFromPool( RES_POOLCOLL_TEXT )); + + aSectPaM.GetPoint()->nNode = SwNodeIndex(*pTxtNd); + aSectPaM.GetPoint()->nContent.Assign( + aSectPaM.GetCntntNode(), 0); + } + + aSectPaM.SetMark(); + + aSectPaM.GetPoint()->nNode = aIter->maStart; + aSectPaM.GetPoint()->nContent.Assign( + aSectPaM.GetCntntNode(), 0); + + SwSectionFmt *pRet = InsertSection(aSectPaM, *aIter); + //The last section if continous is always unbalanced + if (aNext == aEnd && pRet) + pRet->SetAttr(SwFmtNoBalancedColumns(true)); + } + + if (pTxtNd) + { + SwNodeIndex aIdx(*pTxtNd); + SwPosition aPos(aIdx); + SwPaM aTest(aPos); + mrReader.pDoc->DelFullPara(aTest); + pTxtNd = 0; + } + } + + myDummyIter aDEnd = maDummyPageNos.end(); + for (myDummyIter aDummy = maDummyPageNos.begin(); aDummy != aDEnd; ++aDummy) + mrReader.pDoc->DelPageDesc(*aDummy); } SwRTFParser::~SwRTFParser() @@ -605,6 +1097,21 @@ void SwRTFParser::NextToken( int nToken ) break; case RTF_PN: + if( bNewNumList ) + SkipGroup(); + else + { + bStyleTabValid = TRUE; + if (SwNumRule* pRule = ReadNumSecLevel( nToken )) + { + GetAttrSet().Put( SwNumRuleItem( pRule->GetName() )); + + if( SFX_ITEM_SET != GetAttrSet().GetItemState( FN_PARAM_NUM_LEVEL, FALSE )) + GetAttrSet().Put( SfxUInt16Item( FN_PARAM_NUM_LEVEL, 0 )); + } + } + break; + case RTF_PNSECLVL: if( bNewNumList ) SkipGroup(); @@ -634,18 +1141,10 @@ void SwRTFParser::NextToken( int nToken ) break; case RTF_PAGE: - { - const SwCntntNode* pCNd; - const SwAttrSet* pSet; - if( pPam->GetPoint()->nContent.GetIndex() || - ( 0 != ( pCNd = pPam->GetCntntNode()) && - 0 != ( pSet = pCNd->GetpSwAttrSet()) && - ( SFX_ITEM_SET == pSet->GetItemState( RES_BREAK, FALSE ) || - SFX_ITEM_SET == pSet->GetItemState( RES_PAGEDESC, FALSE )))) - InsertPara(); - CheckInsNewTblLine(); - pDoc->Insert( *pPam, SvxFmtBreakItem( SVX_BREAK_PAGE_BEFORE ) ); - } + if (lcl_UsedPara(*pPam)) + InsertPara(); + CheckInsNewTblLine(); + pDoc->Insert(*pPam, SvxFmtBreakItem(SVX_BREAK_PAGE_BEFORE)); break; case RTF_SECT: @@ -982,29 +1481,6 @@ void SwRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet ) // dann setze ueber diesen Bereich die Attrbiute SetSwgValues( rSet.GetAttrSet() ); - -#if 0 -///!!!!!!!!!!!!!!!!!!!!! - if( !rSet.GetAttrSet().GetParent() ) - { - const SfxItemPool& rPool = pDoc->GetAttrPool(); - SfxItemSet &rAttrSet = rSet.GetAttrSet(); - SfxItemIter aIter( rAttrSet ); - USHORT nWhich = aIter.GetCurItem()->Which(); - while( TRUE ) - { - if( SFX_WHICH_MAX < nWhich || - rPool.GetDefaultItem( nWhich ) == *aIter.GetCurItem() ) - rAttrSet.ClearItem( nWhich ); // loeschen - - if( aIter.IsAtEnd() ) - break; - nWhich = aIter.NextItem()->Which(); - } - } - if( rSet.GetAttrSet().Count() ) -#endif - pDoc->Insert( aPam, rSet.GetAttrSet(), SETATTR_DONTCHGNUMRULE ); } @@ -1050,48 +1526,112 @@ void SwRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet ) } } +DocPageInformation::DocPageInformation() + : mnPaperw(12240), mnPaperh(15840), mnMargl(1800), mnMargr(1800), + mnMargt(1440), mnMargb(1440), mnGutter(0), mnPgnStart(1), mbFacingp(false), + mbLandscape(false), mbRTLdoc(false) +{ +} -// lese alle Dokument-Controls ein -void SwRTFParser::ReadDocControls( int nToken ) +SectPageInformation::SectPageInformation(const DocPageInformation &rDoc) + : + mpTitlePageHdFt(0), mpPageHdFt(0), + mnPgwsxn(rDoc.mnPaperw), mnPghsxn(rDoc.mnPaperh), + mnMarglsxn(rDoc.mnMargl), mnMargrsxn(rDoc.mnMargr), + mnMargtsxn(rDoc.mnMargt), mnMargbsxn(rDoc.mnMargb), + mnGutterxsn(rDoc.mnGutter), mnHeadery(720), mnFootery(720), mnPgnStarts(1), + mnCols(1), mnColsx(720), mnStextflow(rDoc.mbRTLdoc ? 3 : 0), mnBkc(2), + mbLndscpsxn(rDoc.mbLandscape), mbTitlepg(false), mbFacpgsxn(rDoc.mbFacingp), + mbRTLsection(rDoc.mbRTLdoc), mbPgnrestart(false) { - int bWeiter = TRUE; +}; + +SectPageInformation::SectPageInformation(const SectPageInformation &rSect) + : maColumns(rSect.maColumns), maNumType(rSect.maNumType), + mpTitlePageHdFt(rSect.mpTitlePageHdFt), mpPageHdFt(rSect.mpPageHdFt), + mnPgwsxn(rSect.mnPgwsxn), mnPghsxn(rSect.mnPghsxn), + mnMarglsxn(rSect.mnMarglsxn), mnMargrsxn(rSect.mnMargrsxn), + mnMargtsxn(rSect.mnMargtsxn), mnMargbsxn(rSect.mnMargbsxn), + mnGutterxsn(rSect.mnGutterxsn), mnHeadery(rSect.mnHeadery), + mnFootery(rSect.mnFootery), mnPgnStarts(rSect.mnPgnStarts), + mnCols(rSect.mnCols), mnColsx(rSect.mnColsx), + mnStextflow(rSect.mnStextflow), mnBkc(rSect.mnBkc), + mbLndscpsxn(rSect.mbLndscpsxn), mbTitlepg(rSect.mbTitlepg), + mbFacpgsxn(rSect.mbFacpgsxn), mbRTLsection(rSect.mbRTLsection), + mbPgnrestart(rSect.mbPgnrestart) +{ +}; - SwFmtFrmSize aFrmSize(ATT_FIX_SIZE, 12240, 15840 ); - SvxULSpaceItem aUL; - SvxLRSpaceItem aLR; - SwFtnInfo aFtnInfo; - SwEndNoteInfo aEndInfo; - UseOnPage eUseOn; - USHORT nPgStart = USHRT_MAX; +rtfSection::rtfSection(const SwPosition &rPos, + const SectPageInformation &rPageInfo) + : maStart(rPos.nNode), maPageInfo(rPageInfo), mpSection(0), mpTitlePage(0), + mpPage(0) +{ +} - SvxFrameDirectionItem aFrmDir; - if( bFirstDocControl ) - { - // RTF-Defaults setzen - SwFmtFrmSize aFrmSize(ATT_FIX_SIZE, 12240, 15840 ); +void rtfSections::push_back(const rtfSection &rSect) +{ + if (!maSegments.empty() && (maSegments.back().maStart == rSect.maStart)) + maSegments.pop_back(); + maSegments.push_back(rSect); +} - aUL.SetUpper( 1440 ); aUL.SetLower( 1440 ); - aLR.SetRight( 1800 ); aLR.SetLeft( 1800 ); - eUseOn = UseOnPage(PD_ALL | PD_HEADERSHARE | PD_FOOTERSHARE); - aFtnInfo.ePos = FTNPOS_CHAPTER; aFtnInfo.eNum = FTNNUM_DOC; - bFirstDocControl = FALSE; +// lese alle Dokument-Controls ein +void SwRTFParser::SetPageInformationAsDefault(const DocPageInformation &rInfo) +{ + maSegments.push_back(rtfSection(*pPam->GetPoint(), + SectPageInformation(rInfo))); - aFrmDir.SetValue(FRMDIR_HORI_LEFT_TOP); - } - else + if (!bSwPageDesc && IsNewDoc()) { - const SwPageDesc& rStdPgDsc = pDoc->GetPageDesc( 0 ); - aFrmSize = rStdPgDsc.GetMaster().GetFrmSize(); - aUL = rStdPgDsc.GetMaster().GetULSpace(); - aLR = rStdPgDsc.GetMaster().GetLRSpace(); + SwFmtFrmSize aFrmSize(ATT_FIX_SIZE, rInfo.mnPaperw, rInfo.mnPaperh); - eUseOn = rStdPgDsc.ReadUseOn(); + SvxLRSpaceItem aLR(rInfo.mnMargl, rInfo.mnMargr); + SvxULSpaceItem aUL(rInfo.mnMargt, rInfo.mnMargb); + + UseOnPage eUseOn; + if (rInfo.mbFacingp) + eUseOn = UseOnPage(PD_MIRROR | PD_HEADERSHARE | PD_FOOTERSHARE); + else + eUseOn = UseOnPage(PD_ALL | PD_HEADERSHARE | PD_FOOTERSHARE); - aEndInfo = pDoc->GetEndNoteInfo(); - aFtnInfo = pDoc->GetFtnInfo(); + USHORT nPgStart(rInfo.mnPgnStart); - aFrmDir = rStdPgDsc.GetMaster().GetFrmDir(); + SvxFrameDirectionItem aFrmDir(rInfo.mbRTLdoc ? + FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP); + + // direkt an der Standartseite drehen + SwPageDesc& rPg = pDoc->_GetPageDesc( 0 ); + rPg.WriteUseOn( eUseOn ); + + if (rInfo.mbLandscape) + rPg.SetLandscape(true); + + SwFrmFmt &rFmt1 = rPg.GetMaster(), &rFmt2 = rPg.GetLeft(); + + rFmt1.SetAttr( aFrmSize ); rFmt2.SetAttr( aFrmSize ); + rFmt1.SetAttr( aLR ); rFmt2.SetAttr( aLR ); + rFmt1.SetAttr( aUL ); rFmt2.SetAttr( aUL ); + rFmt1.SetAttr( aFrmDir ); rFmt2.SetAttr( aFrmDir ); + + // StartNummer der Seiten setzen + if (nPgStart != 1) + { + SwFmtPageDesc aPgDsc( &rPg ); + aPgDsc.SetNumOffset( nPgStart ); + pDoc->Insert( *pPam, aPgDsc ); + } } +} + +// lese alle Dokument-Controls ein +void SwRTFParser::ReadDocControls( int nToken ) +{ + int bWeiter = true; + + SwFtnInfo aFtnInfo; + SwEndNoteInfo aEndInfo; + bool bSetHyph = false; BOOL bEndInfoChgd = FALSE, bFtnInfoChgd = FALSE; @@ -1099,46 +1639,45 @@ void SwRTFParser::ReadDocControls( int nToken ) USHORT nValue = USHORT( nTokenValue ); switch( nToken ) { -/* case '}': --nOpenBrakets; nToken = RTF_DOCFMT; break; - case '{': ++nOpenBrakets; nToken = RTF_DOCFMT; break; - case RTF_IGNOREFLAG: nToken = RTF_DOCFMT; break; -*/ - case RTF_RTLDOC: - aFrmDir.SetValue(FRMDIR_HORI_RIGHT_TOP); + maPageDefaults.mbRTLdoc = true; break; case RTF_LTRDOC: - aFrmDir.SetValue(FRMDIR_HORI_LEFT_TOP); + maPageDefaults.mbRTLdoc = false; + break; + case RTF_LANDSCAPE: + maPageDefaults.mbLandscape = true; break; case RTF_PAPERW: if( 0 < nTokenValue ) - aFrmSize.SetWidth( nTokenValue ); + maPageDefaults.mnPaperw = nTokenValue; break; case RTF_PAPERH: if( 0 < nTokenValue ) - aFrmSize.SetHeight( nTokenValue ); + maPageDefaults.mnPaperh = nTokenValue; break; case RTF_MARGL: if( 0 <= nTokenValue ) - aLR.SetLeft( nValue ); + maPageDefaults.mnMargl = nTokenValue; break; case RTF_MARGR: if( 0 <= nTokenValue ) - aLR.SetRight( nValue ); + maPageDefaults.mnMargr = nTokenValue; break; case RTF_MARGT: if( 0 <= nTokenValue ) - aUL.SetUpper( nValue ); + maPageDefaults.mnMargt = nTokenValue; break; case RTF_MARGB: if( 0 <= nTokenValue ) - aUL.SetLower( nValue ); + maPageDefaults.mnMargb = nTokenValue; + break; + case RTF_FACINGP: + maPageDefaults.mbFacingp = true; + break; + case RTF_PGNSTART: + maPageDefaults.mnPgnStart = nTokenValue; break; - - case RTF_FACINGP: eUseOn = UseOnPage(PD_MIRROR | PD_HEADERSHARE | PD_FOOTERSHARE); - break; - case RTF_PGNSTART: nPgStart = nValue; break; - case RTF_ENDDOC: case RTF_ENDNOTES: aFtnInfo.ePos = FTNPOS_CHAPTER; bFtnInfoChgd = TRUE; @@ -1196,16 +1735,30 @@ void SwRTFParser::ReadDocControls( int nToken ) case RTF_AFTNNAR: aEndInfo.aFmt.SetNumberingType(SVX_NUM_ARABIC); bEndInfoChgd = TRUE; break; case RTF_AFTNNALC: - aEndInfo.aFmt.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER_N); bEndInfoChgd = TRUE; break; + aEndInfo.aFmt.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER_N); + bEndInfoChgd = TRUE; + break; case RTF_AFTNNAUC: - aEndInfo.aFmt.SetNumberingType(SVX_NUM_CHARS_UPPER_LETTER_N); bEndInfoChgd = TRUE; break; + aEndInfo.aFmt.SetNumberingType(SVX_NUM_CHARS_UPPER_LETTER_N); + bEndInfoChgd = TRUE; + break; case RTF_AFTNNRLC: - aEndInfo.aFmt.SetNumberingType(SVX_NUM_ROMAN_LOWER); bEndInfoChgd = TRUE; break; + aEndInfo.aFmt.SetNumberingType(SVX_NUM_ROMAN_LOWER); + bEndInfoChgd = TRUE; + break; case RTF_AFTNNRUC: - aEndInfo.aFmt.SetNumberingType(SVX_NUM_ROMAN_UPPER); bEndInfoChgd = TRUE; break; + aEndInfo.aFmt.SetNumberingType(SVX_NUM_ROMAN_UPPER); + bEndInfoChgd = TRUE; + break; case RTF_AFTNNCHI: - aEndInfo.aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL); bEndInfoChgd = TRUE; break; - + aEndInfo.aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL); + bEndInfoChgd = TRUE; + break; + case RTF_HYPHAUTO: + if (nTokenValue) + bSetHyph = true; + //FOO// + break; case '{': { short nSkip = 0; @@ -1240,7 +1793,7 @@ void SwRTFParser::ReadDocControls( int nToken ) nToken = GetNextToken(); } while( bWeiter && IsParserWorking() ); - if( IsNewDoc() ) + if (IsNewDoc()) { if( bEndInfoChgd ) pDoc->SetEndNoteInfo( aEndInfo ); @@ -1248,45 +1801,32 @@ void SwRTFParser::ReadDocControls( int nToken ) pDoc->SetFtnInfo( aFtnInfo ); } - if( !bSwPageDesc ) + if (!bSwPageDesc) { - if( IsNewDoc() ) + SetPageInformationAsDefault(maPageDefaults); + + MakeStyleTab(); + + SwTxtFmtColl* pColl = aTxtCollTbl.Get(0); + if (!pColl) { - // direkt an der Standartseite drehen - SwPageDesc& rPg = pDoc->_GetPageDesc( 0 ); - rPg.WriteUseOn( eUseOn ); - SwFrmFmt &rFmt1 = rPg.GetMaster(), &rFmt2 = rPg.GetLeft(); + pColl = pDoc->GetTxtCollFromPoolSimple(RES_POOLCOLL_STANDARD, + FALSE ); + } - rFmt1.SetAttr( aFrmSize ); rFmt2.SetAttr( aFrmSize ); - rFmt1.SetAttr( aLR ); rFmt2.SetAttr( aLR ); - rFmt1.SetAttr( aUL ); rFmt2.SetAttr( aUL ); - rFmt1.SetAttr( aFrmDir ); rFmt2.SetAttr( aFrmDir ); + ASSERT(pColl, "impossible to have no standard style"); - // StartNummer der Seiten setzen - if( USHRT_MAX != nPgStart ) + if (pColl) + { + if ( + IsNewDoc() && bSetHyph && + SFX_ITEM_SET != pColl->GetItemState(RES_PARATR_HYPHENZONE, + false) + ) { - SwFmtPageDesc* pCurPgDsc = GetCurrentPageDesc(pPam); - if(pCurPgDsc) - { - pCurPgDsc->SetNumOffset( nPgStart ); - } - else - { - SwFmtPageDesc aPgDsc( &rPg ); - aPgDsc.SetNumOffset( nPgStart ); - pDoc->Insert( *pPam, aPgDsc ); - } + pColl->SetAttr(SvxHyphenZoneItem(true)); } - } - MakeStyleTab(); - // das default-Style schon gleich am ersten Node setzen -// if( IsNewDoc() ) - { - SwTxtFmtColl* pColl = aTxtCollTbl.Get( 0 ); - if( !pColl ) - pColl = pDoc->GetTxtCollFromPoolSimple( RES_POOLCOLL_STANDARD, - FALSE ); pDoc->SetTxtFmtColl( *pPam, pColl ); } } @@ -1450,892 +1990,301 @@ SwFmtPageDesc* SwRTFParser::GetCurrentPageDesc(SwPaM *pPam) return aFmtPageDsc; } -// lese alle Section-Controls ein -void SwRTFParser::ReadSectControls( int nToken ) +void SwRTFParser::DoHairyWriterPageDesc(int nToken) { int bWeiter = TRUE; - - // werden die eigenen PageDesc - Informationen gelesen, dann alles - // ueberlesen - // Wird in ein bestehendes Doc eingelesen oder wurden eigene PageDesc - // gelesen, dann sind nur die Bereiche von interresse - BOOL bInsPageDesc = IsNewDoc() && !bSwPageDesc; - - if( bInPgDscTbl ) - { - do { - if( '{' == nToken ) + do { + if( '{' == nToken ) + { + switch( nToken = GetNextToken() ) { - switch( nToken = GetNextToken() ) + case RTF_IGNOREFLAG: + if( RTF_SECTFMT != (( nToken = GetNextToken() ) + & ~(0xff | RTF_SWGDEFS)) ) { - case RTF_IGNOREFLAG: - if( RTF_SECTFMT != (( nToken = GetNextToken() ) - & ~(0xff | RTF_SWGDEFS)) ) - { - SkipToken( -2 ); // Ignore und Token wieder zurueck - bWeiter = FALSE; - break; - } - // kein break, Gruppe ueberspringen - - case RTF_FOOTER: - case RTF_HEADER: - case RTF_FOOTERR: - case RTF_HEADERR: - case RTF_FOOTERL: - case RTF_HEADERL: - case RTF_FOOTERF: - case RTF_HEADERF: - SkipGroup(); // erstmal komplett ueberlesen - // ueberlese noch die schliessende Klammer - GetNextToken(); - break; - - default: - SkipToken( -1 ); // Ignore wieder zurueck + SkipToken( -2 ); // Ignore und Token wieder zurueck bWeiter = FALSE; break; } - } - else if( RTF_SECTFMT == (nToken & ~(0xff | RTF_SWGDEFS)) || - RTF_UNKNOWNCONTROL == nToken ) - SvxRTFParser::NextToken( nToken ); - else - bWeiter = FALSE; - if( bWeiter ) - nToken = GetNextToken(); - } while( bWeiter && IsParserWorking() ); - SkipToken( -1 ); // letztes Token wieder zurueck - return; - } - - // RTF-Defaults setzen - BOOL bFirstCall = 1 == pDoc->GetPageDescCnt(); - BOOL bHeaderUL = FALSE, bHeaderLR = FALSE, - bFooterUL = FALSE, bFooterLR = FALSE; - bool bIsRTL=false; - - USHORT nLastPageDesc = nAktPageDesc, - nLastFirstPageDesc = nAktFirstPageDesc; + // kein break, Gruppe ueberspringen + + case RTF_FOOTER: + case RTF_HEADER: + case RTF_FOOTERR: + case RTF_HEADERR: + case RTF_FOOTERL: + case RTF_HEADERL: + case RTF_FOOTERF: + case RTF_HEADERF: + SkipGroup(); // erstmal komplett ueberlesen + // ueberlese noch die schliessende Klammer + GetNextToken(); + break; - BOOL bMakeNewPageDesc = RTF_SECT == nToken; - BOOL bInsNewPageDesc = bMakeNewPageDesc || bFirstCall || bSwPageDesc; - SwPageDesc* pAkt, *pFirst = 0; - if( bInsNewPageDesc ) - { - pAkt = _MakeNewPageDesc( FALSE ); - if( bMakeNewPageDesc ) - { - nToken = GetNextToken(); - // some export filter write the RTF_SECT in brakets -> skip over - while( '}' == nToken ) - { - NextToken( nToken ); - nToken = GetNextToken(); + default: + SkipToken( -1 ); // Ignore wieder zurueck + bWeiter = FALSE; + break; } } - } - else - { - pAkt = &pDoc->_GetPageDesc( nAktPageDesc ); - if( nAktFirstPageDesc ) - pFirst = &pDoc->_GetPageDesc( nAktFirstPageDesc ); - } - - SwFmtFrmSize aSz( pAkt->GetMaster().GetFrmSize() ), aHSz( ATT_MIN_SIZE ); - SvxULSpaceItem aUL( pAkt->GetMaster().GetULSpace() ), aHUL, aFUL; - SvxLRSpaceItem aLR( pAkt->GetMaster().GetLRSpace() ), aHLR, aFLR; - BOOL bPgWiChgd = FALSE, bPgHeChgd = FALSE, - bPgUpChgd = FALSE, bPgLoChgd = FALSE, - bPgLeChgd = FALSE, bPgRiChgd = FALSE, - bPgFcChgd = FALSE, - bNoBalancedCols = FALSE; + else if( RTF_SECTFMT == (nToken & ~(0xff | RTF_SWGDEFS)) || + RTF_UNKNOWNCONTROL == nToken ) + SvxRTFParser::NextToken( nToken ); + else + bWeiter = FALSE; + if( bWeiter ) + nToken = GetNextToken(); + } while( bWeiter && IsParserWorking() ); + SkipToken( -1 ); // letztes Token wieder zurueck + return; +} +void SwRTFParser::ReadSectControls( int nToken ) +{ + AttrGroupEnd(); //#106493# - USHORT nRestoreUpper = USHRT_MAX, nRestoreLower = USHRT_MAX; - SwFrmFmt* pFmt = (SwFrmFmt*)pAkt->GetMaster().GetHeader().GetHeaderFmt(); - if( pFmt ) + //this is some hairy stuff to try and retain writer style page descriptors + //in rtf, almost certainy a bad idea, but we've inherited it, so here it + //stays + if (bInPgDscTbl) { - aHUL = pFmt->GetULSpace(); - aHLR = pFmt->GetLRSpace(); - aHSz = pFmt->GetFrmSize(); - if( aHSz.GetHeight() ) - { - nRestoreUpper = (USHORT)aHSz.GetHeight(); - aUL.SetUpper( aUL.GetUpper() + nRestoreUpper ); - aHSz.SetHeight( 0 ); - } + DoHairyWriterPageDesc(nToken); + return; } - if( 0 != (pFmt = (SwFrmFmt*)pAkt->GetMaster().GetFooter().GetFooterFmt()) ) + ASSERT(!maSegments.empty(), "suspicious to have a section with no " + "page info, though probably legal"); + if (maSegments.empty()) { - aFUL = pFmt->GetULSpace(); - aFLR = pFmt->GetLRSpace(); - if( aFUL.GetUpper() ) - { - nRestoreLower = aFUL.GetUpper(); - aUL.SetLower( aUL.GetLower() + nRestoreLower ); - aFUL.SetUpper( 0 ); - } + maSegments.push_back(rtfSection(*pPam->GetPoint(), + SectPageInformation(maPageDefaults))); } - BOOL bCheckEqualPgDesc = TRUE, bPgDescChgd = FALSE; - SvxBreak eBreak = SVX_BREAK_PAGE_BEFORE; - - USHORT nCols = USHRT_MAX, nColSpace = USHRT_MAX, nAktCol = 0; - SvUShorts aColumns; - - USHORT nPgStart = USHRT_MAX; - SvxNumberType aNumType; - - SvxFrameDirectionItem aFrmDir(FRMDIR_HORI_LEFT_TOP); + SectPageInformation aNewSection(maSegments.back().maPageInfo); + int bWeiter = true; do { - BOOL bIsSectToken = FALSE; + bool bIsSectToken = false; USHORT nValue = USHORT( nTokenValue ); switch( nToken ) { - case RTF_SECT: - bWeiter = FALSE; - break; - - case RTF_SECTD: - { - // Wert von der StandardPage holen ! - const SwFrmFmt& rFmt = pDoc->GetPageDesc(0).GetMaster(); - aSz = rFmt.GetFrmSize(); - aUL = rFmt.GetULSpace(); - aLR = rFmt.GetLRSpace(); - - nRestoreUpper = USHRT_MAX, nRestoreLower = USHRT_MAX; - aHUL.SetUpper( 720 ); aHUL.SetLower( 0 ); - aFUL.SetUpper( 0 ); aFUL.SetLower( 720 ); - aHLR.SetLeft( 0 ); aHLR.SetRight( 0 ); - aFLR.SetLeft( 0 ); aFLR.SetRight( 0 ); - pAkt->WriteUseOn( UseOnPage(PD_ALL | PD_HEADERSHARE | PD_FOOTERSHARE) ); - pAkt->SetLandscape( FALSE ); - aFrmDir.SetValue( FRMDIR_HORI_LEFT_TOP ); - - // remove Columns/Header/Footer - pAkt->GetMaster().ResetAttr( RES_COL ); - if( pFirst ) - pFirst->GetMaster().ResetAttr( RES_COL ); - - nPgStart = USHRT_MAX; - - SwFmtPageDesc* pCurPgDsc = GetCurrentPageDesc(pPam); - if(pCurPgDsc) + case RTF_SECT: +// bWeiter = false; + break; + case RTF_SECTD: + //Reset to page defaults + aNewSection = SectPageInformation(maPageDefaults); + break; + case RTF_PGWSXN: + if (0 < nTokenValue) + aNewSection.mnPgwsxn = nTokenValue; + break; + case RTF_PGHSXN: + if (0 < nTokenValue) + aNewSection.mnPghsxn = nTokenValue; + break; + case RTF_MARGLSXN: + if (0 <= nTokenValue) + aNewSection.mnMarglsxn = nTokenValue; + break; + case RTF_MARGRSXN: + if (0 <= nTokenValue) + aNewSection.mnMargrsxn = nTokenValue; + break; + case RTF_MARGTSXN: + if (0 <= nTokenValue) + aNewSection.mnMargtsxn = nTokenValue; + break; + case RTF_MARGBSXN: + if (0 <= nTokenValue) + aNewSection.mnMargbsxn = nTokenValue; + break; + case RTF_FACPGSXN: + aNewSection.mbFacpgsxn = true; + break; + case RTF_HEADERY: + aNewSection.mnHeadery = nTokenValue; + break; + case RTF_FOOTERY: + aNewSection.mnFootery = nTokenValue; + break; + case RTF_LNDSCPSXN: + aNewSection.mbLndscpsxn = true; + break; + case RTF_PGNSTARTS: + aNewSection.mnPgnStarts = nTokenValue; + break; + case RTF_PGNDEC: + aNewSection.maNumType.SetNumberingType(SVX_NUM_ARABIC); + break; + case RTF_PGNUCRM: + aNewSection.maNumType.SetNumberingType(SVX_NUM_ROMAN_UPPER); + break; + case RTF_PGNLCRM: + aNewSection.maNumType.SetNumberingType(SVX_NUM_ROMAN_LOWER); + break; + case RTF_PGNUCLTR: + aNewSection.maNumType.SetNumberingType( + SVX_NUM_CHARS_UPPER_LETTER_N); + break; + case RTF_PGNLCLTR: + aNewSection.maNumType.SetNumberingType( + SVX_NUM_CHARS_LOWER_LETTER_N); + break; + case RTF_SBKNONE: + aNewSection.mnBkc = 0; + break; + case RTF_SBKCOL: + aNewSection.mnBkc = 1; + break; + case RTF_ENDNHERE: + case RTF_BINFSXN: + case RTF_BINSXN: + case RTF_SBKPAGE: + case RTF_SBKEVEN: + case RTF_SBKODD: + case RTF_LINEBETCOL: + case RTF_LINEMOD: + case RTF_LINEX: + case RTF_LINESTARTS: + case RTF_LINERESTART: + case RTF_LINEPAGE: + case RTF_LINECONT: + case RTF_GUTTERSXN: + case RTF_PGNCONT: + case RTF_PGNRESTART: + case RTF_PGNX: + case RTF_PGNY: + case RTF_VERTALT: + case RTF_VERTALB: + case RTF_VERTALC: + case RTF_VERTALJ: + break; + case RTF_TITLEPG: + aNewSection.mbTitlepg = true; + break; + case RTF_HEADER: + case RTF_HEADERL: + case RTF_HEADERR: + case RTF_FOOTER: + case RTF_FOOTERL: + case RTF_FOOTERR: + if (!aNewSection.mpPageHdFt) { - nPgStart = pCurPgDsc->GetNumOffset(); + String aName(RTL_CONSTASCII_STRINGPARAM("rtfHdFt")); + aName += String::CreateFromInt32(maSegments.size()); + sal_uInt16 nPageNo = pDoc->MakePageDesc(aName); + aNewSection.mpPageHdFt = &pDoc->_GetPageDesc(nPageNo); + maSegments.maDummyPageNos.push_back(nPageNo); } - - nCols = USHRT_MAX; - nColSpace = USHRT_MAX; - aNumType.SetNumberingType(SVX_NUM_ARABIC); - bHeaderUL = bHeaderLR = bFooterUL = bFooterLR = TRUE; - eBreak = SVX_BREAK_PAGE_BEFORE; - nNewNumSectDef = USHRT_MAX; - - bPgWiChgd = bPgHeChgd = bPgUpChgd = bPgLoChgd = bPgLeChgd = - bPgRiChgd = bPgFcChgd = TRUE; - bPgDescChgd = TRUE; - } - break; - - case RTF_PGWSXN: - if( 0 < nTokenValue ) - { - aSz.SetWidth( nTokenValue ); - bPgWiChgd = TRUE; - bPgDescChgd = TRUE; - } - break; - - case RTF_PGHSXN: - if( 0 < nTokenValue ) - { - aSz.SetHeight( nTokenValue ); - bPgHeChgd = TRUE; - bPgDescChgd = TRUE; - } - break; - case RTF_MARGLSXN: - if( 0 <= nTokenValue ) - { - aLR.SetLeft( nValue ); - bPgLeChgd =TRUE; - bPgDescChgd = TRUE; - } - break; - case RTF_MARGRSXN: - if( 0 <= nTokenValue ) - { - aLR.SetRight( nValue ); - bPgRiChgd = TRUE; - bPgDescChgd = TRUE; - } - break; - - case RTF_MARGTSXN: - if( 0 <= nTokenValue ) - { - nRestoreUpper = USHRT_MAX; - aUL.SetUpper( nValue ); - bPgUpChgd = TRUE; - bPgDescChgd = TRUE; - } - break; - - case RTF_MARGBSXN: - if( 0 <= nTokenValue ) - { - nRestoreLower = USHRT_MAX; - aUL.SetLower( nValue ); - bPgLoChgd = TRUE; - bPgDescChgd = TRUE; - } - break; - - case RTF_FACPGSXN: - pAkt->SetUseOn( UseOnPage(PD_MIRROR | ( pAkt->GetUseOn() & - ~(PD_HEADERSHARE | PD_FOOTERSHARE) ))); - bPgDescChgd = TRUE; - break; - - case RTF_HEADERY: - aHUL.SetUpper( nValue ); - bHeaderUL = TRUE; - bPgDescChgd = TRUE; - break; - - case RTF_FOOTERY: - aFUL.SetLower( nValue ); - bFooterUL = TRUE; - bPgDescChgd = TRUE; - break; - - case RTF_LNDSCPSXN: - pAkt->SetLandscape( TRUE ); - bPgFcChgd = TRUE; - bPgDescChgd = TRUE; - break; - - case RTF_PGNSTARTS: - nPgStart = nValue; - bPgDescChgd = TRUE; - break; - - case RTF_PGNDEC: - aNumType.SetNumberingType(SVX_NUM_ARABIC); - bPgDescChgd = TRUE; - break; - case RTF_PGNUCRM: - aNumType.SetNumberingType(SVX_NUM_ROMAN_UPPER); - bPgDescChgd = TRUE; - break; - case RTF_PGNLCRM: - aNumType.SetNumberingType(SVX_NUM_ROMAN_LOWER); - bPgDescChgd = TRUE; - break; - case RTF_PGNUCLTR: - aNumType.SetNumberingType(SVX_NUM_CHARS_UPPER_LETTER_N); - bPgDescChgd = TRUE; - break; - case RTF_PGNLCLTR: - aNumType.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER_N); - bPgDescChgd = TRUE; - break; - - case RTF_SBKNONE: - bIsSectToken = TRUE; - eBreak = SVX_BREAK_NONE; - bPgDescChgd = !bFirstCall; - break; - - case RTF_SBKCOL: - eBreak = SVX_BREAK_COLUMN_BEFORE; - bPgDescChgd = TRUE; - break; - - case RTF_ENDNHERE: - case RTF_BINFSXN: - case RTF_BINSXN: - case RTF_SBKPAGE: - case RTF_SBKEVEN: - case RTF_SBKODD: - case RTF_LINEBETCOL: - case RTF_LINEMOD: - case RTF_LINEX: - case RTF_LINESTARTS: - case RTF_LINERESTART: - case RTF_LINEPAGE: - case RTF_LINECONT: - case RTF_GUTTERSXN: - case RTF_PGNCONT: - case RTF_PGNRESTART: - case RTF_PGNX: - case RTF_PGNY: - case RTF_VERTALT: - case RTF_VERTALB: - case RTF_VERTALC: - case RTF_VERTALJ: - break; - - case RTF_TITLEPG: - if( bInsPageDesc && !pFirst ) - pFirst = _MakeNewPageDesc( TRUE ); - bCheckEqualPgDesc = FALSE; - bPgDescChgd = TRUE; - break; - - case RTF_HEADER: - case RTF_HEADERL: - case RTF_HEADERR: - case RTF_FOOTER: - case RTF_FOOTERL: - case RTF_FOOTERR: - if( bInsPageDesc ) - ReadHeaderFooter( nToken, pAkt ); - else - SkipGroup(), GetNextToken(); //Gruppe mit schl. Klammer lesen - bCheckEqualPgDesc = FALSE; - bPgDescChgd = TRUE; - break; - - case RTF_FOOTERF: - case RTF_HEADERF: - if( bInsPageDesc ) - { - if( !pFirst ) - pFirst = _MakeNewPageDesc( TRUE ); - ReadHeaderFooter( nToken, pFirst ); - } - else - SkipGroup(), GetNextToken(); //Gruppe mit schl. Klammer lesen - bCheckEqualPgDesc = FALSE; - bPgDescChgd = TRUE; - break; - - case RTF_COLS: - bIsSectToken = TRUE; - nCols = nValue; - bPgDescChgd = TRUE; - break; - - case RTF_COLSX: - bIsSectToken = TRUE; - nColSpace = nValue; - bPgDescChgd = TRUE; - break; - - case RTF_COLNO: - bIsSectToken = TRUE; - nAktCol = nValue; - if( RTF_COLW == GetNextToken() ) - { - USHORT nWidth = USHORT( nTokenValue ), nSpace = 0; - if( RTF_COLSR == GetNextToken() ) - nSpace = USHORT( nTokenValue ); - else - SkipToken( -1 ); // wieder zurueck - - if( --nAktCol == ( aColumns.Count() / 2 ) ) + ReadHeaderFooter(nToken, aNewSection.mpPageHdFt); + break; + case RTF_FOOTERF: + case RTF_HEADERF: + if (!aNewSection.mpTitlePageHdFt) { - aColumns.Insert( nWidth, aColumns.Count() ); - aColumns.Insert( nSpace, aColumns.Count() ); + String aTitle(RTL_CONSTASCII_STRINGPARAM("rtfTitleHdFt")); + aTitle += String::CreateFromInt32(maSegments.size()); + sal_uInt16 nPageNo = pDoc->MakePageDesc(aTitle); + aNewSection.mpTitlePageHdFt = &pDoc->_GetPageDesc(nPageNo); + maSegments.maDummyPageNos.push_back(nPageNo); } - } - bPgDescChgd = TRUE; - break; - - case RTF_STEXTFLOW: - switch( nValue ) - { - case 0: // Text flows left to right and top to bottom - aFrmDir.SetValue( FRMDIR_HORI_LEFT_TOP ); - bPgDescChgd = TRUE; + ReadHeaderFooter(nToken, aNewSection.mpTitlePageHdFt); break; - case 1: // Text flows top to bottom and right to left, vertical - case 5: // Text flows vertically, non-vertical font - aFrmDir.SetValue( FRMDIR_VERT_TOP_RIGHT ); - bPgDescChgd = TRUE; + case RTF_COLS: + aNewSection.mnCols = nTokenValue; break; -// case 2: // Text flows left to right and bottom to top -// aFrmDir.SetValue( ?? ); break; - case 3: // Text flows right to left and top to bottom - aFrmDir.SetValue( FRMDIR_HORI_RIGHT_TOP ); - bPgDescChgd = TRUE; + case RTF_COLSX: + aNewSection.mnColsx = nTokenValue; break; - case 4: // Text flows left to right and top to bottom, vertical - aFrmDir.SetValue( FRMDIR_VERT_TOP_LEFT ); - bPgDescChgd = TRUE; - break; - } - break; - - case RTF_RTLSECT: - bIsRTL=true; - bPgDescChgd = TRUE; - break; - - case RTF_LTRSECT: - bIsRTL=false; - bPgDescChgd = TRUE; - break; - - case '{': - { - short nSkip = 0; - if( RTF_IGNOREFLAG != ( nToken = GetNextToken() )) - nSkip = -1; - else if( RTF_SECTFMT != (( nToken = GetNextToken() ) - & ~(0xff | RTF_SWGDEFS)) && - ( RTF_DOCFMT != ( nToken & ~(0xff | RTF_SWGDEFS))) ) - nSkip = -2; - else + case RTF_COLNO: { - bPgDescChgd = TRUE; - switch( nToken ) + long nAktCol = nValue; + if (RTF_COLW == GetNextToken()) { - case RTF_HEADER_YB: - aHUL.SetLower( USHORT(nTokenValue) ); - bHeaderUL = TRUE; - if( RTF_HEADER_XL == GetNextToken() && - RTF_HEADER_XR == GetNextToken() ) - { - bHeaderLR = TRUE; - aHLR.SetLeft( USHORT(GetStackPtr( -1 )->nTokenValue) ); - aHLR.SetRight( USHORT(nTokenValue)); - } + long nWidth = nTokenValue, nSpace = 0; + if( RTF_COLSR == GetNextToken() ) + nSpace = nTokenValue; else - SkipGroup(); - break; - - case RTF_FOOTER_YT: - aFUL.SetUpper( USHORT(nTokenValue)); - bFooterUL = TRUE; - if( RTF_FOOTER_XL == GetNextToken() && - RTF_FOOTER_XR == GetNextToken() ) + SkipToken( -1 ); // wieder zurueck + + if (--nAktCol == (aNewSection.maColumns.size() / 2 )) { - bFooterLR = TRUE; - aFLR.SetLeft( USHORT(GetStackPtr( -1 )->nTokenValue) ); - aFLR.SetRight( USHORT(nTokenValue)); + aNewSection.maColumns.push_back(nWidth); + aNewSection.maColumns.push_back(nSpace); } - else - SkipGroup(); - break; - - case RTF_BALANCED_COLUMN: - bIsSectToken = TRUE; - bPgDescChgd = TRUE; - bNoBalancedCols = TRUE; - break; - - default: - SkipGroup(); // erstmal komplett ueberlesen - break; } - - // ueberlese noch die schliessende Klammer - GetNextToken(); } - if( nSkip ) + break; + case RTF_STEXTFLOW: + aNewSection.mnStextflow = nTokenValue; + break; + case RTF_RTLSECT: + aNewSection.mbRTLsection = true; + break; + case RTF_LTRSECT: + aNewSection.mbRTLsection = false; + break; + case '{': { - bWeiter = -1 == nSkip && ( - RTF_FOOTER == nToken || RTF_HEADER == nToken || - RTF_FOOTERR == nToken || RTF_HEADERR == nToken || - RTF_FOOTERL == nToken || RTF_HEADERL == nToken || - RTF_FOOTERF == nToken || RTF_HEADERF == nToken ); - SkipToken( nSkip ); // Ignore wieder zurueck + short nSkip = 0; + if( RTF_IGNOREFLAG != ( nToken = GetNextToken() )) + nSkip = -1; + else if( RTF_SECTFMT != (( nToken = GetNextToken() ) + & ~(0xff | RTF_SWGDEFS)) && + ( RTF_DOCFMT != ( nToken & ~(0xff | RTF_SWGDEFS))) ) + nSkip = -2; + else + { + // erstmal komplett ueberlesen + SkipGroup(); + // ueberlese noch die schliessende Klammer + GetNextToken(); + } + if (nSkip) + { + bWeiter = ((-1 == nSkip) && + ( + RTF_FOOTER == nToken || RTF_HEADER == nToken || + RTF_FOOTERR == nToken || RTF_HEADERR == nToken || + RTF_FOOTERL == nToken || RTF_HEADERL == nToken || + RTF_FOOTERF == nToken || RTF_HEADERF == nToken + )); + SkipToken (nSkip); // Ignore wieder zurueck + } } - } - break; - - case RTF_PAPERW: - case RTF_PAPERH: - case RTF_MARGL: - case RTF_MARGR: - case RTF_MARGT: - case RTF_MARGB: - case RTF_FACINGP: - { - ReadDocControls( nToken ); - - // set the new Values - const SwPageDesc& rStdPgDsc = pDoc->GetPageDesc( 0 ); - const SwFmtFrmSize& rSz = rStdPgDsc.GetMaster().GetFrmSize(); - const SvxULSpaceItem rUL = rStdPgDsc.GetMaster().GetULSpace(); - const SvxLRSpaceItem rLR = rStdPgDsc.GetMaster().GetLRSpace(); - - if( !bPgWiChgd ) aSz.SetWidth( rSz.GetWidth() ); - if( !bPgHeChgd ) aSz.SetHeight( rSz.GetHeight() ); - if( !bPgUpChgd ) aUL.SetUpper( rUL.GetUpper() ); - if( !bPgLoChgd ) aUL.SetLower( rUL.GetLower() ); - if( !bPgLeChgd ) aLR.SetLeft( rLR.GetLeft() ); - if( !bPgRiChgd ) aLR.SetRight( rLR.GetRight() ); - if( !bPgFcChgd ) pAkt->SetLandscape( rStdPgDsc.GetLandscape() ); - } - break; - default: - if( RTF_DOCFMT == (nToken & ~(0xff | RTF_SWGDEFS)) ) + break; + case RTF_PAPERW: + case RTF_PAPERH: + case RTF_MARGL: + case RTF_MARGR: + case RTF_MARGT: + case RTF_MARGB: + case RTF_FACINGP: + ASSERT(!this, "why are these tokens found in this section?"); ReadDocControls( nToken ); - else if( RTF_SECTFMT == (nToken & ~(0xff | RTF_SWGDEFS)) || - RTF_UNKNOWNCONTROL == nToken ) - SvxRTFParser::NextToken( nToken ); - else - bWeiter = FALSE; - break; - } - - - if( bWeiter ) - { - // kein eigener Bereich und kein Section Attribut? - if( !bInsPageDesc && !bIsSectToken ) - bCheckEqualPgDesc = FALSE; - nToken = GetNextToken(); - } - } while( bWeiter && IsParserWorking() ); - - - if( !bPgDescChgd ) - { - // der aktuelle muss wieder entnfernt werden - if( bInsNewPageDesc ) - { - pDoc->DelPageDesc( nAktPageDesc ); - if( pFirst ) - pDoc->DelPageDesc( nAktFirstPageDesc ); - nAktPageDesc = nLastPageDesc; - nAktFirstPageDesc = nLastFirstPageDesc; - } - SkipToken( -1 ); - return ; - } - - - // den letzen Bereich wieder zumachen - if( pRegionEndIdx ) - { - DelLastNode(); - pPam->GetPoint()->nNode = *pRegionEndIdx; - pPam->Move( fnMoveForward, fnGoNode ); - delete pRegionEndIdx, pRegionEndIdx = 0; - } - - - pFmt = &pAkt->GetMaster(); - - if (bInsPageDesc) - { - if( bHeaderUL ) - { - if( aUL.GetUpper() > aHUL.GetUpper() ) - { - aHSz.SetHeight( aUL.GetUpper() - aHUL.GetUpper() ); - aHUL.SetUpper( 0 ); - aUL.SetUpper( USHORT(aUL.GetUpper() - aHSz.GetHeight()) ); - - if( !pFmt->GetHeader().GetHeaderFmt() ) - pFmt->SetAttr( SwFmtHeader( (BOOL)TRUE )); - if( pFirst && !pFirst->GetMaster().GetHeader().GetHeaderFmt() ) - pFirst->GetMaster().SetAttr( SwFmtHeader( (BOOL)TRUE )); - } - } - else if( USHRT_MAX != nRestoreUpper ) - aUL.SetUpper( aUL.GetUpper() - nRestoreUpper ); - - if( bFooterUL ) - { - if( aUL.GetLower() > aFUL.GetLower() ) - { - aFUL.SetUpper( aUL.GetLower() - aFUL.GetLower() ); - aUL.SetLower( aFUL.GetLower() ); - aFUL.SetLower( 0 ); - if( !pFmt->GetFooter().GetFooterFmt() ) - pFmt->SetAttr( SwFmtFooter( (BOOL)TRUE )); - if( pFirst && !pFirst->GetMaster().GetFooter().GetFooterFmt() ) - pFirst->GetMaster().SetAttr( SwFmtFooter( (BOOL)TRUE )); - } - else - { - aUL.SetLower( aFUL.GetLower() ); - aFUL.SetLower( 0 ); - } - } - else if( USHRT_MAX != nRestoreLower ) - aUL.SetLower( aUL.GetLower() - nRestoreLower ); - - pFmt->SetAttr( aSz ); - pFmt->SetAttr( aLR ); - pFmt->SetAttr( aUL ); - - if (bIsRTL && aFrmDir.GetValue() == FRMDIR_HORI_LEFT_TOP) - aFrmDir.SetValue(FRMDIR_HORI_RIGHT_TOP); - - pFmt->SetAttr( aFrmDir ); - - pAkt->SetNumType( aNumType ); - if( pFirst ) - pFirst->SetNumType( aNumType ); - - if( ( bHeaderUL || bHeaderLR ) && - 0 != (pFmt = (SwFrmFmt*)pAkt->GetMaster().GetHeader().GetHeaderFmt()) ) - { - if( bHeaderUL && aHSz.GetHeight() ) pFmt->SetAttr( aHSz ); - if( bHeaderLR ) pFmt->SetAttr( aHLR ); - } - - if( ( bFooterUL || bFooterLR ) && - 0 != ( pFmt = (SwFrmFmt*)pAkt->GetMaster().GetFooter().GetFooterFmt()) ) - { - if( bFooterUL ) pFmt->SetAttr( aFUL ); - if( bFooterLR ) pFmt->SetAttr( aFLR ); - } - } - - - if( nCols && USHRT_MAX != nCols ) - { - if( ::lcl_SetFmtCol( pAkt->GetMaster(), nCols, nColSpace, aColumns ) - && pFirst ) - pFirst->GetMaster().SetAttr( pAkt->GetMaster().GetAttr( RES_COL )); - - //JP 19.03.99 - Spaltigkeit NIE an der Seite setzen - dieses - // ist immer ein Kennzeichen fuer einen Bereich, weil - // die Seitenspalten NIE vom Layout aufgebrochen werden. - //JP 24.02.00 - but dont insert column section into a column page - // Bug 73480 - if( bSwPageDesc ) - { - const SwPageDesc& rOld = pDoc->GetPageDesc( nLastPageDesc ); - if( rOld.GetMaster().GetAttr( RES_COL ) != - pAkt->GetMaster().GetAttr( RES_COL ) ) - { - bCheckEqualPgDesc = TRUE; - bInsPageDesc = FALSE; - eBreak = SVX_BREAK_NONE; - -// !! ???? muss das hier passieren ?? - // fuer den Absatz dahinter sorgen - pDoc->AppendTxtNode(*pPam->GetPoint()); - pPam->Move( fnMoveBackward ); - pPam->SetMark(); - } - } - } - else if( bInsNewPageDesc ) - { - pAkt->GetMaster().ResetAttr( RES_COL ); - if( pFirst ) - pFirst->GetMaster().ResetAttr( RES_COL ); - } - - if( pFirst ) - { - // setze am ersten den richtigen Follow - pFirst->SetFollow( pAkt ); - - // und setze noch die die Werte aus PageDesc: - pFirst->SetLandscape( pAkt->GetLandscape() ); - - pFmt = &pFirst->GetMaster(); - - pFmt->SetAttr( aSz ); - pFmt->SetAttr( aLR ); - pFmt->SetAttr( aUL ); - if( !( aFrmDir == pFmt->GetAttr( RES_FRAMEDIR )) ) - pFmt->SetAttr( aFrmDir ); - - if( ( bHeaderUL || bHeaderLR ) && - 0 != (pFmt = (SwFrmFmt*)pFirst->GetMaster().GetHeader().GetHeaderFmt()) ) - { - if( bHeaderUL && aHSz.GetHeight() ) pFmt->SetAttr( aHSz ); - if( bHeaderLR ) pFmt->SetAttr( aHLR ); - } - - if( ( bFooterUL || bFooterLR ) && - 0 != ( pFmt = (SwFrmFmt*)pFirst->GetMaster().GetFooter().GetFooterFmt()) ) - { - if( bFooterUL ) pFmt->SetAttr( aFUL ); - if( bFooterLR ) pFmt->SetAttr( aFLR ); - } - } - - const SwPageDesc& rOld = pDoc->GetPageDesc( nLastPageDesc ); - if( bInsNewPageDesc && pFirst && - pDoc->GetPageDesc( nLastFirstPageDesc ).GetFollow() != &rOld ) - { - bCheckEqualPgDesc = FALSE; - } - - if( bInsPageDesc && ( !bCheckEqualPgDesc || !bInsNewPageDesc || - // dann pruefe ob die Attribute beider PageDesc gleich sind - !::lcl_CompareRTFPageDesc(pDoc->GetPageDesc( nLastPageDesc ), *pAkt )) - || ( bMakeNewPageDesc && SVX_BREAK_NONE != eBreak ) ) - { - // Pagedescriptoren am Dokument updaten (nur so werden auch die - // linken Seiten usw. eingestellt). - - // Spaltigkeit in den Set uebernehmen - SfxItemSet* pSet = 0; - const SfxPoolItem* pItem; - SfxItemSet aSet( pDoc->GetAttrPool(), RES_COL, RES_FRAMEDIR ); - if( SFX_ITEM_SET == pAkt->GetMaster().GetItemState( - RES_COL, FALSE, &pItem ) - && 1 < ((SwFmtCol*)pItem)->GetColumns().Count() ) - { - aSet.Put( *pItem ); - pSet = &aSet; - pAkt->GetMaster().ResetAttr( RES_COL ); - if( pFirst ) - pFirst->GetMaster().ResetAttr( RES_COL ); - } - - if (bIsRTL && aFrmDir.GetValue() == FRMDIR_HORI_LEFT_TOP) - aFrmDir.SetValue(FRMDIR_HORI_RIGHT_TOP); - aSet.Put(aFrmDir); - - pDoc->ChgPageDesc( nAktPageDesc, *pAkt ); - - if( pSet ) - { - SwSection aSect( CONTENT_SECTION, pDoc->GetUniqueSectionName() ); - SwSection* pSect = pDoc->Insert( *pPam, aSect, &aSet); - pPam->DeleteMark(); - - SwSectionNode* pSectNd = pSect->GetFmt()->GetSectionNode( TRUE ); - if( pRegionEndIdx ) - *pRegionEndIdx = *pSectNd->EndOfSectionNode(); - else - pRegionEndIdx = new SwNodeIndex( *pSectNd->EndOfSectionNode()); - - pPam->GetPoint()->nNode = *pSectNd; - pPam->Move( fnMoveForward, fnGoNode ); - - // Attribut Enden ggfs. anpassen!!!! - if( GetAttrStack().Count() ) - { - // Attribut Stack-Eintraege, muessen ans Ende des vorherigen - // Nodes verschoben werden. - for( USHORT n = GetAttrStack().Count(); n; ) + break; + default: + if (RTF_DOCFMT == (nToken & ~(0xff | RTF_SWGDEFS))) + ReadDocControls( nToken ); + else if (RTF_SECTFMT == (nToken & ~(0xff | RTF_SWGDEFS)) || + RTF_UNKNOWNCONTROL == nToken) { - SvxRTFItemStackType* pStkEntry = (SvxRTFItemStackType*) - GetAttrStack()[ --n ]; - if( pRegionEndIdx->GetIndex() == pStkEntry->GetSttNode().GetIdx() ) - pStkEntry->SetStartPos( SwxPosition( pPam ) ); + SvxRTFParser::NextToken(nToken); } - } - } - - if( bInsNewPageDesc ) - { - SwFmtPageDesc aPgDsc( pAkt ); - - if( pFirst ) - { - // Pagedescriptoren am Dokument updaten (nur so werden auch die - // linken Seiten usw. eingestellt). - pDoc->ChgPageDesc( nAktFirstPageDesc, *pFirst ); - pFirst->Add( &aPgDsc ); - } - - if( USHRT_MAX != nPgStart ) - aPgDsc.SetNumOffset( nPgStart ); - pDoc->Insert( *pPam, aPgDsc ); - } - } - else - { - // sollte es ein BereichsWechsel sein? - if( bCheckEqualPgDesc && SVX_BREAK_NONE == eBreak - /*&& (!bInsPageDesc || neuen Bereich aufsetzen - rOld.GetMaster().GetCol() != pAkt->GetMaster().GetCol() )*/ ) - { - // Spaltigkeit in den Set uebernehmen - SfxItemSet* pSet = 0; - const SfxPoolItem* pItem; - SfxItemSet aSet( pDoc->GetAttrPool(), RES_COL, RES_FRAMEDIR); - if( SFX_ITEM_SET == pAkt->GetMaster().GetItemState( - RES_COL, FALSE, &pItem ) - && 1 < ((SwFmtCol*)pItem)->GetColumns().Count() ) - { - aSet.Put( *pItem ); - pSet = &aSet; - } - - if( bNoBalancedCols ) - { - aSet.Put( SwFmtNoBalancedColumns( TRUE ) ); - pSet = &aSet; - } - - if (bIsRTL && aFrmDir.GetValue() == FRMDIR_HORI_LEFT_TOP) - aFrmDir.SetValue(FRMDIR_HORI_RIGHT_TOP); - aSet.Put(aFrmDir); - - if( !bFirstCall || pSet ) - { - SwSection aSect( CONTENT_SECTION, pDoc->GetUniqueSectionName() ); - SwSection* pSect = pDoc->Insert( *pPam, aSect, &aSet ); - pPam->DeleteMark(); - - SwSectionNode* pSectNd = pSect->GetFmt()->GetSectionNode( TRUE ); - if( pRegionEndIdx ) - *pRegionEndIdx = *pSectNd->EndOfSectionNode(); else - pRegionEndIdx = new SwNodeIndex( *pSectNd->EndOfSectionNode()); - - pPam->GetPoint()->nNode = *pSectNd; - pPam->Move( fnMoveForward, fnGoNode ); - - // Attribut Enden ggfs. anpassen!!!! - if( GetAttrStack().Count() ) - { - // Attribut Stack-Eintraege, muessen ans Ende des vorherigen - // Nodes verschoben werden. - for( USHORT n = GetAttrStack().Count(); n; ) - { - SvxRTFItemStackType* pStkEntry = (SvxRTFItemStackType*) - GetAttrStack()[ --n ]; - if( pRegionEndIdx->GetIndex() == pStkEntry->GetSttNode().GetIdx() ) - pStkEntry->SetStartPos( SwxPosition( pPam ) ); - } - } - } - } - else if( bInsPageDesc ) - { - if(SVX_BREAK_COLUMN_BEFORE == eBreak ) - pDoc->Insert( *pPam, SvxFmtBreakItem( eBreak )); - else if( SVX_BREAK_NONE != eBreak ) - { - SwFmtPageDesc aPgDsc( ( pFirst && &rOld == - pDoc->GetPageDesc( nLastFirstPageDesc ).GetFollow() ) - ? &pDoc->_GetPageDesc( nLastFirstPageDesc ) - : &rOld ); - - if( USHRT_MAX != nPgStart ) - aPgDsc.SetNumOffset( nPgStart ); - pDoc->Insert( *pPam, aPgDsc ); - } - } - - // der aktuelle muss wieder entnfernt werden - if( bInsNewPageDesc ) - { - pDoc->DelPageDesc( nAktPageDesc ); - if( pFirst ) - pDoc->DelPageDesc( nAktFirstPageDesc ); - nAktPageDesc = nLastPageDesc; - nAktFirstPageDesc = nLastFirstPageDesc; + bWeiter = false; + break; } - } - SkipToken( -1 ); -} + if (bWeiter) + nToken = GetNextToken(); + } while (bWeiter && IsParserWorking()); + maSegments.push_back(rtfSection(*pPam->GetPoint(), aNewSection)); + SkipToken(-1); +} void SwRTFParser::ReadPageDescTbl() { @@ -2359,7 +2308,7 @@ void SwRTFParser::ReadPageDescTbl() SetChkStyleAttr(FALSE); // Attribute nicht gegen die Styles checken - bInPgDscTbl = TRUE; + bInPgDscTbl = true; USHORT nPos = 0; SwPageDesc* pPg; SwFrmFmt* pPgFmt; @@ -2410,11 +2359,14 @@ void SwRTFParser::ReadPageDescTbl() break; case RTF_PGDSC: - if( nPos) // kein && wg MAC - if (nPos != pDoc->MakePageDesc( - String::CreateFromInt32( nTokenValue ), - FALSE ) ) - ASSERT( FALSE, "PageDesc an falscher Position" ); + if (nPos) // kein && wg MAC + { + if (nPos != pDoc->MakePageDesc( + String::CreateFromInt32(nTokenValue))) + { + ASSERT( FALSE, "PageDesc an falscher Position" ); + } + } pPg = &pDoc->_GetPageDesc( nPos ); pPg->SetLandscape( FALSE ); @@ -2630,10 +2582,10 @@ void SwRTFParser::ReadPageDescTbl() SetChkStyleAttr( bSaveChkStyleAttr ); - bInPgDscTbl = FALSE; + bInPgDscTbl = false; nAktPageDesc = 0; nAktFirstPageDesc = 0; - bSwPageDesc = TRUE; + bSwPageDesc = true; SkipToken( -1 ); } @@ -2863,6 +2815,11 @@ void SwRTFParser::ReadHeaderFooter( int nToken, SwPageDesc* pPageDesc ) pPam->GetPoint()->nNode = *pNode->EndOfSectionNode(); pPam->Move( fnMoveBackward ); + SwTxtFmtColl* pColl = aTxtCollTbl.Get( 0 ); + if( !pColl ) + pColl = pDoc->GetTxtCollFromPoolSimple( RES_POOLCOLL_STANDARD, FALSE ); + pDoc->SetTxtFmtColl( *pPam, pColl ); + SetNewGroup( TRUE ); while( !( nOpenBrakets == GetOpenBrakets() && !GetStackPos()) && IsParserWorking() ) @@ -3560,3 +3517,5 @@ xub_StrLen SwxPosition::GetCntIdx() const { return pPam->GetPoint()->nContent.GetIndex(); } + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/rtf/swparrtf.hxx b/sw/source/filter/rtf/swparrtf.hxx index 7c6214928039..ef2ad13664d9 100644 --- a/sw/source/filter/rtf/swparrtf.hxx +++ b/sw/source/filter/rtf/swparrtf.hxx @@ -2,9 +2,9 @@ * * $RCSfile: swparrtf.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: os $ $Date: 2002-12-10 14:30:10 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:41:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,12 +58,21 @@ * * ************************************************************************/ + +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ + #ifndef _SWPARRTF_HXX #define _SWPARRTF_HXX #ifndef __SGI_STL_MAP #include <map> #endif +#ifndef __SGI_STL_DEQUE +#include <deque> +#endif +#ifndef __SGI_STL_VECTOR +#include <vector> +#endif #ifndef _SVSTDARR_HXX #define _SVSTDARR_BOOLS @@ -72,6 +81,9 @@ #ifndef _SVXRTF_HXX //autogen #include <svx/svxrtf.hxx> #endif +#ifndef _SVX_NUMITEM_HXX +#include <svx/numitem.hxx> +#endif #ifndef _NDINDEX_HXX #include <ndindex.hxx> @@ -162,10 +174,124 @@ typedef SwFlySave* SwFlySavePtr; SV_DECL_PTRARR_DEL( SwFlySaveArr, SwFlySavePtr, 0, 20 ) SV_DECL_VARARR( SwListArr, SwListEntry, 0, 20 ) +struct DocPageInformation +{ + long mnPaperw; + long mnPaperh; + long mnMargl; + long mnMargr; + long mnMargt; + long mnMargb; + long mnGutter; + long mnPgnStart; + bool mbFacingp; + bool mbLandscape; + bool mbRTLdoc; + DocPageInformation(); +}; + +struct SectPageInformation +{ + std::vector<long> maColumns; + SvxNumberType maNumType; + SwPageDesc *mpTitlePageHdFt; + SwPageDesc *mpPageHdFt; + long mnPgwsxn; + long mnPghsxn; + long mnMarglsxn; + long mnMargrsxn; + long mnMargtsxn; + long mnMargbsxn; + long mnGutterxsn; + long mnHeadery; + long mnFootery; + long mnPgnStarts; + long mnCols; + long mnColsx; + long mnStextflow; + int mnBkc; + bool mbLndscpsxn; + bool mbTitlepg; + bool mbFacpgsxn; + bool mbRTLsection; + bool mbPgnrestart; + SectPageInformation(const DocPageInformation &rDoc); + SectPageInformation(const SectPageInformation &rSect); +}; + +class rtfSection +{ +public: + rtfSection(const SwPosition &rPos, + const SectPageInformation &rPageInfo); + SwNodeIndex maStart; + SectPageInformation maPageInfo; + SwSection *mpSection; + SwPageDesc *mpTitlePage; + SwPageDesc *mpPage; + + bool IsContinous() const { return maPageInfo.mnBkc == 0; } + long NoCols() const { return maPageInfo.mnCols; } + long StandardColSeperation() const { return maPageInfo.mnColsx; } + bool HasTitlePage() const { return maPageInfo.mbTitlepg; } + long PageStartAt() const { return maPageInfo.mnPgnStarts; } + bool PageRestartNo() const { return maPageInfo.mbPgnrestart; } + bool IsBiDi() const { return maPageInfo.mbRTLsection; } + sal_uInt16 GetPageWidth() const { return maPageInfo.mnPgwsxn; } + sal_uInt16 GetPageHeight() const { return maPageInfo.mnPghsxn; } + sal_uInt16 GetPageLeft() const { return maPageInfo.mnMarglsxn; } + sal_uInt16 GetPageRight() const { return maPageInfo.mnMargrsxn; } + bool IsLandScape() const { return maPageInfo.mbLndscpsxn; } +}; + +class rtfSections +{ +private: + SwRTFParser &mrReader; + std::deque<rtfSection> maSegments; + typedef std::deque<rtfSection>::iterator mySegIter; + typedef std::deque<rtfSection>::reverse_iterator mySegrIter; + + struct wwULSpaceData + { + bool bHasHeader, bHasFooter; + short nSwHLo, nHdUL, nSwFUp, nFtUL, nSwUp, nSwLo; + wwULSpaceData() : bHasHeader(false), bHasFooter(false) {} + }; + + void SetSegmentToPageDesc(const rtfSection &rSection, bool bTitlePage, + bool bIgnoreCols); + SwSectionFmt *InsertSection(SwPaM& rMyPaM, rtfSection &rSection); + void SetPage(SwPageDesc &rInPageDesc, SwFrmFmt &rFmt, + const rtfSection &rSection, bool bIgnoreCols); + void GetPageULData(const rtfSection &rSection, bool bFirst, + wwULSpaceData& rData); + void SetPageULSpaceItems(SwFrmFmt &rFmt, wwULSpaceData& rData); + bool SetCols(SwFrmFmt &rFmt, const rtfSection &rSection, + USHORT nNettoWidth); + void SetHdFt(rtfSection &rSection); + void CopyFrom(const SwPageDesc &rFrom, SwPageDesc &rDest); +public: + bool empty() const { return maSegments.empty(); } + int size() const { return maSegments.size(); } + void push_back(const rtfSection &rSect); + rtfSection& back() { return maSegments.back(); } + const rtfSection& back() const { return maSegments.back(); } + void InsertSegments(bool bIsNewDoc); + rtfSections(SwRTFParser &rReader) : mrReader(rReader) {} + std::vector<sal_uInt16> maDummyPageNos; + typedef std::vector<sal_uInt16>::iterator myDummyIter; + void PrependedInlineNode(const SwPosition &rPos, + const SwNode &rNode); +}; class SwRTFParser : public SvxRTFParser { - ::std::map<SwTableNode *, SwNodeIndex *> maTables; + friend class rtfSections; + DocPageInformation maPageDefaults; + rtfSections maSegments; + + std::map<SwTableNode *, SwNodeIndex *> maTables; SwRTFStyleTbl aTxtCollTbl; SwRTFCharStyleTbl aCharFmtTbl; SwFlySaveArr aFlyArr; // Flys als Letzes im Doc setzen @@ -196,7 +322,6 @@ class SwRTFParser : public SvxRTFParser bool bInPgDscTbl; // beim PageDescTbl lesen bool bNewNumList; // Word 7.0 NumList gelesen, 6.0 ueberspringen bool bFirstContinue; // 1.Call ins Continue - bool bFirstDocControl; // 1.Call of ReadDocControl /* #i9243# @@ -220,7 +345,7 @@ class SwRTFParser : public SvxRTFParser void ReadListLevel( SwNumRule& rRule, BYTE nLvl ); void ReadListTable(); void ReadListOverrideTable(); - void ReadNumSecLevel( int nToken ); + SwNumRule *ReadNumSecLevel( int nToken ); SwNumRule* GetNumRuleOfListNo( long nListNo, BOOL bRemoveFromList = FALSE ); void RemoveUnusedNumRule( SwNumRule* ); @@ -281,7 +406,9 @@ protected: void ReadField(); void ReadHeaderFooter( int nToken, SwPageDesc* pPageDesc = 0 ); void ReadDocControls( int nToken ); + void SetPageInformationAsDefault(const DocPageInformation &rInfo); void ReadSectControls( int nToken ); + void DoHairyWriterPageDesc(int nToken); void ReadFly( int nToken, SfxItemSet* pFillSet = 0 ); void ReadTable( int nToken ); void ReadPageDescTbl(); @@ -303,5 +430,5 @@ public: #endif - //_SWPARRTF_HXX +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx index 5beba34636cd..2bd0e368bc17 100644 --- a/sw/source/filter/writer/writer.cxx +++ b/sw/source/filter/writer/writer.cxx @@ -2,9 +2,9 @@ * * $RCSfile: writer.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: cmc $ $Date: 2002-04-08 12:47:23 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -561,7 +561,7 @@ void Writer::_AddFontItem( SfxItemPool& rPool, const SvxFontItem& rFont ) else pItem = (SvxFontItem*)&rPool.Put( rFont ); - if( 1 < pItem->GetRef() ) + if( 1 < pItem->GetRefCount() ) rPool.Remove( *pItem ); else { @@ -588,7 +588,6 @@ void Writer::CreateBookmarkTbl() // search alle Bookmarks in the range and return it in the Array -// this is exclusive of bookmarks on the end point of the range USHORT Writer::GetBookmarks( const SwCntntNode& rNd, xub_StrLen nStt, xub_StrLen nEnd, SvPtrarr& rArr ) { @@ -598,23 +597,31 @@ USHORT Writer::GetBookmarks( const SwCntntNode& rNd, xub_StrLen nStt, SvPtrarr* pArr = pImpl->pBkmkNodePos ? pImpl->pBkmkNodePos->Get( nNd ) : 0; if( pArr ) { - for( USHORT n = 0; n < pArr->Count(); ++n ) + // there exist some bookmarks, search now all which is in the range + if( !nStt && nEnd == rNd.Len() ) + // all + rArr.Insert( pArr, 0 ); + else { + USHORT n; xub_StrLen nCntnt; - void* p = (*pArr)[ n ]; - const SwBookmark& rBkmk = *(SwBookmark*)p; - if( rBkmk.GetPos().nNode == nNd && - (nCntnt = rBkmk.GetPos().nContent.GetIndex() ) >= nStt && - nCntnt < nEnd ) + for( n = 0; n < pArr->Count(); ++n ) { - rArr.Insert( p, rArr.Count() ); - } - else if( rBkmk.GetOtherPos() && nNd == - rBkmk.GetOtherPos()->nNode.GetIndex() && (nCntnt = - rBkmk.GetOtherPos()->nContent.GetIndex() ) >= nStt && + void* p = (*pArr)[ n ]; + const SwBookmark& rBkmk = *(SwBookmark*)p; + if( rBkmk.GetPos().nNode == nNd && + (nCntnt = rBkmk.GetPos().nContent.GetIndex() ) >= nStt && nCntnt < nEnd ) - { - rArr.Insert( p, rArr.Count() ); + { + rArr.Insert( p, rArr.Count() ); + } + else if( rBkmk.GetOtherPos() && nNd == + rBkmk.GetOtherPos()->nNode.GetIndex() && (nCntnt = + rBkmk.GetOtherPos()->nContent.GetIndex() ) >= nStt && + nCntnt < nEnd ) + { + rArr.Insert( p, rArr.Count() ); + } } } } diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx index 1d0dd51d60f2..dae105bab0bb 100644 --- a/sw/source/filter/ww1/fltshell.cxx +++ b/sw/source/filter/ww1/fltshell.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fltshell.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: cmc $ $Date: 2002-12-06 16:36:26 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2193,3 +2193,17 @@ void SwFltShell::NextStyle(USHORT nWhich, USHORT nNext) *pColls[nNext]->GetColl() ); } +// UpdatePageDescs muss am Ende des Einlesevorganges aufgerufen werden, damit +// der Writer den Inhalt der Pagedescs wirklich akzeptiert +void UpdatePageDescs(SwDoc &rDoc, sal_uInt16 nInPageDescOffset) +{ + // Pagedescriptoren am Dokument updaten (nur so werden auch die + // linken Seiten usw. eingestellt). + + // PageDesc "Standard" + rDoc.ChgPageDesc(0, rDoc.GetPageDesc(0)); + + // PageDescs "Konvert..." + for (sal_uInt16 i = nInPageDescOffset; i < rDoc.GetPageDescCnt(); ++i) + rDoc.ChgPageDesc(i, rDoc.GetPageDesc(i)); +} diff --git a/sw/source/filter/ww8/dump/dump8a.cxx b/sw/source/filter/ww8/dump/dump8a.cxx index fa4cb5d3cdb7..8f600b156cbe 100644 --- a/sw/source/filter/ww8/dump/dump8a.cxx +++ b/sw/source/filter/ww8/dump/dump8a.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dump8a.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: cmc $ $Date: 2002-12-06 16:39:31 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses diff --git a/sw/source/filter/ww8/escher.hxx b/sw/source/filter/ww8/escher.hxx index de208f41c6b7..69540d71c497 100644 --- a/sw/source/filter/ww8/escher.hxx +++ b/sw/source/filter/ww8/escher.hxx @@ -2,9 +2,9 @@ * * $RCSfile: escher.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 12:41:14 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifndef _ESCHER_HXX @@ -95,6 +94,8 @@ protected: virtual INT32 WriteFlyFrameAttr(const SwFrmFmt& rFmt, MSO_SPT eShapeType, EscherPropertyContainer& rPropOpt); + void WritePicture(EscherPropertyContainer &rPropOpt, + const Graphic &rGraphic, const SdrObject &rObj, sal_uInt32 nShapeId); void WriteGrfAttr(const SwNoTxtNode& rNd,EscherPropertyContainer& rPropOpt); INT32 DrawModelToEmu(INT32 nVal) const @@ -160,3 +161,5 @@ private: }; #endif + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/makefile.mk b/sw/source/filter/ww8/makefile.mk index 871fb0e1905b..bb764bcf8090 100644 --- a/sw/source/filter/ww8/makefile.mk +++ b/sw/source/filter/ww8/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: vg $ $Date: 2002-08-27 15:35:22 $ +# last change: $Author: hr $ $Date: 2003-03-27 15:42:06 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -121,6 +121,7 @@ SLOFILES = \ $(SLO)$/ww8scan.obj EXCEPTIONSFILES = \ + $(SLO)$/ww8par5.obj \ $(SLO)$/ww8graf2.obj diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 5e79c975b557..3df30b6a441f 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: wrtw8esh.cxx,v $ * - * $Revision: 1.57 $ + * $Revision: 1.58 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 12:41:14 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,6 +59,8 @@ * ************************************************************************/ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ + #ifdef PCH #include "filt_pch.hxx" #endif @@ -160,6 +162,9 @@ #ifndef _SVX_UNOAPI_HXX_ #include <svx/unoapi.hxx> #endif +#ifndef _SVDXCGV_HXX +#include <svx/svdxcgv.hxx> +#endif #ifndef _COM_SUN_STAR_UNO_REFERENCE_H_ #include <com/sun/star/uno/Reference.h> #endif @@ -1377,29 +1382,9 @@ INT32 SwBasicEscherEx::WriteOLEFlyFrame(const SwFrmFmt& rFmt, UINT32 nShapeId) #endif OpenContainer(ESCHER_SpContainer); - AddShape(ESCHER_ShpInst_PictureFrame, 0xa10, nShapeId); EscherPropertyContainer aPropOpt; + WritePicture(aPropOpt, aGraphic, *pSdrObj, nShapeId); - GraphicObject aGraphicObject(aGraphic); - ByteString aId = aGraphicObject.GetUniqueID(); - if (aId.Len()) - { - Size aSz(rOLENd.GetTwipSize()); - aSz.Width() = DrawModelToEmu(aSz.Width()); - aSz.Height() = DrawModelToEmu(aSz.Height()); - Rectangle aRect(Point(0,0), aSz); - - sal_uInt32 nBlibId = GetBlibID(*QueryPicStream(), aId, aRect, 0); - if (nBlibId) - { - aPropOpt.AddOpt(ESCHER_Prop_fillType, ESCHER_FillPicture); - aPropOpt.AddOpt(ESCHER_Prop_pib, nBlibId, sal_True); - } - } - - SetPicId(*pSdrObj, nShapeId, aPropOpt); - - aPropOpt.AddOpt(ESCHER_Prop_pictureActive, 0x10000); nBorderThick = WriteFlyFrameAttr(rFmt, mso_sptPictureFrame, aPropOpt); WriteGrfAttr(rOLENd, aPropOpt); aPropOpt.Commit(GetStream()); @@ -1768,21 +1753,6 @@ void SwEscherEx::FinishEscher() pEscherStrm->Seek(0); *rWrt.pTableStrm << *pEscherStrm; delete pEscherStrm, pEscherStrm = 0; - - /*#82587# Everytime MS 2000 creates an escher stream there is always an - ObjectPool dir (even if empty). It turns out that if a copy of MS 2000 is - used to open a document that contains escher graphics exported from - StarOffice without this empty dir then *if* that copy of MS Office has - never been used to open a MSOffice document that has escher graphics (and - an ObjectPool dir of course) and that copy of office has not been used to - draw escher graphics then our exported graphics do not appear. Once you - do open a ms document with escher graphics or draw an escher graphic with - that copy of word, then all documents from staroffice that contain escher - work from then on. Tricky to track down, some sort of late binding - trickery in MS where solely for first time initialization the existence - of an ObjectPool dir is necessary for triggering some magic. cmc*/ - rWrt.GetStorage().OpenStorage(CREATE_CONST_ASC(SL::aObjectPool), - STREAM_READWRITE | STREAM_SHARE_DENYALL); } extern "C" @@ -2402,22 +2372,47 @@ INT32 SwEscherEx::WriteTxtFlyFrame(const SwFrmFmt& rFmt, UINT32 nShapeId, return nBorderThick; } +void SwBasicEscherEx::WritePicture(EscherPropertyContainer &rPropOpt, + const Graphic &rGraphic, const SdrObject &rObj, sal_uInt32 nShapeId) +{ + AddShape( ESCHER_ShpInst_PictureFrame, 0xa10, nShapeId ); + + GraphicObject aGraphicObject(rGraphic); + ByteString aId = aGraphicObject.GetUniqueID(); + if (aId.Len()) + { + Rectangle aRect = rObj.GetLogicRect(); + aRect.SetPos(Point(0,0)); + aRect.Right() = DrawModelToEmu(aRect.Right()); + aRect.Bottom() = DrawModelToEmu(aRect.Bottom()); + sal_uInt32 nBlibId = GetBlibID(*QueryPicStream(), aId, aRect, 0); + if (nBlibId) + { + rPropOpt.AddOpt(ESCHER_Prop_fillType, ESCHER_FillPicture); + rPropOpt.AddOpt(ESCHER_Prop_pib, nBlibId, sal_True); + } + } + + SetPicId(rObj, nShapeId, rPropOpt); + rPropOpt.AddOpt( ESCHER_Prop_pictureActive, 0x10000 ); +} + void SwEscherEx::WriteOCXControl( const SwFrmFmt& rFmt, UINT32 nShapeId ) { if (const SdrObject* pSdrObj = rFmt.FindRealSdrObject()) { OpenContainer( ESCHER_SpContainer ); - AddShape( ESCHER_ShpInst_PictureFrame, 0xa10, nShapeId ); + SdrModel *pModel = rWrt.pDoc->GetDrawModel(); + OutputDevice *pDevice = Application::GetDefaultDevice(); + ASSERT(pModel && pDevice, "no model or device"); + SdrExchangeView aExchange(pModel, pDevice); + Graphic aGraphic(aExchange.GetObjGraphic(pModel, + const_cast<SdrObject*>(pSdrObj))); EscherPropertyContainer aPropOpt; - Size aSz( pSdrObj->GetLogicRect().GetSize() ); - aSz.Width() = DrawModelToEmu( aSz.Width() ); - aSz.Height() = DrawModelToEmu( aSz.Height() ); + WritePicture(aPropOpt, aGraphic, *pSdrObj, nShapeId); - SetPicId(*pSdrObj, nShapeId, aPropOpt); - - aPropOpt.AddOpt( ESCHER_Prop_pictureActive, 0x10000 ); WriteFlyFrameAttr( rFmt, mso_sptPictureFrame , aPropOpt ); aPropOpt.Commit( GetStream() ); @@ -2554,10 +2549,11 @@ bool SwMSConvertControls::ExportControl(Writer &rWrt, const SdrObject *pObj) //I think I painted myself into a little bit of a //corner by trying to use the uno interface for //controls export - Size aTempSize=pFormObj->GetLogicRect().GetSize(); + Rectangle aRect = pFormObj->GetLogicRect(); + aRect.SetPos(Point(0,0)); awt::Size aSize; - aSize.Width = TWIPS_TO_MM(aTempSize.A()); - aSize.Height = TWIPS_TO_MM(aTempSize.B()); + aSize.Width = TWIPS_TO_MM(aRect.Right()); + aSize.Height = TWIPS_TO_MM(aRect.Bottom()); //Open the ObjectPool SvStorageRef xObjPool = rWW8Wrt.GetStorage().OpenStorage( @@ -2600,3 +2596,5 @@ bool SwMSConvertControls::ExportControl(Writer &rWrt, const SdrObject *pObj) rWW8Wrt.OutField( 0, 87, aEmptyStr, WRITEFIELD_END | WRITEFIELD_CLOSE ); return true; } + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 6892c7b64b3e..52d61a085d48 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -2,9 +2,9 @@ * * $RCSfile: wrtw8nds.cxx,v $ * - * $Revision: 1.46 $ + * $Revision: 1.47 $ * - * last change: $Author: cmc $ $Date: 2002-12-05 17:53:19 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifdef PCH @@ -447,7 +446,7 @@ WW8_SwAttrIter::WW8_SwAttrIter(SwWW8Writer& rWr, const SwTxtNode& rTxtNd) } } - ::std::sort(maFlyFrms.begin(), maFlyFrms.end(), sortswflys()); + std::sort(maFlyFrms.begin(), maFlyFrms.end(), sortswflys()); maFlyIter = maFlyFrms.begin(); @@ -1095,7 +1094,7 @@ void WW8_SwAttrIter::FieldVanish( const String& rTxt ) void WW8_SwAttrIter::OutSwTOXMark(const SwTOXMark& rAttr, bool bStart) { // its a field; so get the Text form the Node and build the field - ASSERT( !bStart, "calls only with the endposition!" ); + ASSERT( bStart, "calls only with the startposition!" ); String sTxt; const SwTxtTOXMark& rTxtTOXMark = *rAttr.GetTxtTOXMark(); @@ -1162,7 +1161,7 @@ bool WW8_SwAttrIter::OutAttrWithRange( xub_StrLen nPos ) OutSwFmtINetFmt((SwFmtINetFmt&)*pItem, true); bRet = true; } - else if (nPos == *pHt->GetEnd()) + if( 0 != ( pEnd = pHt->GetEnd() ) && nPos == *pEnd ) OutSwFmtINetFmt((SwFmtINetFmt&)*pItem, false); } break; @@ -1176,10 +1175,11 @@ bool WW8_SwAttrIter::OutAttrWithRange( xub_StrLen nPos ) OutSwFmtRefMark((SwFmtRefMark&)*pItem, false); break; case RES_TXTATR_TOXMARK: - if( nPos == *pHt->GetStart() ) + if (nPos == *pHt->GetStart()) + { + OutSwTOXMark((SwTOXMark&)*pItem, true); bRet = true; - if( 0 != ( pEnd = pHt->GetEnd() ) && nPos == *pEnd ) - OutSwTOXMark((SwTOXMark&)*pItem, false); + } break; case RES_TXTATR_CJK_RUBY: if( nPos == *pHt->GetStart() ) @@ -1454,10 +1454,10 @@ Writer& OutWW8_SwTxtNode( Writer& rWrt, SwCntntNode& rNode ) if( nNextAttr > nEnd ) nNextAttr = nEnd; - //Append bookmarks in this range, exclusive of final position - //of this range - rWW8Wrt.AppendBookmarks( *pNd, nAktPos, nNextAttr - nAktPos ); aAttrIter.OutFlys(nAktPos); + //Append bookmarks in this range after flys, exclusive of final + //position of this range + rWW8Wrt.AppendBookmarks( *pNd, nAktPos, nNextAttr - nAktPos ); bool bTxtAtr = aAttrIter.IsTxtAttr( nAktPos ); bool bAttrWithRange = aAttrIter.OutAttrWithRange( nAktPos ); @@ -1475,10 +1475,10 @@ Writer& OutWW8_SwTxtNode( Writer& rWrt, SwCntntNode& rNode ) bRedlineAtEnd = true; else { - //insert final bookmarks if any before CR - rWW8Wrt.AppendBookmarks( *pNd, nEnd, 1 ); //insert final graphic anchors if any before CR aAttrIter.OutFlys(nEnd); + //insert final bookmarks if any before CR and after flys + rWW8Wrt.AppendBookmarks( *pNd, nEnd, 1 ); if( pTOXSect ) rWW8Wrt.EndTOX( *pTOXSect ); rWW8Wrt.WriteCR(); // CR danach @@ -1494,7 +1494,8 @@ Writer& OutWW8_SwTxtNode( Writer& rWrt, SwCntntNode& rNode ) // Ausnahme: Fussnoten am Zeilenende if( nNextAttr == nEnd ) { - aAttrIter.OutAttrWithRange( nEnd ); + if (nAktPos != nEnd) + aAttrIter.OutAttrWithRange(nEnd); if( pO->Count() ) { rWW8Wrt.pChpPlc->AppendFkpEntry( rWrt.Strm().Tell(), @@ -1504,10 +1505,10 @@ Writer& OutWW8_SwTxtNode( Writer& rWrt, SwCntntNode& rNode ) if( bTxtAtr || bAttrWithRange || bRedlineAtEnd ) { - //insert final bookmarks if any before CR - rWW8Wrt.AppendBookmarks( *pNd, nEnd, 1 ); //insert final graphic anchors if any before CR aAttrIter.OutFlys(nEnd); + //insert final bookmarks if any before CR and after flys + rWW8Wrt.AppendBookmarks( *pNd, nEnd, 1 ); if( pTOXSect ) rWW8Wrt.EndTOX( *pTOXSect ); @@ -2498,4 +2499,4 @@ SwNodeFnTab aWW8NodeFnTab = { /* RES_OLENODE */ OutWW8_SwOleNode, }; - +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx index e026691b6e7a..d141e30bfd8d 100644 --- a/sw/source/filter/ww8/wrtw8num.cxx +++ b/sw/source/filter/ww8/wrtw8num.cxx @@ -2,9 +2,9 @@ * * $RCSfile: wrtw8num.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 12:41:14 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifdef PCH @@ -759,4 +758,4 @@ bool SwWW8Writer::Out_SwNum(const SwTxtNode* pNd) return bRet; } - +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index ef300ddcd85a..b70026858c55 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -2,9 +2,9 @@ * * $RCSfile: wrtw8sty.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: cmc $ $Date: 2002-11-07 16:54:14 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,6 +59,8 @@ * ************************************************************************/ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ + #ifdef PCH #include "filt_pch.hxx" #endif @@ -1284,7 +1286,8 @@ bool WW8_WrPlcSepx::WriteKFTxt(SwWW8Writer& rWrt) rWrt.pISet = pOldI; - bOutPgDscSet = false; + if (nBreakCode == 0) + bOutPgDscSet = false; } } @@ -1448,36 +1451,39 @@ bool WW8_WrPlcSepx::WriteKFTxt(SwWW8Writer& rWrt) ? &pPd->GetFollow()->GetMaster() : &pPd->GetLeft(); - SetHeaderFlag( nHeadFootFlags, *pPdFmt, WW8_HEADER_ODD ); - SetFooterFlag( nHeadFootFlags, *pPdFmt, WW8_FOOTER_ODD ); - if( !pPd->IsHeaderShared() || bLeftRightPgChain ) - SetHeaderFlag( nHeadFootFlags, *pPdLeftFmt, WW8_HEADER_EVEN ); - if( !pPd->IsFooterShared() || bLeftRightPgChain ) - SetFooterFlag( nHeadFootFlags, *pPdLeftFmt, WW8_FOOTER_EVEN ); - if( pPdFmt != pPdFirstPgFmt ) + if (nBreakCode != 0) { - // es gibt eine ErsteSeite: - SetHeaderFlag( nHeadFootFlags, *pPdFirstPgFmt, WW8_HEADER_FIRST ); - SetFooterFlag( nHeadFootFlags, *pPdFirstPgFmt, WW8_FOOTER_FIRST ); - } + SetHeaderFlag( nHeadFootFlags, *pPdFmt, WW8_HEADER_ODD ); + SetFooterFlag( nHeadFootFlags, *pPdFmt, WW8_FOOTER_ODD ); + if( !pPd->IsHeaderShared() || bLeftRightPgChain ) + SetHeaderFlag( nHeadFootFlags, *pPdLeftFmt, WW8_HEADER_EVEN ); + if( !pPd->IsFooterShared() || bLeftRightPgChain ) + SetFooterFlag( nHeadFootFlags, *pPdLeftFmt, WW8_FOOTER_EVEN ); + if( pPdFmt != pPdFirstPgFmt ) + { + // es gibt eine ErsteSeite: + SetHeaderFlag( nHeadFootFlags, *pPdFirstPgFmt, WW8_HEADER_FIRST ); + SetFooterFlag( nHeadFootFlags, *pPdFirstPgFmt, WW8_FOOTER_FIRST ); + } - if( nHeadFootFlags && !rWrt.bWrtWW8 ) - { - BYTE nTmpFlags = nHeadFootFlags; - if( rWrt.pDop->fFacingPages ) + if( nHeadFootFlags && !rWrt.bWrtWW8 ) { - if( !(nTmpFlags & WW8_FOOTER_EVEN) && - (nTmpFlags & WW8_FOOTER_ODD ) ) - nTmpFlags |= WW8_FOOTER_EVEN; + BYTE nTmpFlags = nHeadFootFlags; + if( rWrt.pDop->fFacingPages ) + { + if( !(nTmpFlags & WW8_FOOTER_EVEN) && + (nTmpFlags & WW8_FOOTER_ODD ) ) + nTmpFlags |= WW8_FOOTER_EVEN; - if( !(nTmpFlags & WW8_HEADER_EVEN) && - (nTmpFlags & WW8_HEADER_ODD ) ) - nTmpFlags |= WW8_HEADER_EVEN; - } + if( !(nTmpFlags & WW8_HEADER_EVEN) && + (nTmpFlags & WW8_HEADER_ODD ) ) + nTmpFlags |= WW8_HEADER_EVEN; + } - // sprmSGprfIhdt, wird nur noch im WW95 benoetigt - pO->Insert( 153, pO->Count() ); - pO->Insert( nTmpFlags, pO->Count() ); + // sprmSGprfIhdt, wird nur noch im WW95 benoetigt + pO->Insert( 153, pO->Count() ); + pO->Insert( nTmpFlags, pO->Count() ); + } } if( pO->Count() ) @@ -1976,3 +1982,4 @@ const SvULongs* WW8_WrPlcSubDoc::GetShapeIdArr() const return 0; } +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index d9c6c19fd2ba..d63167058d06 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -2,9 +2,9 @@ * * $RCSfile: wrtww8.cxx,v $ * - * $Revision: 1.50 $ + * $Revision: 1.51 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 12:41:14 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,6 +59,8 @@ * ************************************************************************/ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ + #ifdef PCH #include "filt_pch.hxx" #pragma hdrstop @@ -280,7 +282,8 @@ class WW8_WrtBookmarks private: SvULongs aSttCps, aEndCps; // Array of Start- and End CPs SvBools aFieldBookmarks; // If the bookmark is in a field result - ::std::vector<String> maSwBkmkNms; // Array of Sw - Bookmarknames + std::vector<String> maSwBkmkNms; // Array of Sw - Bookmarknames + typedef std::vector<String>::iterator myIter; USHORT GetPos( const String& rNm ); @@ -301,7 +304,7 @@ public: class WW8_WrtRedlineAuthor { private: - ::std::vector<String> maAuthors; // Array of Sw - Bookmarknames + std::vector<String> maAuthors; // Array of Sw - Bookmarknames USHORT GetPos( const String& rNm ); @@ -1323,15 +1326,19 @@ void WW8_WrtBookmarks::Append( WW8_CP nStartCp, const String& rNm ) { // new -> insert as start position nPos = aSttCps.Count(); + myIter aIter = maSwBkmkNms.end(); // sort by startposition // theory: write continuous -> then the new position is at end while( nPos && aSttCps[ nPos - 1 ] > ULONG( nStartCp )) + { --nPos; + --aIter; + } aSttCps.Insert(nStartCp, nPos); aEndCps.Insert(nStartCp, nPos); aFieldBookmarks.Insert(BOOL(false), nPos); - maSwBkmkNms.push_back(rNm); + maSwBkmkNms.insert(aIter, rNm); } else { @@ -1375,7 +1382,7 @@ void WW8_WrtBookmarks::Write( SwWW8Writer& rWrt ) rWrt.pFib->fcPlcfbkf = rStrm.Tell(); for( i = 0; i < nCount; ++i ) SwWW8Writer::WriteLong( rStrm, aSttCps[ i ] ); - SwWW8Writer::WriteLong( rStrm, rWrt.pFib->ccpText ); + SwWW8Writer::WriteLong(rStrm, rWrt.pFib->ccpText + rWrt.pFib->ccpTxbx); for( i = 0; i < nCount; ++i ) { ULONG nEndCP = aEndCps[ i ]; @@ -1397,7 +1404,7 @@ void WW8_WrtBookmarks::Write( SwWW8Writer& rWrt ) rWrt.pFib->fcPlcfbkl = rStrm.Tell(); for( i = 0; i < nCount; ++i ) SwWW8Writer::WriteLong( rStrm, aEndSortTab[ i ] ); - SwWW8Writer::WriteLong( rStrm, rWrt.pFib->ccpText ); + SwWW8Writer::WriteLong(rStrm, rWrt.pFib->ccpText + rWrt.pFib->ccpTxbx); rWrt.pFib->lcbPlcfbkl = rStrm.Tell() - rWrt.pFib->fcPlcfbkl; } } @@ -1487,8 +1494,8 @@ void SwWW8Writer::AppendBookmark( const String& rName, USHORT nOffset ) USHORT WW8_WrtRedlineAuthor::AddName( const String& rNm ) { USHORT nRet; - typedef ::std::vector<String>::iterator myiter; - myiter aIter = ::std::find(maAuthors.begin(), maAuthors.end(), rNm); + typedef std::vector<String>::iterator myiter; + myiter aIter = std::find(maAuthors.begin(), maAuthors.end(), rNm); if (aIter != maAuthors.end()) nRet = aIter - maAuthors.begin(); else @@ -1518,7 +1525,7 @@ USHORT SwWW8Writer::AddRedlineAuthor( USHORT nId ) //-------------------------------------------------------------------------- /* */ -void SwWW8Writer::WriteAsStringTable(const ::std::vector<String>& rStrings, +void SwWW8Writer::WriteAsStringTable(const std::vector<String>& rStrings, INT32& rfcSttbf, INT32& rlcbSttbf, USHORT nExtraLen) { USHORT n, nCount = rStrings.size(); @@ -1997,6 +2004,32 @@ void SwWW8Writer::WriteFkpPlcUsw() pFldTxtBxs->Write( *this ); // Fields ( Textboxes ) pFldHFTxtBxs->Write( *this ); // Fields ( Head/Foot-Textboxes ) + if (pEscher || pDoc->ContainsMSVBasic()) + { + /* + #82587# Everytime MS 2000 creates an escher stream there is always + an ObjectPool dir (even if empty). It turns out that if a copy of + MS 2000 is used to open a document that contains escher graphics + exported from StarOffice without this empty dir then *if* that + copy of MS Office has never been used to open a MSOffice document + that has escher graphics (and an ObjectPool dir of course) and + that copy of office has not been used to draw escher graphics then + our exported graphics do not appear. Once you do open a ms + document with escher graphics or draw an escher graphic with that + copy of word, then all documents from staroffice that contain + escher work from then on. Tricky to track down, some sort of late + binding trickery in MS where solely for first time initialization + the existence of an ObjectPool dir is necessary for triggering + some magic. cmc + */ + /* + #10570# Similiarly having msvbasic storage seems to also trigger + creating this stream + */ + GetStorage().OpenStorage(CREATE_CONST_ASC(SL::aObjectPool), + STREAM_READWRITE | STREAM_SHARE_DENYALL); + } + // dggInfo - escher stream WriteEscher(); @@ -2011,6 +2044,9 @@ void SwWW8Writer::WriteFkpPlcUsw() OutListTab(); // listformats - LSTF OutOverrideListTab(); // - "" - - LFO OutListNamesTab(); // - "" - - ListNames + + RestoreMacroCmds(); + pMagicTable->Write( *this ); pPiece->WritePc( *this ); // Piece-Table @@ -2500,3 +2536,32 @@ void WW8_WrPlcTxtBoxes::WritePlc( SwWW8Writer& rWrt ) const rWrt.pFib->lcbPlcfHdrtxbxTxt ); } } + +void SwWW8Writer::RestoreMacroCmds() +{ + pFib->fcCmds = pTableStrm->Tell(); + + SvStorageRef xSrcRoot(pDoc->GetDocShell()->GetStorage()); + SvStorageStreamRef xSrcStream = + xSrcRoot->OpenStream(CREATE_CONST_ASC(SL::aMSMacroCmds), + STREAM_STD_READ | STREAM_NOCREATE ); + + if (xSrcStream.Is() && SVSTREAM_OK == xSrcStream->GetError()) + { + xSrcStream->Seek(STREAM_SEEK_TO_END); + pFib->lcbCmds = xSrcStream->Tell(); + xSrcStream->Seek(0); + + sal_uInt8 *pBuffer = new sal_uInt8[pFib->lcbCmds]; + xSrcStream->Read(pBuffer, pFib->lcbCmds); + pTableStrm->Write(pBuffer, pFib->lcbCmds); + delete[] pBuffer; + + } + + // set len to FIB + pFib->lcbCmds = pTableStrm->Tell() - pFib->fcCmds; +} + + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 17e293158737..693ae2a09550 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -2,9 +2,9 @@ * * $RCSfile: wrtww8.hxx,v $ * - * $Revision: 1.42 $ + * $Revision: 1.43 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 12:41:15 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifndef _WRTWW8_HXX @@ -449,6 +448,9 @@ friend Writer& OutWW8_SwTxtNode( Writer& rWrt, SwCntntNode& rNode ); void OutListTab(); void OutOverrideListTab(); void OutListNamesTab(); + + void RestoreMacroCmds(); + void InitFontTable(); public: SwPosFlyFrms maFlyPos; // Pointer auf die aktuelle "FlyFrmTabelle" @@ -958,3 +960,5 @@ Writer& OutWW8_SwFmtVertOrient( Writer& rWrt, const SfxPoolItem& rHt ); #endif // _WRTWW8_HXX + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index 1f910c57884d..7b7dd1a8d67d 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: wrtww8gr.cxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: cmc $ $Date: 2002-12-02 10:29:38 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifdef PRECOMPILED @@ -68,8 +67,8 @@ #pragma hdrstop -#ifndef _TOOLS_SOLMATH_H -#include <tools/solmath.hxx> +#ifndef INCLUDED_RTL_MATH_HXX +#include <rtl/math.hxx> #endif #ifndef _FILTER_HXX //autogen @@ -436,7 +435,10 @@ void SwWW8Writer::OutGrf( const SwNoTxtNode* pNd ) GetItem(RES_CHRATR_FONTSIZE)).GetHeight(); nHeight-=nFontHeight/20; - Set_UInt16( pArr, 0x4845 ); + if (bWrtWW8) + Set_UInt16( pArr, 0x4845 ); + else + Set_UInt8( pArr, 101 ); Set_UInt16( pArr, -((INT16)nHeight)); } } @@ -651,7 +653,7 @@ void SwWW8WrGrf::WritePICFHeader(SvStream& rStrm, const SwNoTxtNode* pNd, if( aGrTwipSz.Width() + nXSizeAdd ) // set mx { double fVal = nWidth * 1000.0 / (aGrTwipSz.Width() + nXSizeAdd); - Set_UInt16( pArr, (USHORT)SolarMath::Round(fVal) ); + Set_UInt16( pArr, (USHORT)::rtl::math::round(fVal) ); } else pArr += 2; @@ -659,7 +661,7 @@ void SwWW8WrGrf::WritePICFHeader(SvStream& rStrm, const SwNoTxtNode* pNd, if( aGrTwipSz.Height() + nYSizeAdd ) // set my { double fVal = nHeight * 1000.0 / (aGrTwipSz.Height() + nYSizeAdd); - Set_UInt16( pArr, (USHORT)SolarMath::Round(fVal) ); + Set_UInt16( pArr, (USHORT)::rtl::math::round(fVal) ); } else pArr += 2; @@ -854,3 +856,5 @@ void SwWW8WrGrf::Write() } } } + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 254e096b02b9..7aa202240167 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8atr.cxx,v $ * - * $Revision: 1.56 $ + * $Revision: 1.57 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 12:41:15 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ /* @@ -2921,6 +2920,8 @@ ULONG SwWW8Writer::ReplaceCr( BYTE nChar ) { // then write as normal char WriteChar(nChar); + pPiece->SetParaBreak(); + pPapPlc->AppendFkpEntry(rStrm.Tell()); nRetPos = rStrm.Tell(); } #ifdef PRODUCT @@ -4451,5 +4452,4 @@ SwAttrFnTab aWW8AttrFnTab = { /* RES_UNKNOWNATR_CONTAINER */ 0 }; - - +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx index 718879b9c7a8..3e3a482373a2 100644 --- a/sw/source/filter/ww8/ww8glsy.cxx +++ b/sw/source/filter/ww8/ww8glsy.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8glsy.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 12:41:15 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifdef PRECOMPILED @@ -150,8 +149,8 @@ bool WW8Glossary::HasBareGraphicEnd(SwDoc *pDoc,SwNodeIndex &rIdx) } bool WW8Glossary::MakeEntries(SwDoc *pD, SwTextBlocks &rBlocks, - bool bSaveRelFile, const ::std::vector<String>& rStrings, - const ::std::vector<String>& rExtra) + bool bSaveRelFile, const std::vector<String>& rStrings, + const std::vector<String>& rExtra) { // this code will be called after reading all text into the // empty sections @@ -254,8 +253,8 @@ bool WW8Glossary::Load( SwTextBlocks &rBlocks, bool bSaveRelFile ) if( pGlossary->IsGlossaryFib() && rBlocks.StartPutMuchBlockEntries() ) { //read the names of the autotext entries - ::std::vector<String> aStrings; - ::std::vector<String> aExtra; + std::vector<String> aStrings; + std::vector<String> aExtra; rtl_TextEncoding eStructCharSet = WW8Fib::GetFIBCharset(pGlossary->chseTables); @@ -388,3 +387,4 @@ UINT32 WW8GlossaryFib::FindGlossaryFibOffset(SvStream &rTableStrm, return nEndLastPage; } +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8glsy.hxx b/sw/source/filter/ww8/ww8glsy.hxx index 446b3bb98ac1..3780e79c33da 100644 --- a/sw/source/filter/ww8/ww8glsy.hxx +++ b/sw/source/filter/ww8/ww8glsy.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8glsy.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 12:41:15 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifndef _WW8GLSY_HXX @@ -130,3 +129,5 @@ private: WW8Glossary& operator=(const WW8Glossary&); }; #endif + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index e95418262017..af0a29d65524 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8graf.cxx,v $ * - * $Revision: 1.91 $ + * $Revision: 1.92 $ * - * last change: $Author: cmc $ $Date: 2002-12-12 13:50:33 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #pragma hdrstop @@ -311,9 +310,8 @@ void wwFrameNamer::SetUniqueGraphName(SwFrmFmt *pFrmFmt, const String &rFixed) { if (mbIsDisabled || !rFixed.Len()) return; - mnImportedGraphicsCount++; String aName(msSeed); - aName += String::CreateFromInt32(mnImportedGraphicsCount); + aName += String::CreateFromInt32(++mnImportedGraphicsCount); aName.APPEND_CONST_ASC( ": " ); aName += rFixed; pFrmFmt->SetName( aName ); @@ -346,7 +344,7 @@ bool SwWW8ImplReader::ReadGrafStart(void* pData, short nDataSiz, if( eAnchor == FLY_AT_CNTNT ) { if( SVBT8ToByte( pDo->bx ) == 1 ) // Pos: echt links - nDrawXOfs2 -= nPgLeft; + nDrawXOfs2 -= maSectionManager.GetPageLeft(); if( nInTable ) // Obj in Table nDrawXOfs2 -= GetTableLeft(); // -> siehe Kommentar // bei GetTableLeft() @@ -354,9 +352,11 @@ bool SwWW8ImplReader::ReadGrafStart(void* pData, short nDataSiz, else { if( SVBT8ToByte( pDo->bx ) != 1 ) - nDrawXOfs2 += nPgLeft; + nDrawXOfs2 += maSectionManager.GetPageLeft(); +#if 0 if( SVBT8ToByte( pDo->by ) == 0 ) - nDrawYOfs2 += nPgTop; + nDrawYOfs2 += maSectionManager.GetPageTop(); +#endif } return true; @@ -2168,9 +2168,9 @@ void SwWW8ImplReader::SetAttributesAtGrfNode( SvxMSDffImportRec* pRecord, //gamma if (WW8ITEMVALUE(rOldSet, SDRATTR_GRAFGAMMA, SdrGrafGamma100Item)) { - SwGammaGrf aGamma(WW8ITEMVALUE(rOldSet, SDRATTR_GRAFGAMMA, - SdrGrafGamma100Item)); - pGrfNd->SetAttr( aGamma ); + double fVal = WW8ITEMVALUE(rOldSet, SDRATTR_GRAFGAMMA, + SdrGrafGamma100Item); + pGrfNd->SetAttr(SwGammaGrf(fVal/100.)); } //drawmode @@ -2380,8 +2380,8 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord, if (rParentHori.GetRelationOrient() == REL_PG_FRAME) { - pFSPA->nXaLeft -= nPgLeft; - pFSPA->nXaRight -= nPgLeft; + pFSPA->nXaLeft -= maSectionManager.GetPageLeft(); + pFSPA->nXaRight -= maSectionManager.GetPageLeft(); } } } @@ -2686,7 +2686,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp ) pRecord = aData.GetRecord(nTxbx); if (pRecord && pRecord->pObj && pRecord->aTextId.nTxBxS) { - MungeTextIntoDrawBox(pRecord->pObj, pRecord, + pRetFrmFmt = MungeTextIntoDrawBox(pRecord->pObj, pRecord, nGrafAnchorCp, pRetFrmFmt); } } @@ -2718,14 +2718,13 @@ void SwWW8ImplReader::RemoveAutoAnchor(const SwFrmFmt *pFmt) pAnchorStck->RemoveAnchor(pFmt); } -void SwWW8ImplReader::MungeTextIntoDrawBox(SdrObject* pTrueObject, +SwFrmFmt* SwWW8ImplReader::MungeTextIntoDrawBox(SdrObject* pTrueObject, SvxMSDffImportRec *pRecord, long nGrafAnchorCp, SwFrmFmt* pRetFrmFmt) { SdrTextObj* pSdrTextObj; // Pruefen, ob Gruppenobjekt (z.B. zwei Klammern) vorliegt - SdrObjGroup* pThisGroup = PTR_CAST(SdrObjGroup, pRecord->pObj); - if( pThisGroup ) + if (SdrObjGroup* pThisGroup = PTR_CAST(SdrObjGroup, pRecord->pObj)) { // Gruppenobjekte haben keinen Text. Fuege ein Textobjekt in die // Gruppe ein, um den Text zu halten. @@ -2751,23 +2750,7 @@ void SwWW8ImplReader::MungeTextIntoDrawBox(SdrObject* pTrueObject, pThisGroup->GetSubList()->NbcInsertObject(pSdrTextObj); } else - { pSdrTextObj = PTR_CAST(SdrTextObj, pRecord->pObj); - /* - Die Frage: was tun, wenn hier false hereuskommt, z.B. bei - 3D-Objekten (nicht von SdrTextObj abgeleitet) - - Wunsch: neues SdrTextObj hinzufuegen, das mit dem alten in einer - neu zu schaffenden Gruppe geklammert wird. - - Implementierung: nicht zur 5.1 (jp und khz am 11.02.1999) - - if( !pSdrTextObj ) - { - ... - } - */ - } if( pSdrTextObj ) { @@ -2785,7 +2768,7 @@ void SwWW8ImplReader::MungeTextIntoDrawBox(SdrObject* pTrueObject, bEraseThisObject, 0, 0, 0, 0, pRecord); // wurde dieses Objekt ersetzt ?? - if( bEraseThisObject ) + if (bEraseThisObject) { if( pGroupObject || (pSdrTextObj != pTrueObject) ) { @@ -2814,6 +2797,7 @@ void SwWW8ImplReader::MungeTextIntoDrawBox(SdrObject* pTrueObject, // und FrameFormat entfernen, da durch Grafik ersetzt (dies // loescht auch das Objekt) rDoc.DelFrmFmt( pRetFrmFmt ); + pRetFrmFmt = 0; // auch den Objektmerker loeschen pRecord->pObj = 0; } @@ -2830,6 +2814,7 @@ void SwWW8ImplReader::MungeTextIntoDrawBox(SdrObject* pTrueObject, pSdrTextObj->SetItemSetAndBroadcast(aItemSet); } } + return pRetFrmFmt; } SwFlyFrmFmt* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject, @@ -2903,10 +2888,9 @@ SwFlyFrmFmt* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject, contact object, while a raw rpOutNewObject stored here becomes deleted and useless. */ - pMSDffManager->StoreShapeOrder( pF->nSpId, + pMSDffManager->StoreShapeOrder(pF->nSpId, (((ULONG)pRecord->aTextId.nTxBxS) << 16) + - pRecord->aTextId.nSequence, 0, pRetFrmFmt, - nActSectionNo + bIsHeader ? 1 : 0 + bIsFooter ? 2 : 0 ); + pRecord->aTextId.nSequence, 0, pRetFrmFmt); // Das Kontakt-Objekt MUSS in die Draw-Page gesetzt werden, damit // in SwWW8ImplReader::LoadDoc1() die Z-Order festgelegt werden @@ -3015,7 +2999,7 @@ SwFlyFrmFmt* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObject, SetAttributesAtGrfNode( pRecord, pRetFrmFmt, pF ); } // mehrfaches Auftreten gleicher Grafik-Namen vermeiden - aGrfNameGenerator.SetUniqueGraphName(pRetFrmFmt, aObjectName); + maGrfNameGenerator.SetUniqueGraphName(pRetFrmFmt, aObjectName); } //falls alles Ok, Zeiger auf neues Objekt ermitteln und Z-Order-Liste //entsprechend korrigieren (oder Eintrag loeschen) @@ -3135,3 +3119,5 @@ void SwWW8FltAnchorStack::Flush() --nCnt; } } + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8graf.hxx b/sw/source/filter/ww8/ww8graf.hxx index d39a060a3fd4..c0e09d1efc95 100644 --- a/sw/source/filter/ww8/ww8graf.hxx +++ b/sw/source/filter/ww8/ww8graf.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8graf.hxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: cmc $ $Date: 2002-12-12 10:16:26 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifndef _WW8GRAF_HXX @@ -121,3 +120,5 @@ public: void WW8FSPAShadowToReal( WW8_FSPA_SHADOW* pFSPAS, WW8_FSPA* pPic ); #endif + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx index 8bfb65e9a2da..e839f69147f3 100644 --- a/sw/source/filter/ww8/ww8graf2.cxx +++ b/sw/source/filter/ww8/ww8graf2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8graf2.cxx,v $ * - * $Revision: 1.45 $ + * $Revision: 1.46 $ * - * last change: $Author: cmc $ $Date: 2002-12-12 10:16:26 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifdef PCH @@ -269,6 +268,7 @@ void wwZOrderer::InsertDrawingObject(SdrObject* pObj, short nWwHeight) void wwZOrderer::InsertTextLayerObject(SdrObject* pObject) { + pObject->SetLayer(mnHeaven); if (maIndexes.empty()) { InsertObject(pObject, mnNoInitialObjects + mnInlines); @@ -319,7 +319,7 @@ ULONG wwZOrderer::GetDrawingObjectPos(short nWwHeight) bool wwZOrderer::InsertObject(SdrObject* pObject, ULONG nPos) { - if (!mpDrawPg->IsInserted()) + if (!pObject->IsInserted()) { mpDrawPg->InsertObject(pObject, nPos); return true; @@ -876,9 +876,7 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj, pRet = InsertOle(*((SdrOle2Obj*)pObject),aAttrSet); else { - SdrGrafObj* pGraphObject = 0; - pGraphObject = PTR_CAST(SdrGrafObj, pObject); - if( pGraphObject ) + if (SdrGrafObj* pGraphObject = PTR_CAST(SdrGrafObj, pObject)) { // Nun den Link bzw. die Grafik ins Doc stopfen const Graphic& rGraph = pGraphObject->GetGraphic(); @@ -925,6 +923,8 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj, } } } + else + pRet = rDoc.Insert(*pPaM, *pObject, &aAttrSet); } // also nur, wenn wir ein *Insert* gemacht haben if (pRet) @@ -935,21 +935,23 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj, if (pObject->HasSetName()) pRet->SetName(pObject->GetName()); else - aGrfNameGenerator.SetUniqueGraphName(pRet,aObjectName); + maGrfNameGenerator.SetUniqueGraphName(pRet,aObjectName); // Zeiger auf neues Objekt ermitteln und Z-Order-Liste // entsprechend korrigieren (oder Eintrag loeschen) - SdrObject* pOurNewObject = CreateContactObject(pRet); - if (pOurNewObject) + if (SdrObject* pOurNewObject = CreateContactObject(pRet)) { - pMSDffManager->ExchangeInShapeOrder( pObject, 0, 0, - pOurNewObject ); - - // altes SdrGrafObj aus der Page loeschen und - // zerstoeren - if (pObject->GetPage()) - pDrawPg->RemoveObject(pObject->GetOrdNum()); - delete pObject; + if (pOurNewObject != pObject) + { + pMSDffManager->ExchangeInShapeOrder( pObject, 0, 0, + pOurNewObject ); + + // altes SdrGrafObj aus der Page loeschen und + // zerstoeren + if (pObject->GetPage()) + pDrawPg->RemoveObject(pObject->GetOrdNum()); + delete pObject; + } } else pMSDffManager->RemoveFromShapeOrder( pObject ); @@ -961,7 +963,7 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj, if (pTextObj && !bTextObjWasGrouped && pTextObj->GetPage()) pDrawPg->RemoveObject( pTextObj->GetOrdNum() ); } - pMSDffManager->EnableFallbackStream(); + pMSDffManager->EnableFallbackStream(); } else if (aPic.lcb >= 58) pRet = ImportGraf1(aPic, pDataStream, nPicLocFc); @@ -1041,3 +1043,5 @@ void WW8FSPAShadowToReal( WW8_FSPA_SHADOW * pFSPAS, WW8_FSPA * pFSPA ) pFSPA->nTxbx = SVBT32ToLong( pFSPAS->nTxbx ); } #endif // defined __WW8_NEEDS_COPY + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index bfe106dcfc40..cd6912e468c8 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8par.cxx,v $ * - * $Revision: 1.102 $ + * $Revision: 1.103 $ * - * last change: $Author: aidan $ $Date: 2002-12-10 15:51:51 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifdef PCH @@ -228,6 +227,9 @@ #ifndef _UNODRAW_HXX #include <unodraw.hxx> #endif +#ifndef _SWTABLE_HXX +#include <swtable.hxx> // class SwTableLines, ... +#endif #ifndef _COM_SUN_STAR_I18N_FORBIDDENCHARACTERS_HPP_ #include <com/sun/star/i18n/ForbiddenCharacters.hpp> @@ -265,23 +267,19 @@ SwMSDffManager::SwMSDffManager( SwWW8ImplReader& rRdr ) UINT32 SwMSDffManager::GetFilterFlags() { - UINT32 nFlags = 0; - const OfaFilterOptions* pOpt = OFF_APP()->GetFilterOptions(); - if( pOpt->IsMathType2Math() ) - nFlags |= OLE_MATHTYPE_2_STARMATH; -/* - // !! don't convert the OLE-Object into the own format - if( pOpt->IsWinWord2Writer() ) - nFlags |= OLE_WINWORD_2_STARWRITER; -*/ - if( pOpt->IsExcel2Calc() ) - nFlags |= OLE_EXCEL_2_STARCALC; - if( pOpt->IsPowerPoint2Impress() ) - nFlags |= OLE_POWERPOINT_2_STARIMPRESS; + UINT32 nFlags(0); + if (const OfaFilterOptions* pOpt = OFF_APP()->GetFilterOptions()) + { + if (pOpt->IsMathType2Math()) + nFlags |= OLE_MATHTYPE_2_STARMATH; + if (pOpt->IsExcel2Calc()) + nFlags |= OLE_EXCEL_2_STARCALC; + if (pOpt->IsPowerPoint2Impress()) + nFlags |= OLE_POWERPOINT_2_STARIMPRESS; + } return nFlags; } - /* * I would like to override the default OLE importing to add a test * and conversion of OCX controls from their native OLE type into our @@ -771,8 +769,8 @@ void SwWW8ImplReader::ImportDop() { DateTime aLastPrinted( WW8ScannerBase::WW8DTTM2DateTime(pWDop->dttmLastPrint)); - SfxDocumentInfo* pNeuDocInf = new SfxDocumentInfo(*rDoc.GetpInfo()); - SfxStamp aPrinted(pNeuDocInf->GetPrinted()); + SfxDocumentInfo aNeuDocInf(*rDoc.GetpInfo()); + SfxStamp aPrinted(aNeuDocInf.GetPrinted()); if (aPrinted.GetTime() != aLastPrinted) { // check if WW8 date was set @@ -785,9 +783,8 @@ void SwWW8ImplReader::ImportDop() else aPrinted.SetTime( aLastPrinted ); - pNeuDocInf->SetPrinted( aPrinted ); - rDoc.SetInfo( *pNeuDocInf ); - delete pNeuDocInf; + aNeuDocInf.SetPrinted( aPrinted ); + rDoc.SetInfo(aNeuDocInf); } } @@ -879,12 +876,9 @@ WW8ReaderSave::WW8ReaderSave(SwWW8ImplReader* pRdr ,WW8_CP nStartCp) mpSFlyPara(pRdr->pSFlyPara), mpTableDesc(pRdr->pTableDesc), mnInTable(pRdr->nInTable), mnAktColl(pRdr->nAktColl), mcSymbol(pRdr->cSymbol), mbIgnoreText(pRdr->bIgnoreText), - mbDontCreateSep(pRdr->bDontCreateSep), mbSymbol(pRdr->bSymbol), - mbHdFtFtnEdn(pRdr->bHdFtFtnEdn), mbTxbxFlySection(pRdr->bTxbxFlySection), - mbAnl(pRdr->bAnl), mbInHyperlink(pRdr->bInHyperlink), - mbPgSecBreak(pRdr->bPgSecBreak), - //Honestly should inherit this from parent environment so don't reset this - mbVerticalEnviron(pRdr->bVerticalEnviron), + mbSymbol(pRdr->bSymbol), mbHdFtFtnEdn(pRdr->bHdFtFtnEdn), + mbTxbxFlySection(pRdr->bTxbxFlySection), mbAnl(pRdr->bAnl), + mbInHyperlink(pRdr->bInHyperlink), mbPgSecBreak(pRdr->bPgSecBreak), mbWasParaEnd(pRdr->bWasParaEnd), mbHasBorder(pRdr->bHasBorder) { pRdr->bHdFtFtnEdn = true; @@ -906,13 +900,17 @@ WW8ReaderSave::WW8ReaderSave(SwWW8ImplReader* pRdr ,WW8_CP nStartCp) // rette die Attributverwaltung: dies ist noetig, da der neu anzulegende // PLCFx Manager natuerlich auf die gleichen FKPs zugreift, wie der alte // und deren Start-End-Positionen veraendert... - pRdr->pPlcxMan->SaveAllPLCFx(maPLCFxSave); + if (pRdr->pPlcxMan) + pRdr->pPlcxMan->SaveAllPLCFx(maPLCFxSave); if (nStartCp != -1) { pRdr->pPlcxMan = new WW8PLCFMan(pRdr->pSBase, mpOldPlcxMan->GetManType(), nStartCp); } + + maOldApos.push_back(false); + maOldApos.swap(pRdr->maApos); } void WW8ReaderSave::Restore( SwWW8ImplReader* pRdr ) @@ -923,13 +921,11 @@ void WW8ReaderSave::Restore( SwWW8ImplReader* pRdr ) pRdr->cSymbol = mcSymbol; pRdr->bSymbol = mbSymbol; pRdr->bIgnoreText = mbIgnoreText; - pRdr->bDontCreateSep = mbDontCreateSep; pRdr->bHdFtFtnEdn = mbHdFtFtnEdn; pRdr->bTxbxFlySection = mbTxbxFlySection; pRdr->nInTable = mnInTable; pRdr->bAnl = mbAnl; pRdr->bInHyperlink = mbInHyperlink; - pRdr->bVerticalEnviron = mbVerticalEnviron; pRdr->bWasParaEnd = mbWasParaEnd; pRdr->bPgSecBreak = mbPgSecBreak; pRdr->nAktColl = mnAktColl; @@ -954,7 +950,9 @@ void WW8ReaderSave::Restore( SwWW8ImplReader* pRdr ) delete pRdr->pPlcxMan; pRdr->pPlcxMan = mpOldPlcxMan; } - pRdr->pPlcxMan->RestoreAllPLCFx(maPLCFxSave); + if (pRdr->pPlcxMan) + pRdr->pPlcxMan->RestoreAllPLCFx(maPLCFxSave); + pRdr->maApos.swap(maOldApos); } void SwWW8ImplReader::Read_HdFtFtnText( const SwNodeIndex* pSttIdx, @@ -1044,38 +1042,17 @@ long SwWW8ImplReader::Read_And(WW8PLCFManResult* pRes) return 0; } -//----------------------------------------- -// Header und Footer -//----------------------------------------- - -void SwWW8ImplReader::Read_HdFtText(long nStartCp, long nLen, SwPageDesc* pPD, - bool bUseLeft, bool bFooter) +void SwWW8ImplReader::Read_HdFtText(long nStart, long nLen, SwFrmFmt* pHdFtFmt) { - SwFrmFmt* pFmt = ( bUseLeft ) ? &pPD->GetLeft() : &pPD->GetMaster(); - SwFrmFmt* pHdFtFmt; - - if( bFooter ) - { - bIsFooter = true; - pFmt->SetAttr(SwFmtFooter(true)); - pHdFtFmt = (SwFrmFmt*)pFmt->GetFooter().GetFooterFmt(); - }else - { - bIsHeader = true; - pFmt->SetAttr(SwFmtHeader(true)); - pHdFtFmt = (SwFrmFmt*)pFmt->GetHeader().GetHeaderFmt(); - } - const SwNodeIndex* pSttIdx = pHdFtFmt->GetCntnt().GetCntntIdx(); if (!pSttIdx) return; SwPosition aTmpPos( *pPaM->GetPoint() ); // merke alte Cursorposition - Read_HdFtFtnText( pSttIdx, nStartCp, nLen - 1, MAN_HDFT ); + Read_HdFtFtnText(pSttIdx, nStart, nLen - 1, MAN_HDFT); *pPaM->GetPoint() = aTmpPos; - bIsHeader = bIsFooter = false; } BYTE SwWW8ImplReader::HdFtCorrectPara( BYTE nPara ) @@ -1084,7 +1061,8 @@ BYTE SwWW8ImplReader::HdFtCorrectPara( BYTE nPara ) long nLen; BYTE nNewPara = nPara; - for( BYTE nI = 0x20; nI; nI >>= 1 ) + for (BYTE nI = 0x20; nI; nI >>= 1) + { if( ( nI & nPara ) && pHdFt && ( !pHdFt->GetTextPos( nPara, nI, start, nLen ) || nLen <= 2 ) ) @@ -1092,13 +1070,15 @@ BYTE SwWW8ImplReader::HdFtCorrectPara( BYTE nPara ) { nNewPara &= ~nI; // leere KF-Texte nicht anlegen } + } // Wenn im Doc keine Facing Pages vorhanden sind, sollen // die geraden Header/Footer ignoriert werden. // Die Facing Pages lassen sich nur Doc-weit, // nicht aber abschnittsweise umschalten ! if( pWDop->fFacingPages ) - { // Wenn pDoc->FacingPages + { + // Wenn pDoc->FacingPages // if( nNewPara & WW8_HEADER_ODD ) // und ungerader Header vorhanden // nNewPara |= WW8_HEADER_EVEN; // ... dann muss auch ein gerader // Header erzeugt werden @@ -1112,7 +1092,8 @@ BYTE SwWW8ImplReader::HdFtCorrectPara( BYTE nPara ) return nNewPara; } -void SwWW8ImplReader::Read_HdFt1( BYTE nPara, BYTE nWhichItems, SwPageDesc* pPD ) +void SwWW8ImplReader::Read_HdFt(BYTE nWhichItems, int nSect, SwPageDesc* pPD, + const SwPageDesc *pPrev) { if( pHdFt ) { @@ -1121,83 +1102,73 @@ void SwWW8ImplReader::Read_HdFt1( BYTE nPara, BYTE nWhichItems, SwPageDesc* pPD BYTE nNumber = 5; for( BYTE nI = 0x20; nI; nI >>= 1, nNumber-- ) - if( nI & nWhichItems ) + { + if (nI & nWhichItems) { bool bOk = true; if( bVer67 ) - bOk = ( pHdFt->GetTextPos( nPara, nI, start, nLen ) && nLen >= 2 ); + bOk = ( pHdFt->GetTextPos( nWhichItems, nI, start, nLen ) && nLen >= 2 ); else { - pHdFt->GetTextPosExact(nNumber+ (nActSectionNo+1)*6, start, nLen); + pHdFt->GetTextPosExact(nNumber + (nSect+1)*6, start, nLen); bOk = ( 2 <= nLen ); } - if( bOk ) + + bool bUseLeft + = (nI & ( WW8_HEADER_EVEN | WW8_FOOTER_EVEN )) ? true: false; + bool bFooter + = (nI & ( WW8_FOOTER_EVEN | WW8_FOOTER_ODD | WW8_FOOTER_FIRST )) ? true: false; + + SwFrmFmt* pFmt = bUseLeft ? &pPD->GetLeft() : &pPD->GetMaster(); + SwFrmFmt* pHdFtFmt; + if (bFooter) + { + bIsFooter = true; + pFmt->SetAttr(SwFmtFooter(true)); + pHdFtFmt = (SwFrmFmt*)pFmt->GetFooter().GetFooterFmt(); + } + else { - bool bUseLeft - = (nI & ( WW8_HEADER_EVEN | WW8_FOOTER_EVEN )) ? true: false; - bool bFooter - = (nI & ( WW8_FOOTER_EVEN | WW8_FOOTER_ODD | WW8_FOOTER_FIRST )) ? true: false; - Read_HdFtText( start, nLen, pPD, bUseLeft, bFooter ); + bIsHeader = true; + pFmt->SetAttr(SwFmtHeader(true)); + pHdFtFmt = (SwFrmFmt*)pFmt->GetHeader().GetHeaderFmt(); } + + if (bOk) + Read_HdFtText(start, nLen, pHdFtFmt); + else if (!bOk && pPrev) + CopyPageDescHdFt(pPrev, pPD, nI); + + bIsHeader = bIsFooter = false; } + } } } -void SwWW8ImplReader::SetHdFt( SwPageDesc* pPageDesc0, SwPageDesc* pPageDesc1, - BYTE nIPara ) +void wwSectionManager::SetHdFt(wwSection &rSection, int nSect, + const wwSection *pPrevious) { - - // Header / Footer nicht da oder StyleDef - if( !nCorrIhdt || ( pAktColl != 0 ) ) + // Header / Footer nicht da + if (!rSection.maSep.grpfIhdt) return; - long nOldDoc = pStrm->Tell( ); // WW-Scanner: alles retten - long nOldTbl = pTableStream->Tell(); // WW-Scanner: alles retten - WW8PLCFxSaveAll aSave; - pPlcxMan->SaveAllPLCFx( aSave ); // Attributverwaltung sichern - WW8PLCFMan* pOldPlcxMan = pPlcxMan; - - if( !pPageDesc1 ){ // 1 Pagedesc reicht - - Read_HdFt1( nIPara, - nCorrIhdt & ~( WW8_HEADER_FIRST | WW8_FOOTER_FIRST ), - pPageDesc0 ); - - }else{ // 2 Pagedescs noetig: 1.Seite und folgende - - - // 1. Seite einlesen - Read_HdFt1( nIPara, - nCorrIhdt & ( WW8_HEADER_FIRST | WW8_FOOTER_FIRST ), - pPageDesc0 ); + ASSERT(rSection.mpPage, "makes no sense to call with a main page"); + if (rSection.mpPage) + { + // 1 Pagedesc reicht + mrReader.Read_HdFt( + rSection.maSep.grpfIhdt & ~(WW8_HEADER_FIRST | WW8_FOOTER_FIRST), + nSect, rSection.mpPage, pPrevious ? pPrevious->mpPage : 0); - // Folgeseiten einlesen - Read_HdFt1( nIPara, - nCorrIhdt & ~( WW8_HEADER_FIRST | WW8_FOOTER_FIRST ), - pPageDesc1 ); } - // dann WW-Scanner-Kram restoren - pPlcxMan = pOldPlcxMan; // Attributverwaltung restoren - pPlcxMan->RestoreAllPLCFx( aSave ); - pStrm->Seek( nOldDoc ); // FilePos dito (Sprms) - pTableStream->Seek( nOldTbl ); // FilePos dito (Sprms) -} - -//----------------------------------------- -// PageDescs -//----------------------------------------- - -void SwWW8ImplReader::SetLastPgDeskIdx() -{ - if( 0 == pWDop->epc // store NodeIndex for adding section when FT-/End-Note - || 2 == pWDop->fpc ) // found that shall be on end of section. + if (rSection.mpTitlePage) { - if( pLastPgDeskIdx ) - *pLastPgDeskIdx = pPaM->GetPoint()->nNode; - else - pLastPgDeskIdx = new SwNodeIndex( pPaM->GetPoint()->nNode ); - (*pLastPgDeskIdx)--; + // 2 Pagedescs noetig: 1.Seite und folgende + // 1. Seite einlesen + mrReader.Read_HdFt( + rSection.maSep.grpfIhdt & (WW8_HEADER_FIRST | WW8_FOOTER_FIRST), + nSect, rSection.mpTitlePage, pPrevious ? pPrevious->mpTitlePage : 0); } } @@ -1263,7 +1234,9 @@ void SwWW8ImplReader::AppendTxtNode(SwPosition& rPos) { //Give ourselves a leeway of 1 twip. if ((*pTabStop)[nI].GetTabPos() + pLR->GetTxtLeft() + 1 - >= nPgWidth-nPgRight-nPgLeft) + >= maSectionManager.GetPageWidth() + - maSectionManager.GetPageRight() + - maSectionManager.GetPageLeft()) { pPaM->SetMark(); pPaM->GetMark()->nContent-=nDiff; @@ -1281,131 +1254,41 @@ void SwWW8ImplReader::AppendTxtNode(SwPosition& rPos) pAnchorStck->Flush(); } -SwPageDesc* SwWW8ImplReader::CreatePageDesc(SwPageDesc* pFirstPageDesc, - SwPaM** ppPaMWanted) +USHORT SwWW8ImplReader::TabRowSprm(int nLevel) const { - ASSERT(pFirstPageDesc || ppPaMWanted, "!pFirstPageDesc but NO ppPaMWanted"); - - bool bFollow = ( pFirstPageDesc != 0 ); - SwPageDesc* pNewPD; - USHORT nPos; - - if( bFollow - && pFirstPageDesc->GetFollow() != pFirstPageDesc ) - return pFirstPageDesc; // Fehler: hat schon Follow - - // compose name of PageDescriptor - USHORT nPageDescCount = rDoc.GetPageDescCnt(); - nPos = rDoc.MakePageDesc( - ViewShell::GetShellRes()->GetPageDescName(nPageDescCount,false,bFollow), - bFollow ? pFirstPageDesc : 0, false); - - pNewPD = &rDoc._GetPageDesc( nPos ); - - if (bFollow) - { - // Dieser ist der folgende von pPageDesc - pFirstPageDesc->SetFollow( pNewPD ); - pNewPD->SetFollow( pNewPD ); - } - else - { - // setze PgDesc-Attr ins Doc - if (InAnyApo() || bTxbxFlySection) - { - // PageDesc *muss* ausserhalb des Apo stehen - if( pSFlyPara && pSFlyPara->pMainTextPos ) - { - SwPaM aMyPaM( *pSFlyPara->GetMainTextPos() ); - if( 1 < nPageDescCount ) - AppendTxtNode( *aMyPaM.GetPoint() ); - SwFmtCol* pCol; - RemoveCols( *pNewPD, pCol ); - rDoc.Insert( aMyPaM, SwFmtPageDesc( pNewPD ) ); - if( ppPaMWanted ) - *ppPaMWanted = new SwPaM( aMyPaM ); - if( pCol ) - { - InsertSectionWithWithoutCols( aMyPaM, pCol ); - delete pCol; - } - else - SetLastPgDeskIdx(); - } - } - else - { - if( 0 < pPaM->GetPoint()->nContent.GetIndex() ) - AppendTxtNode( *pPaM->GetPoint() ); - SwFmtCol* pCol; - RemoveCols( *pNewPD, pCol ); - if( ppPaMWanted ) - *ppPaMWanted = new SwPaM( *pPaM ); - - rDoc.Insert( *pPaM, SwFmtPageDesc( pNewPD ) ); - if( pCol ) - { - InsertSectionWithWithoutCols( *pPaM, pCol ); - delete pCol; - } - else - SetLastPgDeskIdx(); - } - } - return pNewPD; + if (bVer67) + return 25; + return nLevel ? 0x244C : 0x2417; } -// UpdatePageDescs muss am Ende des Einlesevorganges aufgerufen werden, damit -// der Writer den Inhalt der Pagedescs wirklich akzeptiert -void SwWW8ImplReader::UpdatePageDescs(USHORT nInPageDescOffset) +void SwWW8ImplReader::EndSpecial() { - USHORT i; - - // Pagedescriptoren am Dokument updaten (nur so werden auch die - // linken Seiten usw. eingestellt). - - // PageDesc "Standard" - rDoc.ChgPageDesc( 0, rDoc.GetPageDesc( 0 )); + // Frame / Table / Anl + if (bAnl) + StopAnl(); // -> bAnl = false - // PageDescs "Konvert..." - for ( i=nInPageDescOffset; i < rDoc.GetPageDescCnt(); i++ ) + while(maApos.size() > 1) { - const SwPageDesc* pPD = &rDoc.GetPageDesc( i ); - rDoc.ChgPageDesc( i, *pPD ); + StopTable(); + maApos.pop_back(); + --nInTable; + if (maApos[nInTable] == true) + StopApo(); } -} -USHORT SwWW8ImplReader::TabRowSprm(int nLevel) const -{ - if (bVer67) - return 25; - return nLevel ? 0x244C : 0x2417; + if (maApos[0] == true) + StopApo(); + + ASSERT(!nInTable, "unclosed table!"); } -bool SwWW8ImplReader::ProcessSpecial(bool bAllEnd, bool* pbReSync, - WW8_CP nStartCp) // Frame / Table / Anl +bool SwWW8ImplReader::ProcessSpecial(bool &rbReSync, WW8_CP nStartCp) { + // Frame / Table / Anl if (bInHyperlink) return false; - *pbReSync = false; - if (bAllEnd) - { - if( bAnl ) - StopAnl(); // -> bAnl = false -#if 1 //revisit - ASSERT(!nInTable, "unclosed table!"); - ASSERT(maApos.size() == 1, "unclosed apo environments!"); -#else - if( nInTable && !bFtnEdn ) // Tabelle in FtnEdn nicht erlaubt - StopTable(); - if( bApo ) - StopApo(); - --nInTable; - bApo = false; -#endif - return false; - } + rbReSync = false; ASSERT(nInTable >= 0,"nInTable < 0!"); @@ -1455,7 +1338,7 @@ bool SwWW8ImplReader::ProcessSpecial(bool bAllEnd, bool* pbReSync, { WW8PLCFxSave1 aSave; pPlcxMan->GetPap()->Save( aSave ); - *pbReSync = true; + rbReSync = true; WW8PLCFx_Cp_FKP* pPap = pPlcxMan->GetPapPLCF(); WW8_CP nMyStartCp=nStartCp; @@ -1533,7 +1416,7 @@ bool SwWW8ImplReader::ProcessSpecial(bool bAllEnd, bool* pbReSync, maApos[nInTable] = StartApo(pSprm29, pNowStyleApo, pTabPos); // nach StartApo ist ein ReSync noetig ( eigentlich nur, falls die Apo // ueber eine FKP-Grenze geht - *pbReSync = true; + rbReSync = true; } if (bStartTab) { @@ -1547,7 +1430,7 @@ bool SwWW8ImplReader::ProcessSpecial(bool bAllEnd, bool* pbReSync, } // nach StartTable ist ein ReSync noetig ( eigentlich nur, falls die // Tabelle ueber eine FKP-Grenze geht - *pbReSync = true; + rbReSync = true; } return bTableRowEnd; } @@ -1750,7 +1633,11 @@ bool SwWW8ImplReader::ReadChars(long& rPos, long nNextAttr, long nTextEnd, while (true) { if (ReadPlainChars(rPos, nEnd, nCpOfs)) - return false; // Fertig, kein CR + { + if (!maApos.back()) //a para end in apo doesn't count + bWasParaEnd = false; //kein CR + return false; // Fertig + } bool bStartLine = ReadChar(rPos, nCpOfs); rPos++; @@ -1761,6 +1648,7 @@ bool SwWW8ImplReader::ReadChars(long& rPos, long nNextAttr, long nTextEnd, bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs) { + bool bNewParaEnd = false; // Unicode-Flag neu setzen und notfalls File-Pos korrigieren // merke: Seek kostet nicht viel, da inline geprueft wird, // ob die korrekte FilePos nicht schon erreicht ist. @@ -1821,6 +1709,7 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs) } break; case 0x7: + bNewParaEnd = true; TabCellEnd(); // table cell end (Flags abfragen!) break; case 0xf: @@ -1921,7 +1810,7 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs) } break; case 0xd: - bRet = true; + bNewParaEnd = bRet = true; if (nInTable > 1) { WW8PLCFspecial* pTest = pPlcxMan->GetMagicTables(); @@ -1955,6 +1844,8 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs) RTL_TEXTENCODING_MS_1252 ); AddTextToParagraph(sInsert); } + if (!maApos.back()) //a para end in apo doesn't count + bWasParaEnd = bNewParaEnd; return bRet; } @@ -1982,8 +1873,7 @@ void SwWW8ImplReader::ProcessAktCollChange(WW8PLCFManResult& rRes, { bool bReSync; // Frame / Table / Autonumbering List Level - bTabRowEnd = ProcessSpecial(false, &bReSync, - rRes.nAktCp + pPlcxMan->GetCpOfs() ); + bTabRowEnd = ProcessSpecial(bReSync, rRes.nAktCp+pPlcxMan->GetCpOfs()); if( bReSync ) *pStartAttr = pPlcxMan->Get( &rRes ); // hole Attribut-Pos neu } @@ -2009,7 +1899,8 @@ long SwWW8ImplReader::ReadTextAttr(long& rTxtPos, bool& rbStartLine) if (aRes.nFlags & MAN_MASK_NEW_SEP) // neue Section { ASSERT(pPaM->GetNode()->GetTxtNode(), "Missing txtnode"); - CreateSep( rTxtPos, bPgSecBreak ); // PageDesc erzeugen und fuellen + // PageDesc erzeugen und fuellen + maSectionManager.CreateSep(rTxtPos, bPgSecBreak); // -> 0xc war ein Sectionbreak, aber // kein Pagebreak; bPgSecBreak = false; // PageDesc erzeugen und fuellen @@ -2027,7 +1918,6 @@ long SwWW8ImplReader::ReadTextAttr(long& rTxtPos, bool& rbStartLine) // position of last CP that's to be ignored long nSkipPos = -1; - bool bOldDontCreateSep = bDontCreateSep; if( 0 < aRes.nSprmId ) // leere Attrs ignorieren { @@ -2064,7 +1954,7 @@ long SwWW8ImplReader::ReadTextAttr(long& rTxtPos, bool& rbStartLine) pStrm->Seek(pSBase->WW8Cp2Fc( pPlcxMan->GetCpOfs() + rTxtPos, &bIsUnicode)); // Find next Attr position (and Skip attributes of field contents if needed) - if( nSkipChars && !bIgnoreText ) + if (nSkipChars && !bIgnoreText) pCtrlStck->MarkAllAttrsOld(); bool bOldIgnoreText = bIgnoreText; bIgnoreText = true; @@ -2085,7 +1975,6 @@ long SwWW8ImplReader::ReadTextAttr(long& rTxtPos, bool& rbStartLine) } while( nSkipPos >= nNext ); bIgnoreText = bOldIgnoreText; - bDontCreateSep = bOldDontCreateSep; if( nSkipChars ) { pCtrlStck->KillUnlockedAttrs( *pPaM->GetPoint() ); @@ -2139,8 +2028,7 @@ void SwWW8ImplReader::CloseAttrEnds() aStack.pop(); } - bool bDummyReSync; - ProcessSpecial(true, &bDummyReSync, -1); + EndSpecial(); } bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, short nType) @@ -2166,28 +2054,6 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, short nType) pStrm->Seek( pSBase->WW8Cp2Fc( nStartCp + nCpOfs, &bIsUnicode ) ); - if ( (0 == nStartCp+nCpOfs) && SetCols(0, pPlcxMan->GetSepPLCF(), 0, true) ) - { - // Start of text: - // - // look for cols and insert a section at the very beginning... - if( !pPageDesc ) - pPageDesc = &rDoc._GetPageDesc( 0 ); - SwFrmFmt &rFmt = pPageDesc->GetMaster(); - USHORT nLIdx = ( ( pWwFib->lid & 0xff ) == 0x9 ) ? 1 : 0; - SetPage1( pPageDesc, rFmt, pPlcxMan->GetSepPLCF(), nLIdx, false); - const SwFmtCol& rCol = rFmt.GetCol(); - // if PageDesc has been inserted and has cols - // insert a *section* with cols instead - if( rCol.GetNumCols() ) - { - InsertSectionWithWithoutCols( *pPaM, &rCol ); - // remove columns from PageDesc - SwFmtCol aCol; - rFmt.SetAttr( aCol ); - } - } - WW8_CP l = nStartCp; while ( l<nStartCp+nTextLen ) { @@ -2198,7 +2064,7 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, short nType) if( l>= nStartCp + nTextLen ) break; - bStartLine = bWasParaEnd = ReadChars(l, nNext, nStartCp+nTextLen, nCpOfs); + bStartLine = ReadChars(l, nNext, nStartCp+nTextLen, nCpOfs); if (bStartLine) // Zeilenende AppendTxtNode(*pPaM->GetPoint()); @@ -2217,7 +2083,7 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, short nType) // pagebreak then look it up to see if it is a section break, and // if it is not then insert a page break. If it is a section break // it will be handled as such in the ReadAttrs of the next loop - if( bPgSecBreak) + if (bPgSecBreak) { // We need only to see if a section is ending at this cp, // the plcf will already be sitting on the correct location @@ -2228,29 +2094,8 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, short nType) pPlcxMan->GetSepPLCF()->GetSprms(&aTemp); if ((aTemp.nStartPos != l) && (aTemp.nEndPos != l)) { - /* - #74468#, ##515## - Insert additional node only WHEN the Pagebreak is contained in - a NODE that is NOT EMPTY. Word can have empty paragraphs with - numbering information before a section break that are not - closed before the section break. In this case they are ignored - and not numbered, this is 74468's problem. But word can have - open paragraphs that only contain a node that in word can be - anchored, i.e. a single character indicating that a graphic or - an ole node or a text box is anchored here. In this case then - we should close the paragraph to ensure that it is is anchored - to the current page, and not pushed to the next page, this is - 515's problem. nLastFlyNode is set on insertion of 0x01 and - 0x08 graphics as well as on insertion of old ww6 textboxes. - */ - SwPosition& rPt = *pPaM->GetPoint(); - if ( (nLastFlyNode == rPt.nNode.GetIndex()) - || (0 < rPt.nContent.GetIndex()) ) - { - AppendTxtNode( rPt ); - } - - rDoc.Insert( *pPaM, SvxFmtBreakItem( SVX_BREAK_PAGE_BEFORE ) ); +// AppendTxtNode(*pPaM->GetPoint()); + rDoc.Insert(*pPaM, SvxFmtBreakItem(SVX_BREAK_PAGE_BEFORE)); bPgSecBreak = false; } } @@ -2262,10 +2107,8 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, short nType) CloseAttrEnds(); if (!bInHyperlink) bJoined = JoinNode(*pPaM); - if( nType == MAN_MAINTEXT ) - UpdatePageDescs( nPageDescOffset ); // muss passieren, solange es den // PlcxMan noch gibt - DELETEZ( pPlcxMan ); + delete pPlcxMan, pPlcxMan = 0; return bJoined; } @@ -2276,9 +2119,9 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, short nType) SwWW8ImplReader::SwWW8ImplReader(BYTE nVersionPara, SvStorage* pStorage, SvStream* pSt, SwDoc& rD, bool bNewDoc) : pStg(pStorage), pStrm(pSt), pTableStream(0), pDataStream(0), rDoc(rD), - aGrfNameGenerator(bNewDoc,String('G')), pMSDffManager(0), mpAtnNames(0), - pAuthorInfos(0), pOleMap(0), pTabNode(0), pLastPgDeskIdx(0), - mbNewDoc(bNewDoc) + maSectionManager(*this), maSectionNameGenerator(rD,CREATE_CONST_ASC("WW")), + maGrfNameGenerator(bNewDoc,String('G')), pMSDffManager(0), mpAtnNames(0), + pAuthorInfos(0), pOleMap(0), pTabNode(0), mbNewDoc(bNewDoc) { pStrm->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); nWantedVersion = nVersionPara; @@ -2303,29 +2146,22 @@ SwWW8ImplReader::SwWW8ImplReader(BYTE nVersionPara, SvStorage* pStorage, nObjLocFc = nPicLocFc = 0; nInTable=0; bReadNoTbl = bPgSecBreak = bSpec = bObj = bTxbxFlySection - = bHasBorder = bSymbol = bIgnoreText = bDontCreateSep + = bHasBorder = bSymbol = bIgnoreText = bWasTabRowEnd = false; bShdTxtCol = bCharShdTxtCol = bAnl = bHdFtFtnEdn = bFtnEdn - = bIsHeader = bIsFooter = bSectionHasATitlePage - = bIsUnicode = bCpxStyle = bStyNormal = bWWBugNormal = false; + = bIsHeader = bIsFooter = bIsUnicode = bCpxStyle = bStyNormal = + bWWBugNormal = false; bNoAttrImport = bPgChpLevel = bEmbeddObj = false; bAktAND_fNumberAcross = false; bNoLnNumYet = true; - bRestartLnNumPerSection = false; bInHyperlink = false; - bVerticalEnviron = false; bWasParaEnd = false; nProgress = 0; - nPgWidth = lA4Width; - nPgLeft = nPgRight = nPgTop = MM_250; - nCorrIhdt = 0; nSwNumLevel = nWwNumType = 0xff; pTableDesc = 0; pNumRule = 0; pNumOlst = 0; - pAfterSection = 0; - pLastInsertedSection = 0; pNode_FLY_AT_CNTNT = 0; pDrawModel = 0; pDrawPg = 0; @@ -2342,11 +2178,9 @@ SwWW8ImplReader::SwWW8ImplReader(BYTE nVersionPara, SvStorage* pStorage, nLFOPosition = USHRT_MAX; nListLevel = WW8ListManager::nMaxLevel; - mbRTLPgn = false; eHardCharSet = RTL_TEXTENCODING_DONTKNOW; - pPageDesc = 0; - nNfcPgn = nPgChpDelim = nPgChpLevel = 0; + nPgChpDelim = nPgChpLevel = 0; maApos.push_back(false); } @@ -2365,6 +2199,231 @@ void SwWW8ImplReader::DeleteStk(SwFltControlStack* pStck) } } +void wwSectionManager::SetSegmentToPageDesc(const wwSection &rSection, + bool bTitlePage, bool bIgnoreCols) +{ + SwPageDesc &rPage = bTitlePage ? *rSection.mpTitlePage : *rSection.mpPage; + + SetNumberingType(rSection, rPage); + + SwFrmFmt &rFmt = rPage.GetMaster(); + mrReader.SetDocumentGrid(rFmt, rSection); + + wwULSpaceData aULData; + GetPageULData(rSection, bTitlePage, aULData); + SetPageULSpaceItems(rFmt, aULData); + + SetPage(rPage, rFmt, rSection, bIgnoreCols); +} + +void wwSectionManager::SetUseOn(wwSection &rSection) +{ + bool bEven = (rSection.maSep.grpfIhdt & (WW8_HEADER_EVEN|WW8_FOOTER_EVEN)) ? + true : false; + + UseOnPage eUseBase = mrReader.pWDop->fMirrorMargins ? PD_MIRROR : PD_ALL; + UseOnPage eUse = eUseBase; + if (!bEven) + eUse = (UseOnPage)(eUse | PD_HEADERSHARE | PD_FOOTERSHARE); + + ASSERT(rSection.mpPage, "Makes no sense to call me with no pages to set"); + if (rSection.mpPage) + rSection.mpPage->WriteUseOn(eUse); + if (rSection.mpTitlePage) + { + rSection.mpTitlePage->WriteUseOn( + (UseOnPage) (eUseBase | PD_HEADERSHARE | PD_FOOTERSHARE)); + } +} + +void wwSectionManager::InsertSegments(bool bIsNewDoc) +{ + sal_uInt16 nDesc(0); + mySegIter aEnd = maSegments.end(); + mySegIter aStart = maSegments.begin(); + for (mySegIter aIter = aStart; aIter != aEnd; ++aIter) + { + mySegIter aNext = aIter+1; + + bool bInsertSection = aIter != aStart ? aIter->IsContinous() : false; + + if (!bInsertSection) + { + /* + If a cont section follow this section then we won't be + creating a page desc with 2+ cols as we cannot host a one + col section in a 2+ col pagedesc and make it look like + word. But if the current section actually has columns then + we are forced to insert a section here as well as a page + descriptor. + */ + + /* + Note for the future: + If we want to import "protected sections" the here is + where we would also test for that and force a section + insertion if that was true. + */ + bool bIgnoreCols = false; + if (aNext != aEnd && aNext->IsContinous()) + { + bIgnoreCols = true; + if (aIter->NoCols() > 1) + bInsertSection = true; + } + + if (aIter->maSep.fTitlePage) + { + if (bIsNewDoc && aIter == aStart) + { + aIter->mpTitlePage = + mrReader.rDoc.GetPageDescFromPool(RES_POOLPAGE_FIRST); + } + else + { + USHORT nPos = mrReader.rDoc.MakePageDesc( + ViewShell::GetShellRes()->GetPageDescName(nDesc) + , 0, false); + aIter->mpTitlePage = &mrReader.rDoc._GetPageDesc(nPos); + } + ASSERT(aIter->mpTitlePage, "no page!"); + if (!aIter->mpTitlePage) + continue; + + SetSegmentToPageDesc(*aIter, true, bIgnoreCols); + } + + if (bIsNewDoc && aIter == aStart) + { + aIter->mpPage = + mrReader.rDoc.GetPageDescFromPool(RES_POOLPAGE_STANDARD); + } + else + { + USHORT nPos = mrReader.rDoc.MakePageDesc( + ViewShell::GetShellRes()->GetPageDescName(nDesc, + false, aIter->maSep.fTitlePage), + aIter->mpTitlePage, false); + aIter->mpPage = &mrReader.rDoc._GetPageDesc(nPos); + } + ASSERT(aIter->mpPage, "no page!"); + if (!aIter->mpPage) + continue; + + const wwSection *pPrevious = 0; + if (aIter != aStart) + pPrevious = &(*(aIter-1)); + SetHdFt(*aIter, std::distance(aStart, aIter), pPrevious); + SetUseOn(*aIter); + + if (aIter->mpTitlePage) + SetSegmentToPageDesc(*aIter, true, bIgnoreCols); + SetSegmentToPageDesc(*aIter, false, bIgnoreCols); + + SwFmtPageDesc aPgDesc(aIter->maSep.fTitlePage ? + aIter->mpTitlePage : aIter->mpPage); + + if (aIter->mpTitlePage) + aIter->mpTitlePage->SetFollow(aIter->mpPage); + + if (aIter->PageRestartNo()) + aPgDesc.SetNumOffset(aIter->PageStartAt()); + + /* + If its a table here, apply the pagebreak to the table + properties, otherwise we add it to the para at this + position + */ + if (aIter->maStart.GetNode().IsTableNode()) + { + SwTable& rTable = + aIter->maStart.GetNode().GetTableNode()->GetTable(); + SwFrmFmt* pApply = rTable.GetFrmFmt(); + ASSERT(pApply, "impossible"); + if (pApply) + pApply->SetAttr(aPgDesc); + } + else + { + SwPosition aPamStart(aIter->maStart); + aPamStart.nContent.Assign( + aIter->maStart.GetNode().GetCntntNode(), 0); + SwPaM aPage(aPamStart); + + mrReader.rDoc.Insert(aPage, aPgDesc); + } + ++nDesc; + } + + SwTxtNode* pTxtNd = 0; + if (bInsertSection) + { + SwPaM aSectPaM(*mrReader.pPaM); + SwNodeIndex aAnchor(aSectPaM.GetPoint()->nNode); + if (aNext != aEnd) + { + aAnchor = aNext->maStart; + aSectPaM.GetPoint()->nNode = aAnchor; + aSectPaM.GetPoint()->nContent.Assign( + aNext->maStart.GetNode().GetCntntNode(), 0); + aSectPaM.Move(fnMoveBackward); + } + + const SwPosition* pPos = aSectPaM.GetPoint(); + const SwTxtNode* pSttNd = + mrReader.rDoc.GetNodes()[ pPos->nNode ]->GetTxtNode(); + const SwTableNode* pTableNd = pSttNd ? pSttNd->FindTableNode() : 0; + if (pTableNd) + { + pTxtNd = + mrReader.rDoc.GetNodes().MakeTxtNode(aAnchor, + mrReader.rDoc.GetTxtCollFromPool( RES_POOLCOLL_TEXT )); + + aSectPaM.GetPoint()->nNode = SwNodeIndex(*pTxtNd); + aSectPaM.GetPoint()->nContent.Assign( + aSectPaM.GetCntntNode(), 0); + } + + aSectPaM.SetMark(); + + aSectPaM.GetPoint()->nNode = aIter->maStart; + aSectPaM.GetPoint()->nContent.Assign( + aSectPaM.GetCntntNode(), 0); + + SwSectionFmt *pRet = InsertSection(aSectPaM, *aIter); + //The last section if continous is always unbalanced + if (aNext == aEnd && pRet) + pRet->SetAttr(SwFmtNoBalancedColumns(true)); + } + + if (pTxtNd) + { + SwNodeIndex aIdx(*pTxtNd); + SwPosition aPos(aIdx); + SwPaM aTest(aPos); + mrReader.rDoc.DelFullPara(aTest); + pTxtNd = 0; + } + } +} + +void SwWW8ImplReader::StoreMacroCmds() +{ + if (pWwFib->lcbCmds) + { + pTableStream->Seek(pWwFib->fcCmds); + + SvStorageRef xDestRoot(rDoc.GetDocShell()->GetStorage()); + SvStorageStreamRef xDestStream = + xDestRoot->OpenStream(CREATE_CONST_ASC(SL::aMSMacroCmds)); + + sal_uInt8 *pBuffer = new sal_uInt8[pWwFib->lcbCmds]; + pTableStream->Read(pBuffer, pWwFib->lcbCmds); + xDestStream->Write(pBuffer, pWwFib->lcbCmds); + delete[] pBuffer; + } +} + ULONG SwWW8ImplReader::LoadDoc1( SwPaM& rPaM ,WW8Glossary *pGloss) { ULONG nErrRet = 0; @@ -2386,7 +2445,7 @@ ULONG SwWW8ImplReader::LoadDoc1( SwPaM& rPaM ,WW8Glossary *pGloss) pAnchorStck = new SwWW8FltAnchorStack(&rDoc, nFieldFlags); - nPageDescOffset = rDoc.GetPageDescCnt(); + sal_uInt16 nPageDescOffset = rDoc.GetPageDescCnt(); SwNodeIndex aSttNdIdx( rDoc.GetNodes() ); SwRelNumRuleSpaces aRelNumRule(rDoc, mbNewDoc); @@ -2425,6 +2484,7 @@ ULONG SwWW8ImplReader::LoadDoc1( SwPaM& rPaM ,WW8Glossary *pGloss) // praktische Hilfsvariablen besetzen: bVer67 = ( (6 == pWwFib->nVersion) || (7 == pWwFib->nVersion) ); // z.B.: altes Sprm-Id-Format! + bVer6 = (6 == pWwFib->nVersion); bVer7 = (7 == pWwFib->nVersion); bVer8 = (8 == pWwFib->nVersion); @@ -2665,12 +2725,6 @@ ULONG SwWW8ImplReader::LoadDoc1( SwPaM& rPaM ,WW8Glossary *pGloss) ::SetProgressState( nProgress, rDoc.GetDocShell() ); // Update - if (pCollA) - { - SetOutLineStyles(); - delete[] pCollA; - } - if (pDrawPg && pMSDffManager && pMSDffManager->GetShapeOrders()) { // Hilfsarray zum Verketten der (statt SdrTxtObj) eingefuegten @@ -2707,10 +2761,8 @@ ULONG SwWW8ImplReader::LoadDoc1( SwPaM& rPaM ,WW8Glossary *pGloss) { SvxMSDffShapeOrder *pNextOrder = aTxBxSort.GetObject(nTxBxNum+1); - if( (0xFFFF0000 & pOrder->nTxBxComp) - == (0xFFFF0000 & pNextOrder->nTxBxComp) - && pOrder->nHdFtSection - == pNextOrder->nHdFtSection ) + if ((0xFFFF0000 & pOrder->nTxBxComp) + == (0xFFFF0000 & pNextOrder->nTxBxComp)) pNextFlyFmt = pNextOrder->pFly; } // ggfs. Vorgaenger ermitteln @@ -2718,15 +2770,13 @@ ULONG SwWW8ImplReader::LoadDoc1( SwPaM& rPaM ,WW8Glossary *pGloss) { SvxMSDffShapeOrder *pPrevOrder = aTxBxSort.GetObject(nTxBxNum-1); - if( (0xFFFF0000 & pOrder->nTxBxComp) - == (0xFFFF0000 & pPrevOrder->nTxBxComp) - && pOrder->nHdFtSection - == pPrevOrder->nHdFtSection ) + if ((0xFFFF0000 & pOrder->nTxBxComp) + == (0xFFFF0000 & pPrevOrder->nTxBxComp)) pPrevFlyFmt = pPrevOrder->pFly; } // Falls Nachfolger oder Vorgaenger vorhanden, // die Verkettung am Fly-Frame-Format eintragen - if( pNextFlyFmt || pPrevFlyFmt ) + if (pNextFlyFmt || pPrevFlyFmt) { aChain.SetNext( pNextFlyFmt ); aChain.SetPrev( pPrevFlyFmt ); @@ -2744,7 +2794,7 @@ ULONG SwWW8ImplReader::LoadDoc1( SwPaM& rPaM ,WW8Glossary *pGloss) eMode |= REDLINE_ON; if( pWDop->fRMView ) eMode |= REDLINE_SHOW_DELETE; - if(pStg && !pGloss) /*meaningless for a glossary, cmc*/ + if (pStg && !pGloss) /*meaningless for a glossary, cmc*/ { const OfaFilterOptions* pVBAFlags = OFF_APP()->GetFilterOptions(); @@ -2756,9 +2806,19 @@ ULONG SwWW8ImplReader::LoadDoc1( SwPaM& rPaM ,WW8Glossary *pGloss) int nRet = aVBasic.Import( s1, s2 ); if( 2 & nRet ) rDoc.SetContainsMSVBasic(true); + + StoreMacroCmds(); } } + maSectionManager.InsertSegments(mbNewDoc); + + if (pCollA) + { + SetOutLineStyles(); + delete[] pCollA; + } + DELETEZ( pStyles ); if( pFormImpl ) @@ -2768,13 +2828,12 @@ ULONG SwWW8ImplReader::LoadDoc1( SwPaM& rPaM ,WW8Glossary *pGloss) DELETEZ( pHdFt ); DELETEZ( pLstManager ); DELETEZ( pSBase ); - DELETEZ( pWDop ); + delete pWDop; DELETEZ( pFonts ); delete mpAtnNames; DELETEZ( pAuthorInfos ); DELETEZ( pOleMap ); DELETEZ( pTabNode ); - DELETEZ( pLastPgDeskIdx ); delete mpSprmParser; ::EndProgress( rDoc.GetDocShell() ); } @@ -2783,15 +2842,15 @@ ULONG SwWW8ImplReader::LoadDoc1( SwPaM& rPaM ,WW8Glossary *pGloss) } if (!pGloss) - DELETEZ( pWwFib ); + DELETEZ(pWwFib); DeleteCtrlStk(); mpRedlineStack->closeall(*pPaM->GetPoint()); delete mpRedlineStack; DeleteAnchorStk(); DeleteRefStk(); - aRelNumRule.SetNumRelSpaces( rDoc ); - if( !mbNewDoc && !nErrRet && aSttNdIdx.GetIndex() ) + aRelNumRule.SetNumRelSpaces(rDoc); + if (!mbNewDoc && !nErrRet && aSttNdIdx.GetIndex()) { aSttNdIdx++; aRelNumRule.SetOultineRelSpaces( aSttNdIdx, @@ -2804,36 +2863,9 @@ ULONG SwWW8ImplReader::LoadDoc1( SwPaM& rPaM ,WW8Glossary *pGloss) if (mbNewDoc) rDoc.SetRedlineMode( eMode ); - //If there is no content after the end of the final section, we want to delete - //the final node and turn the column balancing off. All sections but the last - //one, have column balancing turned on unless NoColumnBalancing is set in - //MS Office's compatibility options. - if (pAfterSection) - { - // set NoBallanced flag on last inserted section and remove the trailing - // para that inserting the section pushed after the PaM - if(pLastInsertedSection || pPageDesc) - { - SwSectionFmt *pFmt = pLastInsertedSection->GetFmt(); - pFmt->SetAttr(SwFmtNoBalancedColumns(true)); - } - if (mbNewDoc) - { - //Needed to unlock last node so that we can delete it without - //giving writer a fit. Necessary for deleting the para after a - //section. - rPaM.GetBound(true).nContent.Assign( 0, 0 ); - rPaM.GetBound(false).nContent.Assign( 0, 0 ); - - pPaM->SetMark(); - pPaM->GetPoint()->nNode = *pAfterSection; - pPaM->GetPoint()->nContent.Assign(pPaM->GetCntntNode(), 0); + UpdatePageDescs(rDoc, nPageDescOffset); - rDoc.DeleteAndJoin(*pPaM); - } - delete pAfterSection; - } - DELETEZ(pPaM); + delete pPaM, pPaM = 0; return nErrRet; } @@ -3308,3 +3340,4 @@ bool SwWW8ImplReader::InEqualApo(int nLvl) const return maApos[nLvl]; } +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index f0e37ffd8ebf..e742126bac42 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8par.hxx,v $ * - * $Revision: 1.106 $ + * $Revision: 1.107 $ * - * last change: $Author: aidan $ $Date: 2002-12-10 15:51:51 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifndef _WW8PAR_HXX @@ -75,6 +74,9 @@ #ifndef _MSOCXIMEX_HXX #include <svx/msocximex.hxx> #endif +#ifndef _SVX_FRMDIR_HXX +#include <svx/frmdir.hxx> +#endif #ifndef _FLTSHELL_HXX #include <fltshell.hxx> // fuer den Attribut Stack @@ -163,12 +165,9 @@ class GDIMetaFile; struct ESelection; class SfxItemSet; struct WW8PLCFxDesc; - -class SdrAttrObj; -struct WW8ULSpaceData; class _ReadFieldParams; +class SdrAttrObj; class wwZOrderer; - namespace com{namespace sun {namespace star{ namespace beans{ class XPropertySet;} namespace form { class XFormComponent;} @@ -421,6 +420,7 @@ class WW8ReaderSave private: WW8PLCFxSaveAll maPLCFxSave; SwPosition maTmpPos; + std::deque<bool> maOldApos; SwWW8FltControlStack* mpOldStck; SwWW8FltAnchorStack* mpOldAnchorStck; wwRedlineStack *mpOldRedlines; @@ -432,14 +432,12 @@ private: USHORT mnAktColl; sal_Unicode mcSymbol; bool mbIgnoreText; - bool mbDontCreateSep; bool mbSymbol; bool mbHdFtFtnEdn; bool mbTxbxFlySection; bool mbAnl; bool mbInHyperlink; bool mbPgSecBreak; - bool mbVerticalEnviron; bool mbWasParaEnd; bool mbHasBorder; public: @@ -583,6 +581,97 @@ public: void EnableFallbackStream(); }; +class wwSection +{ +public: + wwSection(const SwPosition &rPos); + SEPr maSep; + WW8_BRC brc[4]; + SwNodeIndex maStart; + SwSection *mpSection; + SwPageDesc *mpTitlePage; + SwPageDesc *mpPage; + SvxFrameDirection meDir; + + short nPgWidth; + short nPgLeft; + short nPgRight; + + BYTE mnBorders; + bool mbHasFootnote; + void SetDirection(); + bool DoesContainFootnote() const { return mbHasFootnote; } + bool IsContinous() const { return maSep.bkc == 0; } + bool IsVertical() const; + long NoCols() const { return maSep.ccolM1 + 1; } + long StandardColSeperation() const { return maSep.dxaColumns; } + bool HasTitlePage() const { return maSep.fTitlePage ? true : false; } + long PageStartAt() const { return maSep.pgnStart; } + bool PageRestartNo() const { return maSep.fPgnRestart ? true : false; } + bool IsBiDi() const { return maSep.fBiDi ? true : false; } + sal_uInt16 GetPageWidth() const { return nPgWidth; } + sal_uInt16 GetPageHeight() const { return maSep.yaPage; } + sal_uInt16 GetPageLeft() const { return nPgLeft; } + sal_uInt16 GetPageRight() const { return nPgRight; } + bool IsLandScape() const { return maSep.dmOrientPage ? true : false; } +}; + +class wwSectionManager +{ +private: + /* + A queue of the ms sections in the document + */ + SwWW8ImplReader& mrReader; + std::deque<wwSection> maSegments; + typedef ::std::deque<wwSection>::iterator mySegIter; + typedef ::std::deque<wwSection>::reverse_iterator mySegrIter; + + struct wwULSpaceData + { + bool bHasHeader, bHasFooter; + short nSwHLo, nHdUL, nSwFUp, nFtUL, nSwUp, nSwLo; + wwULSpaceData() : bHasHeader(false), bHasFooter(false) {} + }; + + void SetSegmentToPageDesc(const wwSection &rSection, bool bTitlePage, + bool bIgnoreCols); + + void GetPageULData(const wwSection &rNewSection, bool bFirst, + wwULSpaceData& rData); + void SetPageULSpaceItems(SwFrmFmt &rFmt, wwULSpaceData& rData); + + void SetPage(SwPageDesc &rPageDesc, SwFrmFmt &rFmt, + const wwSection &rSection, bool bIgnoreCols); + + void SetNumberingType(const wwSection &rNewSection, SwPageDesc &rPageDesc); + + void SetUseOn(wwSection &rSection); + void SetHdFt(wwSection &rSection, int nSect, const wwSection *pPrevious); + + SwSectionFmt *InsertSection(SwPaM& rMyPaM, wwSection &rSection); + bool SetCols(SwFrmFmt &rFmt, const wwSection &rSection, USHORT nNettoWidth); + void SetLeftRight(wwSection &rSection); + + //No copying + wwSectionManager(const wwSectionManager&); + wwSectionManager& operator=(const wwSectionManager&); +public: + wwSectionManager(SwWW8ImplReader &rReader) : mrReader(rReader) + {}; + void SetCurrentSectionHasFootnote(); + bool CurrentSectionIsVertical() const; + void PrependedInlineNode(const SwPosition &rPos, const SwNode &rNode); + USHORT CurrentSectionColCount() const; + bool WillHavePageDescHere(SwNodeIndex aIdx) const; + void CreateSep(const long nTxtPos, bool bMustHaveBreak); + void InsertSegments(bool bIsNewDoc); + void JoinNode(const SwPosition &rPos, const SwNode &rNode); + short GetPageLeft() const; + short GetPageRight() const; + short GetPageWidth() const; +}; + class wwFrameNamer { private: @@ -599,6 +688,22 @@ public: { } }; +class wwSectionNamer +{ +private: + const SwDoc &mrDoc; + String msFileLinkSeed; + int mnFileSectionNo; + //No copying + wwSectionNamer(const wwSectionNamer&); + wwSectionNamer& operator=(const wwSectionNamer&); +public: + String UniqueName(); + wwSectionNamer(const SwDoc &rDoc, const String &rSeed) + : mrDoc(rDoc), msFileLinkSeed(rSeed), mnFileSectionNo(0) + { } +}; + //----------------------------------------- // Storage-Reader //----------------------------------------- @@ -614,6 +719,7 @@ friend class WW8FlySet; friend class SwMSDffManager; friend class SwWW8FltControlStack; friend class WW8FormulaControl; +friend class wwSectionManager; SvStorage* pStg; // Input-Storage SvStream* pStrm; // Input-(Storage)Stream @@ -661,6 +767,16 @@ friend class WW8FormulaControl; typedef std::deque<USHORT>::const_iterator mycFieldIter; /* + A queue of the ms sections in the document + */ + wwSectionManager maSectionManager; + + /* + Creates unique names to give to (file link) sections (WW1/WW2/...) + */ + wwSectionNamer maSectionNameGenerator; + + /* Knows how to split a series of bytes into sprms and their arguments */ wwSprmParser *mpSprmParser; @@ -668,7 +784,7 @@ friend class WW8FormulaControl; /* Creates unique names to give to graphics */ - wwFrameNamer aGrfNameGenerator; + wwFrameNamer maGrfNameGenerator; /* Stack of textencoding being used as we progress through the document text @@ -705,7 +821,6 @@ friend class WW8FormulaControl; const SwTxtFmtColl* pDfltTxtFmtColl; // Default SwFmt* pStandardFmtColl;// "Standard" - SwPageDesc* pPageDesc; // fuer uebernommene KF-Zeilen WW8PLCF_HdFt* pHdFt; // Pointer auf Header / Footer - Scannerklasse WW8FlyPara* pWFlyPara; // WW-Parameter @@ -717,8 +832,6 @@ friend class WW8FormulaControl; SwNumRule* pNumRule; // fuer Nummerierung / Aufzaehlungen im Text WW8_OLST* pNumOlst; // Gliederung im Text - SwNodeIndex* pAfterSection; - SwSection* pLastInsertedSection; // last Section that was inserted into the doc SwNode* pNode_FLY_AT_CNTNT; // set: WW8SwFlyPara() read: CreateSwTable() @@ -745,9 +858,6 @@ friend class WW8FormulaControl; SwNodeIndex *pTabNode; xub_StrLen nTabCntnt; - SwNodeIndex* pLastPgDeskIdx;// for inserting a section when Ft-/End-Note - // with flag 'on end of section' set - // Ini-Flags: ULONG nIniFlags; // Flags aus der writer.ini ULONG nIniFlags1; // dito ( zusaetzliche Flags ) @@ -772,18 +882,12 @@ friend class WW8FormulaControl; USHORT nProgress; // %-Angabe fuer Progressbar USHORT nColls; // Groesse des Arrays USHORT nAktColl; // gemaess WW-Zaehlung - USHORT nPageDescOffset; // fuer UpdatePageDescs USHORT nDrawTxbx; // Nummer der Textbox ( noetig ?? ) USHORT nFldNum; // laufende Nummer dafuer USHORT nLFOPosition; - short nActSectionNo; // aktuelle Abschnitts-Nummer (in CreateSep() gesetzt) short nCharFmt; // gemaess WW-Zaehlung, <0 fuer keine short nAlign2; - short nPgWidth; - short nPgTop; // fuer APOs - short nPgLeft; // Seitenraender, z.B. fuer APOs, Tabellen - short nPgRight; // dito short nLeftParaMgn; // Absatz L-Space short nTxtFirstLineOfst; // Absatz 1st line ofset @@ -803,14 +907,9 @@ friend class WW8FormulaControl; sal_Int8 nDrawHeaven, nDrawHell; BYTE nListLevel; - BYTE nNfcPgn; // Formatting of PageNum - bool mbRTLPgn; // Direction of page BYTE nPgChpDelim; // ChapterDelim from PageNum BYTE nPgChpLevel; // ChapterLevel of Heading from PageNum - BYTE nCorrIhdt; // used in CreateSep() - bool bSectionHasATitlePage; // used in CreateSep() - bool mbNewDoc; // Neues Dokument ? bool bReadNoTbl; // Keine Tabellen bool bPgSecBreak; // Page- oder Sectionbreak ist noch einzufuegen @@ -820,7 +919,6 @@ friend class WW8FormulaControl; bool bHasBorder; // fuer Buendelung der Border bool bSymbol; // z.B. Symbol statt Times bool bIgnoreText; // z.B. fuer FieldVanish - bool bDontCreateSep; // e.g. when skipping result of multi-column index-field int nInTable; // wird gerade eine Tabelle eingelesen bool bWasTabRowEnd; // Tabelle : Row End Mark @@ -843,7 +941,6 @@ friend class WW8FormulaControl; bool bNoAttrImport; // Attribute ignorieren zum Ignorieren v. Styles bool bInHyperlink; // Sonderfall zum einlesen eines 0x01 // siehe: SwWW8ImplReader::Read_F_Hyperlink() - bool bVerticalEnviron; bool bWasParaEnd; // praktische Hilfsvariablen: @@ -859,8 +956,6 @@ friend class WW8FormulaControl; bool bNoLnNumYet; // no Line Numbering has been activated yet (we import // the very 1st Line Numbering and ignore the rest) - bool bRestartLnNumPerSection; - @@ -869,33 +964,18 @@ friend class WW8FormulaControl; void AppendTxtNode(SwPosition& rPos); void GetNoninlineNodeAttribs(const SwTxtNode *pNode, std::vector<const xub_StrLen*> &rPositions); - void SetLastPgDeskIdx(); - - SwPageDesc* CreatePageDesc( SwPageDesc* pFirstPageDesc, - SwPaM** ppPaMWanted = 0 ); - void RemoveCols( SwPageDesc& rPageDesc, SwFmtCol*& rpCol ); - bool SetCols(SwFrmFmt* pFmt, const WW8PLCFx_SEPX* pSep, USHORT nNettoWidth, - bool bTestOnly = false); - void SetPage1(SwPageDesc* pPageDesc, SwFrmFmt &rFmt, - const WW8PLCFx_SEPX* pSep, USHORT nLIdx, bool bIgnoreCols); - void SetHdFt(SwPageDesc* pPageDesc0, SwPageDesc* pPageDesc1, BYTE nIPara); - void GetPageULData(const WW8PLCFx_SEPX* pSep, USHORT nLIdx, bool bFirst, - WW8ULSpaceData& rData); - void SetPageULSpaceItems(SwFrmFmt &rFmt, WW8ULSpaceData& rData); - void SetDocumentGrid(SwFrmFmt &rFmt,const WW8PLCFx_SEPX* pSep); - - void SetPageBorder( SwPageDesc* pPageDesc0, SwPageDesc* pPageDesc1, - const WW8PLCFx_SEPX* pSep, USHORT nLIdx ); - void SetUseOn(SwPageDesc* pPageDesc0, SwPageDesc* pPageDesc1, BYTE nHdFt); - void InsertSectionWithWithoutCols( SwPaM& rMyPaM, const SwFmtCol* pCol ); - void CreateSep(const long nTxtPos, bool bMustHaveBreak); + + void Read_HdFt(BYTE nWhichItems, int nSect, SwPageDesc* pPD, + const SwPageDesc *pPrev); + void Read_HdFtText(long nStartCp, long nLen, SwFrmFmt* pHdFtFmt); + + void HandleLineNumbering(const wwSection &rSection); + bool MustCloseSection(long nTxtPos); void CopyPageDescHdFt( const SwPageDesc* pOrgPageDesc, SwPageDesc* pNewPageDesc, BYTE nCode ); - void UpdatePageDescs( USHORT nPageDescOffset ); - void DeleteStk(SwFltControlStack* prStck); void DeleteCtrlStk() { DeleteStk( pCtrlStck ); pCtrlStck = 0; } void DeleteRefStk() { DeleteStk( pRefStck ); pRefStck = 0; } @@ -905,6 +985,7 @@ friend class WW8FormulaControl; bool ReadPlainChars(long& rPos, long nEnd, long nCpOfs); bool ReadChars(long& rPos, long nNextAttr, long nTextEnd, long nCpOfs); + void SetDocumentGrid(SwFrmFmt &rFmt, const wwSection &rSection); void ReadPlainText( long nStartCp, long nTextLen ); void ProcessAktCollChange(WW8PLCFManResult& rRes, bool* pStartAttr, @@ -919,9 +1000,6 @@ friend class WW8FormulaControl; void Read_HdFtFtnText( const SwNodeIndex* pSttIdx, long nStartCp, long nLen, short nType ); - void Read_HdFt1( BYTE nPara, BYTE nWhichItems, SwPageDesc* pPD ); - void Read_HdFtText(long nStartCp, long nLen, SwPageDesc* pPD, - bool bUseLeft, bool bFooter); BYTE* ReadUntilToken( USHORT& rStrLen, USHORT nMaxLen, BYTE nToken ); void ImportTox( int nFldId, String aStr ); @@ -948,7 +1026,7 @@ friend class WW8FormulaControl; bool SetBorder(SvxBoxItem& rBox, const WW8_BRC* pbrc, short *pSizeArray=0, BYTE nSetBorders=0xFF, bool bChkBtwn = false); - void GetBorderDistance( WW8_BRC* pbrc, Rectangle& rInnerDist ); + void GetBorderDistance(const WW8_BRC* pbrc, Rectangle& rInnerDist); bool SetShadow(SvxShadowItem& rShadow, const SvxBoxItem& rBox, const WW8_BRC pbrc[4]); @@ -981,7 +1059,8 @@ friend class WW8FormulaControl; WW8FlyPara* &pbNowStyleApo, int nCellLevel, bool bTableRowEnd, WW8_TablePos *pTabPos); - bool ProcessSpecial(bool bAllEnd, bool* pbReSync, WW8_CP nStartCp ); + void EndSpecial(); + bool ProcessSpecial(bool &rbReSync, WW8_CP nStartCp); USHORT TabRowSprm(int nLevel) const; ULONG ReadWmfHeader( WmfFileHd* pHd, long nPos ); @@ -1099,7 +1178,7 @@ friend class WW8FormulaControl; SwFlyFrmFmt *ConvertDrawTextToFly( SdrObject* &rpObject, SdrObject* &rpOurNewObject, SvxMSDffImportRec* pRecord, RndStdIds eAnchor, WW8_FSPA *pF, SfxItemSet &rFlySet ); - void MungeTextIntoDrawBox(SdrObject* pTrueObject, + SwFrmFmt* MungeTextIntoDrawBox(SdrObject* pTrueObject, SvxMSDffImportRec *pRecord, long nGrafAnchorCp, SwFrmFmt *pRetFrmFmt); void GrafikCtor(); @@ -1159,6 +1238,8 @@ friend class WW8FormulaControl; void SetOutLineStyles(); + void StoreMacroCmds(); + //No copying SwWW8ImplReader(const SwWW8ImplReader &); SwWW8ImplReader& operator=(const SwWW8ImplReader&); @@ -1302,6 +1383,7 @@ public: // eigentlich private, geht aber leider nur public void Read_SubF_Ruby( _ReadFieldParams& rReadParam); void Read_SubF_Combined( _ReadFieldParams& rReadParam); eF_ResT Read_F_IncludePicture( WW8FieldDesc*, String& rStr ); + String CreateNextFileLinkName(); eF_ResT Read_F_IncludeText( WW8FieldDesc*, String& rStr ); eF_ResT Read_F_Seq( WW8FieldDesc*, String& rStr ); @@ -1341,3 +1423,5 @@ public: // eigentlich private, geht aber leider nur public }; #endif + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index b17099d6b693..e5e9f881f95c 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8par2.cxx,v $ * - * $Revision: 1.78 $ + * $Revision: 1.79 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 12:41:17 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifdef PRECOMPILED @@ -345,13 +344,42 @@ public: void SetNumRuleName( const String& rName ); }; +void wwSectionManager::SetCurrentSectionHasFootnote() +{ + ASSERT(!maSegments.empty(), + "should not be possible, must be at least one segment"); + if (!maSegments.empty()) + maSegments.back().mbHasFootnote = true; +} + +bool wwSectionManager::CurrentSectionIsVertical() const +{ + ASSERT(!maSegments.empty(), + "should not be possible, must be at least one segment"); + if (!maSegments.empty()) + return maSegments.back().IsVertical(); + return false; +} + +short wwSectionManager::GetPageLeft() const +{ + return !maSegments.empty() ? maSegments.back().nPgLeft : 0; +} + +short wwSectionManager::GetPageRight() const +{ + return !maSegments.empty() ? maSegments.back().nPgRight : 0; +} + +short wwSectionManager::GetPageWidth() const +{ + return !maSegments.empty() ? maSegments.back().nPgWidth : 0; +} + long SwWW8ImplReader::Read_Ftn(WW8PLCFManResult* pRes) { bool bFtEdOk = false; - if( nIniFlags & WW8FL_NO_FTN ) - return 0; - /* #84095# Ignoring Footnote outside of the normal Text. People will put footnotes @@ -438,30 +466,8 @@ long SwWW8ImplReader::Read_Ftn(WW8PLCFManResult* pRes) bSymbol = false; } - // insert Section to get this Ft-/End-Note at the end of the section, - // when there is no open section at the moment - if( bFtEdOk && pLastPgDeskIdx && !pAfterSection) - { - const SwNodeIndex aOrgLastPgDeskIdx( *pLastPgDeskIdx ); - - (*pLastPgDeskIdx)++; - SwPosition aSectStart(*pLastPgDeskIdx); - aSectStart.nContent.Assign(pLastPgDeskIdx->GetNode().GetCntntNode(), 0); - - SwPosition *pTemp = pPaM->GetPoint(); - if (pTableDesc) - pTemp = pTableDesc->GetPos(); - - SwPaM aSectPaM(aSectStart, *pTemp); - InsertSectionWithWithoutCols( aSectPaM, 0 ); - - if (pTableDesc) - (*pAfterSection)--; - pPaM->Move( fnMoveBackward ); - DELETEZ( pLastPgDeskIdx ); - // set attributes to correct position - pCtrlStck->MoveAttrsToNextNode( aOrgLastPgDeskIdx ); - } + if (bFtEdOk) + maSectionManager.SetCurrentSectionHasFootnote(); return 1; // das Fussnotenzeichen ueberlesen! } @@ -2052,6 +2058,15 @@ void WW8TabDesc::SetSizePosition(SwFrmFmt* pFrmFmt) } } +void wwSectionManager::PrependedInlineNode(const SwPosition &rPos, + const SwNode &rNode) +{ + ASSERT(!maSegments.empty(), + "should not be possible, must be at least one segment"); + if ((!maSegments.empty()) && (maSegments.back().maStart == rPos.nNode)) + maSegments.back().maStart = SwNodeIndex(rNode); +} + void WW8TabDesc::CreateSwTable() { ::SetProgressState( pIo->nProgress, pIo->rDoc.GetDocShell() ); // Update @@ -2108,6 +2123,18 @@ void WW8TabDesc::CreateSwTable() // da sich die (identischen) Zeilen eines Bandes prima duplizieren lassen pTable = pIo->rDoc.InsertTable( *pTmpPos, nBands, nDefaultSwCols, eOri ); + ASSERT(pTable, "insert table failed"); + if (!pTable) + return; + + SwTableNode* pTableNode = pTable->GetTableNode(); + ASSERT(pTableNode, "no table node!"); + if (pTableNode) + { + pIo->maSectionManager.PrependedInlineNode(*pIo->pPaM->GetPoint(), + *pTableNode); + } + // Abfrage, ob im Node, in dem die Tabelle eingefuegt werden soll, bereits // ein Pagedesc steht. Dann wuerde der PageDesc in die naechste Zeile // hinter der Tabelle rutschen, wo er nichts zu suchen hat. -> loeschen @@ -2118,16 +2145,8 @@ void WW8TabDesc::CreateSwTable() { SfxPoolItem *pSetAttr = 0; const SfxPoolItem* pItem; - if (SFX_ITEM_SET == pSet->GetItemState(RES_PAGEDESC, false, &pItem)) - { - pSetAttr = new SwFmtPageDesc( *(SwFmtPageDesc*)pItem ); - pNd->ResetAttr( RES_PAGEDESC ); - pSet = pNd->GetpSwAttrSet(); - } - if (pSet && - SFX_ITEM_SET == pSet->GetItemState(RES_BREAK, false, &pItem)) + if (SFX_ITEM_SET == pSet->GetItemState(RES_BREAK, false, &pItem)) { - delete pSetAttr; pSetAttr = new SvxFmtBreakItem( *(SvxFmtBreakItem*)pItem ); pNd->ResetAttr( RES_BREAK ); } @@ -3869,5 +3888,4 @@ void SwWW8ImplReader::ReadDocInfo() } } - - +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx index c6d22f29f699..45973fd97d0c 100644 --- a/sw/source/filter/ww8/ww8par2.hxx +++ b/sw/source/filter/ww8/ww8par2.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8par2.hxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: cmc $ $Date: 2002-12-03 15:57:05 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifndef _WW8PAR2_HXX @@ -116,6 +115,7 @@ struct WW8FlyPara bool bGrafApo; // true: Dieser Rahmen dient allein dazu, die // enthaltene Grafik anders als zeichengebunden // zu positionieren + bool mbVertSet; // true if vertical positioning has been set WW8FlyPara(bool bIsVer67, const WW8FlyPara* pSrc = 0); bool operator==(const WW8FlyPara& rSrc) const; @@ -306,3 +306,5 @@ enum WW8LvlType {WW8_None, WW8_Outline, WW8_Numbering, WW8_Sequence, WW8_Pause}; WW8LvlType GetNumType(BYTE nWwLevelNo); #endif + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 4cd148313dac..3271567fe72d 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8par3.cxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 12:41:17 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifdef PCH @@ -2134,3 +2133,4 @@ sal_Bool SwMSConvertControls::InsertControl( return sal_True; } +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx index aee64aacea56..1f23609be2cd 100644 --- a/sw/source/filter/ww8/ww8par4.cxx +++ b/sw/source/filter/ww8/ww8par4.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8par4.cxx,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 12:41:17 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifdef PCH @@ -594,7 +593,10 @@ private: void SetInDocAndDelete::operator()(SwFltStackEntry *pEntry) { SwPaM aRegion(pEntry->nMkNode); - if (pEntry->MakeRegion(&mrDoc, aRegion, true)) + if ( + pEntry->MakeRegion(&mrDoc, aRegion, true) && + (*aRegion.GetPoint() != *aRegion.GetMark()) + ) { mrDoc.SetRedlineMode(REDLINE_ON | REDLINE_SHOW_INSERT | REDLINE_SHOW_DELETE); @@ -681,7 +683,7 @@ void SwWW8ImplReader::Read_CRevisionMark(SwRedlineType eType, { // there *must* be a SprmCIbstRMark[Del] and a SprmCDttmRMark[Del] // pointing to the very same char position as our SprmCFRMark[Del] - if (!pPlcxMan) + if (!pPlcxMan || bIgnoreText) return; const BYTE* pSprmCIbstRMark; const BYTE* pSprmCDttmRMark; @@ -716,8 +718,10 @@ void SwWW8ImplReader::Read_CRevisionMark(SwRedlineType eType, } } +#if 0 ASSERT(nLen < 0 || (pSprmCIbstRMark || pSprmCDttmRMark), "The wheels have fallen off revision mark import"); +#endif if (nLen < 0) mpRedlineStack->close(*pPaM->GetPoint(), eType); @@ -732,7 +736,9 @@ void SwWW8ImplReader::Read_CRevisionMark(SwRedlineType eType, if (const WW8AuthorInfo* pAuthor = pAuthorInfos->GetObject(nPos)) { UINT32 nWWDate = pSprmCDttmRMark ? SVBT32ToLong(pSprmCDttmRMark): 0; +#if 0 ASSERT(nWWDate, "Date is 0, this will cause trouble!"); +#endif DateTime aStamp(WW8ScannerBase::WW8DTTM2DateTime(nWWDate)); USHORT nAutorNo = pAuthor->nOurId; @@ -765,3 +771,5 @@ void SwWW8ImplReader::Read_CPropRMark(USHORT , const BYTE* pData, short nLen) // 4 bytes - chp.dttmPropRMark; Read_CRevisionMark( REDLINE_FORMAT, pData, nLen ); } + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 63b02ccb0f87..8666efd4405f 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8par5.cxx,v $ * - * $Revision: 1.62 $ + * $Revision: 1.63 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 12:41:18 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifdef PCH @@ -89,6 +88,16 @@ #include <so3/linkmgr.hxx> #endif +#ifndef _UCBHELPER_CONTENT_HXX_ +#include <ucbhelper/content.hxx> +#endif +#ifndef _UCBHELPER_CONTENTBROKER_HXX_ +#include <ucbhelper/contentbroker.hxx> +#endif +#ifndef _UCBHELPER_COMMANDENVIRONMENT_HXX +#include <ucbhelper/commandenvironment.hxx> +#endif + #ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_ #include <com/sun/star/i18n/ScriptType.hdl> #endif @@ -632,21 +641,42 @@ static ULONG MSDateTimeFormatToSwFormat(String& rParams, rParams.EraseAllChars('\''); - rbForceJapanese = false; - static const char aJapanese[] = + //#102782# & #102815# have to work at the same time :-) + bool bForceNatNum(false); + static const char aJapaneseNatNum[] = { - 'E', 'O', 'A', 'e', 'a', 'o', 'g', 'G' + 'O', 'A', 'o' }; - for (size_t i = 0; i < sizeof(aJapanese); ++i) + for (size_t i = 0; i < sizeof(aJapaneseNatNum); ++i) { - if (STRING_NOTFOUND != rParams.Search(aJapanese[i])) + if (STRING_NOTFOUND != rParams.Search(aJapaneseNatNum[i])) { - rbForceJapanese = true; + bForceNatNum = true; break; } } + if (bForceNatNum) + rbForceJapanese = true; + else + { + rbForceJapanese = false; + static const char aJapaneseLang[] = + { + 'E', 'e', 'g', 'G', 'a' + }; + + for (size_t i = 0; i < sizeof(aJapaneseLang); ++i) + { + if (STRING_NOTFOUND != rParams.Search(aJapaneseLang[i])) + { + rbForceJapanese = true; + break; + } + } + } + rParams.SearchAndReplaceAll(CREATE_CONST_ASC("EE"), CREATE_CONST_ASC("YYYY")); rParams.SearchAndReplaceAll('O', 'M'); @@ -655,11 +685,8 @@ static ULONG MSDateTimeFormatToSwFormat(String& rParams, CREATE_CONST_ASC("yyyy")); rParams.SearchAndReplaceAll('o', 'm'); - if (rbForceJapanese) - { + if (bForceNatNum) rParams.Insert(CREATE_CONST_ASC("[NatNum1][$-411]"),0); -// rParams.Insert(CREATE_CONST_ASC("[~gengou]"),0); - } pFormatter->PutEntry(rParams, nCheckPos, nType, nKey, nLang); @@ -1407,8 +1434,10 @@ eF_ResT SwWW8ImplReader::Read_F_Seq( WW8FieldDesc*, String& rStr ) SwSetExpFieldType( &rDoc, aSequenceName, GSE_SEQ ) ); SwSetExpField aFld( pFT, aEmptyStr, eNumFormat ); - if( sStart.Len() ) + if (sStart.Len()) aFld.SetFormula( ( aSequenceName += '=' ) += sStart ); + else if (!bCountOn) + aFld.SetFormula(aSequenceName); if( sLevel.Len() ) { @@ -2131,7 +2160,27 @@ eF_ResT SwWW8ImplReader::Read_F_IncludePicture( WW8FieldDesc*, String& rStr ) } } - if( !bEmbedded ) + if (!bEmbedded) + { + try + { + ::ucb::Content aCnt(aGrfName, + ::com::sun::star::uno::Reference< + ::com::sun::star::ucb::XCommandEnvironment >() ); + rtl::OUString aTitle; + + aCnt.getPropertyValue(rtl::OUString::createFromAscii("Title" )) + >>= aTitle; + bEmbedded = (aTitle.getLength() <= 0); + } + catch( ... ) + { + // this file did not exist, so we will not set this as graphiclink + bEmbedded = true; + } + } + + if (!bEmbedded) { /* Besonderheit: @@ -2153,12 +2202,20 @@ eF_ResT SwWW8ImplReader::Read_F_IncludePicture( WW8FieldDesc*, String& rStr ) 0, // Graphic* &aFlySet, 0); // SwFrmFmt* - aGrfNameGenerator.SetUniqueGraphName(pFlyFmtOfJustInsertedGraphic, + maGrfNameGenerator.SetUniqueGraphName(pFlyFmtOfJustInsertedGraphic, INetURLObject(aGrfName).GetBase()); } return FLD_READ_FSPA; } + +String wwSectionNamer::UniqueName() +{ + String aName(msFileLinkSeed); + aName += String::CreateFromInt32(++mnFileSectionNo); + return mrDoc.GetUniqueSectionName(&aName); +} + // "EINFUEGENTEXT" eF_ResT SwWW8ImplReader::Read_F_IncludeText( WW8FieldDesc* pF, String& rStr ) { @@ -2192,7 +2249,6 @@ eF_ResT SwWW8ImplReader::Read_F_IncludeText( WW8FieldDesc* pF, String& rStr ) aPara += so3::cTokenSeperator; aPara += aBook; } - String aStr(CREATE_CONST_ASC( "WW" )); /* ##509## @@ -2202,27 +2258,33 @@ eF_ResT SwWW8ImplReader::Read_F_IncludeText( WW8FieldDesc* pF, String& rStr ) */ WW8ReaderSave aSave( this ); - SwSection aSection( FILE_LINK_SECTION, rDoc.GetUniqueSectionName( &aStr ) ); + SwSection aSection(FILE_LINK_SECTION, maSectionNameGenerator.UniqueName()); aSection.SetLinkFileName( aPara ); aSection.SetProtect(true); - pLastInsertedSection = rDoc.Insert(*pPaM, aSection, 0 ,false); - - const SwSectionNode* pSectionNode = pLastInsertedSection->GetFmt()->GetSectionNode(); - ASSERT(!pAfterSection, "recursive sections!"); - pAfterSection = new SwNodeIndex( *pSectionNode->EndOfSectionNode(), 1 ); + SwSection* pSection = rDoc.Insert(*pPaM, aSection, 0 ,false); + ASSERT(pSection, "no section inserted"); + if (!pSection) + return FLD_OK; + const SwSectionNode* pSectionNode = pSection->GetFmt()->GetSectionNode(); + ASSERT(pSectionNode, "no section node!"); + if (!pSectionNode) + return FLD_OK; pPaM->GetPoint()->nNode = pSectionNode->GetIndex()+1; pPaM->GetPoint()->nContent.Assign(pPaM->GetCntntNode(), 0 ); + //we have inserted a section before this point, so adjust pos + //for future page/section segment insertion + maSectionManager.PrependedInlineNode(aSave.GetStartPos(), *pPaM->GetNode()); + bTxbxFlySection = true; ReadText(pF->nSRes, pF->nLRes, pPlcxMan->GetManType()); - //SwWW8ImplReader::MustCloseSection(long nTxtPos) ?? - delete pAfterSection, pAfterSection=0; - aSave.Restore( this ); + if (!maApos.back()) //a para end in apo doesn't count + bWasParaEnd = true; return FLD_OK; } @@ -2587,6 +2649,30 @@ void lcl_toxMatchTSwitch(SwWW8ImplReader& rReader, SwTOXBase& rBase, } } +USHORT wwSectionManager::CurrentSectionColCount() const +{ + USHORT nIndexCols = 1; + if (!maSegments.empty()) + nIndexCols = maSegments.back().maSep.ccolM1 + 1; + return nIndexCols; +} + +//Will there be a new pagebreak at this position (don't know what type +//until later) +bool wwSectionManager::WillHavePageDescHere(SwNodeIndex aIdx) const +{ + bool bRet = false; + if (!maSegments.empty()) + { + if (!maSegments.back().IsContinous() && + maSegments.back().maStart == aIdx) + { + bRet = true; + } + } + return bRet; +} + eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr ) { if( nIniFlags & WW8FL_NO_TOX ) @@ -2610,16 +2696,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr ) USHORT nCreateOf = (eTox == TOX_CONTENT) ? TOX_OUTLINELEVEL : TOX_MARK; - USHORT nIndexCols = 0; - SwSection *pTest = rDoc.GetCurrSection(*pPaM->GetPoint()); - if (pTest) //section is open, set to its no of section cols - { - const SwSectionFmt *pFmt = pTest->GetFmt(); - if (pFmt) - nIndexCols = pFmt->GetCol().GetNumCols(); - } - else if (pPageDesc) //set to current number of page cols - nIndexCols = pPageDesc->GetMaster().GetCol().GetNumCols(); + USHORT nIndexCols = maSectionManager.CurrentSectionColCount(); const SwTOXType* pType = rDoc.GetTOXType( eTox, 0 ); SwForm aOrigForm(eTox); @@ -3001,13 +3078,17 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr ) // Update fuer TOX anstossen rDoc.SetUpdateTOX(true); + //#i10028# inserting a toc implicltly acts like a parabreak + //in word and writer + if (pPaM->GetPoint()->nContent.GetIndex()) + AppendTxtNode(*pPaM->GetPoint()); + const SwPosition* pPos = pPaM->GetPoint(); SwFltTOX aFltTOX( pBase, nIndexCols ); // test if there is already a break item on this node - SwCntntNode* pNd = pPos->nNode.GetNode().GetCntntNode(); - if( pNd ) + if(SwCntntNode* pNd = pPos->nNode.GetNode().GetCntntNode()) { const SfxItemSet* pSet = pNd->GetpSwAttrSet(); if( pSet ) @@ -3019,16 +3100,32 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr ) } } + //Will there be a new pagebreak at this position (don't know what type + //until later) + if (maSectionManager.WillHavePageDescHere(pPos->nNode)) + aFltTOX.SetHadPageDescItem(true); + // Setze Anfang in Stack pRefStck->NewAttr( *pPos, aFltTOX ); - if( 1 < nIndexCols ) - bDontCreateSep = true; rDoc.InsertTableOf(*pPaM->GetPoint(), *aFltTOX.GetBase()); + //inserting a toc inserts a section before this point, so adjust pos + //for future page/section segment insertion + SwPaM aRegion(*pPaM); + aRegion.Move(fnMoveBackward); + ASSERT(rDoc.GetCurTOX(*aRegion.GetPoint()), "Misunderstood how toc works"); + if(rDoc.GetCurTOX(*aRegion.GetPoint())) + { + maSectionManager.PrependedInlineNode(*pPaM->GetPoint(), + *aRegion.GetNode()); + } + // Setze Ende in Stack pRefStck->SetAttr( *pPos, RES_FLTR_TOX ); + if (!maApos.back()) //a para end in apo doesn't count + bWasParaEnd = true; return FLD_OK; } @@ -3299,3 +3396,5 @@ void SwWW8ImplReader::Read_Invisible( USHORT, const BYTE*, short nLen ) InsertTagField( n, aTag ); } } + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 83c256961f06..68420245131c 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8par6.cxx,v $ * - * $Revision: 1.128 $ + * $Revision: 1.129 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 12:41:18 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #include <stdlib.h> @@ -401,67 +400,55 @@ static SwTwips AdjustSize( USHORT nPara ) return nSi; } -void SwWW8ImplReader::RemoveCols( SwPageDesc& rPageDesc, SwFmtCol*& rpCol ) +void wwSection::SetDirection() { - SwFrmFmt &rFmt0 = rPageDesc.GetMaster(); - const SwFmtCol rCol = rFmt0.GetCol(); - if( rCol.GetNumCols() ) + //sprmSTextFlow + switch (maSep.wTextFlow) { - rpCol = new SwFmtCol( rCol ); - SwFmtCol aCol; - rFmt0.SetAttr( aCol ); - rPageDesc.GetLeft().SetAttr( aCol ); + default: + ASSERT(!this, "Unknown layout type"); + case 0: + meDir=FRMDIR_HORI_LEFT_TOP; + break; + case 1: + meDir=FRMDIR_VERT_TOP_RIGHT; + break; + case 2: + //asian letters are not rotated, western are. We can't import + //bottom to top going left to right, we can't do this in + //pages, (in drawboxes we could partly hack it with a rotated + //drawing box, though not frame) + meDir=FRMDIR_VERT_TOP_RIGHT; + break; + case 3: + //asian letters are not rotated, western are. We can't import + meDir=FRMDIR_VERT_TOP_RIGHT; + break; + case 4: + //asian letters are rotated, western not. We can't import + meDir=FRMDIR_HORI_LEFT_TOP; + break; } - else - rpCol = 0; + + sal_uInt8 nRTLPgn = maSep.fBiDi; + if ((meDir == FRMDIR_HORI_LEFT_TOP) && nRTLPgn) + meDir = FRMDIR_HORI_RIGHT_TOP; } -void SwWW8ImplReader::SetDocumentGrid(SwFrmFmt &rFmt,const WW8PLCFx_SEPX* pSep) +bool wwSection::IsVertical() const +{ + if (meDir == FRMDIR_VERT_TOP_RIGHT || meDir == FRMDIR_VERT_TOP_LEFT) + return true; + return false; +} + +void SwWW8ImplReader::SetDocumentGrid(SwFrmFmt &rFmt, + const wwSection &rSection) { if (bVer67) return; - SvxFrameDirection eDir=FRMDIR_HORI_LEFT_TOP; - - //sprmSTextFlow - if (short nGridType = ReadULSprm(pSep, 0x5033, 0)) - { - switch(nGridType) - { - default: - ASSERT(!this, "Unknown layout type"); - case 0: - eDir=FRMDIR_HORI_LEFT_TOP; - break; - case 1: - eDir=FRMDIR_VERT_TOP_RIGHT; - break; - case 2: - //asian letters are not rotated, western are. We can't import - //bottom to top going left to right, we can't do this in - //pages, (in drawboxes we could partly hack it with a rotated - //drawing box, though not frame) - eDir=FRMDIR_VERT_TOP_RIGHT; - break; - case 3: - //asian letters are not rotated, western are. We can't import - eDir=FRMDIR_VERT_TOP_RIGHT; - break; - case 4: - //asian letters are rotated, western not. We can't import - eDir=FRMDIR_HORI_LEFT_TOP; - break; - } - } - if ((eDir == FRMDIR_HORI_LEFT_TOP) && mbRTLPgn) - eDir = FRMDIR_HORI_RIGHT_TOP; - - rFmt.SetAttr(SvxFrameDirectionItem(eDir)); - - if (eDir == FRMDIR_VERT_TOP_RIGHT || eDir == FRMDIR_VERT_TOP_LEFT) - bVerticalEnviron = true; - else - bVerticalEnviron = false; + rFmt.SetAttr(SvxFrameDirectionItem(rSection.meDir)); SwTwips nTextareaHeight = rFmt.GetFrmSize().GetHeight(); const SvxULSpaceItem &rUL = (const SvxULSpaceItem&) @@ -475,7 +462,7 @@ void SwWW8ImplReader::SetDocumentGrid(SwFrmFmt &rFmt,const WW8PLCFx_SEPX* pSep) nTextareaWidth -= rLR.GetLeft(); nTextareaWidth -= rLR.GetRight(); - if (bVerticalEnviron) + if (rSection.IsVertical()) { SwTwips nSwap = nTextareaHeight; nTextareaHeight = nTextareaWidth; @@ -486,32 +473,31 @@ void SwWW8ImplReader::SetDocumentGrid(SwFrmFmt &rFmt,const WW8PLCFx_SEPX* pSep) aGrid.SetDisplayGrid(false); aGrid.SetPrintGrid(false); SwTextGrid eType=GRID_NONE; - if (short nGridType = ReadULSprm( pSep, 0x5032, 0 )) + + switch (rSection.maSep.clm) { - switch (nGridType) - { - case 0: - eType = GRID_NONE; - break; - default: - ASSERT(!this, "Unknown grid type"); - case 3: - //Text snaps to char grid, this doesn't make a lot of sense to - //me. This is closer than LINES_CHARS - eType = GRID_LINES_ONLY; - break; - case 1: - eType = GRID_LINES_CHARS; - break; - case 2: - eType = GRID_LINES_ONLY; - break; - } + case 0: + eType = GRID_NONE; + break; + default: + ASSERT(!this, "Unknown grid type"); + case 3: + //Text snaps to char grid, this doesn't make a lot of sense to + //me. This is closer than LINES_CHARS + eType = GRID_LINES_ONLY; + break; + case 1: + eType = GRID_LINES_CHARS; + break; + case 2: + eType = GRID_LINES_ONLY; + break; } + aGrid.SetGridType(eType); //sep.dyaLinePitch - short nLinePitch = ReadULSprm(pSep, 0x9031, 360); + short nLinePitch = rSection.maSep.dyaLinePitch; aGrid.SetLines(nTextareaHeight/nLinePitch); @@ -541,9 +527,9 @@ void SwWW8ImplReader::SetDocumentGrid(SwFrmFmt &rFmt,const WW8PLCFx_SEPX* pSep) } //dxtCharSpace - if (const BYTE* pS = pSep->HasSprm(0x7030)) + if (rSection.maSep.dxtCharSpace) { - UINT32 nCharSpace = SVBT32ToLong(pS); + UINT32 nCharSpace = rSection.maSep.dxtCharSpace; //main lives in top 20 bits, and is signed. INT32 nMain = (nCharSpace & 0xFFFFF000); nMain/=0x1000; @@ -572,35 +558,22 @@ void SwWW8ImplReader::Read_ParaBiDi(USHORT, const BYTE* pData, short nLen) } } -bool SwWW8ImplReader::SetCols(SwFrmFmt* pFmt, const WW8PLCFx_SEPX* pSep, - USHORT nNettoWidth, bool bTestOnly) +bool wwSectionManager::SetCols(SwFrmFmt &rFmt, const wwSection &rSection, + USHORT nNettoWidth) { - if( nIniFlags & WW8FL_NO_COLS ) // ausgeschaltet - return false; - //sprmSCcolumns - Anzahl der Spalten - 1 - USHORT nCols = ReadSprm( pSep, (bVer67 ? 144 : 0x500B), 0 ); + USHORT nCols = rSection.NoCols(); - nCols ++; // Zahl der SW-Spalten - if( nCols < 2 ) + if (nCols < 2) return false; // keine oder bloedsinnige Spalten - if( bTestOnly ) - return true; - - if( !pFmt ) - { - ASSERT( !this, "code error: pFmt hat Zero value!" ); - return false; - } - SwFmtCol aCol; // Erzeuge SwFmtCol //sprmSDxaColumns - Default-Abstand 1.25 cm - USHORT nColSpace = ReadUSprm( pSep, (bVer67 ? 145 : 0x900C), 708 ); + USHORT nColSpace = rSection.StandardColSeperation(); // sprmSLBetween - if( ReadBSprm( pSep, (bVer67 ? 158 : 0x3019), 0 ) ) + if (rSection.maSep.fLBetween) { aCol.SetLineAdj( COLADJ_TOP ); // Line aCol.SetLineHeight( 100 ); @@ -608,145 +581,54 @@ bool SwWW8ImplReader::SetCols(SwFrmFmt* pFmt, const WW8PLCFx_SEPX* pSep, aCol.SetLineWidth( 1 ); } + aCol.Init( nCols, nColSpace, nNettoWidth ); // sprmSFEvenlySpaced - bool bEven = ReadBSprm(pSep, (bVer67 ? 138 : 0x3005), 1) ? true : false; - - if( bEven ) // alle Spalten sind gleich - aCol.Init( nCols, nColSpace, nNettoWidth ); - else + if (!rSection.maSep.fEvenlySpaced) { - aCol.Init( nCols, nColSpace, USHRT_MAX ); - // Spalten unterschiedlich breit: fein, das kann der Writer inzwischen! - USHORT nWishWidth = 0, nLeftDist = 0, nRightDist = 0; - USHORT i; - for( i = 0; i < nCols; i++ ) - { - SwColumn* pCol = aCol.GetColumns()[ i ]; - pCol->SetLeft( nLeftDist ); - - if( i < nCols-1 ) - { - //sprmSDxaColSpacing - const BYTE* pSD = - pSep->HasSprm( (bVer67 ? 137 : 0xF204), BYTE( i ) ); - - ASSERT( pSD, "+Sprm 137 (bzw. 0xF204) (Colspacing) fehlt" ); - if( pSD ) - { - USHORT nSp = SVBT16ToShort( pSD + 1 ); - nRightDist = nSp / 2; - - pCol->SetRight( nSp - nRightDist ); - } - } - else - nRightDist = 0; // letzte Spalte hat keinen Zwischenraum mehr - - //sprmSDxaColWidth - const BYTE* pSW = - pSep->HasSprm( (bVer67 ? 136 : 0xF203), BYTE( i ) ); - - ASSERT( pSW, "+Sprm 136 (bzw. 0xF203) (ColWidth) fehlt" ); - if( pSW ) - pCol->SetWishWidth( SVBT16ToShort( pSW + 1 ) - + nLeftDist - + pCol->GetRight() ); - // aufsummierte Spaltenbreiten ergeben Gesamtbreite - nWishWidth += pCol->GetWishWidth(); - // Halber Abstand ist an naechster Spalte noch zu setzen - nLeftDist = nRightDist; - } - aCol.SetWishWidth( nWishWidth ); - -#ifdef niemalsdef - // beim RTF-Import: aCol._SetOrtho(false); - USHORT nWishWidth = 0, nHalfPrev = 0; - for( USHORT n = 0, i = 0; n < aColumns.Count(); n += 2, ++i ) + int nIdx = 1; + for (USHORT i = 0; i < nCols; i++ ) { SwColumn* pCol = aCol.GetColumns()[ i ]; - pCol->SetLeft( nHalfPrev ); - USHORT nSp = aColumns[ n+1 ]; - nHalfPrev = nSp / 2; - pCol->SetRight( nSp - nHalfPrev ); - pCol->SetWishWidth( aColumns[ n ] + - pCol->GetLeft() + pCol->GetRight() ); - nWishWidth += pCol->GetWishWidth(); + USHORT nLeft = rSection.maSep.rgdxaColumnWidthSpacing[nIdx - 1]/2; + USHORT nRight = rSection.maSep.rgdxaColumnWidthSpacing[nIdx + 1]/2; + USHORT nWishWidth = rSection.maSep.rgdxaColumnWidthSpacing[nIdx] + + nLeft + nRight; + pCol->SetWishWidth(nWishWidth); + pCol->SetLeft(nLeft); + pCol->SetRight(nRight); + nIdx += 2; } - aCol.SetWishWidth( nWishWidth ); -#endif + aCol.SetWishWidth(nNettoWidth); } - pFmt->SetAttr( aCol ); + rFmt.SetAttr(aCol); return true; } -// SetPage1() setzt Orientierung, Papiergroesse, LRRaender, Spalten -void SwWW8ImplReader::SetPage1(SwPageDesc* pInPageDesc, SwFrmFmt &rFmt, - const WW8PLCFx_SEPX* pSep, USHORT nLIdx, bool bIgnoreCols) +void wwSectionManager::SetLeftRight(wwSection &rSection) { - if( nIniFlags & WW8FL_NO_LRUL ) // Abgeschaltet - return; - - static const USHORT aVer67Ids[] = - { - /*sprmSBOrientation*/ 162, - /*sprmSXaPage*/ 164, - /*sprmSYaPage*/ 165, - /*sprmSDxaLeft*/ 166, - /*sprmSDxaRight*/ 167, - /*sprmSDzaGutter*/ 170 - }; - - static const USHORT aVer8Ids[] = - { - /*sprmSBOrientation*/ 0x301d, - /*sprmSXaPage*/ 0xB01F, - /*sprmSYaPage*/ 0xB020, - /*sprmSDxaLeft*/ 0xB021, - /*sprmSDxaRight*/ 0xB022, - /*sprmSDzaGutter*/ 0xB025 - }; - - const USHORT* pIds = bVer67 ? aVer67Ids : aVer8Ids; - - // 1. Orientierung - pInPageDesc->SetLandscape( 0 != ReadBSprm( pSep, pIds[0], 0 ) ); - - // 2. Papiergroesse - SwFmtFrmSize aSz( rFmt.GetFrmSize() ); - aSz.SetWidth(AdjustSize(ReadUSprm(pSep, pIds[1], (USHORT)lLetterWidth))); - - nPgWidth = (short)aSz.GetWidth(); // Merken fuer Tabellen u. ae. - aSz.SetHeight(AdjustSize(ReadUSprm(pSep, pIds[2], (USHORT)lLetterHeight))); - - rFmt.SetAttr( aSz ); - // 3. LR-Raender - // Default-Raender fuer verschiedene nationale Versionen - static const USHORT nLef[] = { MM_250, 1800 }; - static const USHORT nRig[] = { MM_250, 1800 }; - - short nWWLe = MSRoundTweak(ReadULSprm( pSep, pIds[3], nLef[nLIdx])); - short nWWRi = MSRoundTweak(ReadULSprm( pSep, pIds[4], nRig[nLIdx])); - short nWWGu = ReadULSprm( pSep, pIds[5], 0); + short nWWLe = MSRoundTweak(rSection.maSep.dxaLeft); + short nWWRi = MSRoundTweak(rSection.maSep.dxaRight); + short nWWGu = rSection.maSep.dzaGutter; /* - 0x322A is set if the gutter is on the right, the gutter is otherwise - placed on the left unless the global dop options are to put it on top, - that case is handled in GetPageULData, unfortunately when we are "2 pages - in 1" then the gutter is alternated between the top of odd pages and bottom - of even pages, which we can't do, so ignore it in that case + fRTLGutter is set if the gutter is on the right, the gutter is otherwise + placed on the left unless the global dop options are to put it on top, that + case is handled in GetPageULData, unfortunately when we are "2 pages in 1" + then the gutter is alternated between the top of odd pages and bottom of + even pages, which we can't do, so ignore it in that case */ - if (!pWDop->doptypography.f2on1) + if (!mrReader.pWDop->doptypography.f2on1) { - if ((!bVer67) && ReadULSprm( pSep, 0x322A, 0 )) + if (rSection.maSep.fRTLGutter) nWWRi += nWWGu; - else if (!pWDop->iGutterPos) + else if (!mrReader.pWDop->iGutterPos) nWWLe += nWWGu; } // Left / Right - if ((aSz.GetWidth() - nWWLe - nWWRi) < MINLAY) + if ((rSection.nPgWidth - nWWLe - nWWRi) < MINLAY) { /* There are some label templates which are "broken", they specify @@ -761,62 +643,42 @@ void SwWW8ImplReader::SetPage1(SwPageDesc* pInPageDesc, SwFrmFmt &rFmt, it will add up the values to give a wider page than is actually being used. */ - nWWRi = aSz.GetWidth()-nWWLe-MINLAY; + nWWRi = rSection.nPgWidth - nWWLe - MINLAY; } - SvxLRSpaceItem aTemp( nWWLe, nWWRi ); - rFmt.SetAttr( aTemp ); - - nPgLeft = nWWLe; - nPgRight = nWWRi; - - if( !bIgnoreCols ) - { - // 4. Spalten - SetCols( &rFmt, pSep, (USHORT)(aSz.GetWidth() - nWWLe - nWWRi) ); - } + rSection.nPgLeft = nWWLe; + rSection.nPgRight = nWWRi; } -struct WW8ULSpaceData +void wwSectionManager::SetPage(SwPageDesc &rInPageDesc, SwFrmFmt &rFmt, + const wwSection &rSection, bool bIgnoreCols) { - bool bHasHeader, bHasFooter; - short nSwHLo, nHdUL, nSwFUp, nFtUL, nSwUp, nSwLo; - WW8ULSpaceData() : bHasHeader(false), bHasFooter(false) {} -}; - -void SwWW8ImplReader::GetPageULData( const WW8PLCFx_SEPX* pSep, USHORT nLIdx, - bool bFirst, WW8ULSpaceData& rData ) -{ - if( nIniFlags & WW8FL_NO_LRUL ) // abgeschaltet - return; + // 1. Orientierung + rInPageDesc.SetLandscape(rSection.IsLandScape()); - // Default-Raender fuer verschiedene nationale Versionen - static const USHORT nTop[] = { MM_250, 1440 }; - static const USHORT nBot[] = { MM_200, 1440 }; + // 2. Papiergroesse + SwFmtFrmSize aSz( rFmt.GetFrmSize() ); + aSz.SetWidth(rSection.GetPageWidth()); + aSz.SetHeight(AdjustSize(rSection.GetPageHeight())); + rFmt.SetAttr(aSz); - // Einlesen der WW-Einstellungen + rFmt.SetAttr( + SvxLRSpaceItem(rSection.GetPageLeft(), rSection.GetPageRight())); - static const USHORT aVer67Ids[] = + if (!bIgnoreCols) { - /*sprmSDyaTop*/ 168, - /*sprmSDyaBottom*/ 169, - /*sprmSDyaHdrTop*/ 156, - /*sprmSDyaHdrBottom*/ 157 - }; - static const USHORT aVer8Ids[] = - { - /*sprmSDyaTop*/ 0x9023, - /*sprmSDyaBottom*/ 0x9024, - /*sprmSDyaHdrTop*/ 0xB017, - /*sprmSDyaHdrBottom*/ 0xB018 - }; - - const USHORT* pIds = bVer67 ? aVer67Ids : aVer8Ids; + SetCols(rFmt, rSection, rSection.GetPageWidth() - + rSection.GetPageLeft() - rSection.GetPageRight()); + } +} - short nWWUp = ReadULSprm( pSep, pIds[0], nTop[nLIdx] ); - short nWWLo = ReadULSprm( pSep, pIds[1], nBot[nLIdx] ); - short nWWHTop = ReadULSprm( pSep, pIds[2], MM_125 ); - short nWWFBot = ReadULSprm( pSep, pIds[3], MM_125 ); +void wwSectionManager::GetPageULData(const wwSection &rSection, bool bFirst, + wwSectionManager::wwULSpaceData& rData) +{ + short nWWUp = rSection.maSep.dyaTop; + short nWWLo = rSection.maSep.dyaBottom; + short nWWHTop = rSection.maSep.dyaHdrTop; + short nWWFBot = rSection.maSep.dyaHdrBottom; /* If there is gutter in 97+ and the dop says put it on top then get the @@ -825,16 +687,21 @@ void SwWW8ImplReader::GetPageULData( const WW8PLCFx_SEPX* pSep, USHORT nLIdx, even pages, something we cannot do. So we will put it on top of all pages, that way the pages are at least the right size. */ - if ( pWDop->doptypography.f2on1 || - (!bVer67 && pWDop->iGutterPos && !ReadULSprm( pSep, 0x322A, 0 ))) + if ( mrReader.pWDop->doptypography.f2on1 || + (!mrReader.bVer67 && mrReader.pWDop->iGutterPos && + rSection.maSep.fRTLGutter) + ) { - nWWUp += ReadULSprm( pSep, 0xB025, 0 ); + nWWUp += rSection.maSep.dzaGutter; } if( bFirst ) - rData.bHasHeader = (nCorrIhdt & WW8_HEADER_FIRST )!=0; + rData.bHasHeader = (rSection.maSep.grpfIhdt & WW8_HEADER_FIRST) !=0; else - rData.bHasHeader = (nCorrIhdt & (WW8_HEADER_EVEN | WW8_HEADER_ODD))!=0; + { + rData.bHasHeader = (rSection.maSep.grpfIhdt & + (WW8_HEADER_EVEN | WW8_HEADER_ODD)) != 0; + } if( rData.bHasHeader ) { @@ -848,9 +715,12 @@ void SwWW8ImplReader::GetPageULData( const WW8PLCFx_SEPX* pSep, USHORT nLIdx, rData.nSwUp = nWWUp; if( bFirst ) - rData.bHasFooter = (nCorrIhdt & WW8_FOOTER_FIRST )!=0; + rData.bHasFooter = (rSection.maSep.grpfIhdt & WW8_FOOTER_FIRST) !=0; else - rData.bHasFooter = (nCorrIhdt & (WW8_FOOTER_EVEN | WW8_FOOTER_ODD))!=0; + { + rData.bHasFooter = (rSection.maSep.grpfIhdt & + (WW8_FOOTER_EVEN | WW8_FOOTER_ODD)) != 0; + } if( rData.bHasFooter ) { @@ -862,16 +732,12 @@ void SwWW8ImplReader::GetPageULData( const WW8PLCFx_SEPX* pSep, USHORT nLIdx, } else // kein Footer -> Lo einfach uebernehmen rData.nSwLo = nWWLo; - - nPgTop = rData.nSwUp; } -void SwWW8ImplReader::SetPageULSpaceItems(SwFrmFmt &rFmt, WW8ULSpaceData& rData) +void wwSectionManager::SetPageULSpaceItems(SwFrmFmt &rFmt, + wwSectionManager::wwULSpaceData& rData) { - if( nIniFlags & WW8FL_NO_LRUL ) // deactivated ? - return; - - if( rData.bHasHeader ) // ... und Header-Lower setzen + if (rData.bHasHeader) // ... und Header-Lower setzen { //Kopfzeilenhoehe minimal sezten if (SwFrmFmt* pHdFmt = (SwFrmFmt*)rFmt.GetHeader().GetHeaderFmt()) @@ -885,7 +751,7 @@ void SwWW8ImplReader::SetPageULSpaceItems(SwFrmFmt &rFmt, WW8ULSpaceData& rData) } } - if( rData.bHasFooter ) // ... und Footer-Upper setzen + if (rData.bHasFooter) // ... und Footer-Upper setzen { if (SwFrmFmt* pFtFmt = (SwFrmFmt*)rFmt.GetFooter().GetFooterFmt()) { @@ -898,346 +764,91 @@ void SwWW8ImplReader::SetPageULSpaceItems(SwFrmFmt &rFmt, WW8ULSpaceData& rData) } } - SvxULSpaceItem aUL( rData.nSwUp, rData.nSwLo ); // Page-UL setzen - rFmt.SetAttr( aUL ); + SvxULSpaceItem aUL(rData.nSwUp, rData.nSwLo); // Page-UL setzen + rFmt.SetAttr(aUL); } -void SwWW8ImplReader::SetPageBorder(SwPageDesc *pPageDesc0, - SwPageDesc *pPageDesc1, const WW8PLCFx_SEPX* pSep, USHORT nLIdx ) +SwSectionFmt *wwSectionManager::InsertSection( + SwPaM& rMyPaM, wwSection &rSection) { - WW8_BRC brc[4]; - if( !bVer67 && ::lcl_ReadBorders( bVer67, brc, 0, 0, pSep ) && - IsBorder( brc )) - { - short nPgbProp = ReadSprm( pSep, 0x522F, 0 ); //sprmSPgbProp - - // ogbProp - pgbApplyTo - // 0 all Pages in this Section - // 1 first Page in this Section - // 2 all Pages in this Section but first - // 3 whole document (all Sections) - if( !pPageDesc0 && pPageDesc1 && - ( 2 == (nPgbProp & 0x7 ) || 1 == (nPgbProp & 0x7 )) ) - { - // dann muss aber einer angelegt werden - SwPaM* pPageDeskPaM = 0; - pPageDesc0 = CreatePageDesc( 0, &pPageDeskPaM ); - - // if PageDesc was inserted check for cols - // and insert section instead - if( pPageDeskPaM ) - { - SwFrmFmt &rFmt = pPageDesc0->GetMaster(); - SetPage1(pPageDesc0, rFmt, pSep, nLIdx, false); - const SwFmtCol& rCol = rFmt.GetCol(); - // if PageDesc has been inserted and has cols - // insert a *section* with cols instead - if( rCol.GetNumCols() ) - { - InsertSectionWithWithoutCols( *pPaM, &rCol ); - // remove columns from PageDesc - SwFmtCol aCol; - rFmt.SetAttr( aCol ); - } - delete pPageDeskPaM; - } - - rDoc.CopyPageDesc(*pPageDesc1, *pPageDesc0, false); - pPageDesc0->SetFollow( pPageDesc1 ); - pPageDesc1->SetFollow( pPageDesc1 ); - } - - SwFrmFmt* pFmt0 = 0, *pFmt1 = 0; - if( 2 != (nPgbProp & 0x7 ) && pPageDesc0 ) - pFmt0 = &pPageDesc0->GetMaster(); - - if( 1 != (nPgbProp & 0x7 ) && pPageDesc1 ) - pFmt1 = &pPageDesc1->GetMaster(); - - SvxBoxItem aBox; - SetBorder( aBox, brc ); + SwSection aSection( CONTENT_SECTION, mrReader.rDoc.GetUniqueSectionName() ); - Rectangle aInnerDist; - GetBorderDistance( brc, aInnerDist ); + SfxItemSet aSet( mrReader.rDoc.GetAttrPool(), aFrmFmtSetRange ); - if( aInnerDist.Left() || aInnerDist.Top() - || aInnerDist.Right() || aInnerDist.Bottom() ) - { - // das muss natuerlich von den Raendern abgezogen werden! - SwFrmFmt* pFmt = pFmt0; - for( int i = 0; i < 2; ++i, pFmt = pFmt1 ) - if( pFmt ) - { - SvxLRSpaceItem aLR( pFmt->GetLRSpace() ); - SvxULSpaceItem aUL( pFmt->GetULSpace() ); - - if( 0x20 == ( nPgbProp & 0xe0 )) // distance from pageborder - { - // Left - if( aInnerDist.Left() < aLR.GetLeft() ) - { - aLR.SetLeft(aLR.GetLeft() - aInnerDist.Left()); - aBox.SetDistance( (USHORT)aInnerDist.Left(), - BOX_LINE_LEFT ); - } - else - { - aBox.SetDistance( (USHORT)aLR.GetLeft(), - BOX_LINE_LEFT ); - aLR.SetLeft( 0 ); - } - // Right - if( aInnerDist.Right() < aLR.GetRight() ) - { - aLR.SetRight(aLR.GetRight() - aInnerDist.Right()); - aBox.SetDistance( (USHORT)aInnerDist.Right(), - BOX_LINE_RIGHT ); - } - else - { - aBox.SetDistance( (USHORT)aLR.GetRight(), - BOX_LINE_RIGHT ); - aLR.SetRight( 0 ); - } - // Top - if( aInnerDist.Top() < aUL.GetUpper() ) - { - aUL.SetUpper( (USHORT)(aUL.GetUpper() - - aInnerDist.Top() ) ); - aBox.SetDistance( (USHORT)aInnerDist.Top(), - BOX_LINE_TOP ); - } - else - { - aBox.SetDistance( aUL.GetUpper(), BOX_LINE_TOP ); - aUL.SetUpper( 0 ); - } - // Bottom - if( aInnerDist.Bottom() < aUL.GetLower() ) - { - aUL.SetLower( (USHORT)(aUL.GetLower() - - aInnerDist.Bottom() ) ); - aBox.SetDistance( (USHORT)aInnerDist.Bottom(), - BOX_LINE_BOTTOM ); - } - else - { - aBox.SetDistance( aUL.GetLower(), BOX_LINE_BOTTOM ); - aUL.SetLower( 0 ); - } - - pFmt->SetAttr( aLR ); - pFmt->SetAttr( aUL ); - pFmt->SetAttr( aBox ); - } - else // distance from text - { - // Left - aBox.SetDistance( (USHORT)aInnerDist.Left(), - BOX_LINE_LEFT ); - aLR.SetLeft( Max((long)0, aLR.GetLeft() - - aInnerDist.Left() )); - // Right - aBox.SetDistance( (USHORT)aInnerDist.Right(), - BOX_LINE_RIGHT ); - aLR.SetRight(Max((long)0, aLR.GetRight() - - aInnerDist.Right() )); - // Top - aBox.SetDistance( (USHORT)aInnerDist.Top(), - BOX_LINE_TOP ); - aUL.SetUpper(Max(0, aUL.GetUpper() - - (USHORT)aInnerDist.Top() )); - // Bottom - aBox.SetDistance( (USHORT)aInnerDist.Bottom(), - BOX_LINE_BOTTOM ); - aUL.SetLower(Max(0, aUL.GetLower() - - (USHORT)aInnerDist.Bottom() )); - - pFmt->SetAttr( aLR ); - pFmt->SetAttr( aUL ); - pFmt->SetAttr( aBox ); - } - } - - } - else - { - if( pFmt0 ) pFmt0->SetAttr( aBox ); - if( pFmt1 ) pFmt1->SetAttr( aBox ); - } - - - SvxShadowItem aS; - if( SetShadow( aS, aBox, brc)) - { - if( pFmt0 ) pFmt0->SetAttr( aS ); - if( pFmt1 ) pFmt1->SetAttr( aS ); - } - } -} + sal_uInt8 nRTLPgn = maSegments.empty() ? 0 : maSegments.back().IsBiDi(); + aSet.Put(SvxFrameDirectionItem( + nRTLPgn ? FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP)); -void SwWW8ImplReader::SetUseOn( SwPageDesc* pPageDesc0, SwPageDesc* pPageDesc1, - BYTE nIhdt ) -{ - bool bEven = (nIhdt & ( WW8_HEADER_EVEN | WW8_FOOTER_EVEN )) ? true : false; + if (2 == mrReader.pWDop->fpc) + aSet.Put( SwFmtFtnAtTxtEnd(FTNEND_ATTXTEND)); + if (0 == mrReader.pWDop->epc) + aSet.Put( SwFmtEndAtTxtEnd(FTNEND_ATTXTEND)); - UseOnPage eUseBase = pWDop->fMirrorMargins ? PD_MIRROR : PD_ALL; - UseOnPage eUse = eUseBase; - if( !bEven ) - eUse = (UseOnPage)( eUse | PD_HEADERSHARE | PD_FOOTERSHARE ); + rSection.mpSection = mrReader.rDoc.Insert( rMyPaM, aSection, &aSet ); + ASSERT(rSection.mpSection, "section not inserted!"); + if (!rSection.mpSection) + return 0; - if( !pPageDesc1 ) // 1 Pagedesc reicht - pPageDesc0->WriteUseOn(eUse); // alle Seiten - else // 2 Pagedescs noetig + SwPageDesc *pPage = 0; + mySegrIter aEnd = maSegments.rend(); + for (mySegrIter aIter = maSegments.rbegin(); aIter != aEnd; ++aIter) { - // 1. Seite - pPageDesc0->WriteUseOn( (UseOnPage) - ( eUseBase | PD_HEADERSHARE | PD_FOOTERSHARE ) ); - pPageDesc1->WriteUseOn( eUse ); // Folgeseiten + if (pPage = aIter->mpPage) + break; } -} -void SwWW8ImplReader::InsertSectionWithWithoutCols(SwPaM& rMyPaM, - const SwFmtCol* pCol) -{ - // if this Node is not empty create a new Node befor inserting the Section - const SwPosition* pPos = rMyPaM.GetPoint(); - const SwTxtNode* pSttNd = pPos->nNode.GetNode().GetTxtNode(); - USHORT nCntPos = pPos->nContent.GetIndex(); - if( nCntPos && pSttNd->GetTxt().Len() ) - { - if( rMyPaM.HasMark() ) // do we have a SELECTION ? - { - SwNodeIndex aMarkNd( rMyPaM.GetMark()->nNode, -1 ); - xub_StrLen nMarkCnt = rMyPaM.GetMark()->nContent.GetIndex(); - rDoc.SplitNode( *pPos ); - - rMyPaM.Move( fnMoveBackward ); - aMarkNd++; - rMyPaM.GetMark()->nNode = aMarkNd; - rMyPaM.GetMark()->nContent.Assign(aMarkNd.GetNode().GetCntntNode(), - nMarkCnt ); - } - else - rDoc.SplitNode( *pPos ); - } + ASSERT(pPage, "no page outside this section!"); - SwSection aSection( CONTENT_SECTION, rDoc.GetUniqueSectionName() ); + if (!pPage) + pPage = &mrReader.rDoc._GetPageDesc(0); - SfxItemSet aSet( rDoc.GetAttrPool(), aFrmFmtSetRange ); + if (!pPage) + return 0; - if( pCol ) - aSet.Put( *pCol ); + SwFrmFmt& rFmt = pPage->GetMaster(); + const SwFmtFrmSize& rSz = rFmt.GetFrmSize(); + const SvxLRSpaceItem& rLR = rFmt.GetLRSpace(); + SwTwips nWidth = rSz.GetWidth(); + long nLeft = rLR.GetTxtLeft(); + long nRight = rLR.GetRight(); - aSet.Put(SvxFrameDirectionItem( - mbRTLPgn ? FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP)); + SwSectionFmt *pFmt = rSection.mpSection->GetFmt(); + ASSERT(pFmt, "impossible"); + if (!pFmt) + return 0; - if( 2 == pWDop->fpc ) - aSet.Put( SwFmtFtnAtTxtEnd( FTNEND_ATTXTEND )); - if( 0 == pWDop->epc ) - aSet.Put( SwFmtEndAtTxtEnd( FTNEND_ATTXTEND )); + SetCols(*pFmt, rSection, (USHORT)(nWidth - nLeft - nRight) ); - pLastInsertedSection = rDoc.Insert( rMyPaM, aSection, &aSet ); //Set the columns to be UnBalanced if compatability option is set - if (pWDop->fNoColumnBalance ) + if (mrReader.pWDop->fNoColumnBalance ) { - SwSectionFmt *pFmt = pLastInsertedSection->GetFmt(); + SwSectionFmt *pFmt = rSection.mpSection->GetFmt(); pFmt->SetAttr(SwFmtNoBalancedColumns(true)); } - // set PaM into first Node of the new Section - const SwSectionNode* pSectionNode = pLastInsertedSection->GetFmt()->GetSectionNode(); - ASSERT( pSectionNode, "Kein Inhalt vorbereitet." ); - - ASSERT( !pAfterSection, "pAfterSection not Null! why Recursion?"); - pAfterSection = new SwNodeIndex( *pSectionNode->EndOfSectionNode(), 1 ); - rMyPaM.GetPoint()->nNode = pSectionNode->GetIndex()+1; - rMyPaM.GetPoint()->nContent.Assign(rMyPaM.GetCntntNode(), 0); + return pFmt; } -bool SwWW8ImplReader::MustCloseSection(long nTxtPos) +void SwWW8ImplReader::HandleLineNumbering(const wwSection &rSection) { - // Might we have to close a section first? - bool bSectionWasJustClosed = pAfterSection && nTxtPos; - if( bSectionWasJustClosed ) - { - /* - #96598# - When a section is created it is created with an empty para inside it. - We should never want this para. - */ - rDoc.DelFullPara(*pPaM); - - // set PaM behind section - pPaM->GetPoint()->nNode = *pAfterSection; - pPaM->GetPoint()->nContent.Assign(pPaM->GetCntntNode(), 0); - - ASSERT(!pPaM->GetNode()->IsEndNode(), - "WW8: I want to see an example of this to ease my mind"); - if (pPaM->GetNode()->IsEndNode()) - rDoc.AppendTxtNode(*pPaM->GetPoint()); - - delete pAfterSection, pAfterSection=0; - delete pLastPgDeskIdx, pLastPgDeskIdx=0; - } - return bSectionWasJustClosed; -} - - -// Bei jedem Abschnittswechsel ( auch am Anfang eines Dokuments ) wird -// CreateSep gerufen, dass dann den / die Pagedesc(s) erzeugt und -// mit Attributen un KF-Texten fuellt. -// Dieses Vorgehen ist noetig geworden, da die UEbersetzung der verschiedenen -// Seiten-Attribute zu stark verflochten ist. -void SwWW8ImplReader::CreateSep(const long nTxtPos, bool bMustHaveBreak) -{ - /* - #i1909# #100688# section/page breaks should not occur in tables, word - itself ignores them in this case. The bug is truly that this filter - created such documents in the past! - */ - if (nInTable) - return; - - if (bTxbxFlySection || bDontCreateSep) - return; - - BYTE nLastSectionCorrIhdt = nCorrIhdt; - bool bLastSectionHadATitlePage = bSectionHasATitlePage; - - bool bSectionWasJustClosed = MustCloseSection(nTxtPos); - - SwPageDesc* pOldPageDesc = pPageDesc; - SwPageDesc* pPageDesc1 = 0; - WW8PLCFx_SEPX* pSep = pPlcxMan->GetSepPLCF(); - - // check if Line Numbering must be activated or resetted - const BYTE* pSprmSNLnnMod = mbNewDoc ? - pSep->HasSprm( bVer67 ? 154 : 0x5015 ) : 0; - if( pSprmSNLnnMod && *pSprmSNLnnMod ) + if (mbNewDoc && rSection.maSep.nLnnMod) { // restart-numbering-mode: 0 per page, 1 per section, 2 never restart - const BYTE* pSprmSLnc = pSep->HasSprm( bVer67 ? 152 : 0x3013 ); - bRestartLnNumPerSection = pSprmSLnc && 1 == *pSprmSLnc; + bool bRestartLnNumPerSection = (1 == rSection.maSep.lnc); - if( bNoLnNumYet ) + if (bNoLnNumYet) { SwLineNumberInfo aInfo( rDoc.GetLineNumberInfo() ); aInfo.SetPaintLineNumbers(true); - aInfo.SetRestartEachPage( !pSprmSLnc || 0 == *pSprmSLnc ); + aInfo.SetRestartEachPage(!bRestartLnNumPerSection); - const BYTE* pSprmSDxaLnn = pSep->HasSprm( bVer67 ? 155:0x9016 ); - if( pSprmSDxaLnn ) - { - INT16 nSDxaLnn = SVBT16ToShort( pSprmSDxaLnn ); - aInfo.SetPosFromLeft( nSDxaLnn ); - } - - aInfo.SetCountBy( *pSprmSNLnnMod ); //Paint only for every n line + aInfo.SetPosFromLeft( rSection.maSep.dxaLnn); + //Paint only for every n line + aInfo.SetCountBy(rSection.maSep.nLnnMod); // to be defaulted features ( HARDCODED in MS Word 6,7,8,9 ) aInfo.SetCountBlankLines(true); @@ -1250,547 +861,327 @@ void SwWW8ImplReader::CreateSep(const long nTxtPos, bool bMustHaveBreak) bNoLnNumYet = false; } - const BYTE* pSprmSLnnMin = pSep->HasSprm( bVer67 ? 160:0x501B ); - if( ( pSprmSLnnMin - && 0 < *pSprmSLnnMin ) - || ( bRestartLnNumPerSection - && !bNoLnNumYet ) ) + if ( + (0 < rSection.maSep.lnnMin) || + (bRestartLnNumPerSection && !bNoLnNumYet) + ) { SwFmtLineNumber aLN; - if( pSprmSLnnMin ) - aLN.SetStartValue( 1 + *pSprmSLnnMin ); - else - aLN.SetStartValue( 1 ); - - NewAttr( aLN ); - pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_LINENUMBER ); + aLN.SetStartValue(1 + rSection.maSep.lnnMin); + NewAttr(aLN); + pCtrlStck->SetAttr(*pPaM->GetPoint(), RES_LINENUMBER); } bNoLnNumYet = false; } +} +wwSection::wwSection(const SwPosition &rPos) : maStart(rPos.nNode), + mpSection(0), mpTitlePage(0), mpPage(0), meDir(FRMDIR_HORI_LEFT_TOP), + nPgWidth(lA4Width), nPgLeft(MM_250), nPgRight(MM_250), mnBorders(0), + mbHasFootnote(false) +{ +} - // pruefen, ob und wie umzubrechen ist break code: 0 No break - // 1 New column - const BYTE* pSprmBkc = pSep->HasSprm( bVer67 ? 142 : 0x3009 );// 2 New page - BYTE nBreakCode = pSprmBkc ? *pSprmBkc : 2; // 3 Even page - bool bContinuousBreak=(0 == nBreakCode); // 4 Odd page +void wwSectionManager::SetNumberingType(const wwSection &rNewSection, + SwPageDesc &rPageDesc) +{ + // Seitennummernformat speichern + static const SvxExtNumType aNumTyp[5] = + { + SVX_NUM_ARABIC, SVX_NUM_ROMAN_UPPER, SVX_NUM_ROMAN_LOWER, + SVX_NUM_CHARS_UPPER_LETTER_N, SVX_NUM_CHARS_LOWER_LETTER_N + }; - // im wievielten Abschnitt stehen wir denn eigentlich? - nActSectionNo = (short)( pSep->GetIdx() & 0x00007fff ); + SvxNumberType aType; + aType.SetNumberingType(aNumTyp[rNewSection.maSep.nfcPgn]); + rPageDesc.SetNumType(aType); +} +// Bei jedem Abschnittswechsel ( auch am Anfang eines Dokuments ) wird +// CreateSep gerufen, dass dann den / die Pagedesc(s) erzeugt und +// mit Attributen un KF-Texten fuellt. +// Dieses Vorgehen ist noetig geworden, da die UEbersetzung der verschiedenen +// Seiten-Attribute zu stark verflochten ist. +void wwSectionManager::CreateSep(const long nTxtPos, bool bMustHaveBreak) +{ + /* + #i1909# #100688# section/page breaks should not occur in tables or subpage + elements like frames. Word itself ignores them in this case. The bug is + more likely that this filter created such documents in the past! + */ + if (mrReader.nInTable || mrReader.bTxbxFlySection) + return; + WW8PLCFx_SEPX* pSep = mrReader.pPlcxMan->GetSepPLCF(); + ASSERT(pSep, "impossible!"); + if (!pSep) + return; - /* - Welche Kopf-/Fuss-Bereiche sind - identisch mit dem Vorgaenger-Abschnitt? - */ // sprmSFTitlePage - bSectionHasATitlePage = (0 != ReadBSprm( pSep, bVer67 ? 143 : 0x300A, 0 )); + bool bVer67(mrReader.bVer67); - BYTE nIPara; + wwSection aLastSection(*mrReader.pPaM->GetPoint()); + if (!maSegments.empty()) + aLastSection = maSegments.back(); - BYTE nJustCopyHdFt = 0; // HdFt that are stored in previous WW section prop - // and were NOT USED but may be copied now - BYTE nSameHdFt = 0; // HdFt that WERE the same in previous WW section + //Here + USHORT nLIdx = ( ( mrReader.pWwFib->lid & 0xff ) == 0x9 ) ? 1 : 0; - short aOldSectionNo[ 6 ]; - memset( &aOldSectionNo, 0, sizeof( aOldSectionNo ) ); + //BEGIN read section values + wwSection aNewSection(*mrReader.pPaM->GetPoint()); - if( bVer67 ) + if (!maSegments.empty()) { - // sprmSGprfIhdt - bool bSameHdFt = ( !ReadBSprmRet( nIPara, pSep, 153, 0 ) ); - - // Leere Hd/Ft will ich nicht - nCorrIhdt = pHdFt ? HdFtCorrectPara( nIPara ) : 0; - if( bSameHdFt ) - { - nSameHdFt = 0xff; - nJustCopyHdFt = nSameHdFt; - } + // Type of break: break codes are: + // 0 No break + // 1 New column + // 2 New page + // 3 Even page + // 4 Odd page + if (const BYTE* pSprmBkc = pSep->HasSprm(bVer67 ? 142 : 0x3009)) + aNewSection.maSep.bkc = *pSprmBkc; } - else - { - if( !pHdFt ) - nCorrIhdt = 0; - else - { - // nCorrIhdt ermitteln: WELCHE Hd/Ft sind ueberhaupt zu aktivieren? - // - nCorrIhdt = WW8_HEADER_ODD | WW8_FOOTER_ODD; - - if( bSectionHasATitlePage ) - nCorrIhdt |= WW8_HEADER_FIRST | WW8_FOOTER_FIRST; - - if( pWDop->fFacingPages ) - nCorrIhdt |= WW8_HEADER_EVEN | WW8_FOOTER_EVEN; - - // den PLCF analysieren: - // - // Hd/Ft ist gleich, wenn die Laenge des Eintrags NULL ist - // oder die Ziel-Offsets identisch sind. - // - WW8_CP nStart; - WW8_CP nOldStart=0; - long nLen; - long nOldLen=0; - BYTE nHdFtInfosStored=0; - - for( BYTE nI = 0, nMask = 1; nI < 6; nI++, nMask <<= 1 ) - { - // 1st find ALL Hd/Ft infos that are stored in this WW section - // -- or in the sections before this one -- - // regardless whether they are used in this section or not - pHdFt->GetTextPosExact( nI+ (nActSectionNo+1)*6, nStart, nLen ); - if( nLen <=2 && nActSectionNo ) - { - short nOldSectionNo = nActSectionNo; - do - { - --nOldSectionNo; - pHdFt->GetTextPosExact( nI + (nOldSectionNo+1)*6, - nOldStart, nOldLen); - if( nOldLen ) - aOldSectionNo[ nI ] = nOldSectionNo; - } - while( nOldSectionNo && !nOldLen ); - } - if( nLen >= 2 || nOldLen ) - nHdFtInfosStored |= nMask; + // Has a table page + aNewSection.maSep.fTitlePage = + (0 != ReadBSprm( pSep, bVer67 ? 143 : 0x300A, 0 )); + // sprmSNfcPgn + aNewSection.maSep.nfcPgn = ReadBSprm( pSep, (bVer67 ? 147 : 0x300E), 0 ); + if (aNewSection.maSep.nfcPgn > 4) + aNewSection.maSep.nfcPgn = 0; - if( nCorrIhdt & nMask ) - { - if( nActSectionNo ) - { - if( nLen < 2 || - ((nOldStart == nStart) && (nOldLen == nLen)) ) - { - // same Hd/Ft as in previous Section or NO Hd/Ft - if( nHdFtInfosStored & nMask ) - { - // prev. sect. really DID have and USE the Hd/Ft - if( nLastSectionCorrIhdt & nMask ) - nJustCopyHdFt |= nMask; - // Hd/Ft may be found in one of prev. sections - nSameHdFt |= nMask; - } - else - nCorrIhdt &= ~nMask;// NO prev. Hd/Ft at all - } - } - else if (nLen < 2) - nCorrIhdt &= ~nMask;// 0 in 1.Sect.: Hd/Ft undefined - } - } - } - // Einlese-Flag auf Use-On-Flag setzen - nIPara = nCorrIhdt; - } + // sprmSFBiDi + if (!bVer67) + aNewSection.maSep.fBiDi = ReadBSprm(pSep, 0x3228, 0); + aNewSection.maSep.ccolM1 = ReadSprm(pSep, (bVer67 ? 144 : 0x500B), 0 ); - USHORT nLIdx = ( ( pWwFib->lid & 0xff ) == 0x9 ) ? 1 : 0; + //sprmSDxaColumns - Default-Abstand 1.25 cm + aNewSection.maSep.dxaColumns = + ReadUSprm( pSep, (bVer67 ? 145 : 0x900C), 708 ); - // sprmSNfcPgn - BYTE nLastNfcPgn = nNfcPgn; - nNfcPgn = ReadBSprm( pSep, (bVer67 ? 147 : 0x300E), 0 ); - if (nNfcPgn > 4) - nNfcPgn = 0; + // sprmSLBetween + aNewSection.maSep.fLBetween = ReadBSprm(pSep, (bVer67 ? 158 : 0x3019), 0 ); - // sprmSFBiDi - bool bLastRTLPgn = mbRTLPgn; - if (!bVer67) - mbRTLPgn = ReadBSprm(pSep, 0x3228, 0) ? true : false; + // sprmSFEvenlySpaced + aNewSection.maSep.fEvenlySpaced = + ReadBSprm(pSep, (bVer67 ? 138 : 0x3005), 1) ? true : false; - /* - Pruefen, ob wir uns den neuen Abschnitt schenken koennen, da kein - Umbruch erforderlich ist. - */ - if( pSep->GetIMax() > 1 ) + if (aNewSection.maSep.ccolM1 > 0 && !aNewSection.maSep.fEvenlySpaced) { - if( nActSectionNo ) + aNewSection.maSep.rgdxaColumnWidthSpacing[0] = 0; + USHORT nWidth; + int nCols = aNewSection.maSep.ccolM1 + 1; + int nIdx = 0; + for (int i = 0; i < nCols; ++i) { - // Index eins zurueck setzen - pSep->SetIdx( nActSectionNo-1 ); - // Attribute von vorigem Abschnitt einlesen - WW8PLCFxDesc aOther; - pSep->GetSprms( &aOther ); - long nOtherSprmsLen = aOther.nSprmsLen; - // Kopie der vorigen Attr. anlegen, da sie gleich ueberschrieben werden - BYTE* pOtherMem = new BYTE[ nOtherSprmsLen ]; - memcpy( pOtherMem, aOther.pMemPos, nOtherSprmsLen ); - // Index wieder richtig setzen - pSep->SetIdx( nActSectionNo ); - // aktuelle Attribute einlesen - WW8PLCFxDesc aCur; - pSep->GetSprms( &aCur ); - - // zu ignorierende Attribute sammeln - bool bEqual = false; - if (bContinuousBreak) - bEqual = true; - else - { - bEqual = (bSectionHasATitlePage == bLastSectionHadATitlePage) - && (nCorrIhdt == nLastSectionCorrIhdt) - && (nCorrIhdt == (nCorrIhdt & nJustCopyHdFt)) - && (nNfcPgn == nLastNfcPgn) && (mbRTLPgn == bLastRTLPgn); - } + //sprmSDxaColWidth + const BYTE* pSW = + pSep->HasSprm( (bVer67 ? 136 : 0xF203), BYTE( i ) ); - if (bEqual) //Give continious breaks leniency. - { - /* - #95903# - If we are a continious section, word will report the same - headers and footers as the current (pOldPageDesc) page - descriptor, but we would really like to use the next style, - because thats what the user will probably expect on what to - them is the next page, so we'll pretend that our current style - is the follow style, and we'll disable any flags that claim we - want to use special first page headers/footers. None of this - dancing around widdershins to the sun would be required if our - sections could have margins independant of the host page, like - tables or graphics. - */ - pOldPageDesc = pOldPageDesc ? pOldPageDesc->GetFollow() : 0; - if (bSectionHasATitlePage) - { - bSectionHasATitlePage = 0; - nSameHdFt ^= (WW8_HEADER_FIRST | WW8_FOOTER_FIRST); - } - /* - If we are a continous section then are we equal to the host - (previous) section. Relevent because margins cannot be - different in a section than from its host page in writer but - they can in word, if that is the case then we must make a new - page anyway :-( - */ - bEqual = pSep->SprmsAreEquivalent(pOtherMem,nOtherSprmsLen); - } + ASSERT( pSW, "+Sprm 136 (bzw. 0xF203) (ColWidth) fehlt" ); + if (pSW) + nWidth = SVBT16ToShort(pSW + 1); - // Copy of vorigen Attr. here freed. - delete[] pOtherMem; + aNewSection.maSep.rgdxaColumnWidthSpacing[++nIdx] = nWidth; - if( bEqual ) + if (i < nCols-1) { - switch( nBreakCode ) - { - case 0: - InsertSectionWithWithoutCols( *pPaM, 0 ); - if( pPageDesc ) - { - SwFrmFmt& rFmt = pPageDesc->GetMaster(); - const SwFmtFrmSize& rSz = rFmt.GetFrmSize(); - const SvxLRSpaceItem& rLR = rFmt.GetLRSpace(); - SwTwips nWidth = rSz.GetWidth(); - long nLeft = rLR.GetTxtLeft(); - long nRight = rLR.GetRight(); - SetCols( pLastInsertedSection->GetFmt(), pSep, - (USHORT)(nWidth - nLeft - nRight) ); - } - break; - case 1: - if (mbNewDoc) - { - rDoc.Insert(*pPaM, SvxFmtBreakItem( - SVX_BREAK_COLUMN_BEFORE )); - } - break; - //case 2: - //case 3: // alle drei Faelle -> PgDesc-Format-Einfuegung - //case 4: - default: - /* - Wir koennen den aktuellen PgDesk einsetzen, da dies - immer der 1st-Page Deskriptor ist, nie der Follow! - - So geht es, auch wenn der Break auf Seite 7 kommt, - wieder mit einer ERSTEN Seite weiter. - */ - if (mbNewDoc) - { - if( pPageDesc ) - rDoc.Insert(*pPaM, SwFmtPageDesc( pPageDesc )); - else - // kein voriger PgDesc vorhanden? - rDoc.Insert(*pPaM, - SvxFmtBreakItem( SVX_BREAK_PAGE_BEFORE )); - SetLastPgDeskIdx(); - } - break; - } - return; - // ======== Das war's Freunde, jetzt nichts wie weg hier! - } - } - if (mbNewDoc && - ( bSectionWasJustClosed || (pPageDesc != &rDoc._GetPageDesc(0)) )) - { - if ((nBreakCode > 1) && bMustHaveBreak) - { - if( pPageDesc ) - rDoc.Insert(*pPaM, SwFmtPageDesc( pPageDesc )); - } - // Create and *insert* PageDesc - SwPaM* pPageDeskPaM = 0; - pPageDesc = CreatePageDesc( 0, &pPageDeskPaM ); - SwFrmFmt &rFmt = pPageDesc->GetMaster(); - SetPage1(pPageDesc, rFmt, pSep, nLIdx, false); - // if PageDesc has been inserted and has cols - // insert a *section* with cols instead - if( pPageDeskPaM ) - { - const SwFmtCol& rCol = rFmt.GetCol(); - if( rCol.GetNumCols() ) + //sprmSDxaColSpacing + const BYTE* pSD = + pSep->HasSprm( (bVer67 ? 137 : 0xF204), BYTE( i ) ); + + ASSERT( pSD, "+Sprm 137 (bzw. 0xF204) (Colspacing) fehlt" ); + if( pSD ) { - InsertSectionWithWithoutCols( *pPaM, &rCol ); - // remove columns from PageDesc - SwFmtCol aCol; - rFmt.SetAttr( aCol ); + nWidth = SVBT16ToShort(pSD + 1); + aNewSection.maSep.rgdxaColumnWidthSpacing[++nIdx] = nWidth; } - delete pPageDeskPaM; } } } - else if (mbNewDoc) - pPageDesc = &rDoc._GetPageDesc( 0 ); // Standard - if (!mbNewDoc) - return; + static const USHORT aVer67Ids[] = + { + /*sprmSBOrientation*/ 162, + /*sprmSXaPage*/ 164, + /*sprmSYaPage*/ 165, + /*sprmSDxaLeft*/ 166, + /*sprmSDxaRight*/ 167, + /*sprmSDzaGutter*/ 170 + }; - // Seitennummernformat speichern + static const USHORT aVer8Ids[] = { - static const SvxExtNumType aNumTyp[5] = - { - SVX_NUM_ARABIC, SVX_NUM_ROMAN_UPPER, SVX_NUM_ROMAN_LOWER, - SVX_NUM_CHARS_UPPER_LETTER_N, SVX_NUM_CHARS_LOWER_LETTER_N - }; + /*sprmSBOrientation*/ 0x301d, + /*sprmSXaPage*/ 0xB01F, + /*sprmSYaPage*/ 0xB020, + /*sprmSDxaLeft*/ 0xB021, + /*sprmSDxaRight*/ 0xB022, + /*sprmSDzaGutter*/ 0xB025 + }; - SvxNumberType aType; aType.SetNumberingType(aNumTyp[ nNfcPgn ]); - pPageDesc->SetNumType( aType ); - } + const USHORT* pIds = bVer67 ? aVer67Ids : aVer8Ids; + + // 1. Orientierung + aNewSection.maSep.dmOrientPage = ReadBSprm(pSep, pIds[0], 0); + + // 2. Papiergroesse + aNewSection.maSep.xaPage = ReadUSprm(pSep, pIds[1], (USHORT)lLetterWidth); + + aNewSection.nPgWidth = AdjustSize(aNewSection.maSep.xaPage); + + aNewSection.maSep.yaPage = ReadUSprm(pSep, pIds[2], (USHORT)lLetterHeight); + + // 3. LR-Raender + static const USHORT nLef[] = { MM_250, 1800 }; + static const USHORT nRig[] = { MM_250, 1800 }; + + aNewSection.maSep.dxaLeft = ReadULSprm( pSep, pIds[3], nLef[nLIdx]); + aNewSection.maSep.dxaRight = ReadULSprm( pSep, pIds[4], nRig[nLIdx]); + aNewSection.maSep.dzaGutter = ReadULSprm( pSep, pIds[5], 0); + + aNewSection.maSep.fRTLGutter = !bVer67 ? ReadULSprm( pSep, 0x322A, 0 ) : 0; // Page Number Restarts - sprmSFPgnRestart - BYTE nfPgnRestart = ReadBSprm( pSep, (bVer67 ? 150 : 0x3011), 0 ); + aNewSection.maSep.fPgnRestart = ReadBSprm(pSep, (bVer67 ? 150 : 0x3011), 0); - if( nfPgnRestart ) - { - const SfxPoolItem* pItem; - const SfxItemSet* pSet; - if( ( 0 != (pSet = pPaM->GetCntntNode()->GetpSwAttrSet()) ) - && ( SFX_ITEM_SET == - pSet->GetItemState(RES_PAGEDESC, false, &pItem) ) ) - { - // read Pagination Start attribute - sprmSPgnStart - BYTE nPgnStart = ReadBSprm( pSep, (bVer67 ? 161 : 0x501C), 0 ); - ((SwFmtPageDesc*)pItem)->SetNumOffset( nPgnStart ); - } - else if( pPageDesc == &rDoc.GetPageDesc( 0 ) ) - { - // read Pagination Start attribute - sprmSPgnStart - BYTE nPgnStart = ReadBSprm( pSep, (bVer67 ? 161 : 0x501C), 0 ); - SwFmtPageDesc aPgDesc( pPageDesc ); - aPgDesc.SetNumOffset( nPgnStart ); - rDoc.Insert( *pPaM, aPgDesc ); - SetLastPgDeskIdx(); - } + aNewSection.maSep.pgnStart = ReadBSprm( pSep, (bVer67 ? 161 : 0x501C), 0 ); - // Chapterlevel und Chapterdelimiter ? (sprmScnsPgn & sprmSiHeadingPgn) - const BYTE* p = pSep->HasSprm( bVer67 ? 132 : 0x3001 ); - if( p && *p ) - { - bPgChpLevel = true; - nPgChpLevel = *p - 1; - if( MAXLEVEL <= nPgChpLevel ) - nPgChpLevel = MAXLEVEL - 1; + if (const BYTE* p = pSep->HasSprm( bVer67 ? 132 : 0x3001 )) + aNewSection.maSep.iHeadingPgn = *p; - if( 0 != (p = pSep->HasSprm( bVer67 ? 131 : 0x3000 )) ) - nPgChpDelim = *p; - else - nPgChpDelim = 0; - } - else - bPgChpLevel = false; - } + if (const BYTE* p = pSep->HasSprm( bVer67 ? 131 : 0x3000 )) + aNewSection.maSep.cnsPgn = *p; - // Vorsicht: gibt es ueberhaupt einen vorigen Page Descriptor? - if (!pOldPageDesc) - { - nSameHdFt = 0; - SetLastPgDeskIdx(); - } + static const BYTE aPaperBinIds[17] = {5,2,4,0,3,0,0,0,0,0,0,0,0,0,0,0,1}; + // WW SW + // ------------------------------ + // 0 == default 5 + // 1 == Upper paper tray 2 + // 2 == Lower paper tray 4 + // 4 == Manual paper feed 3 + // 15 == Automatically select 0 + // 16 == First tray available 1 + + if(const BYTE* pSprmSDmBinFirst = pSep->HasSprm( bVer67 ? 140 : 0x5007 )) + aNewSection.maSep.dmBinFirst = *pSprmSDmBinFirst; - SwFrmFmt &rFmt0 = pPageDesc->GetMaster(); + if (const BYTE* pSprmSDmBinOther = pSep->HasSprm( bVer67 ? 141 : 0x5008)) + aNewSection.maSep.dmBinOther = *pSprmSDmBinOther; + + static const USHORT nTop[] = { MM_250, 1440 }; + static const USHORT nBot[] = { MM_200, 1440 }; - if( !bSectionHasATitlePage ) + static const USHORT aVer67Ids2[] = { - // Gegebenenfalls Einstellungen des vorigen PgDesc uebernehmen - // und das Einlese-Flag entsprechend korrigieren, - // damit nur noch die Eintraege gelesen werden, die NICHT - // vom vorigen PgDesc zu uebernehmen sind. - // - if( 0 < nSameHdFt ) - { - CopyPageDescHdFt( pOldPageDesc, pPageDesc, nSameHdFt ); - if( bVer67 ) - nIPara = 0; - else - nIPara &= ~nSameHdFt; - } + /*sprmSDyaTop*/ 168, + /*sprmSDyaBottom*/ 169, + /*sprmSDyaHdrTop*/ 156, + /*sprmSDyaHdrBottom*/ 157 + }; + static const USHORT aVer8Ids2[] = + { + /*sprmSDyaTop*/ 0x9023, + /*sprmSDyaBottom*/ 0x9024, + /*sprmSDyaHdrTop*/ 0xB017, + /*sprmSDyaHdrBottom*/ 0xB018 + }; - WW8ULSpaceData aULData; - GetPageULData(pSep, nLIdx, false, aULData); + pIds = bVer67 ? aVer67Ids2 : aVer8Ids2; - // und uebrige Einstellungen updaten - // Orientierung, Hoehe, Breite, Vertikale Formatierung - SetPage1(pPageDesc, rFmt0, pSep, nLIdx, true); + aNewSection.maSep.dyaTop = ReadULSprm( pSep, pIds[0], nTop[nLIdx] ); + aNewSection.maSep.dyaBottom = ReadULSprm( pSep, pIds[1], nBot[nLIdx] ); + aNewSection.maSep.dyaHdrTop = ReadULSprm( pSep, pIds[2], 720 ); + aNewSection.maSep.dyaHdrBottom = ReadULSprm( pSep, pIds[3], 720 ); - // dann Header / Footer lesen, falls noch noetig - if( nIPara ) - SetHdFt( pPageDesc, 0, nIPara ); + if (!bVer67) + { + aNewSection.maSep.wTextFlow = ReadULSprm(pSep, 0x5033, 0); + aNewSection.maSep.clm = ReadULSprm( pSep, 0x5032, 0 ); + aNewSection.maSep.dyaLinePitch = ReadULSprm(pSep, 0x9031, 360); + if (const BYTE* pS = pSep->HasSprm(0x7030)) + aNewSection.maSep.dxtCharSpace = SVBT32ToLong(pS); - SetPageULSpaceItems( rFmt0, aULData ); - SetDocumentGrid(rFmt0, pSep); - SetPageBorder( 0, pPageDesc, pSep, nLIdx ); + //sprmSPgbProp + sal_uInt16 pgbProp = ReadSprm( pSep, 0x522F, 0 ); + aNewSection.maSep.pgbApplyTo = pgbProp & 0x0007; + aNewSection.maSep.pgbPageDepth = (pgbProp & 0x0018) >> 3; + aNewSection.maSep.pgbOffsetFrom = (pgbProp & 0x00E0) >> 5; + + aNewSection.mnBorders = + ::lcl_ReadBorders(bVer67, aNewSection.brc, 0, 0, pSep); } - else - { - // Hier beachten: - // ============== - // - // pPageDesc = erste Seite - // pPageDesc1 = Folge-Seiten - // + // check if Line Numbering must be activated or resetted + if (const BYTE* pSprmSNLnnMod = pSep->HasSprm( bVer67 ? 154 : 0x5015 )) + aNewSection.maSep.nLnnMod = *pSprmSNLnnMod; + + if (const BYTE* pSprmSLnc = pSep->HasSprm( bVer67 ? 152 : 0x3013 )) + aNewSection.maSep.lnc = *pSprmSLnc; - // erst folgende PageDesc-Werte einstellen: - // - // Orientierung, Hoehe, Breite, Vertikale Formatierung - SetPage1(pPageDesc, rFmt0, pSep, nLIdx, true); + if (const BYTE* pSprmSDxaLnn = pSep->HasSprm( bVer67 ? 155:0x9016 )) + aNewSection.maSep.dxaLnn = SVBT16ToShort( pSprmSDxaLnn ); - // dann den PageDesc1 anlegen fuer Folge-Seiten - // - pPageDesc1 = CreatePageDesc( pPageDesc ); + if (const BYTE* pSprmSLnnMin = pSep->HasSprm( bVer67 ? 160:0x501B )) + aNewSection.maSep.lnnMin = *pSprmSLnnMin; - // Gegebenenfalls Einstellungen des/der vorigen PgDesc uebernehmen - // - if( 0 < nSameHdFt ) + if (bVer67) + aNewSection.maSep.grpfIhdt = ReadBSprm(pSep, 153, 0); + else if (mrReader.pHdFt) + { + aNewSection.maSep.grpfIhdt = WW8_HEADER_ODD | WW8_FOOTER_ODD; + + if (aNewSection.maSep.fTitlePage) + aNewSection.maSep.grpfIhdt |= WW8_HEADER_FIRST | WW8_FOOTER_FIRST; + + if (mrReader.pWDop->fFacingPages) + aNewSection.maSep.grpfIhdt |= WW8_HEADER_EVEN | WW8_FOOTER_EVEN; + + //See if we have a header or footer for each enabled possibility + //if we do not then we inherit the previous sections header/footer, + for (int nI = 0, nMask = 1; nI < 6; ++nI, nMask <<= 1) { - // ggfs. erst den alten 1st-Seite-PgDesc suchen und dessen - // Einstellungen uebernehmen - // - if( nSameHdFt & (WW8_HEADER_FIRST | WW8_FOOTER_FIRST) ) + if (aNewSection.maSep.grpfIhdt & nMask) { - if( pOldPageDesc == pOldPageDesc->GetFollow() ) + WW8_CP nStart; + long nLen; + mrReader.pHdFt->GetTextPosExact(nI + ( maSegments.size() + 1) * 6, nStart, nLen); + //No header or footer, inherit pervious one, or set to zero + //if no previous one + if (!nLen) { - // hoppla, die vorige Section hatte keine 1st Page? - // - // also: auslesen der in WW8 fuer die nicht vorhandene - // 1st Page gespeicherten Hd/Ft-Einstellungen... - // - // Beachte: pPageDesc1 MUSS hier mit uebergeben werden, - // obwohl wir dessen Werte ja eigentlich hier - // gar nicht einlesen wollen! - // Das macht aber nichts, denn wir stellen den - // "SetHdFt( nIPara )"-Parameter so ein, dass - // nur der 1.-Seite-PgDesc eingelesen wird. - // - short nSaveSectionNo = nActSectionNo; - if( bVer67 ) - --nActSectionNo; - else - nActSectionNo = aOldSectionNo[ 4 ] - ? aOldSectionNo[ 4 ] // Hd 1st - : aOldSectionNo[ 5 ]; // Ft 1st - SetHdFt(pPageDesc, pPageDesc1, - nSameHdFt & (WW8_HEADER_FIRST | WW8_FOOTER_FIRST)); - nActSectionNo = nSaveSectionNo; + if ( + maSegments.empty() || + !(maSegments.back().maSep.grpfIhdt & nMask) + ) + { + aNewSection.maSep.grpfIhdt &= ~nMask; + } } - else - CopyPageDescHdFt( pOldPageDesc, pPageDesc, - nSameHdFt & (WW8_HEADER_FIRST | WW8_FOOTER_FIRST) ); } - - // ggfs. Werte des vorigen PgDesc fuer Folge-Seiten uebernehmen - // - if( nSameHdFt & ( WW8_HEADER_EVEN | WW8_HEADER_ODD - | WW8_FOOTER_EVEN | WW8_FOOTER_ODD ) ) - { - CopyPageDescHdFt( pOldPageDesc, pPageDesc1, - nSameHdFt & ( WW8_HEADER_EVEN | WW8_HEADER_ODD - | WW8_FOOTER_EVEN | WW8_FOOTER_ODD ) ); - } - // das Einlese-Flag entsprechend korrigieren, - // damit nur noch die Eintraege gelesen werden, die NICHT - // von vorigem/n PgDesc(s) zu uebernehmen sind. - // - if( bVer67 ) - nIPara = 0; - else - nIPara &= ~nSameHdFt; } - - SwFrmFmt &rFmt1 = pPageDesc1->GetMaster(); - - WW8ULSpaceData aULData0, aULData1; - // Vertikale Formatierung - GetPageULData(pSep, nLIdx, true, aULData0); - // einzeln, da KF evtl. verschieden - GetPageULData(pSep, nLIdx, false, aULData1); - - // dann Header / Footer lesen, falls noch noetig - if( nIPara ) - SetHdFt( pPageDesc, pPageDesc1, nIPara ); - - // und uebrige Einstellungen updaten - // Vertikale Formatierung - SetPageULSpaceItems( rFmt0, aULData0 ); - SetDocumentGrid(rFmt0, pSep); - // einzeln, da KF evtl. verschieden - SetPageULSpaceItems( rFmt1, aULData1 ); - SetDocumentGrid(rFmt1, pSep); - SetPageBorder( pPageDesc, pPageDesc1, pSep, nLIdx ); } - SetUseOn(pPageDesc, pPageDesc1, nCorrIhdt); + SetLeftRight(aNewSection); + //END read section values - static const BYTE aPaperBinIds[17] = {5,2,4,0,3,0,0,0,0,0,0,0,0,0,0,0,1}; - // WW SW - // ------------------------------ - // 0 == default 5 - // 1 == Upper paper tray 2 - // 2 == Lower paper tray 4 - // 4 == Manual paper feed 3 - // 15 == Automatically select 0 - // 16 == First tray available 1 + if (!bVer67) + aNewSection.SetDirection(); - const BYTE* pSprmSDmBinFirst = pSep->HasSprm( bVer67 ? 140 : 0x5007 ); - const BYTE* pSprmSDmBinOther = pSep->HasSprm( bVer67 ? 141 : 0x5008 ); - if( pSprmSDmBinFirst && (17 > *pSprmSDmBinFirst) ) - { - SvxPaperBinItem aItem(ITEMID_PAPERBIN, aPaperBinIds[*pSprmSDmBinFirst]); - pPageDesc->GetMaster().SetAttr( aItem ); - } - if( pSprmSDmBinOther && (17 > *pSprmSDmBinOther) ) - { - SvxPaperBinItem aItem(ITEMID_PAPERBIN, aPaperBinIds[*pSprmSDmBinOther]); - SwFrmFmt &rFmtOther = pPageDesc1 ? pPageDesc1->GetMaster() : - pPageDesc->GetLeft(); - rFmtOther.SetAttr( aItem ); - } + maSegments.push_back(aNewSection); // Kopf / Fuss - Index Updaten // Damit der Index auch spaeter noch stimmt - if( pHdFt ) - pHdFt->UpdateIndex( nCorrIhdt ); + if (mrReader.pHdFt) + mrReader.pHdFt->UpdateIndex(aNewSection.maSep.grpfIhdt); } - -void SwWW8ImplReader::CopyPageDescHdFt( const SwPageDesc* pOrgPageDesc, - SwPageDesc* pNewPageDesc, BYTE nCode ) +void SwWW8ImplReader::CopyPageDescHdFt(const SwPageDesc* pOrgPageDesc, + SwPageDesc* pNewPageDesc, BYTE nCode ) { // copy first header content section - if( nCode & WW8_HEADER_FIRST ) + if (nCode & WW8_HEADER_FIRST) rDoc.CopyHeader(pOrgPageDesc->GetMaster(), pNewPageDesc->GetMaster()); // copy first footer content section @@ -1800,30 +1191,28 @@ void SwWW8ImplReader::CopyPageDescHdFt( const SwPageDesc* pOrgPageDesc, if( nCode & ( WW8_HEADER_ODD | WW8_FOOTER_ODD | WW8_HEADER_EVEN | WW8_FOOTER_EVEN ) ) { - // determine PageDesc of follow pages - const SwPageDesc* pOrgFollowPageDesc = pOrgPageDesc->GetFollow(); // copy odd header content section if( nCode & WW8_HEADER_ODD ) { - rDoc.CopyHeader(pOrgFollowPageDesc->GetMaster(), + rDoc.CopyHeader(pOrgPageDesc->GetMaster(), pNewPageDesc->GetMaster() ); } // copy odd footer content section if( nCode & WW8_FOOTER_ODD ) { - rDoc.CopyFooter(pOrgFollowPageDesc->GetMaster(), + rDoc.CopyFooter(pOrgPageDesc->GetMaster(), pNewPageDesc->GetMaster()); } // copy even header content section if( nCode & WW8_HEADER_EVEN ) { - rDoc.CopyHeader(pOrgFollowPageDesc->GetLeft(), + rDoc.CopyHeader(pOrgPageDesc->GetLeft(), pNewPageDesc->GetLeft()); } // copy even footer content section if( nCode & WW8_FOOTER_EVEN ) { - rDoc.CopyFooter(pOrgFollowPageDesc->GetLeft(), + rDoc.CopyFooter(pOrgPageDesc->GetLeft(), pNewPageDesc->GetLeft()); } } @@ -2197,19 +1586,24 @@ bool SwWW8ImplReader::SetShadow(SvxShadowItem& rShadow, const SvxBoxItem& rBox, return bRet; } -void SwWW8ImplReader::GetBorderDistance( WW8_BRC* pbrc, Rectangle& rInnerDist ) +void SwWW8ImplReader::GetBorderDistance(const WW8_BRC* pbrc, + Rectangle& rInnerDist) { // 'dptSpace' is stored in 3 bits of 'Border Code (BRC)' - if( bVer67 ) + if (bVer67) + { rInnerDist = Rectangle(((pbrc[ 1 ].aBits1[1] >> 3) & 0x1f) * 20, ((pbrc[ 0 ].aBits1[1] >> 3) & 0x1f) * 20, ((pbrc[ 3 ].aBits1[1] >> 3) & 0x1f) * 20, ((pbrc[ 2 ].aBits1[1] >> 3) & 0x1f) * 20 ); + } else + { rInnerDist = Rectangle( (pbrc[ 1 ].aBits2[1] & 0x1f) * 20, (pbrc[ 0 ].aBits2[1] & 0x1f) * 20, (pbrc[ 3 ].aBits2[1] & 0x1f) * 20, (pbrc[ 2 ].aBits2[1] & 0x1f) * 20 ); + } } @@ -2298,37 +1692,37 @@ WW8FlyPara::WW8FlyPara(bool bIsVer67, const WW8FlyPara* pSrc /* = 0 */) bVer67 = bIsVer67; } - -// WW8FlyPara::operator == vergleicht alles, was in der Definition vor -// den Borders steht! -// dieses wird u.a. fuer TestSameApo benoetigt. bool WW8FlyPara::operator==(const WW8FlyPara& rSrc) const { - ASSERT( ( (BYTE*)rSrc.brc - (BYTE*)&rSrc < sizeof( WW8FlyPara ) ), - "WW8FlyPara::operator == geht schief" ); - return memcmp(this, &rSrc, (BYTE*)rSrc.brc - (BYTE*)&rSrc) ? false : true; - // memcmp ist moeglich, da die gesamte Struktur beim Initialisieren - // incl. Luecken mit 0 gefuellt wird und sich damit durch die - // Luecken keine falschen Unterschiede ergeben koennen. - // Ausserdem sind alle Elemente aligned, so dass keine Luecken - // existieren + //Compare the parts that word seems to compare for equivalence + return + ( + (nSp26 == rSrc.nSp26) && + (nSp27 == rSrc.nSp27) && + (nSp45 == rSrc.nSp45) && + (nSp28 == rSrc.nSp28) && + (nLeMgn == rSrc.nLeMgn) && + (nRiMgn == rSrc.nRiMgn) && + (nUpMgn == rSrc.nUpMgn) && + (nLoMgn == rSrc.nLoMgn) && + (nSp29 == rSrc.nSp29) && + (nSp37 == rSrc.nSp37) + ); } - // Read fuer normalen Text - void WW8FlyPara::Read(const BYTE* pSprm29, WW8PLCFx_Cp_FKP* pPap) { sal_uInt8 nOrigSp29 = nSp29; if (pSprm29) nOrigSp29 = *pSprm29; // PPC ( Bindung ) - bool bVertSet=false; const BYTE* pS = 0; if( bVer67 ) { SetValSprm( &nSp26, pPap, 26 ); // X-Position //sprmPDxaAbs - bVertSet = SetValSprm( &nSp27, pPap, 27 ); // Y-Position //sprmPDyaAbs + //set in me or in parent style + mbVertSet |= SetValSprm( &nSp27, pPap, 27 ); // Y-Position //sprmPDyaAbs SetValSprm( &nSp45, pPap, 45 ); // Hoehe //sprmPWHeightAbs SetValSprm( &nSp28, pPap, 28 ); // Breite //sprmPDxaWidth SetValSprm( &nLeMgn, pPap, 49 ); // L-Raender //sprmPDxaFromText @@ -2343,7 +1737,8 @@ void WW8FlyPara::Read(const BYTE* pSprm29, WW8PLCFx_Cp_FKP* pPap) else { SetValSprm( &nSp26, pPap, 0x8418 ); // X-Position - bVertSet = SetValSprm( &nSp27, pPap, 0x8419 ); // Y-Position + //set in me or in parent style + mbVertSet |= SetValSprm( &nSp27, pPap, 0x8419 ); // Y-Position SetValSprm( &nSp45, pPap, 0x442B ); // Hoehe SetValSprm( &nSp28, pPap, 0x841A ); // Breite SetValSprm( &nLeMgn, pPap, 0x842F ); // L-Raender @@ -2366,7 +1761,7 @@ void WW8FlyPara::Read(const BYTE* pSprm29, WW8PLCFx_Cp_FKP* pPap) from para anchor, so we update the frame to have explicitly this type of anchoring */ - if (!bVertSet) + if (!mbVertSet) nSp29 = (nOrigSp29 & 0xCF) | 0x20; else nSp29 = nOrigSp29; @@ -2440,12 +1835,12 @@ void WW8FlyPara::Read(const BYTE* pSprm29, WW8RStyle* pStyle) if (pSprm29) nOrigSp29 = *pSprm29; // PPC ( Bindung ) - bool bVertSet=false; const BYTE* pS = 0; if (bVer67) { SetValSprm( &nSp26, pStyle, 26 ); // X-Position - bVertSet = SetValSprm(&nSp27, pStyle, 27); // Y-Position + //set in me or in parent style + mbVertSet |= SetValSprm(&nSp27, pStyle, 27); // Y-Position SetValSprm( &nSp45, pStyle, 45 ); // Hoehe SetValSprm( &nSp28, pStyle, 28 ); // Breite SetValSprm( &nLeMgn, pStyle, 49 ); // L-Raender @@ -2460,7 +1855,8 @@ void WW8FlyPara::Read(const BYTE* pSprm29, WW8RStyle* pStyle) else { SetValSprm( &nSp26, pStyle, 0x8418 ); // X-Position - bVertSet = SetValSprm(&nSp27, pStyle, 0x8419); // Y-Position + //set in me or in parent style + mbVertSet |= SetValSprm(&nSp27, pStyle, 0x8419); // Y-Position SetValSprm( &nSp45, pStyle, 0x442B ); // Hoehe SetValSprm( &nSp28, pStyle, 0x841A ); // Breite SetValSprm( &nLeMgn, pStyle, 0x842F ); // L-Raender @@ -2483,7 +1879,7 @@ void WW8FlyPara::Read(const BYTE* pSprm29, WW8RStyle* pStyle) from para anchor, so we update the frame to have explicitly this type of anchoring */ - if (!bVertSet) + if (!mbVertSet) nSp29 = (nOrigSp29 & 0xCF) | 0x20; else nSp29 = nOrigSp29; @@ -2492,6 +1888,14 @@ void WW8FlyPara::Read(const BYTE* pSprm29, WW8RStyle* pStyle) bool WW8FlyPara::IsEmpty() const { WW8FlyPara aEmpty(bVer67); + /* + wr of 0 like 2 appears to me to be equivalent for checking here. See + #107103# if wrong, so given that the empty is 2, if we are 0 then set + empty to 0 to make 0 equiv to 2 for empty checking + */ + ASSERT(aEmpty.nSp37 == 2, "this is not what we expect for nSp37"); + if (this->nSp37 == 0) + aEmpty.nSp37 = 0; if (aEmpty == *this) return true; return false; @@ -2775,7 +2179,7 @@ WW8FlySet::WW8FlySet( SwWW8ImplReader& rReader, const SwPaM* pPaM, //The horizontal default is on the baseline, the vertical is centered //around the character center it appears - if (rReader.bVerticalEnviron) + if (rReader.maSectionManager.CurrentSectionIsVertical()) Put(SwFmtVertOrient(0, VERT_CHAR_CENTER,REL_CHAR)); else Put(SwFmtVertOrient(0, VERT_TOP, FRAME)); @@ -2935,8 +2339,10 @@ bool SwWW8ImplReader::StartApo(const BYTE* pSprm29, return false; } - pSFlyPara = new WW8SwFlyPara( *pPaM, *this, *pWFlyPara, nPgLeft, - (nPgWidth - nPgRight - nPgLeft), nIniFlyDx, nIniFlyDy ); + pSFlyPara = new WW8SwFlyPara( *pPaM, *this, *pWFlyPara, + maSectionManager.GetPageLeft(), + (maSectionManager.GetPageWidth() - maSectionManager.GetPageRight() - + maSectionManager.GetPageLeft()), nIniFlyDx, nIniFlyDy ); if( !pWFlyPara->bGrafApo ) { @@ -2992,6 +2398,12 @@ bool SwWW8ImplReader::StartApo(const BYTE* pSprm29, return true; } +void wwSectionManager::JoinNode(const SwPosition &rPos, const SwNode &rNode) +{ + if ((!maSegments.empty()) && (maSegments.back().maStart == rPos.nNode)) + maSegments.back().maStart = SwNodeIndex(rNode); +} + bool SwWW8ImplReader::JoinNode(SwPaM &rPam, bool bStealAttr) { bool bRet = false; @@ -2999,9 +2411,9 @@ bool SwWW8ImplReader::JoinNode(SwPaM &rPam, bool bStealAttr) SwNodeIndex aPref(rPam.GetPoint()->nNode, -1); - SwTxtNode* pNode = aPref.GetNode().GetTxtNode(); - if (pNode) + if (SwTxtNode* pNode = aPref.GetNode().GetTxtNode()) { + maSectionManager.JoinNode(*rPam.GetPoint(), aPref.GetNode()); rPam.GetPoint()->nNode = aPref; rPam.GetPoint()->nContent.Assign(pNode, pNode->GetTxt().Len()); if (bStealAttr) @@ -4491,7 +3903,7 @@ void SwWW8ImplReader::Read_LineSpace( USHORT, const BYTE* pData, short nLen ) NewAttr( aLSpc ); if( pSFlyPara ) pSFlyPara->nLineSpace = nSpaceTw; // LineSpace fuer Graf-Apos - +#if 0 if( ( nWwPre > nSwPre || nWwPost > nSwPost ) && !( nIniFlags & WW8FL_NO_IMPLPASP ) ) { @@ -4507,6 +3919,7 @@ void SwWW8ImplReader::Read_LineSpace( USHORT, const BYTE* pData, short nLen ) aUL.SetLower( nDL ); NewAttr( aUL ); } +#endif } void SwWW8ImplReader::Read_ParaAutoBefore(USHORT, const BYTE *pData, short nLen) @@ -6238,3 +5651,5 @@ short SwWW8ImplReader::ImportSprm(const BYTE* pPos,USHORT nId) return nL; } + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 293cd02b7a1e..e65418c7ee7d 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8scan.cxx,v $ * - * $Revision: 1.93 $ + * $Revision: 1.94 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 12:41:18 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifdef PCH @@ -123,6 +122,7 @@ namespace SL IMPLCONSTSTRINGARRAY(CheckBox); IMPLCONSTSTRINGARRAY(TextBox); IMPLCONSTSTRINGARRAY(TextField); + IMPLCONSTSTRINGARRAY(MSMacroCmds); } template<class C> bool wwString<C>::TestBeltAndBraces(const SvStream& rStrm) @@ -3425,125 +3425,7 @@ const BYTE* WW8PLCFx_SEPX::HasSprm( USHORT nId, BYTE n2nd ) const return 0; // Sprm nicht gefunden } -const wwSprmSequence* WW8PLCFx_SEPX::GetWW6IgnoredSprms() -{ - static sal_uInt16 aSprmIds[] = - { - 136, 137, 138, 139, 142, 144, 145, 147, 152, 154, 155, - 158, 160 - }; - - static wwSprmSequence aWWSprmIds(aSprmIds, - sizeof(aSprmIds) / sizeof(aSprmIds[0])); - return &aWWSprmIds; -} - -const wwSprmSequence* WW8PLCFx_SEPX::GetWW8IgnoredSprms() -{ - //0x3014 -> #i4813# - static sal_uInt16 aSprmIds[] = - { - 0x3005, 0x3006, 0x3009, 0x300E, 0x3013, 0x3014, 0x3019, - 0x301A, 0x3228, 0x3229, 0x500B, 0x5015, 0x501B, 0x5026, - 0x703A, 0x900C, 0x9016, 0x9023, 0x9024, 0xB017, 0xB018, - 0xF203, 0xF204 - }; - - static wwSprmSequence aWWSprmIds(aSprmIds, - sizeof(aSprmIds) / sizeof(aSprmIds[0])); - return &aWWSprmIds; -} - -bool WW8PLCFx_SEPX::SprmsAreEquivalent(const BYTE* pOtherSprms, - long nOtherSprmSiz) const -{ - bool bRes = false; - const BYTE* pSp = pSprms; - - /* - zu 'sprmSBkc': - Wir sehen zwei WW-Abschnitte auch dann als gleich an, - wenn sie sich lediglich im break code unterscheiden. - Natuerlich muessen die Kopf/Fuss-Bereiche identisch sein. - - Ignoriert werden auch die folgenden, - spaltenbezogene Flags: - SCcolumns, SDxaColumns, SDxaColWidth, - SDxaColSpacing, SFEvenlySpaced, SLBetween - und: SFFacingCol (nur bei Ver8) - - We will also ignore a different formatting of the page - number here. - - We will also ignore different line numbering settings here - since only the very 1st line numbering settings are taken - into account anyway, see: bNoLnNum - */ - const wwSprmSequence *pIgnore; - if (GetVersion() < 8) - pIgnore = GetWW6IgnoredSprms(); - else - pIgnore = GetWW8IgnoredSprms(); - - ASSERT(pIgnore, "Impossible"); - - if ( maSprmParser.CountSprms(pSp, nSprmSiz, pIgnore) == - maSprmParser.CountSprms(pOtherSprms, nOtherSprmSiz, pIgnore) ) - { - bRes = true; - USHORT i=0; - while (i + maSprmParser.MinSprmLen() <= nSprmSiz) - { - USHORT nSpId = maSprmParser.GetSprmId(pSp); - - if( !nSpId ) - break; - - USHORT nSpLen = maSprmParser.GetSprmSize(nSpId, pSp); - - if (!pIgnore->search(nSpId)) - { - const BYTE* pOtherSp = - HasSprm( nSpId, pOtherSprms, nOtherSprmSiz ); - - if (!pOtherSp) - bRes = false; - else - { - const BYTE *pTst = pSp + maSprmParser.DistanceToData(nSpId); - //Allow a one twip fuzziness for the margins, word is - //doing something very small but intriguing with its - //rounding of these margins - if (nSpId == 0xB021 || nSpId == 0xB022 || - nSpId == 0x9023 || nSpId == 0x9024 || - nSpId == 0xB017 || nSpId == 0xB018 ) - { - short nOne = SVBT16ToShort(pTst); - short nTwo = SVBT16ToShort(pOtherSp); - if (abs(nOne-nTwo) > 1) //(perhaps ww8par2#nToleranz) - bRes = false; - } - else if (memcmp(pTst, pOtherSp, - maSprmParser.GetSprmTailLen(nSpId, pSp))) - { - bRes = false; - } - } - - if (!bRes) - break; - } - // increase pointers, so it points to next sprm - i += nSpLen; - pSp += nSpLen; - } - } - return bRes; // different Sprms -} - -//----------------------------------------- //----------------------------------------- - WW8PLCFx_SubDoc::WW8PLCFx_SubDoc(SvStream* pSt, BYTE nVersion, WW8_CP nStartCp, long nFcRef, long nLenRef, long nFcTxt, long nLenTxt, long nStruct) @@ -4200,7 +4082,7 @@ void WW8PLCFMan::AdjustEnds( WW8PLCFxDesc& rDesc ) } } -void WW8PLCFxDesc::ReduceByOffset(void) +void WW8PLCFxDesc::ReduceByOffset() { ASSERT((LONG_MAX == nStartPos) || (nStartPos <= nEndPos), "Attr-Anfang und -Ende ueber Kreuz" ); @@ -6817,3 +6699,91 @@ USHORT wwSprmParser::DistanceToData(USHORT nId) const { return 1 + mnDelta + SprmDataOfs(nId); } + +#if 0 +ALNV::ANLV() + : nfc(0), cbTextBefore(0), cbTextAfter(0), jc(0), fPrev(0), fHang(0), + fSetBold(0), fSetItalic(0), fSetSmallCaps(0), fSetCaps(0), fSetStrike(0), + fSetKul(0), fPrevSpace(0), fBold(0), fItalic(0), fSmallCaps(0), fCaps(0), + fStrike(0), kul(0), ico(0), ftc(0), hps(0), iStartAt(0), dxaIndent(0), + dxaSpace(0) +{} + +void ANLV::ReadFromMem(const sal_uInt8 *&pData) +{ + nfc = Get_Byte(pData); + cbTextBefore = Get_Byte(pData); + cbTextAfter = Get_Byte(pData); + sal_uInt8 nTemp = Get_Byte(pData); + jc = nTemp & 0x03; + fPrev = (nTemp & 0x04) >> 2; + fHang = (nTemp & 0x08) >> 3; + fSetBold = (nTemp & 0x10) >> 4; + fSetItalic = (nTemp & 0x20) >> 5; + fSetSmallCaps = (nTemp & 0x40) >> 6; + fSetCaps = (nTemp & 0x80) >> 7; + nTemp = Get_Byte(pData); + fSetStrike = nTemp & 0x01; + fSetKul = (nTemp & 0x02) >> 1; + fPrevSpace = (nTemp & 0x04) >> 2; + fBold = (nTemp & 0x08) >> 3; + fItalic = (nTemp & 0x10) >> 4; + fSmallCaps = (nTemp & 0x20) >> 5; + fCaps = (nTemp & 0x40) >> 6; + fStrike = (nTemp & 0x80) >> 7; + nTemp = Get_Byte(pData); + kul = nTemp & 0x07; + ico = (nTemp & 0xF1) >> 3; + ftc = Get_Short(pData); + hps = Get_Short(pData); + iStartAt = Get_Short(pData); + dxaIndent = Get_Short(pData); + dxaSpace = Get_Short(pData); +} + +OLST::OLST() : + fRestartHdr(0), fSpareOlst2(0), fSpareOlst3(0), fSpareOlst4(0), +{ + memset(rgxch, 0, sizeof(rgxch)); +} + +void OLST::ReadFromMem(const sal_uInt8 *&pData, bool bVer67) +{ + for (int i = 0;i < 9; ++i) + rganlv[i].ReadFromMem(pData); + fRestartHdr = Get_Byte(pData); + fSpareOlst2 = Get_Byte(pData); + fSpareOlst3 = Get_Byte(pData); + fSpareOlst4 = Get_Byte(pData); + if (bVer67) + { + for (int j = 0; j < 64; ++j) + rgxch[j] = Get_Byte(pData); + } + else + { + for (int j = 0; j < 32; ++j) + rgxch[j] = Get_Short(pData); + } +} +#endif + +SEPr::SEPr() : + bkc(2), fTitlePage(0), fAutoPgn(0), nfcPgn(0), fUnlocked(0), cnsPgn(0), + fPgnRestart(0), fEndNote(1), lnc(0), grpfIhdt(0), nLnnMod(0), dxaLnn(0), + dxaPgn(720), dyaPgn(720), fLBetween(0), vjc(0), dmBinFirst(0), + dmBinOther(0), dmPaperReq(0), fPropRMark(0), ibstPropRMark(0), + dttmPropRMark(0), dxtCharSpace(0), dyaLinePitch(0), clm(0), reserved1(0), + dmOrientPage(0), iHeadingPgn(0), pgnStart(1), lnnMin(0), wTextFlow(0), + reserved2(0), pgbApplyTo(0), pgbPageDepth(0), pgbOffsetFrom(0), + xaPage(12240), yaPage(15840), xaPageNUp(12240), yaPageNUp(15840), + dxaLeft(1800), dxaRight(1800), dyaTop(1440), dyaBottom(1440), dzaGutter(0), + dyaHdrTop(720), dyaHdrBottom(720), ccolM1(0), fEvenlySpaced(1), + reserved3(0), fBiDi(0), fFacingCol(0), fRTLGutter(0), fRTLAlignment(0), + dxaColumns(720), dxaColumnWidth(0), dmOrientFirst(0), fLayout(0), + reserved4(0) +{ + memset(rgdxaColumnWidthSpacing, 0, sizeof(rgdxaColumnWidthSpacing)); +} + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index 445b4a45fa7d..cc0ca0868b2a 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8scan.hxx,v $ * - * $Revision: 1.57 $ + * $Revision: 1.58 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 12:41:19 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifndef _WW8SCAN_HXX @@ -113,6 +112,7 @@ namespace SL DEFCONSTSTRINGARRAY(CheckBox); DEFCONSTSTRINGARRAY(TextBox); DEFCONSTSTRINGARRAY(TextField); + DEFCONSTSTRINGARRAY(MSMacroCmds); } /* @@ -668,9 +668,6 @@ private: USHORT nArrMax; UINT16 nSprmSiz; - static const wwSprmSequence* GetWW8IgnoredSprms(); - static const wwSprmSequence* GetWW6IgnoredSprms(); - //no copying WW8PLCFx_SEPX(const WW8PLCFx_SEPX&); WW8PLCFx_SEPX& operator=(const WW8PLCFx_SEPX&); @@ -691,7 +688,6 @@ public: long nOtherSprmSiz ) const; bool Find4Sprms(USHORT nId1, USHORT nId2, USHORT nId3, USHORT nId4, BYTE*& p1, BYTE*& p2, BYTE*& p3, BYTE*& p4 ) const; - bool SprmsAreEquivalent(const BYTE* pOtherSprms, long nOtherSprmSiz) const; }; // Iterator fuer Fuss-/Endnoten und Anmerkungen @@ -1682,3 +1678,5 @@ public: }; #endif + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx index 827c1e3f3f27..f173dca7ab5f 100644 --- a/sw/source/filter/ww8/ww8struc.hxx +++ b/sw/source/filter/ww8/ww8struc.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ww8struc.hxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: cmc $ $Date: 2002-12-10 12:41:19 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,6 @@ * ************************************************************************/ -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */ #ifndef _WW8STRUC_HXX @@ -543,7 +542,6 @@ struct WW8_ANLD BYTE rgchAnld[32]; // 0x14 characters displayed before/after autonumber }; - struct WW8_OLST { WW8_ANLV rganlv[9]; // 0 an array of 9 ANLV structures (heading levels) @@ -555,6 +553,55 @@ struct WW8_OLST }; // cbOLST is 212(decimal), D4(hex). +#if 0 +struct ANLV +{ + ALNV(); + void ReadFromMem(const sal_uInt8 *&pData); + sal_uInt8 nfc; + sal_uInt8 cbTextBefore; + sal_uInt8 cbTextAfter; + sal_uInt8 jc : 2; + sal_uInt8 fPrev : 1; + sal_uInt8 fHang : 1; + sal_uInt8 fSetBold : 1; + sal_uInt8 fSetItalic : 1; + sal_uInt8 fSetSmallCaps : 1; + sal_uInt8 fSetCaps : 1; + sal_uInt8 fSetStrike : 1; + sal_uInt8 fSetKul : 1; + sal_uInt8 fPrevSpace : 1; + sal_uInt8 fBold : 1; + sal_uInt8 fItalic : 1; + sal_uInt8 fSmallCaps : 1; + sal_uInt8 fCaps : 1; + sal_uInt8 fStrike : 1; + sal_uInt8 kul : 3; + sal_uInt8 ico : 5; + sal_uInt16 ftc; + sal_uInt16 hps; + sal_uInt16 iStartAt; + sal_uInt16 dxaIndent; + sal_uInt16 dxaSpace; +}; + +struct OLST +{ + OLST(); + void ReadFromMem(const sal_uInt8 *&pData, bool bVer67) + ANLV rganlv[9]; // 0 an array of 9 ANLV structures (heading levels) + sal_uInt8 fRestartHdr; // when ==1, restart heading on section break + sal_uInt8 fSpareOlst2; // reserved + sal_uInt8 fSpareOlst3; // reserved + sal_uInt8 fSpareOlst4; // reserved + sal_uInt16 rgxch[64]; // array of 64 chars text before/after number +#if 0 + sal_uInt16 rgxch[32]; // array of 32 chars text before/after number + sal_uInt8 rgch[64]; // array of 64 chars text before/after number +#endif +}; +#endif + struct WW8_FDOA { SVBT32 fc; // 0 FC pointing to drawing object data @@ -853,6 +900,83 @@ struct WW8_TXBXS # pragma pack() #endif +struct SEPr +{ + SEPr(); + sal_uInt8 bkc; + sal_uInt8 fTitlePage; + sal_Int8 fAutoPgn; + sal_uInt8 nfcPgn; + sal_uInt8 fUnlocked; + sal_uInt8 cnsPgn; + sal_uInt8 fPgnRestart; + sal_uInt8 fEndNote; + sal_Int8 lnc; + sal_Int8 grpfIhdt; + sal_uInt16 nLnnMod; + sal_Int32 dxaLnn; + sal_Int16 dxaPgn; + sal_Int16 dyaPgn; + sal_Int8 fLBetween; + sal_Int8 vjc; + sal_uInt16 dmBinFirst; + sal_uInt16 dmBinOther; + sal_uInt16 dmPaperReq; +#if 0 + 28 1C brcTop BRC top page border + + 32 20 brcLeft BRC left page border + + 36 24 brcBottom BRC bottom page border + + 40 28 brcRight BRC right page border +#endif + sal_Int16 fPropRMark; + sal_Int16 ibstPropRMark; + sal_Int32 dttmPropRMark; //DTTM + sal_Int32 dxtCharSpace; + sal_Int32 dyaLinePitch; + sal_uInt16 clm; + sal_Int16 reserved1; + sal_uInt8 dmOrientPage; + sal_uInt8 iHeadingPgn; + sal_uInt16 pgnStart; + sal_Int16 lnnMin; + sal_uInt16 wTextFlow; + sal_Int16 reserved2; + sal_uInt16 pgbApplyTo:3; + sal_uInt16 pgbPageDepth:2; + sal_Int16 pgbOffsetFrom:3; + sal_Int16 :8; + sal_uInt32 xaPage; + sal_uInt32 yaPage; + sal_uInt32 xaPageNUp; + sal_uInt32 yaPageNUp; + sal_uInt32 dxaLeft; + sal_uInt32 dxaRight; + sal_Int32 dyaTop; + sal_Int32 dyaBottom; + sal_uInt32 dzaGutter; + sal_uInt32 dyaHdrTop; + sal_uInt32 dyaHdrBottom; + sal_Int16 ccolM1; + sal_Int8 fEvenlySpaced; + sal_Int8 reserved3; + sal_uInt8 fBiDi; + sal_uInt8 fFacingCol; + sal_uInt8 fRTLGutter; + sal_uInt8 fRTLAlignment; + sal_Int32 dxaColumns; + sal_Int32 rgdxaColumnWidthSpacing[89]; + sal_Int32 dxaColumnWidth; + sal_uInt8 dmOrientFirst; + sal_uInt8 fLayout; + sal_Int16 reserved4; +#if 0 + OLST olstAnm; //currently unused +#endif +}; + namespace wwUtility { sal_uInt32 BGRToRGB(sal_uInt32 nColour); @@ -860,3 +984,5 @@ namespace wwUtility }; #endif + +/* vi:set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index eb3508b20d22..271cdeabfedf 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -2,9 +2,9 @@ * * $RCSfile: swxml.cxx,v $ * - * $Revision: 1.49 $ + * $Revision: 1.50 $ * - * last change: $Author: tl $ $Date: 2002-11-20 14:33:04 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -100,6 +100,9 @@ #ifndef _COM_SUN_STAR_IO_XACTIVEDATASOURCE_HPP_ #include <com/sun/star/io/XActiveDataSource.hpp> #endif +#ifndef _COM_SUN_STAR_PACKAGES_ZIP_ZIPIOEXCEPTION_HPP_ +#include <com/sun/star/packages/zip/ZipIOException.hpp> +#endif #include <svtools/svstdarr.hxx> #ifndef _SFXDOCFILE_HXX //autogen wg. SfxMedium @@ -346,6 +349,15 @@ sal_Int32 ReadThroughComponent( #endif return ERR_SWG_READ_ERROR; } + catch( packages::zip::ZipIOException& r ) + { +#ifdef DEBUG + ByteString aError( "Zip exception catched while importing:\n" ); + aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US ); + DBG_ERROR( aError.GetBuffer() ); +#endif + return ERRCODE_IO_BROKENPACKAGE; + } catch( io::IOException& r ) { #ifdef DEBUG diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx index 863377ff9a86..b7f25f9497ee 100644 --- a/sw/source/filter/xml/xmlexpit.cxx +++ b/sw/source/filter/xml/xmlexpit.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlexpit.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: dvo $ $Date: 2002-06-19 13:07:54 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -243,8 +243,6 @@ void SvXMLExportItemMapper::exportXML( SvXMLAttributeList& rAttrList, sal_uInt16 nFlags, const SfxItemSet *pSet ) const { - OUString sCDATA( GetXMLToken(XML_CDATA) ); - if( 0 != (rEntry.nMemberId & MID_FLAG_SPECIAL_ITEM_EXPORT) ) { if( rItem.ISA( SvXMLAttrContainerItem ) ) @@ -281,7 +279,7 @@ void SvXMLExportItemMapper::exportXML( SvXMLAttributeList& rAttrList, sName.append( GetXMLToken(XML_XMLNS) ); sName.append( sal_Unicode(':') ); sName.append( sPrefix ); - rAttrList.AddAttribute( sName.makeStringAndClear(), sCDATA, + rAttrList.AddAttribute( sName.makeStringAndClear(), sNamespace ); } @@ -290,7 +288,7 @@ void SvXMLExportItemMapper::exportXML( SvXMLAttributeList& rAttrList, } sName.append( pUnknown->GetAttrLName( i ) ); - rAttrList.AddAttribute( sName.makeStringAndClear(), sCDATA, + rAttrList.AddAttribute( sName.makeStringAndClear(), pUnknown->GetAttrValue(i) ); } @@ -311,7 +309,7 @@ void SvXMLExportItemMapper::exportXML( SvXMLAttributeList& rAttrList, OUString sName( rNamespaceMap.GetQNameByKey( rEntry.nNameSpace, GetXMLToken(rEntry.eLocalName))); - rAttrList.AddAttribute( sName, sCDATA, aValue ); + rAttrList.AddAttribute( sName, aValue ); } } } diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx index f3853a9c3a6d..cf806225419e 100644 --- a/sw/source/filter/xml/xmliteme.cxx +++ b/sw/source/filter/xml/xmliteme.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmliteme.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: dvo $ $Date: 2001-10-26 12:02:47 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -146,7 +146,6 @@ extern SvXMLItemMapEntry aXMLTableCellItemMap[]; class SwXMLTableItemMapper_Impl: public SvXMLExportItemMapper { - const OUString sCDATA; SwXMLBrushItemExport aBrushItemExport; protected: @@ -188,7 +187,6 @@ SwXMLTableItemMapper_Impl::SwXMLTableItemMapper_Impl( SvXMLItemMapEntriesRef rMapEntries, SwXMLExport& rExp ) : SvXMLExportItemMapper( rMapEntries ), - sCDATA( GetXMLToken( XML_CDATA ) ), aBrushItemExport( rExp ), nAbsWidth( USHRT_MAX ) { @@ -206,7 +204,7 @@ void SwXMLTableItemMapper_Impl::AddAttribute( sal_uInt16 nPrefix, { OUString sName( rNamespaceMap.GetQNameByKey( nPrefix, GetXMLToken(eLName) ) ); - rAttrList.AddAttribute( sName, sCDATA, rValue ); + rAttrList.AddAttribute( sName, rValue ); } void SwXMLTableItemMapper_Impl::handleSpecialItem( diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 50df41ee5d32..51a98522f711 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmltbli.cxx,v $ * - * $Revision: 1.40 $ + * $Revision: 1.41 $ * - * last change: $Author: hbrinkm $ $Date: 2002-12-04 16:24:56 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -170,6 +170,10 @@ #include <vos/mutex.hxx> #endif +#ifndef _NDTXT_HXX +#include "ndtxt.hxx" +#endif + using namespace ::rtl; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -1738,7 +1742,8 @@ void SwXMLTableContext::InsertRepRows( sal_uInt32 nCount ) { const SwXMLTableCell_Impl *pSrcCell = GetCell( nCurRow-1, nCurCol ); - InsertCell( pSrcCell->GetStyleName(), 1U, pSrcCell->GetColSpan(), + InsertCell( pSrcCell->GetStyleName(), 1U, + pSrcCell->GetColSpan(), InsertTableSection(), 0, pSrcCell->IsProtected(), &pSrcCell->GetFormula(), pSrcCell->HasValue(), pSrcCell->GetValue() ); @@ -2067,19 +2072,76 @@ SwTableBox *SwXMLTableContext::MakeTableBox( if( pCell->GetStartNode() ) { - const OUString& rFormula = pCell->GetFormula(); - if (rFormula.getLength() > 0) + + // #104801# try to rescue broken documents with a certain pattern + // if: 1) the cell has a default number format (number 0) + // 2) the call has no formula + // 3) the value is 0.0 + // 4) the text doesn't look anything like 0.0 + // [read: length > 10, or length smaller 10 and no 0 in it] + // then make it a text cell! + bool bSuppressNumericContent = false; + if( pCell->HasValue() && (pCell->GetValue() == 0.0) && + (pCell->GetFormula().getLength() == 0) && + (sStyleName.getLength() != 0) ) { - // formula cell: insert formula if valid - SwTblBoxFormula aFormulaItem( rFormula ); - pBoxFmt->SetAttr( aFormulaItem ); + // default num format? + const SfxPoolItem* pItem = NULL; + if( pBoxFmt->GetItemState( RES_BOXATR_FORMAT, FALSE, &pItem ) + == SFX_ITEM_SET ) + { + const SwTblBoxNumFormat* pNumFormat = + static_cast<const SwTblBoxNumFormat*>( pItem ); + if( ( pNumFormat != NULL ) && ( pNumFormat->GetValue() == 0 ) ) + { + // only one text node? + SwNodeIndex aNodeIndex( *(pCell->GetStartNode()), 1 ); + if( ( aNodeIndex.GetNode().EndOfSectionIndex() - + aNodeIndex.GetNode().StartOfSectionIndex() ) == 2 ) + { + SwTxtNode* pTxtNode= aNodeIndex.GetNode().GetTxtNode(); + if( pTxtNode != NULL ) + { + // check text: does it look like some form of 0.0? + const String& rText = pTxtNode->GetTxt(); + if( ( rText.Len() > 10 ) || + ( rText.Search( '0' ) == STRING_NOTFOUND ) ) + { + bSuppressNumericContent = true; + } + } + } + else + bSuppressNumericContent = true; // several nodes + } + } } - // always insert value, even if default - if( pCell->HasValue() ) + if( bSuppressNumericContent ) { - SwTblBoxValue aValueItem( pCell->GetValue() ); - pBoxFmt->SetAttr( aValueItem ); + // suppress numeric content? Then reset number format! + pBoxFmt->ResetAttr( RES_BOXATR_FORMULA ); + pBoxFmt->ResetAttr( RES_BOXATR_FORMAT ); + pBoxFmt->ResetAttr( RES_BOXATR_VALUE ); + } + else + { + // the normal case: set formula and value (if available) + + const OUString& rFormula = pCell->GetFormula(); + if (rFormula.getLength() > 0) + { + // formula cell: insert formula if valid + SwTblBoxFormula aFormulaItem( rFormula ); + pBoxFmt->SetAttr( aFormulaItem ); + } + + // always insert value, even if default + if( pCell->HasValue() ) + { + SwTblBoxValue aValueItem( pCell->GetValue() ); + pBoxFmt->SetAttr( aValueItem ); + } } // update cell content depend on the default language @@ -2759,11 +2821,16 @@ const SwStartNode *SwXMLTableContext::InsertTableSection( if( !pPrevSttNd ) { pBox1->pSttNd = pStNd; - SwTable& rTable = pTableNode->GetTable(); - SwFrmFmt *pTblFmt = rTable.GetFrmFmt(); - Reference < XCell > xCell( SwXCell::CreateXCell( pTblFmt, pBox1, 0, &rTable ) ); - Reference < XText > xText( xCell, UNO_QUERY ); - Reference < XTextCursor > xTextCursor = xText->createTextCursor(); + SwCntntNode *pCNd = pDoc->GetNodes()[ pStNd->GetIndex() + 1 ] + ->GetCntntNode(); + SwPosition aPos( *pCNd ); + aPos.nContent.Assign( pCNd, 0U ); + + Reference < XTextRange > xTextRange = + SwXTextRange::CreateTextRangeFromPosition( pDoc, aPos, 0 ); + Reference < XText > xText = xTextRange->getText(); + Reference < XTextCursor > xTextCursor = + xText->createTextCursorByRange( xTextRange ); GetImport().GetTextImport()->SetCursor( xTextCursor ); } } diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx index edea7b16d1f2..426c5abf43c5 100644 --- a/sw/source/filter/xml/xmltexte.cxx +++ b/sw/source/filter/xml/xmltexte.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmltexte.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: mib $ $Date: 2001-11-26 11:37:14 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -288,26 +288,6 @@ SwXMLTextParagraphExport::~SwXMLTextParagraphExport() { } -void SwXMLTextParagraphExport::getTextEmbeddedObjectProperties( - const Reference < XPropertySet >& rPropSet, - OUString& rURL, - sal_Bool& rExtern ) const -{ - SwOLENode *pOLENd = GetNoTxtNode( rPropSet )->GetOLENode(); - SwOLEObj& rOLEObj = pOLENd->GetOLEObj(); - - rURL = sEmbeddedObjectProtocol; - rURL += rOLEObj.GetName(); - SvInfoObject *pInfo = - pOLENd->GetDoc()->GetPersist()->Find( rOLEObj.GetName() ); - DBG_ASSERT( pInfo, "no info object for OLE object found" ); - if( pInfo ) - { - SvGlobalName aClassName( pInfo->GetClassName() ); - rExtern = aOutplaceClassId == aClassName; - } -} - void SwXMLTextParagraphExport::setTextEmbeddedGraphicURL( const Reference < XPropertySet >& rPropSet, OUString& rURL) const @@ -360,29 +340,32 @@ void lcl_addOutplaceProperties( if( pEmbed ) { const Rectangle& rVisArea = pEmbed->GetVisArea(); - Any aAny; + if( !rVisArea.IsEmpty() ) + { + Any aAny; - aAny <<= (sal_Int32)rVisArea.Left(); - *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_LEFT ), aAny ); - pStates++; + aAny <<= (sal_Int32)rVisArea.Left(); + *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_LEFT ), aAny ); + pStates++; - aAny <<= (sal_Int32)rVisArea.Top(); - *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_TOP ), aAny ); - pStates++; + aAny <<= (sal_Int32)rVisArea.Top(); + *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_TOP ), aAny ); + pStates++; - aAny <<= (sal_Int32)rVisArea.GetWidth(); - *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_WIDTH ), aAny ); - pStates++; + aAny <<= (sal_Int32)rVisArea.GetWidth(); + *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_WIDTH ), aAny ); + pStates++; - aAny <<= (sal_Int32)rVisArea.GetHeight(); - *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_HEIGHT ), aAny ); - pStates++; + aAny <<= (sal_Int32)rVisArea.GetHeight(); + *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_HEIGHT ), aAny ); + pStates++; - aAny <<= (sal_Int32)pEmbed->GetViewAspect(); - *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_DRAW_ASPECT ), aAny ); - pStates++; + aAny <<= (sal_Int32)pEmbed->GetViewAspect(); + *pStates = new XMLPropertyState( rMapper->FindEntryIndex( CTF_OLE_DRAW_ASPECT ), aAny ); + pStates++; - // TODO: aspect + // TODO: aspect + } } } @@ -551,7 +534,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( if( (rExport.getExportFlags() & EXPORT_EMBEDDED) == 0 ) { OUString sURL( sEmbeddedObjectProtocol ); - sURL += rOLEObj.GetName(); + sURL += pInfo->GetStorageName(); sURL = GetExport().AddEmbeddedObject( sURL ); lcl_addURL( rExport, sURL, sal_False ); } diff --git a/sw/source/filter/xml/xmltexte.hxx b/sw/source/filter/xml/xmltexte.hxx index a71cf928efc6..0673a237d9cf 100644 --- a/sw/source/filter/xml/xmltexte.hxx +++ b/sw/source/filter/xml/xmltexte.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmltexte.hxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: mib $ $Date: 2001-03-21 10:19:54 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -115,11 +115,6 @@ public: SvXMLAutoStylePoolP& rAutoStylePool ); ~SwXMLTextParagraphExport(); - virtual void getTextEmbeddedObjectProperties( - const ::com::sun::star::uno::Reference < - ::com::sun::star::beans::XPropertySet >& rPropSet, - ::rtl::OUString& rStreamName, - sal_Bool& rExtern ) const; virtual void setTextEmbeddedGraphicURL( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >& rPropSet, diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src index 4cc6b9618294..13e212f666ea 100644 --- a/sw/source/ui/app/app.src +++ b/sw/source/ui/app/app.src @@ -2,9 +2,9 @@ * * $RCSfile: app.src,v $ * - * $Revision: 1.79 $ + * $Revision: 1.80 $ * - * last change: $Author: os $ $Date: 2002-12-11 15:06:53 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,7 +87,7 @@ String STR_PRINT_MERGE_MACRO Text [ english_us ] = "Print form letters" ; Text [ italian ] = "Stampa in serie" ; Text [ spanish ] = "Imprimir cartas en serie" ; - Text [ french ] = "Imprimer un mailing" ; + Text [ french ] = "Imprimer les lettres type" ; Text [ dutch ] = "Standaardbrieven afdrukken" ; Text [ swedish ] = "Skriv ut standardbrev" ; Text [ danish ] = "Udskriv flettede breve" ; @@ -103,7 +103,7 @@ String STR_PRINT_MERGE_MACRO Text[ dutch ] = "Standaardbrieven afdrukken"; Text[ chinese_simplified ] = "鎵撳嵃閭欢鍚堝苟"; Text[ greek ] = "抨酏瘗箸 邈牾觌唢 屦轶麸朕"; - Text[ korean ] = "韼胳歆 鞏戩嫕 鞚胳噭"; + Text[ korean ] = "韼胳 鞏戩嫕 鞚胳噭"; Text[ turkish ] = "Standart mektup yazd齬"; Text[ catalan ] = "Imprimeix les cartes de formulari"; Text[ finnish ] = "Tulosta joukkokirjeet"; @@ -580,11 +580,11 @@ SfxStyleFamilies DLG_STYLE_DESIGNER < "Autom醫ico" ; SFXSTYLEBIT_AUTO ; > ; < "Estilos de texto" ; SWSTYLEBIT_TEXT ; > ; < "Estilos de cap韙ulos" ; SWSTYLEBIT_CHAPTER ; > ; - < "Estilos de listas" ; SWSTYLEBIT_LIST ; > ; - < "Estilos de 韓dices" ; SWSTYLEBIT_IDX ; > ; + < "Estilos de lista" ; SWSTYLEBIT_LIST ; > ; + < "Estilos de 韓dice" ; SWSTYLEBIT_IDX ; > ; < "Estilos de 醨eas especiales" ; SWSTYLEBIT_EXTRA ; > ; < "Estilos HTML" ; SWSTYLEBIT_HTML ; > ; - < "Estilos condicionados" ; SWSTYLEBIT_CONDCOLL ; > ; + < "Estilos condicionales" ; SWSTYLEBIT_CONDCOLL ; > ; }; FilterList [ finnish ] = { @@ -686,17 +686,17 @@ SfxStyleFamilies DLG_STYLE_DESIGNER }; FilterList [ korean ] = { - < "鞛愲彊" ; SFXSTYLEBIT_ALL ; > ; - < "靷毄霅 鞀ろ儉鞚" ; SFXSTYLEBIT_USED ; > ; + < "氇摖 鞀ろ儉鞚" ; SFXSTYLEBIT_ALL ; > ; + < "鞝侅毄霅 鞀ろ儉鞚" ; SFXSTYLEBIT_USED ; > ; < "靷毄鞛 鞝曥潣 鞀ろ儉鞚" ; SFXSTYLEBIT_USERDEF ; > ; < "鞛愲彊" ; SFXSTYLEBIT_AUTO ; > ; - < "韰嶌姢韸 韰滍攲毽" ; SWSTYLEBIT_TEXT ; > ; - < "鞛 韰滍攲毽" ; SWSTYLEBIT_CHAPTER ; > ; - < "氇╇ 韰滍攲毽" ; SWSTYLEBIT_LIST ; > ; - < "靸夓澑 韰滍攲毽" ; SWSTYLEBIT_IDX ; > ; - < "韸轨垬鞓侅棴 韰滍攲毽" ; SWSTYLEBIT_EXTRA ; > ; - < "HTML 韰滍攲毽" ; SWSTYLEBIT_HTML ; > ; - < "臁瓣贝鞝 韰滍攲毽" ; SWSTYLEBIT_CONDCOLL ; > ; + < "氍胳劀鞖 鞀ろ儉鞚" ; SWSTYLEBIT_TEXT ; > ; + < "鞛 鞀ろ儉鞚" ; SWSTYLEBIT_CHAPTER ; > ; + < "氇╇ 鞀ろ儉鞚" ; SWSTYLEBIT_LIST ; > ; + < "靸夓澑 鞀ろ儉鞚" ; SWSTYLEBIT_IDX ; > ; + < "韸轨垬頃 鞀ろ儉鞚" ; SWSTYLEBIT_EXTRA ; > ; + < "HTML 鞀ろ儉鞚" ; SWSTYLEBIT_HTML ; > ; + < "臁瓣贝攵 鞀ろ儉鞚" ; SWSTYLEBIT_CONDCOLL ; > ; }; FilterList [ chinese_simplified ] = { @@ -959,8 +959,8 @@ SfxStyleFamilies DLG_STYLE_DESIGNER }; FilterList [ korean ] = { - < "鞝勲秬" ; SFXSTYLEBIT_ALL ; > ; - < "靷毄霅 鞀ろ儉鞚" ; SFXSTYLEBIT_USED ; > ; + < "氇憪" ; SFXSTYLEBIT_ALL ; > ; + < "鞝侅毄霅 鞀ろ儉鞚" ; SFXSTYLEBIT_USED ; > ; < "靷毄鞛 鞝曥潣 鞀ろ儉鞚" ; SFXSTYLEBIT_USERDEF ; > ; }; Text[ turkish ] = "Karakter bi鏸mi"; @@ -1004,7 +1004,7 @@ SfxStyleFamilies DLG_STYLE_DESIGNER Text [ french ] = "Styles de cadre" ; Text [ swedish ] = "Ramformatmallar" ; Text [ dutch ] = "Kaderopmaakprofielen" ; - Text [ spanish ] = "Estilos de marcos" ; + Text [ spanish ] = "Estilos de marco" ; Text [ english_us ] = "Frame Styles" ; StyleFamily = SFX_STYLE_FAMILY_FRAME ; FilterList = @@ -1143,7 +1143,7 @@ SfxStyleFamilies DLG_STYLE_DESIGNER < "鑷畾鏍峰紡" ; SFXSTYLEBIT_USERDEF ; > ; }; Text[ greek ] = "旭躔 痣衢筮秕"; - Text[ korean ] = "頂勲爤鞛 韰滍攲毽"; + Text[ korean ] = "頂勲爤鞛 鞀ろ儉鞚"; FilterList [ greek ] = { < "茧" ; SFXSTYLEBIT_ALL ; > ; @@ -1152,8 +1152,8 @@ SfxStyleFamilies DLG_STYLE_DESIGNER }; FilterList [ korean ] = { - < "鞝勲秬" ; SFXSTYLEBIT_ALL ; > ; - < "靷毄霅 鞀ろ儉鞚" ; SFXSTYLEBIT_USED ; > ; + < "氇憪" ; SFXSTYLEBIT_ALL ; > ; + < "鞝侅毄霅 鞀ろ儉鞚" ; SFXSTYLEBIT_USED ; > ; < "靷毄鞛 鞝曥潣 鞀ろ儉鞚" ; SFXSTYLEBIT_USERDEF ; > ; }; Text[ turkish ] = "莈r鏴ve bi鏸mi"; @@ -1345,7 +1345,7 @@ SfxStyleFamilies DLG_STYLE_DESIGNER FilterList [ korean ] = { < "氇憪" ; SFXSTYLEBIT_ALL ; > ; - < "靷毄霅 鞀ろ儉鞚" ; SFXSTYLEBIT_USED ; > ; + < "鞝侅毄霅 鞀ろ儉鞚" ; SFXSTYLEBIT_USED ; > ; < "靷毄鞛 鞝曥潣 鞀ろ儉鞚" ; SFXSTYLEBIT_USERDEF ; > ; }; Text[ turkish ] = "Sayfa bi鏸mi"; @@ -1527,7 +1527,7 @@ SfxStyleFamilies DLG_STYLE_DESIGNER < "鑷畾鏍峰紡" ; SFXSTYLEBIT_USERDEF ; > ; }; Text[ greek ] = "郁蹼 狁哞扃箸"; - Text[ korean ] = "氩堩樃 毵り赴旮 韰滍攲毽"; + Text[ korean ] = "氩堩樃 毵り赴旮 鞀ろ儉鞚"; FilterList [ greek ] = { < "茧" ; SFXSTYLEBIT_ALL ; > ; @@ -1536,8 +1536,8 @@ SfxStyleFamilies DLG_STYLE_DESIGNER }; FilterList [ korean ] = { - < "鞝勳泊" ; SFXSTYLEBIT_ALL ; > ; - < "靷毄霅 鞀ろ儉鞚" ; SFXSTYLEBIT_USED ; > ; + < "氇憪" ; SFXSTYLEBIT_ALL ; > ; + < "鞝侅毄霅 鞀ろ儉鞚" ; SFXSTYLEBIT_USED ; > ; < "靷毄鞛 鞝曥潣 鞀ろ儉鞚" ; SFXSTYLEBIT_USERDEF ; > ; }; Text[ turkish ] = "Numaralama bi鏸mi"; @@ -1615,7 +1615,7 @@ String STR_ENV_TITLE Text[ dutch ] = "Envelop"; Text[ chinese_simplified ] = "淇″皝"; Text[ greek ] = "周赍腼"; - Text[ korean ] = "氪夗埇"; + Text[ korean ] = "韼胳氪夗埇"; Text[ turkish ] = "Zarf"; Text[ language_user1 ] = " "; Text[ catalan ] = "Sobre"; @@ -1694,7 +1694,7 @@ String STR_WRITER_DOCUMENT_FULLTYPE_31 Text [ swedish ] = "%PRODUCTNAME 3.0 text" ; Text [ danish ] = "%PRODUCTNAME 3.0 tekst" ; Text [ italian ] = "Test %PRODUCTNAME 3.0" ; - Text [ spanish ] = "%PRODUCTNAME 3.0 Texto" ; + Text [ spanish ] = "%PRODUCTNAME 3.0 - Texto" ; Text [ french ] = "%PRODUCTNAME 3.0 Texte" ; Text [ dutch ] = "%PRODUCTNAME 3.0 Tekst" ; Text [ portuguese ] = "%PRODUCTNAME 3.0 Text" ; @@ -1724,7 +1724,7 @@ String STR_WRITER_DOCUMENT_FULLTYPE_40 Text [ swedish ] = "%PRODUCTNAME 4.0 text" ; Text [ danish ] = "%PRODUCTNAME 4.0 tekst" ; Text [ italian ] = "Testo %PRODUCTNAME 4.0" ; - Text [ spanish ] = "%PRODUCTNAME 4.0 texto" ; + Text [ spanish ] = "%PRODUCTNAME 4.0 - Texto" ; Text [ french ] = "%PRODUCTNAME 4.0 Texte" ; Text [ dutch ] = "%PRODUCTNAME 4.0 Tekst" ; Text [ portuguese ] = "Texto (%PRODUCTNAME 4.0)" ; @@ -1754,7 +1754,7 @@ String STR_WRITER_DOCUMENT_FULLTYPE_50 Text [ swedish ] = "%PRODUCTNAME 5.0 text" ; Text [ danish ] = "%PRODUCTNAME 5.0 Tekst" ; Text [ italian ] = "Testo %PRODUCTNAME 5.0" ; - Text [ spanish ] = "%PRODUCTNAME 5.0 Texto" ; + Text [ spanish ] = "%PRODUCTNAME 5.0 - Texto" ; Text [ french ] = "%PRODUCTNAME 5.0 Texte" ; Text [ dutch ] = "%PRODUCTNAME 5.0 Tekst" ; Text [ portuguese ] = "%PRODUCTNAME 5.0 Texto" ; @@ -1784,7 +1784,7 @@ String STR_WRITER_DOCUMENT_FULLTYPE Text[ greek ] = "搞泷狯 赍殪蓓秕 %PRODUCTNAME 6.0"; Text[ dutch ] = "%PRODUCTNAME 6.0 Tekstdocument"; Text[ french ] = "%PRODUCTNAME 6.0 Texte"; - Text[ spanish ] = "%PRODUCTNAME 6.0 Documento de texto"; + Text[ spanish ] = "%PRODUCTNAME 6.0 - Documento de texto"; Text[ italian ] = "Documento di testo %PRODUCTNAME 6.0"; Text[ danish ] = "%PRODUCTNAME 6.0 Tekstdokument"; Text[ swedish ] = "Textdokument %PRODUCTNAME 6.0"; @@ -1971,7 +1971,7 @@ String STR_LOAD_HTML_DOC Text [ dutch ] = "Naam en pad van het HTML-document" ; Text [ portuguese ] = "Nome e atalho do documento HTML" ; Text[ chinese_simplified ] = "HTML 鏂囨。鍚嶇О鍜岃矾寰"; - Text[ russian ] = "褥 矬螯 HTML-漕牦戾眚."; + Text[ russian ] = "褥 矬螯 忮-耱疣龛鳆"; Text[ polish ] = "Nazwa i 渃ie縦a dokumentu HTML"; Text[ japanese ] = "HTML 褰㈠紡銉夈偔銉ャ儭銉炽儓銇悕鍓嶃仺銉戙偣"; Text[ chinese_traditional ] = "HTML 鏂囦欢鍚嶇ū鍜岃矾寰"; @@ -2014,7 +2014,7 @@ InfoBox MSG_ERROR_SEND_MAIL MESSAGE[ dutch ] = "Fout bij verzenden van bericht."; MESSAGE[ chinese_simplified ] = "鍦ㄥ瘎鍙戠數瀛愰偖浠舵椂鍙戠敓閿欒銆"; MESSAGE[ greek ] = "遇茈灬 赆糗 翮 狃矬麸朕 麸 扃睚灬麸."; - MESSAGE[ korean ] = "氅旍澕 氤措偞旮 鞓る."; + MESSAGE[ korean ] = "氅旍澕 氤措偞電 欷 鞓る"; MESSAGE[ turkish ] = "輑eti g鰊derilirken hata olu⺶u."; MESSAGE[ catalan ] = "S'ha produ飔 un error en enviar el missatge."; MESSAGE[ thai ] = "喔箞喔囙箑喔∴弗喙屶笢喔脆笖喔炧弗喔侧笖"; @@ -2045,7 +2045,7 @@ InfoBox MSG_ERROR_PASSWD MESSAGE[ dutch ] = "Wachtwoord niet juist."; MESSAGE[ chinese_simplified ] = "瀵嗙爜鏃犳晥銆"; MESSAGE[ greek ] = "朋鲠腱蓓矧 犍溟挈 瘃忉箸."; - MESSAGE[ korean ] = "鞎旐樃臧 鞓踌 鞎婌姷雼堧嫟."; + MESSAGE[ korean ] = "鞎旐樃臧 鞛橂霅橃棃鞀惦媹雼."; MESSAGE[ turkish ] = "Yanl 㱮fre."; MESSAGE[ language_user1 ] = " "; MESSAGE[ catalan ] = "Contrasenya incorrecta."; @@ -2178,7 +2178,7 @@ String STR_DOC_STAT TEXT [ portuguese ] = "Estat韘tica" ; TEXT [ finnish ] = "Tilastotiedot" ; TEXT [ danish ] = "Statistik" ; - TEXT [ french ] = "Statistique" ; + TEXT [ french ] = "Statistiques" ; TEXT [ swedish ] = "Statistik" ; TEXT [ dutch ] = "Statistiek" ; TEXT [ spanish ] = "Estad韘tica" ; @@ -2213,7 +2213,7 @@ String STR_STATSTR_W4WREAD Text [ portuguese ] = "A importar documento..." ; Text [ finnish ] = "Tuodaan asiakirjaa..." ; Text [ danish ] = "Importerer dokument..." ; - Text [ french ] = "Import du document en cours..." ; + Text [ french ] = "Import du document..." ; Text [ swedish ] = "Dokument importeras..." ; Text [ dutch ] = "Document wordt ge飉porteerd..." ; Text [ spanish ] = "Importando el documento..." ; @@ -2244,7 +2244,7 @@ String STR_STATSTR_W4WWRITE Text [ portuguese ] = "A exportar documento..." ; Text [ finnish ] = "Vied滗n asiakirjaa..." ; Text [ danish ] = "Eksporterer dokument" ; - Text [ french ] = "Export du document en cours..." ; + Text [ french ] = "Export du document..." ; Text [ swedish ] = "Dokument exporteras..." ; Text [ dutch ] = "Document wordt ge離porteerd..." ; Text [ spanish ] = "Exportando el documento..." ; @@ -2290,7 +2290,7 @@ String STR_STATSTR_SWGREAD Text[ dutch ] = "Document wordt gemaakt..."; Text[ chinese_simplified ] = "瑁呭叆鏂囨。..."; Text[ greek ] = "燥 葶泷狯 鲲耵弭衢..."; - Text[ korean ] = "氍胳劀 搿滊摐 欷..."; + Text[ korean ] = "氍胳劀毳 搿滊摐頃橂姅 欷..."; Text[ turkish ] = "Belge y黭leniyor..."; Text[ catalan ] = "S'est carregant el document..."; Text[ thai ] = "喔佮赋喔ム副喔囙箓喔弗喔斷箑喔竵喔覆喔..."; @@ -2321,7 +2321,7 @@ String STR_STATSTR_SWGWRITE Text[ dutch ] = "Document wordt opgeslagen..."; Text[ chinese_simplified ] = "瀛樼洏鏂囨。..."; Text[ greek ] = "琉镨揸艴箸 邈泷荟秕..."; - Text[ korean ] = "氍胳劀 鞝鞛..."; + Text[ korean ] = "氍胳劀 鞝鞛ロ晿電 欷..."; Text[ turkish ] = "Belge kaydediliyor..."; Text[ language_user1 ] = " "; Text[ catalan ] = "S'est desant el document..."; @@ -2369,10 +2369,10 @@ String STR_STATSTR_AUTOFORMAT TEXT [ portuguese ] = "A formatar documento automaticamente..." ; TEXT [ finnish ] = "Muotoillaan asiakirjaa automaattisesti..." ; TEXT [ danish ] = "Autoformatering af dokumentet..." ; - TEXT [ french ] = "Mise en forme automatique du document..." ; + TEXT [ french ] = "Formatage automatique du document..." ; TEXT [ swedish ] = "Autoformatering av dokumentet..." ; TEXT [ dutch ] = "Bezig met automatisch opmaken..." ; - TEXT [ spanish ] = "AutoFormato del documento..." ; + TEXT [ spanish ] = "Formateado autom醫ico del documento..." ; TEXT [ english_us ] = "Formatting document automatically..." ; TEXT[ chinese_simplified ] = "鏂囨。鑷姩鏍煎紡鍖..."; TEXT[ language_user1 ] = " "; @@ -2384,7 +2384,7 @@ String STR_STATSTR_AUTOFORMAT TEXT[ dutch ] = "Bezig met automatisch opmaken..."; TEXT[ chinese_simplified ] = "鏂囨。鑷姩鏍煎紡鍖..."; TEXT[ greek ] = "刘酎灬翮 祜聆镳镞珞 麸 邈泷荟秕..."; - TEXT[ korean ] = "氍胳劀 鞛愲彊 靹滌嫕 歆鞝..."; + TEXT[ korean ] = "氍胳劀 鞛愲彊 靹滌嫕 靹れ爼..."; TEXT[ turkish ] = "Otomatik belge formatlama..."; TEXT[ catalan ] = "S'est autoformatant el document..."; TEXT[ thai ] = "喔佮赋喔ム副喔囙笀喔编笖喔｀腹喔涏箒喔氞笟喙喔竵喔覆喔｀腑喔编笗喙傕笝喔∴副喔曕复..."; @@ -2400,7 +2400,7 @@ String STR_STATSTR_IMPGRF Text [ portuguese ] = "A importar imagem..." ; Text [ finnish ] = "Tuodaan grafiikkoja..." ; Text [ danish ] = "Importerer grafik..." ; - Text [ french ] = "Import de l'image en cours..." ; + Text [ french ] = "Import de l'image..." ; Text [ swedish ] = "Grafik importeras..." ; Text [ dutch ] = "Afbeelding wordt ge飉porteerd..." ; Text [ spanish ] = "Importando imagen..." ; @@ -2414,7 +2414,7 @@ String STR_STATSTR_IMPGRF Text[ dutch ] = "Afbeelding wordt ge飉porteerd..."; Text[ chinese_simplified ] = "杈撳叆鍥惧舰..."; Text[ greek ] = "砰筢泫戕 泷狯殛稞..."; - Text[ korean ] = "攴鸽灅頂 臧鞝胳槫旮..."; + Text[ korean ] = "攴鸽 臧鞝胳槫旮..."; Text[ turkish ] = "Grafik i鏴 aktar齦齳or..."; Text[ language_user1 ] = " "; Text[ catalan ] = "S'est important imatge..."; @@ -2477,7 +2477,7 @@ String STR_STATSTR_FORMAT Text[ dutch ] = "Bezig met opmaken..."; Text[ chinese_simplified ] = "鏍煎紡鍖..."; Text[ greek ] = "田聆镳镞珞..."; - Text[ korean ] = "靹滌嫕 歆鞝..."; + Text[ korean ] = "靹滌嫕 靹れ爼..."; Text[ turkish ] = "Formatlan齳or..."; Text[ catalan ] = "S'est formatant..."; Text[ thai ] = "喔佮赋喔ム副喔囙笀喔编笖喔｀腹喔涏箒喔氞笟..."; @@ -2627,7 +2627,7 @@ String STR_STATSTR_HYPHEN Text[ dutch ] = "Woordafbreking..."; Text[ chinese_simplified ] = "杩炲瓧绗..."; Text[ greek ] = "吁腚徕轶禳..."; - Text[ korean ] = "頃橃澊頂 ..."; + Text[ korean ] = "頃橃澊頂..."; Text[ turkish ] = "Heceleme..."; Text[ language_user1 ] = " "; Text[ catalan ] = "S'est separant en s韑.labes..."; @@ -2642,7 +2642,7 @@ String STR_STATSTR_TOX_INSERT Text [ english_us ] = "Inserting Index..." ; Text [ italian ] = "L'indice viene inserito..." ; Text [ spanish ] = "Insertando directorio..." ; - Text [ french ] = "Index en cours d'insertion..." ; + Text [ french ] = "Insertion de l'index..." ; Text [ dutch ] = "Index wordt ingevoegd..." ; Text [ swedish ] = "F鰎teckning infogas..." ; Text [ danish ] = "Inds鎡ter indeks..." ; @@ -2672,7 +2672,7 @@ String STR_STATSTR_TOX_UPDATE Text [ english_us ] = "Updating Index..." ; Text [ italian ] = "L'indice viene aggiornato..." ; Text [ spanish ] = "Actualizando directorio..." ; - Text [ french ] = "Index en cours d'actualisation..." ; + Text [ french ] = "Actualisation de l'index..." ; Text [ dutch ] = "Index wordt bijgewerkt..." ; Text [ swedish ] = "F鰎teckning uppdateras..." ; Text [ danish ] = "Opdaterer indeks..." ; @@ -2704,7 +2704,7 @@ String STR_STATSTR_SUMMARY Text [ swedish ] = "Utdrag skapas..." ; Text [ danish ] = "Opretter abstract..." ; Text [ italian ] = "Il sunto viene creato..." ; - Text [ spanish ] = "Creando el extracto..." ; + Text [ spanish ] = "Creaci髇 del resumen..." ; Text [ french ] = "Cr閍tion de la synth鑣e..." ; Text [ dutch ] = "Overzicht wordt gemaakt..." ; Text [ portuguese ] = "A criar Sum醨io..." ; @@ -2718,7 +2718,7 @@ String STR_STATSTR_SUMMARY Text[ dutch ] = "Overzicht wordt gemaakt..."; Text[ chinese_simplified ] = "鍒朵綔鎽樿..."; Text[ greek ] = "溺扉秕胥哚 abstract..."; - Text[ korean ] = "鞖旍暯 毵岆摛旮..."; + Text[ korean ] = "鞖旍暯 毵岆摐電 欷..."; Text[ turkish ] = "謟et olu⺶uruluyor..."; Text[ catalan ] = "S'est creant l'extracte..."; Text[ finnish ] = "Luodaan tiivistelm滗..."; @@ -2763,26 +2763,26 @@ QueryBox MSG_COMCORE_ASKSEARCH Message = "Zum Fortsetzen des Vorgangs, muss die R點kg鋘gig-Funktion abgeschaltet werden. Wollen Sie die R點kg鋘gig-Funktion abschalten?"; Message [ English ] = "This action needs for undo many memory.\nWould you disable undo?" ; Message [ norwegian ] = "Hvis du vil angre denne handlingen trenger du mye minne.\nVil du sperre angrefunksjonen?" ; - Message [ italian ] = "L'annullamento di questa azione occorre molta memoria.\nVolete disattivare la possibilit di annullare?" ; + Message [ italian ] = "Per procedre con questa operazione dovete disattivare prima la funzione \"Annulla\".\nVolete disattivare la possibilit di annullare?" ; Message [ portuguese_brazilian ] = "Esta a??o requer muita mem?ia para desfazer.\nDeseja desativar a fun??o desfazer?" ; Message [ portuguese ] = "Para poder anular esta ac玢o necess醨ia muita mem髍ia.\nDeseja cancelar esta fun玢o?" ; Message [ finnish ] = "T鋗鋘 toiminnon kumoamiseen tarvitaan suuri m滗r muistia.\nHaluatko peruuttaa kumoamisen?" ; Message [ danish ] = "Denne handling kr鎣er megen hukommelse til fortryd-funktionen\nVil du sl fortryd-funktionen fra?" ; - Message [ french ] = "Cette action n閏essite beaucoup de m閙oire pour l'annulation (Undo).\nVoulez-vous d閟activer l'annulation ?" ; - Message [ swedish ] = "Den h鋜 錿g鋜den kr鋠er mycket minne f鰎 舗gra-funktionen.\nVill du st鋘ga av 舗gra-funktionen?" ; + Message [ french ] = "La fonction d'annulation doit 阾re d閟activ閑, ce sans quoi il sera impossible d'ex閏uter cette op閞ation. Voulez-vous d閟activer la fonction d'annulation ?" ; + Message [ swedish ] = "F鰎 att kunna forts鋞ta med den h鋜 錿g鋜den m錽te du st鋘ga av 錸grafunktionen f鰎st. Vill du st鋘ga av 錸grafunktionen?" ; Message [ dutch ] = "Het ongedaan maken van deze bewerking beslaat veel geheugen.\nWilt U 'Ongedaan maken' opheffen?" ; - Message [ spanish ] = "Esta acci髇 necesita mucha memoria para la operaci髇 de Deshacer.\n緿esea desactivar la opci髇 de deshacer?" ; + Message [ spanish ] = "Para proceder con esta operaci髇 deber anular primero la funci髇 de \"deshacer\".\n緿esea desactivar la funci髇 de \"deshacer\"?" ; Message [ english_us ] = "To proceed with this action, you must first turn off the \"undo\" function. Do you want to turn off the \"undo\" function?" ; - Message[ chinese_simplified ] = "鎾ゆ秷鍛戒护鍔熻兘闇瑕佸緢澶氱殑鍐呭瓨銆俓n瑕佸彇娑堟挙娑堝懡浠ゅ姛鑳斤紵"; + Message[ chinese_simplified ] = "鎾ゆ秷鍛戒护鍔熻兘闇瑕佸緢澶氱殑鍐呭瓨銆俓n瑕佸仠鐢ㄦ挙娑堝懡浠ゅ姛鑳斤紵"; Message[ russian ] = "茵遽箦蝰 犷朦 钺 镟蜩 潆 铗戾睇 钽 溴轳蜮.\n湾 铗戾螯?"; Message[ polish ] = "Cofni阠ie tej akcji wymaga du縠j ilo渃i pami阠i.\nCzy chcesz przerwa cofni阠ie?"; - Message[ japanese ] = "銇撱伄銈€偗銈枫儳銉炽倰鍏冦伀鎴汇仚銇伅闈炲父銇仧銇忋仌銈撱伄銉囥偅銈广偗瀹归噺銇屽繀瑕併仹銇欍俓n鍏冦伀鎴汇仚銇倰銈儯銉炽偦銉仐銇俱仚銇嬨"; - Message[ chinese_traditional ] = "寰╁師鍔熻兘闇瑕佸緢澶氱殑瑷樻喍楂斻俓n瑕侀棞闁夊京鍘熷姛鑳斤紵"; + Message[ japanese ] = "銇撱伄鎿嶄綔銈掔稓琛屻仚銈嬨伀銇併伨銇 \"鍏冦伀鎴汇仚\" 姗熻兘銈掋偑銉曘伀銇椼伨銇欍俓n\"鍏冦伀鎴汇仚\" 姗熻兘銈掋偑銉曘伀銇椼伨銇欍亱銆"; + Message[ chinese_traditional ] = "濡傛灉瑕佺辜绾岄欏嬪嫊浣滐紝鎮ㄥ繀闋堝厛闂滈枆銆屽京鍘熴嶅姛鑳姐傝闂滈枆寰╁師鍔熻兘锛"; Message[ arabic ] = "轻恃翘 阡 逍 轻盘亚 硎蒯 星哐 呷硌 滔丘.\n遽 恃硐 裴矍 轻恃翘诳"; Message[ dutch ] = "Het ongedaan maken van deze bewerking beslaat veel geheugen.\nWilt U 'Ongedaan maken' opheffen?"; - Message[ chinese_simplified ] = "鎾ゆ秷鍛戒护鍔熻兘闇瑕佸緢澶氱殑鍐呭瓨銆俓n瑕佸彇娑堟挙娑堝懡浠ゅ姛鑳斤紵"; + Message[ chinese_simplified ] = "鎾ゆ秷鍛戒护鍔熻兘闇瑕佸緢澶氱殑鍐呭瓨銆俓n瑕佸仠鐢ㄦ挙娑堝懡浠ゅ姛鑳斤紵"; Message[ greek ] = " 尻糨脲箸 狨艮 翮 屙蓠沐獒 狃衢翦 戾丬腌 痫簏翮翎 祉揿珧.\n容脲翦 磲 彡躐弭 翮 犴徇皴箸;"; - Message[ korean ] = "鞚 鞛戨彊鞚 瓿勳啀 歆勴枆頃橁赴 鞙勴暣靹滊姅 鞛呺牓 鞁ろ枆 旆唽 旮半姤鞚 頃挫牅霅橃柎鞎 頃╇媹雼. 鞛呺牓 鞁ろ枆 旆唽 旮半姤鞚 頃挫牅頃橃嫓瓴犾姷雼堦箤?"; + Message[ korean ] = "鞚 鞛戨彊鞚 瓿勳啀 歆勴枆頃橁赴 鞙勴暣靹滊姅 鞁ろ枆 旆唽 旮半姤鞚 頃挫牅霅橃柎鞎 頃╇媹雼. 鞁ろ枆 旆唽 旮半姤鞚 頃挫牅頃橃嫓瓴犾姷雼堦箤?"; Message[ turkish ] = "Bu iemde geri alma i鏸n b鼀黭 miktarda bellek gerekiyor.\nGeri alma ievini kapatmak istiyor musunuz?"; Message[ language_user1 ] = " "; Message[ catalan ] = "Aquesta operaci necessita molta mem騬ia per poder-la desfer.\nVoleu desactivar l'opci de Desf閟?"; @@ -2823,7 +2823,7 @@ String STR_TABLE_DEFNAME Text[ dutch ] = "Tabel"; Text[ chinese_simplified ] = "琛ㄦ牸"; Text[ greek ] = "羞磲赆"; - Text[ korean ] = "鞁滍姼"; + Text[ korean ] = "響"; Text[ turkish ] = "Tablo"; Text[ language_user1 ] = " "; Text[ catalan ] = "Taula"; @@ -2854,7 +2854,7 @@ String STR_GRAPHIC_DEFNAME TEXT[ dutch ] = "Afbeelding"; TEXT[ chinese_simplified ] = "鍥惧舰"; TEXT[ greek ] = "民狯殛"; - TEXT[ korean ] = "攴鸽灅頂"; + TEXT[ korean ] = "攴鸽"; TEXT[ turkish ] = "Grafik"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Imatge"; @@ -2935,7 +2935,7 @@ String STR_REGION_DEFNAME Text [ french ] = "Section" ; Text [ swedish ] = "Omr錮e" ; Text [ dutch ] = "Bereik" ; - Text [ spanish ] = "羠ea" ; + Text [ spanish ] = "Secci髇" ; Text [ english_us ] = "Section" ; Text[ chinese_simplified ] = "鍖哄煙"; Text[ russian ] = "朽玟咫"; @@ -2946,7 +2946,7 @@ String STR_REGION_DEFNAME Text[ dutch ] = "Bereik"; Text[ chinese_simplified ] = "鍖哄煙"; Text[ greek ] = "彭玺"; - Text[ korean ] = "鞓侅棴"; + Text[ korean ] = "甑棴"; Text[ turkish ] = "B鰈黰"; Text[ language_user1 ] = " "; Text[ catalan ] = "Area"; @@ -3026,12 +3026,12 @@ QueryBox MSG_CLPBRD_CLEAR MESSAGE [ finnish ] = "Olet tallentanut leikep鰕d鋖le suuren m滗r鋘 tietoja.\nHaluatko n鋓den tietojen olevan k鋣tett鋠iss muissa sovelluksissa?" ; MESSAGE [ danish ] = "Du har placeret en stor m鎛gde data i udklipsholderen.\nSkal udklipholderens indhold v鎟e tilg鎛geligt for andre applikationer?" ; MESSAGE [ french ] = "Vous avez d閜os un grand nombre de donn閑s dans le presse-papiers. \nSouhaitez-vous en conserver le contenu pour une utilisation ult閞ieure sous une autre application ?" ; - MESSAGE [ swedish ] = "Du har stora datam鋘gder i urklippet.\nSkall inneh錶let i urklippet g鰎as tillg鋘gligt f鰎 andra applikationer?" ; + MESSAGE [ swedish ] = "Du har stora datam鋘gder i urklippet.\nSkall inneh錶let i urklippet g鰎as tillg鋘gligt f鰎 andra till鋗pningar?" ; MESSAGE [ dutch ] = "U hebt een groot aantal gegevens op het Klembord geplaatst.\nWilt u dat de inhoud van het Klembord beschikbaar blijft voor andere toepassingen?" ; MESSAGE [ spanish ] = "Usted tiene muchos datos en el portapapeles.\n緿esea mantener disponible el contenido del portapapeles para otras aplicaciones?" ; MESSAGE[ chinese_simplified ] = "鎮ㄥ皢涓涓緝澶х殑鏁版嵁澶嶅埗鍒板壀璐存澘銆俓n鎮ㄦ兂瑕佽鍏朵粬鐨勫簲鐢ㄧ▼搴忎篃鑳藉浣跨敤杩欎釜鏁版嵁鍚楋紵"; MESSAGE[ language_user1 ] = " "; - MESSAGE[ russian ] = "蔓 耦躔囗桦 犷朦 钺 溧眄 狍翦疱 钺戾磬.\n唁咫囹 漕耱箫睇 耦溴疰桁铄 狍翦疣 钺戾磬 潆 漯筱桴 镳桦铈屙栝?"; + MESSAGE[ russian ] = "蔓 耦躔囗桦 犷朦 钺 溧眄 狍翦疱 钺戾磬.\n疹蜩蝈 腓 恹, 黩钺 耦溴疰桁铄 狍翦疣 钺戾磬 铖蜞腩顸 漕耱箫睇 潆 漯筱桴 镳桦铈屙栝?"; MESSAGE[ polish ] = "W schowku zosta硑 umieszczone wi阫sze ilo渃i danych.\nCzy tre滄 tych danych ma zosta udost阷niona innym aplikacjom?"; MESSAGE[ japanese ] = "銈儶銉冦儣銉溿兗銉夈伀銇仧銇忋仌銈撱伄銉囥兗銈裤亴淇濆瓨銇曘倢銇︺亜銇俱仚銆俓n銈儶銉冦儣銉溿兗銉夈伄鍐呭銈掍粬銇偄銉椼儶銈便兗銈枫儳銉炽伀銈備娇鐢ㄣ仐銇俱仚銇嬨"; MESSAGE[ chinese_traditional ] = "鎮ㄥ凡缍撳皣涓鍊嬭純澶х殑璩囨枡瑜囪＝鍒板壀璨肩翱銆俓n鎮ㄦ兂瑕佽畵鍏朵粬鐨勬噳鐢ㄧ▼搴忎篃鑳藉浣跨敤閫欏嬭硣鏂欙紵"; @@ -3070,7 +3070,7 @@ QueryBox MSG_SAVE_HTML_QUERY Message[ dutch ] = "De conversie naar de HTML-indeling \nkan verlies van gegevens veroorzaken. \nWilt u het document opslaan?"; Message[ chinese_simplified ] = "鏂囦欢杞崲鎴 HTML 鏍煎紡\n鍙兘浼氬紩璧疯祫鏂欐崯澶便俓n鎮ㄨ瀛樼洏杩欎釜鏂囦欢鍚?"; Message[ greek ] = " 戾翎赳镳 箦 祜聆 HTML \n祓锺暹 磲 瘃镪犭蒹彘 狃彘弪 痣珩秭锺辋. \n容脲翦 磲 狃镨珀妪箦翦 麸 葶泷狯;"; - Message[ korean ] = "HTML 靹滌嫕鞙茧 氤頇橃潃 \n鞝曤炒 靻愳嫟鞚 鞗愳澑鞚 霅╇媹雼. \n氍胳劀毳 鞝鞛ロ晿瓴犾姷雼堦箤?"; + Message[ korean ] = "HTML 靹滌嫕鞙茧 氤頇橅晿氅 \n鞝曤炒毳 靻愳嫟頃 靾 鞛堨姷雼堧嫟.\n氍胳劀毳 鞝鞛ロ晿鞁滉矤鞀惦媹旯?"; Message[ turkish ] = "HTML format齨a \nd鰊黰 sonucunda veri kayb olabilir. \nBelgeyi kaydetmek istiyor musunuz?"; Message[ language_user1 ] = " "; Message[ catalan ] = "La transformaci en el format HTML \npot causar p鑢dues d'informaci. \nVoleu desar el document?"; @@ -3085,7 +3085,7 @@ QueryBox MSG_SAVEAS_HTML_QUERY MESSAGE [ English ] = "The HTML source can only be shown if the document is saved in HTML format.\nWould you like to save the document as HTML?" ; MESSAGE[ english_us ] = "The source code can only be displayed if the document is saved in HTML format.\nWould you like to save the document as HTML?"; MESSAGE[ portuguese ] = "S poss韛el ver o texto-fonte se o documento for guardado em formato HTML.\nGuardar o documento em formato HTML?"; - MESSAGE[ russian ] = "锐躅漤 觐 镱赅琨忄弪, 羼腓 漕牦戾眚 耦躔囗屙 纛痨囹 HTML.\n杨躔囗栩 漕牦戾眚 纛痨囹 HTML?"; + MESSAGE[ russian ] = "锐躅漤 觐 祛驽 猁螯 铗钺疣驽 蝾朦觐, 羼腓 漕牦戾眚 耦躔囗屙 纛痨囹 HTML.\n杨躔囗栩 漕牦戾眚 纛痨囹 HTML?"; MESSAGE[ greek ] = "The HTML source can only be shown if the document is saved in HTML format.\nWould you like to save the document as HTML?"; MESSAGE[ dutch ] = "De brontekst kan alleen worden weergegeven als het document in de HTML-indeling is opgeslagen.\nWilt u het document nu in de HTML-indeling opslaan?"; MESSAGE[ french ] = "Le texte source ne peut 阾re affich que si le document a 閠 enregistr au format HTML.\nVoulez-vous enregistrer le document au format HTML ?"; @@ -3097,7 +3097,7 @@ QueryBox MSG_SAVEAS_HTML_QUERY MESSAGE[ polish ] = "Widok tekstu 焤骴硂wego wy渨ietlony zostanie dopiero po zapisaniu dokumentu w formacie HTML.\nZapisa dokument w formacie HTML?"; MESSAGE[ portuguese_brazilian ] = "The HTML source can only be shown if the document is saved in HTML format.\nWould you like to save the document as HTML?"; MESSAGE[ japanese ] = "HTML 銈姐兗銈广伅銉夈偔銉ャ儭銉炽儓銇 HTML 褰㈠紡銇т繚瀛樸仌銈屻仸銇勩倠銇ㄣ亶銇椼亱琛ㄧず銇曘倢銇俱仜銈撱俓n銉夈偔銉ャ儭銉炽儓銈 HTML 褰㈠紡銇т繚瀛樸仐銇俱仚銇嬨"; - MESSAGE[ korean ] = "靻岇姢 韰嶌姢韸 氤搓赴電 氍胳劀臧 HTML-順曥嫕鞙茧 鞝鞛ル悩鞐堨潉 瓴届毎鞐愲 響滌嫓霅 靾 鞛堨姷雼堧嫟.\n氍胳劀毳 歆旮 HTML-順曥嫕鞙茧 鞝鞛ロ晿瓴犾姷雼堦箤?"; + MESSAGE[ korean ] = "鞗愲掣 韰嶌姢韸 氤搓赴電 氍胳劀臧 HTML 靹滌嫕鞙茧 鞝鞛ル悩鞐堨潉 瓴届毎鞐愲 響滌嫓霅╇媹雼.\n氍胳劀毳 HTML 靹滌嫕鞙茧 鞝鞛ロ晿鞁滉矤鞀惦媹旯?"; MESSAGE[ chinese_simplified ] = "鍙湁褰撴枃妗ｅ瓨鐩樻垚 HTML 鏍煎紡鏃讹紝鎵嶈兘澶熸煡鐪 HTML 鐨勬簮鏂囦欢銆俓n鏂囨。瑕佸瓨鐩樻垚 HTML 鏍煎紡?"; MESSAGE[ chinese_traditional ] = "鍙湁鐣舵獢妗堝劜瀛楬TML鏍煎紡鏅傦紝鎵嶈兘妾㈣HTML鍘熷妾斻俓n瑕佸劜瀛樻垚HTML鏍煎紡?"; MESSAGE[ turkish ] = "The HTML source can only be shown if the document is saved in HTML format.\nWould you like to save the document as HTML?"; @@ -3115,7 +3115,7 @@ String STR_ABSTRACT_TITLE Text [ swedish ] = "Utdrag: " ; Text [ danish ] = "Abstract : " ; Text [ italian ] = "Sunto: " ; - Text [ spanish ] = "Extracto: " ; + Text [ spanish ] = "Resumen: " ; Text [ french ] = "Synth鑣e : " ; Text [ dutch ] = "Overzicht:" ; Text[ chinese_simplified ] = "鎽樿锛 "; @@ -3128,7 +3128,7 @@ String STR_ABSTRACT_TITLE Text[ dutch ] = "Overzicht:"; Text[ chinese_simplified ] = "鎽樿锛 "; Text[ greek ] = "Abstract: "; - Text[ korean ] = "於旍儊: "; + Text[ korean ] = "鞖旍暯: "; Text[ turkish ] = "謟et: "; Text[ catalan ] = "Resum:"; Text[ finnish ] = "Tiivistelm: "; @@ -3144,7 +3144,7 @@ String STR_FDLG_TEMPLATE_BUTTON Text [ swedish ] = "Formatmall" ; Text [ danish ] = "Skabelon" ; Text [ italian ] = "Modello" ; - Text [ spanish ] = "Plantilla" ; + Text [ spanish ] = "Estilo" ; Text [ french ] = "Style" ; Text [ dutch ] = "Sjabloon" ; Text [ portuguese ] = "Estilo" ; @@ -3157,7 +3157,7 @@ String STR_FDLG_TEMPLATE_BUTTON Text[ dutch ] = "Sjabloon"; Text[ chinese_simplified ] = "鏍峰紡"; Text[ greek ] = "旭躔"; - Text[ korean ] = "韰滍攲毽"; + Text[ korean ] = "鞀ろ儉鞚"; Text[ turkish ] = "Bi鏸m"; Text[ language_user1 ] = " "; Text[ catalan ] = "Estil"; @@ -3271,7 +3271,7 @@ String STR_WESTERN_FONT Text[ polish ] = "Tekst zachodni:"; Text[ portuguese_brazilian ] = "Western text:"; Text[ japanese ] = "鑻辨暟瀛: "; - Text[ korean ] = "靹滌枒 韰嶌姢韸:"; + Text[ korean ] = "鞓侅柎:"; Text[ chinese_simplified ] = "瑗挎枃锛"; Text[ chinese_traditional ] = "瑗挎枃锛"; Text[ turkish ] = "Western text:"; @@ -3297,7 +3297,7 @@ String STR_CJK_FONT Text[ polish ] = "Tekst azjatycki:"; Text[ portuguese_brazilian ] = "Asian text:"; Text[ japanese ] = "鏃ユ湰瑾: "; - Text[ korean ] = "鞎勳嫓鞎 韰嶌姢韸:"; + Text[ korean ] = "頃滉竴:"; Text[ chinese_simplified ] = "涓棩闊╂枃瀛楋細"; Text[ chinese_traditional ] = "涓棩闊撴枃瀛楋細"; Text[ turkish ] = "Asian text:"; @@ -3322,7 +3322,7 @@ String STR_REDLINE_UNKNOWN_AUTHOR Text[ polish ] = "nieznany"; Text[ portuguese_brazilian ] = "unknown"; Text[ japanese ] = "涓嶆槑"; - Text[ korean ] = "鞎岆牑鞝 鞛堨 鞎婌潓"; + Text[ korean ] = "鞎 靾 鞐嗢潓"; Text[ chinese_simplified ] = "涓嶆槑鐨"; Text[ chinese_traditional ] = "涓嶆槑"; Text[ turkish ] = "unknown"; @@ -3344,7 +3344,7 @@ WarningBox MSG_DISABLE_UNDO_QUESTION Message[ greek ] = "This action deletes the list of actions that can be undone. Previous changes made to the document are still valid, but cannot be undone. Do you want to continue formatting?"; Message[ dutch ] = "This action deletes the list of actions that can be undone. Previous changes made to the document are still valid, but cannot be undone. Do you want to continue formatting?"; Message[ french ] = "Cette action supprime la liste des op閞ations pouvant 阾re annul閑s. Ceci n'affecte pas les modifications apport閑s au document, mais emp阠he de les annuler. Poursuivre le formatage ?"; - Message[ spanish ] = "Esta acci髇 elimina la lista de las acciones que se pueden deshacer. Las modificaciones realizadas hasta ahora en el documento seguir醤 siendo v醠idas, sin embargo no se podr醤 deshacer. 緿esea continuar con el formateado?"; + Message[ spanish ] = "Esta acci髇 borra la lista de las acciones que se pueden deshacer. Las modificaciones realizadas hasta ahora en el documento seguir醤 siendo v醠idas, sin embargo no se podr醤 deshacer. 緿esea continuar con el formateado?"; Message[ finnish ] = "This action deletes the list of actions that can be undone. Previous changes made to the document are still valid, but cannot be undone. Do you want to continue formatting?"; Message[ italian ] = "Questa azione elimina l'elenco delle azioni da annullare. I cambiamenti effettuati al documento sono ancora validi ma non possono essere annullati. Volete proseguire la formattazione?"; Message[ danish ] = "This action deletes the list of actions that can be undone. Previous changes made to the document are still valid, but cannot be undone. Do you want to continue formatting?"; @@ -3352,7 +3352,7 @@ WarningBox MSG_DISABLE_UNDO_QUESTION Message[ polish ] = "This action deletes the list of actions that can be undone. Previous changes made to the document are still valid, but cannot be undone. Do you want to continue formatting?"; Message[ portuguese_brazilian ] = "This action deletes the list of actions that can be undone. Previous changes made to the document are still valid, but cannot be undone. Do you want to continue formatting?"; Message[ japanese ] = "銇撱伄銈€偗銈枫儳銉炽仹銆佸厓銇埢銇欍伄銇屽彲鑳姐仾銈€偗銈枫儳銉炽伄銉偣銉堛亴鍓婇櫎銇曘倢銇俱仚銆傘亾銈屻伨銇с伀銉夈偔銉ャ儭銉炽儓銇ц銇ｃ仧澶夋洿銇仢銇伨銇炬畫銈娿伨銇欍亴銆併偄銈偡銉с兂銈掑厓銇埢銇欍亾銇ㄣ伅銇с亶銇俱仜銈撱傛浉寮忚ō瀹氥倰缍氳銇椼伨銇欍亱銆"; - Message[ korean ] = "鞚 氇呺牴鞚 鞁ろ枆頃橂┐ 霅橂弻毽 靾 鞛堧姅 氇摖 鞛戩梾 雼硠鞚 鞛呺牓 氇╇鞚 靷牅霅╇媹雼. 順勳灛旯岇 氍胳劀鞐愳劀 氤瓴诫悳 雮挫毄鞚 鞙犿毃頃橂倶 雿 鞚挫儊 鞛呺牓 鞁ろ枆 旆唽毳 頃 靾橂姅 鞐嗢姷雼堧嫟. 靹滌嫕 靹れ爼鞚 瓿勳啀頃橃嫓瓴犾姷雼堦箤?"; + Message[ korean ] = "鞚 鞛戨彊鞚 鞁ろ枆頃橂┐ 鞁ろ枆 旆唽頃 靾 鞛堧姅 氇摖 鞛戩梾 雼硠鞚 鞛呺牓 氇╇鞚 靷牅霅╇媹雼. 順勳灛旯岇 氍胳劀鞐愳劀 氤瓴诫悳 雮挫毄鞚 鞙犿毃頃橂倶 雿 鞚挫儊 鞗愲灅雽搿 霅橂弻毽 靾橂姅 鞐嗢姷雼堧嫟. 靹滌嫕鞚 瓿勳啀頃橃嫓瓴犾姷雼堦箤?"; Message[ chinese_simplified ] = "杩欓」鎿嶄綔浼氬垹闄ょ敤浜庢挙娑堝懡浠ょ殑姣忎竴姝ラ鐨勮褰曞垪鍗曘傝嚦鐩墠涓烘鏂囨。鎵鏈夌殑鏇存敼灏嗕細淇濆瓨锛屼絾鏄偍鏃犳硶鍐嶆挙娑堣繖浜涙洿鏀广傛偍瑕佺户缁墽琛屾牸寮忓寲锛"; Message[ chinese_traditional ] = "閫欏嬪嫊浣滄渻鍒櫎寰╁師娓呭柈鐨勯爡鐩傚凡缍撹畩鏇寸殑鍏у灏囨渻淇濈暀涓嶈畩锛屼絾鏄笉鍙互鍐嶅京鍘熸墍鏈夌殑璁婃洿鍏у銆俓n瑕佺辜绾屽煼琛岄欏嬫牸寮忓寲锛"; Message[ turkish ] = "This action deletes the list of actions that can be undone. Previous changes made to the document are still valid, but cannot be undone. Do you want to continue formatting?"; @@ -3360,7 +3360,7 @@ WarningBox MSG_DISABLE_UNDO_QUESTION Message[ catalan ] = "This action deletes the list of actions that can be undone. Previous changes made to the document are still valid, but cannot be undone. Do you want to continue formatting?"; Message[ thai ] = "This action deletes the list of actions that can be undone. Previous changes made to the document are still valid, but cannot be undone. Do you want to continue formatting?"; }; -QueryBox MSG_INS_MERGE_FIELDS +/*QueryBox MSG_INS_MERGE_FIELDS { HelpId = HID_MAIL_MERGE_INSERT_FIELDS; Buttons = WB_OK_CANCEL ; @@ -3369,25 +3369,26 @@ QueryBox MSG_INS_MERGE_FIELDS Message[english_us] = "Do you want to use names and addresses from a database?"; Message[ portuguese ] = "Do you want to use names and addresses from a database?"; Message[ russian ] = "Do you want to use names and addresses from a database?"; - Message[ spanish ] = "Do you want to use names and addresses from a database?"; - Message[ italian ] = "Do you want to use names and addresses from a database?"; - Message[ swedish ] = "Do you want to use names and addresses from a database?"; + Message[ spanish ] = "緿esea utilizar nombres y direcciones de una base de datos?"; + Message[ italian ] = "Volete utilizzare nomi e indirizzi da un database?"; + Message[ swedish ] = "Vill du anv鋘da namn och adresser fr錸 en databas?"; Message[ polish ] = "Do you want to use names and addresses from a database?"; Message[ portuguese_brazilian ] = "Do you want to use names and addresses from a database?"; - Message[ japanese ] = "Do you want to use names and addresses from a database?"; - Message[ korean ] = "Do you want to use names and addresses from a database?"; + Message[ japanese ] = "銉囥兗銈裤儥銉笺偣銇櫥閷层仌銈屻仸銇勩倠銉︺兗銈躲兗鍚嶃仺銈€儔銉偣銈掍娇鐢ㄣ仐銇俱仚銇嬨"; + Message[ korean ] = "雿办澊韯半矤鞚挫姢鞐 鞛堧姅 鞚措瓿 欤检唽毳 靷毄頃橃嫓瓴犾姷雼堦箤?"; Message[ turkish ] = "Do you want to use names and addresses from a database?"; Message[ thai ] = "Do you want to use names and addresses from a database?"; Message[ greek ] = "Do you want to use names and addresses from a database?"; Message[ dutch ] = "Do you want to use names and addresses from a database?"; - Message[ french ] = "Do you want to use names and addresses from a database?"; + Message[ french ] = "Voulez-vous utiliser des noms et adresses provenant d'une base de donn閑s ?"; Message[ finnish ] = "Do you want to use names and addresses from a database?"; Message[ danish ] = "Do you want to use names and addresses from a database?"; - Message[ chinese_simplified ] = "Do you want to use names and addresses from a database?"; - Message[ chinese_traditional ] = "Do you want to use names and addresses from a database?"; + Message[ chinese_simplified ] = "鎮ㄨ浣跨敤涓涓暟鎹簮鐨勫鍚嶅拰鍦板潃锛"; + Message[ chinese_traditional ] = "瑕佷娇鐢ㄨ硣鏂欏韩涓殑濮撳悕鍜屽湴鍧锛"; Message[ arabic ] = "Do you want to use names and addresses from a database?"; Message[ catalan ] = "Do you want to use names and addresses from a database?"; }; +*/ QueryBox MSG_PRINT_AS_MERGE { HelpId = HID_PRINT_AS_MERGE; @@ -3397,22 +3398,22 @@ QueryBox MSG_PRINT_AS_MERGE Message[english_us] = "Your document contains address database fields. Do you want to print a form letter?"; Message[ portuguese ] = "Your document contains address database fields. Do you want to print a form letter?"; Message[ russian ] = "Your document contains address database fields. Do you want to print a form letter?"; - Message[ spanish ] = "Your document contains address database fields. Do you want to print a form letter?"; - Message[ italian ] = "Your document contains address database fields. Do you want to print a form letter?"; - Message[ swedish ] = "Your document contains address database fields. Do you want to print a form letter?"; + Message[ spanish ] = "El documento contiene campos de bases de datos con direcciones. 緿esea imprimir una carta en serie?"; + Message[ italian ] = "Il vostro documento contiene un database Rubrica. Volete eseguire una stampa in serie?"; + Message[ swedish ] = "Ditt dokument inneh錶ler adressdatabasf鋖t. Vill du skriva ut ett standardbrev (kopplad utskrift)?"; Message[ polish ] = "Your document contains address database fields. Do you want to print a form letter?"; Message[ portuguese_brazilian ] = "Your document contains address database fields. Do you want to print a form letter?"; - Message[ japanese ] = "Your document contains address database fields. Do you want to print a form letter?"; - Message[ korean ] = "Your document contains address database fields. Do you want to print a form letter?"; + Message[ japanese ] = "銉夈偔銉ャ儭銉炽儓銇偄銉夈儸銈广儑銉笺偪銉欍兗銈广伄銉曘偅銉笺儷銉夈亴鍚伨銈屻仸銇勩伨銇欍傚樊銇楄炯銇垮嵃鍒枫倰瀹熻銇椼伨銇欍亱銆"; + Message[ korean ] = "氍胳劀鞐 雿办澊韯半矤鞚挫姢 欤检唽 頃勲摐臧 鞛堨姷雼堧嫟. 韼胳 鞏戩嫕鞚 鞚胳噭頃橃嫓瓴犾姷雼堦箤?"; Message[ turkish ] = "Your document contains address database fields. Do you want to print a form letter?"; Message[ thai ] = "Your document contains address database fields. Do you want to print a form letter?"; Message[ greek ] = "Your document contains address database fields. Do you want to print a form letter?"; Message[ dutch ] = "Your document contains address database fields. Do you want to print a form letter?"; - Message[ french ] = "Your document contains address database fields. Do you want to print a form letter?"; + Message[ french ] = "Le document contient des champs de base de donn閑s d'adresses. Voulez-vous imprimer une lettre type ?"; Message[ finnish ] = "Your document contains address database fields. Do you want to print a form letter?"; Message[ danish ] = "Your document contains address database fields. Do you want to print a form letter?"; - Message[ chinese_simplified ] = "Your document contains address database fields. Do you want to print a form letter?"; - Message[ chinese_traditional ] = "Your document contains address database fields. Do you want to print a form letter?"; + Message[ chinese_simplified ] = "鎮ㄧ殑鏂囨。鍚湁涓涓氳绨挎暟鎹瓧娈点傝閲囩敤閭欢鍚堝苟鏂瑰紡鎵撳嵃锛"; + Message[ chinese_traditional ] = "鎮ㄧ殑鏂囦欢鍖呭惈鍦板潃璩囨枡娆勪綅銆傝鍚堜降鍒楀嵃锛"; Message[ arabic ] = "Your document contains address database fields. Do you want to print a form letter?"; Message[ catalan ] = "Your document contains address database fields. Do you want to print a form letter?"; }; @@ -3422,35 +3423,35 @@ WarningBox MSG_MERGE_SOURCE_UNAVAILABLE Buttons = WB_OK ; DefButton = WB_DEF_YES ; Message = "Die Datenquelle \'%1\' konnte nicht gefunden werden.\n躡erpr黤en Sie die Einstellungen in \'Extras - Datenquellen...\'"; - Message[english_us] = "The data source \"%1\" was not found.\nCheck the settings in 'Tools - Data Sources...'"; + Message[english_us] = "The data source \'%1\' was not found.\nCheck the settings in \'Tools - Data Sources...\'"; Message[ portuguese ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; Message[ russian ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; - Message[ spanish ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; - Message[ italian ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; - Message[ swedish ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; + Message[ spanish ] = "La fuente de datos \"%1\" no se encontr.\nCompruebe la configuraci髇 en \'Herramientas - Fuentes de datos...\'"; + Message[ italian ] = "Impossibile trovare la sorgente dati \"%1\".\nControllate le impostazioni in \'Strumenti - Sorgente dati...\'"; + Message[ swedish ] = "Det gick inte att hitta datak鋖lan \\%1\\.\nKontrollera inst鋖lningarna under \'Verktyg - Datak鋖lor...\'"; Message[ polish ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; Message[ portuguese_brazilian ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; - Message[ japanese ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; - Message[ korean ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; + Message[ japanese ] = "銉囥兗銈裤偨銉笺偣銆%1銆嶃亴瑕嬨仱銇嬨倞銇俱仜銈撱仹銇椼仧銆俓n銉勩兗銉 - 銉囥兗銈裤偨銉笺偣...銇цō瀹氥倰銉併偋銉冦偗銇椼仸銇忋仩銇曘亜銆"; + Message[ korean ] = "\'%1\' 雿办澊韯 鞗愲掣鞚 彀眷潉 靾 鞐嗢姷雼堧嫟.\n[霃勱惮] - [雿办澊韯 鞗愲掣...] 氅旊壌鞐愳劀 靹れ爼鞚 鞝愱瞼頃 氤挫嫮鞁滌槫."; Message[ turkish ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; Message[ thai ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; Message[ greek ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; Message[ dutch ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; - Message[ french ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; + Message[ french ] = "Impossible de d閠ecter la source de donn閑s \"%1\" !\nV閞ifiez les param鑤res sous \'Outils - Sources de donn閑s...\'"; Message[ finnish ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; Message[ danish ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; - Message[ chinese_simplified ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; - Message[ chinese_traditional ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; + Message[ chinese_simplified ] = "娌℃湁鎵惧埌鏁版嵁婧 \"%1\" 銆俓n璇锋鏌ュ湪\'宸ュ叿 - 鏁版嵁婧...\' 涔嬩笅鐨勮瀹氥"; + Message[ chinese_traditional ] = "鎵句笉鍒拌硣鏂欐簮 \"%1\"銆俓n妾㈡煡 \'宸ュ叿 - 璩囨枡婧...\' 涓殑瑷畾"; Message[ arabic ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; Message[ catalan ] = "The data source \"%1\" was not found.\nCheck the settings in \'Tools - Data Sources...\'"; }; -QueryBox MSG_DATA_SOURCES_UNAVAILABLE +WarningBox MSG_DATA_SOURCES_UNAVAILABLE { HelpId = HID_DATA_SOURCES_UNAVAILABLE; - Buttons = WB_OK_CANCEL; + Buttons = WB_OK; DefButton = WB_DEF_YES ; - Message = "Es steht keine Datenquelle zur Verf黦ung. M鯿hten Sie die Verbindung zu einer Datenquelle herstellen?"; - Message[english_us] = "There is no data source available. Do you want to establish a data source connnection?"; + Message = "Es wurde noch keine Datenquelle eingerichtet. Sie ben鰐igen eine Datenquelle, um Daten (z.B. Namen und Adressen aus einer Datenbenk) an die Felder zu liefern?"; + Message[english_us] = "No data source has been set up yet. You need a data source, such as a database, to supply data (for example, names and addresses) for the fields?"; Message[ portuguese ] = "There is no data source available.\nDo you want to establish a data source connnection?"; Message[ russian ] = "There is no data source available.\nDo you want to establish a data source connnection?"; Message[ spanish ] = "There is no data source available.\nDo you want to establish a data source connnection?"; @@ -3473,3 +3474,115 @@ QueryBox MSG_DATA_SOURCES_UNAVAILABLE Message[ catalan ] = "There is no data source available.\nDo you want to establish a data source connnection?"; }; +String RID_MODULE_TOOLBOX +{ + TEXT = "Funktionsleiste" ; + TEXT [ english ] = "Function bar" ; + Text [ dutch ] = "Werkbalk" ; + Text [ english_us ] = "Function Bar" ; + Text [ italian ] = "Barra delle funzioni" ; + Text [ spanish ] = "Barra de funciones" ; + Text [ french ] = "Barre de fonctions" ; + Text [ swedish ] = "Funktionslist" ; + Text [ danish ] = "Funktionslinje" ; + Text [ portuguese_brazilian ] = "Funktionsleiste" ; + Text [ portuguese ] = "Barra de fun珲es" ; + Text[ chinese_simplified ] = "鍔熻兘鏍"; + Text[ russian ] = "相礤朦 趔黻鲨"; + Text[ polish ] = "Pasek funkcji"; + Text[ japanese ] = "銉曘偂銉炽偗銈枫儳銉炽儛銉"; + Text[ chinese_traditional ] = "宸ュ叿鍒"; + Text[ arabic ] = "匝碡 轻沐倾"; + Text[ dutch ] = "Werkbalk"; + Text[ chinese_simplified ] = "鍔熻兘鏍"; + Text[ greek ] = "民犰燹 脲轸秕胥辋"; + Text[ korean ] = "旮半姤 氇潓"; + Text[ turkish ] = "蔺lev 鐄bu饀"; + Text[ language_user1 ] = " "; + Text[ catalan ] = "Barra de funcions"; + Text[ finnish ] = "Toimintorivi"; + Text[ thai ] = "喙佮笘喔氞笩喔编竾喔佮箤喔娻副喙堗笝"; +}; + +ToolBox RID_MODULE_TOOLBOX +{ + HelpID = HID_MODULE_TOOLBOX ; + Border = TRUE ; + SVLook = TRUE ; + Dockable = TRUE ; + Moveable = TRUE ; + Sizeable = TRUE ; + Closeable = TRUE ; + Zoomable = TRUE ; + HideWhenDeactivate = TRUE ; + LineSpacing = TRUE ; + Customize = TRUE ; + MenuStrings = TRUE ; + Hide = TRUE ; + ItemList = + { + ToolBoxItem + { + Identifier = SID_SAVEASDOC ; + }; + ToolBoxItem + { + Type = TOOLBOXITEM_SEPARATOR ; + }; + ToolBoxItem + { + Identifier = SID_EDITDOC ; + }; + ToolBoxItem + { + Identifier = SID_MAIL_SENDDOC ; + }; + ToolBoxItem + { + Type = TOOLBOXITEM_SEPARATOR ; + }; + ToolBoxItem + { + Identifier = SID_DIRECTEXPORTDOCASPDF ; + }; + ToolBoxItem + { + Identifier = SID_PRINTDOCDIRECT ; + }; + ToolBoxItem + { + Type = TOOLBOXITEM_SEPARATOR ; + }; + ToolBoxItem + { + Identifier = SID_COPY ; + }; + ToolBoxItem + { + Type = TOOLBOXITEM_SEPARATOR ; + }; + ToolBoxItem + { + Identifier = SID_SEARCH_DLG ; + }; + ToolBoxItem + { + Identifier = SID_NAVIGATOR ; + }; + ToolBoxItem + { + Type = TOOLBOXITEM_SEPARATOR ; + }; + ToolBoxItem + { + Identifier = SID_ATTR_ZOOM ; + }; + }; + Scroll = TRUE ; +}; + + + + + + diff --git a/sw/source/ui/app/appenv.cxx b/sw/source/ui/app/appenv.cxx index 14183123b250..bbf1b6e5125b 100644 --- a/sw/source/ui/app/appenv.cxx +++ b/sw/source/ui/app/appenv.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appenv.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: mba $ $Date: 2002-07-08 08:13:30 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -327,6 +327,7 @@ static USHORT nTitleNo = 0; aSet.Put(aEnvCfg.GetItem()); SfxPrinter* pTempPrinter = pSh->GetPrt( TRUE ); + USHORT nPaperBin = pTempPrinter->GetPaperBin(); if(pOldSh ) { const SwPageDesc& rCurPageDesc = pOldSh->GetPageDesc(pOldSh->GetCurPageDesc()); @@ -339,7 +340,7 @@ static USHORT nTitleNo = 0; //#69563# if it isn't the same printer then the pointer has been invalidated! pTempPrinter = pSh->GetPrt( TRUE ); } - pTempPrinter->SetPaperBin(rCurPageDesc.GetMaster().GetPaperBin().GetValue()); + pTempPrinter->SetPaperBin((nPaperBin = rCurPageDesc.GetMaster().GetPaperBin().GetValue())); } @@ -373,13 +374,13 @@ static USHORT nTitleNo = 0; //dem Dialog. Die Informationen muessen hier vor dem evtl. zerstoeren //der neuen Shell gesetzt werden, weil deren Drucker an den Dialog //gereicht wurde. - if ( nMode != ENV_NEWDOC ) - { ASSERT(pOldSh, "Kein Dokument - war 'Einfuegen' nicht disabled???"); SvxPaperBinItem aItem; aItem.SetValue((BYTE)pSh->GetPrt()->GetPaperBin()); + if ( nMode != ENV_NEWDOC ) pOldSh->GetPageDescFromPool(RES_POOLPAGE_JAKET)->GetMaster().SetAttr(aItem); - } + else + pSh->GetPageDescFromPool(RES_POOLPAGE_JAKET)->GetMaster().SetAttr(aItem); SwWrtShell *pTmp = nMode == ENV_INSERT ? pOldSh : pSh; const SwPageDesc* pFollow = 0; @@ -396,7 +397,9 @@ static USHORT nTitleNo = 0; //Neues Dok wieder loeschen xDocSh->DoClose(); pSh = pOldSh; - + //#i4251# selected text or objects in the document should + //not be deleted on inserting envelopes + pSh->EnterStdMode(); // Los geht's (Einfuegen) pSh->StartUndo(UIUNDO_INSERT_ENVELOPE); pSh->StartAllAction(); @@ -469,10 +472,9 @@ static USHORT nTitleNo = 0; SwPageDesc* pDesc = pSh->GetPageDescFromPool(RES_POOLPAGE_JAKET); SwFrmFmt& rFmt = pDesc->GetMaster(); - Printer *pPrt = pSh->GetPrt( TRUE ); - // Raender (setzen sich zusammen aus Shift-Offset und // Ausrichtung) + Printer *pPrt = pSh->GetPrt( TRUE ); Size aPaperSize = pPrt->PixelToLogic( pPrt->GetPaperSizePixel(), MAP_TWIP); if ( !aPaperSize.Width() && !aPaperSize.Height() ) @@ -489,19 +491,19 @@ static USHORT nTitleNo = 0; USHORT nPageW = (USHORT) Max(rItem.lWidth, rItem.lHeight), nPageH = (USHORT) Min(rItem.lWidth, rItem.lHeight); - switch (rItem.eAlign) - { - case ENV_HOR_LEFT: break; - case ENV_HOR_CNTR: lLeft += Max(0L, long(aPaperSize.Width() - nPageW)) / 2; - break; - case ENV_HOR_RGHT: lLeft += Max(0L, long(aPaperSize.Width() - nPageW)); - break; - case ENV_VER_LEFT: lUpper += Max(0L, long(aPaperSize.Width() - nPageH)); - break; - case ENV_VER_CNTR: lUpper += Max(0L, long(aPaperSize.Width() - nPageH)) / 2; - break; - case ENV_VER_RGHT: break; - } +// switch (rItem.eAlign) +// { +// case ENV_HOR_LEFT: break; +// case ENV_HOR_CNTR: lLeft += Max(0L, long(aPaperSize.Width() - nPageW)) / 2; +// break; +// case ENV_HOR_RGHT: lLeft += Max(0L, long(aPaperSize.Width() - nPageW)); +// break; +// case ENV_VER_LEFT: lUpper += Max(0L, long(aPaperSize.Width() - nPageH)); +// break; +// case ENV_VER_CNTR: lUpper += Max(0L, long(aPaperSize.Width() - nPageH)) / 2; +// break; +// case ENV_VER_RGHT: break; +// } SvxLRSpaceItem aLRMargin; SvxULSpaceItem aULMargin; aLRMargin.SetLeft ((USHORT) lLeft ); @@ -534,8 +536,9 @@ static USHORT nTitleNo = 0; pDesc->SetFollow(pFollow); // Landscape - pDesc->SetLandscape( rItem.eAlign >= ENV_VER_LEFT && - rItem.eAlign <= ENV_VER_RGHT); +// pDesc->SetLandscape( rItem.eAlign >= ENV_VER_LEFT && +// rItem.eAlign <= ENV_VER_RGHT); + pDesc->SetLandscape( rItem.lWidth > rItem.lHeight ); // Page-Desc anwenden diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx index 2be620af448c..94a154320624 100644 --- a/sw/source/ui/app/apphdl.cxx +++ b/sw/source/ui/app/apphdl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: apphdl.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: os $ $Date: 2002-11-29 12:09:39 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -97,8 +97,8 @@ #ifndef _SVX_SRCHITEM_HXX #include <svx/srchitem.hxx> #endif -#ifndef _SVX_COLORCFG_HXX -#include <svx/colorcfg.hxx> +#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX +#include <svtools/colorcfg.hxx> #endif #ifndef _SFXENUMITEM_HXX //autogen #include <svtools/eitem.hxx> @@ -318,10 +318,15 @@ using namespace ::com::sun::star; #include <cfgid.h> #endif +#include <shells.hrc> + SFX_IMPL_INTERFACE( SwModule, SfxModule, SW_RES(RID_SW_NAME) ) { SFX_CHILDWINDOW_REGISTRATION(SvxHyperlinkDlgWrapper::GetChildWindowId()); SFX_STATUSBAR_REGISTRATION(SW_RES(CFG_STATUSBAR)); + SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_APPLICATION | + SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER, + SW_RES(RID_MODULE_TOOLBOX) ); } /*------------------------------------------------------------------------ @@ -795,7 +800,13 @@ void SwModule::ExecViewOptions(SfxRequest &rReq) nDest = VIEWOPT_DEST_TEXT; ApplyUsrPref( *pOpt, pApplyView, nDest ); if ( pApplyView ) + { + SwWrtShell &rSh = pApplyView->GetWrtShell(); + const BOOL bLockedView = rSh.IsViewLocked(); + rSh.LockView( TRUE ); //lock visible section pApplyView->GetWrtShell().EndAction(); + rSh.LockView( bLockedView ); + } delete pOpt; Invalidate(rReq.GetSlot()); @@ -1131,11 +1142,11 @@ SwDBConfig* SwModule::GetDBConfig() /* -----------------------------11.04.2002 15:27------------------------------ ---------------------------------------------------------------------------*/ -svx::ColorConfig& SwModule::GetColorConfig() +svtools::ColorConfig& SwModule::GetColorConfig() { if(!pColorConfig) { - pColorConfig = new svx::ColorConfig; + pColorConfig = new svtools::ColorConfig; SwViewOption::ApplyColorConfigValues(*pColorConfig); StartListening(*pColorConfig); } diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx index f255d6b62ca9..7d4ae6ee3ac0 100644 --- a/sw/source/ui/app/applab.cxx +++ b/sw/source/ui/app/applab.cxx @@ -2,9 +2,9 @@ * * $RCSfile: applab.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: os $ $Date: 2001-11-21 12:35:02 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -287,7 +287,7 @@ const SwFrmFmt *lcl_InsertLabText( SwWrtShell& rSh, const SwLabItem& rItem, String sDBName; if( (!rItem.bSynchron || !(nCol|nRow)) && (sDBName = InsertLabEnvText( rSh, rFldMgr, rItem.aWriting )).Len() && !bLast ) { - sDBName.SetToken( 2, DB_DELIM, String::CreateFromAscii("True")); + sDBName.SetToken( 3, DB_DELIM, String::CreateFromAscii("True")); SwInsertFld_Data aData(TYP_DBNEXTSETFLD, 0, sDBName, aEmptyStr, 0, &rSh ); rFldMgr.InsertFld( aData ); } diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx index 706cc77c0156..0b6fb0d9254c 100644 --- a/sw/source/ui/app/docsh.cxx +++ b/sw/source/ui/app/docsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docsh.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: os $ $Date: 2002-06-21 14:24:27 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -99,6 +99,10 @@ #ifndef _SFXSTRITEM_HXX #include <svtools/stritem.hxx> #endif +#ifndef _SVX_ADJITEM_HXX //autogen +#include <svx/adjitem.hxx> +#endif + #ifndef _SBXCLASS_HXX //autogen #include <svtools/sbx.hxx> #endif @@ -184,13 +188,18 @@ #ifndef _SWWAIT_HXX #include <swwait.hxx> #endif - +#ifndef _SWPRTOPT_HXX +#include <swprtopt.hxx> +#endif #ifndef _FRMATR_HXX #include <frmatr.hxx> #endif #ifndef _VIEW_HXX #include <view.hxx> // fuer die aktuelle Sicht #endif +#ifndef _EDTWIN_HXX +#include <edtwin.hxx> +#endif #ifndef _WRTSH_HXX #include <wrtsh.hxx> // Verbindung zur Core #endif @@ -216,7 +225,10 @@ #include <usrpref.hxx> #endif #ifndef _SHELLIO_HXX -#include <shellio.hxx> +#include <shellio.hxx> // I/O +#endif +#ifndef _SW3IO_HXX +#include <sw3io.hxx> // I/O, Hausformat #endif #ifndef _DOCSTYLE_HXX #include <docstyle.hxx> @@ -245,9 +257,6 @@ #ifndef _NDOLE_HXX #include <ndole.hxx> #endif -#ifndef _NDGRF_HXX -#include <ndgrf.hxx> -#endif #ifndef _SWSWERROR_H #include <swerror.h> // Fehlermeldungen @@ -418,6 +427,9 @@ Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr, if( (pRead == ReadSw3 || pRead == ReadXML) && pFlt->GetVersion() ) aStor->SetVersion( (long)pFlt->GetVersion() ); } + // beim Sw3-Reader noch den pIo-Pointer setzen + if( pRead == ReadSw3 ) + ((Sw3Reader*)pRead)->SetSw3Io( pIo ); if( pFlt->GetDefaultTemplate().Len() ) pRead->SetTemplateName( pFlt->GetDefaultTemplate() ); @@ -467,6 +479,9 @@ BOOL SwDocShell::ConvertFrom( SfxMedium& rMedium ) RemoveLink(); pDoc = pRdr->GetDoc(); + /* #106748# Restore the pool default if reading a saved document. */ + pDoc->GetAttrPool().ResetPoolDefaultItem(RES_PARATR_ADJUST); + // die DocInfo vom Doc am DocShell-Medium setzen if( GetMedium()->GetFilter() && GetMedium()->GetFilter()->UsesStorage() ) @@ -507,8 +522,10 @@ BOOL SwDocShell::ConvertFrom( SfxMedium& rMedium ) BOOL SwDocShell::Save() { RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "SwDocShell::Save" ); - sal_Bool bXML = GetStorage()->GetVersion() >= SOFFICE_FILEFORMAT_60; - + sal_Bool bXML = pIo->GetStorage()->GetVersion() >= SOFFICE_FILEFORMAT_60; + //#i3370# remove quick help to prevent saving of autocorrection suggestions + if(pView) + pView->GetEditWin().StopQuickHelp(); SwWait aWait( *this, TRUE ); ULONG nErr = ERR_SWG_WRITE_ERROR, nVBWarning = ERRCODE_NONE; if( SfxInPlaceObject::Save() ) @@ -520,17 +537,17 @@ BOOL SwDocShell::Save() break; case SFX_CREATE_MODE_ORGANIZER: + if( bXML ) { WriterRef xWrt; - if( bXML ) - ::GetXMLWriter( aEmptyStr, xWrt ); - else - ::GetSw3Writer( aEmptyStr, xWrt ); + ::GetXMLWriter( aEmptyStr, xWrt ); xWrt->SetOrganizerMode( TRUE ); - SwWriter aWrt( *GetStorage(), *pDoc ); + SwWriter aWrt( *pIo->GetStorage(), *pDoc ); nErr = aWrt.Write( xWrt ); xWrt->SetOrganizerMode( FALSE ); } + else + nErr = pIo->SaveStyles(); break; case SFX_CREATE_MODE_EMBEDDED: @@ -544,7 +561,7 @@ BOOL SwDocShell::Save() { if( pDoc->ContainsMSVBasic() ) { - SvxImportMSVBasic aTmp( *this, *GetStorage() ); + SvxImportMSVBasic aTmp( *this, *pIo->GetStorage() ); aTmp.SaveOrDelMSVBAStorage( FALSE, aEmptyStr ); if( OFF_APP()->GetFilterOptions()->IsLoadWordBasicStorage() ) nVBWarning = SvxImportMSVBasic:: @@ -555,7 +572,7 @@ BOOL SwDocShell::Save() if( !bXML && !ISA( SwGlobalDocShell ) && !ISA( SwWebDocShell ) && SFX_CREATE_MODE_EMBEDDED != GetCreateMode() ) - AddXMLAsZipToTheStorage( *GetStorage() ); + AddXMLAsZipToTheStorage( *pIo->GetStorage() ); // TabellenBox Edit beenden! if( pWrtShell ) @@ -563,12 +580,27 @@ BOOL SwDocShell::Save() WriterRef xWrt; if( bXML ) + { ::GetXMLWriter( aEmptyStr, xWrt ); + } else + { ::GetSw3Writer( aEmptyStr, xWrt ); + ((Sw3Writer*)&xWrt)->SetSw3Io( pIo, FALSE ); + } - SwWriter aWrt( *GetStorage(), *pDoc ); + BOOL bLockedView; + if ( pWrtShell ) + { + bLockedView = pWrtShell->IsViewLocked(); + pWrtShell->LockView( TRUE ); //lock visible section + } + + SwWriter aWrt( *pIo->GetStorage(), *pDoc ); nErr = aWrt.Write( xWrt ); + + if ( pWrtShell ) + pWrtShell->LockView( bLockedView ); } break; } @@ -595,6 +627,9 @@ BOOL SwDocShell::SaveAs( SvStorage * pStor ) sal_Bool bXML = pStor->GetVersion() >= SOFFICE_FILEFORMAT_60; SwWait aWait( *this, TRUE ); + //#i3370# remove quick help to prevent saving of autocorrection suggestions + if(pView) + pView->GetEditWin().StopQuickHelp(); if( pDoc->IsGlobalDoc() && !pDoc->IsGlblDocSaveLinks() ) RemoveOLEObjects(); @@ -644,7 +679,7 @@ BOOL SwDocShell::SaveAs( SvStorage * pStor ) if( pDoc->ContainsMSVBasic() ) { - SvxImportMSVBasic aTmp( *this, *GetStorage() ); + SvxImportMSVBasic aTmp( *this, *pIo->GetStorage() ); aTmp.SaveOrDelMSVBAStorage( FALSE, aEmptyStr ); if( OFF_APP()->GetFilterOptions()->IsLoadWordBasicStorage() ) nVBWarning = SvxImportMSVBasic:: @@ -672,13 +707,28 @@ BOOL SwDocShell::SaveAs( SvStorage * pStor ) WriterRef xWrt; if( bXML ) + { ::GetXMLWriter( aEmptyStr, xWrt ); + } else + { ::GetSw3Writer( aEmptyStr, xWrt ); + ((Sw3Writer*)&xWrt)->SetSw3Io( pIo, TRUE ); + } + + BOOL bLockedView; + if ( pWrtShell ) + { + bLockedView = pWrtShell->IsViewLocked(); + pWrtShell->LockView( TRUE ); //lock visible section + } SwWriter aWrt( *pStor, *pDoc ); nErr = aWrt.Write( xWrt ); + if ( pWrtShell ) + pWrtShell->LockView( bLockedView ); + if( bIsModified ) pDoc->SetModified(); pDoc->SetOle2Link( aOldOLELnk ); @@ -716,14 +766,20 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium ) SW_RESSTR(STR_DLLNOTFOUND) ).Execute(); return FALSE; } - + //#i3370# remove quick help to prevent saving of autocorrection suggestions + if(pView) + pView->GetEditWin().StopQuickHelp(); ULONG nVBWarning = 0; - if( pDoc->ContainsMSVBasic() && xWriter->IsStgWriter() ) + if( pDoc->ContainsMSVBasic() ) { BOOL bSave = pFlt->GetUserData().EqualsAscii( "CWW8" ) && OFF_APP()->GetFilterOptions()->IsLoadWordBasicStorage(); - SvStorage* pStg = rMedium.GetStorage(); + SvStorage* pStg; + if( xWriter->IsStgWriter() ) + pStg = rMedium.GetStorage(); + else + pStg = pIo->GetStorage(); SvxImportMSVBasic aTmp( *this, *pStg ); nVBWarning = aTmp.SaveOrDelMSVBAStorage( bSave, String::CreateFromAscii("Macros") ); @@ -907,13 +963,24 @@ BOOL SwDocShell::ConvertTo( SfxMedium& rMedium ) } /*-------------------------------------------------------------------- + Beschreibung: Haende weg + --------------------------------------------------------------------*/ + + +void SwDocShell::HandsOff() +{ + pIo->HandsOff(); + SfxInPlaceObject::HandsOff(); +} + +/*-------------------------------------------------------------------- Beschreibung: ??? noch nicht zu aktivieren, muss TRUE liefern --------------------------------------------------------------------*/ + BOOL SwDocShell::SaveCompleted( SvStorage * pStor ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "SwDocShell::SaveCompleted" ); - BOOL bClearNm = !pStor || !IsHandsOff(); BOOL bRet = SfxInPlaceObject::SaveCompleted( pStor ); if( bRet ) { @@ -923,18 +990,7 @@ BOOL SwDocShell::SaveCompleted( SvStorage * pStor ) else pDoc->ResetModified(); - - // Hier muss noch ueber die Grafiknodes iteriert werden, um - // ihnen zu sagen, wie ihr neuer Streamname lautet! - // Da Grafiken Flys sind, liegen die Nodes im Autotext-Bereich - SwNodes& rNds = pDoc->GetNodes(); - ULONG nEnd = rNds.GetEndOfAutotext().GetIndex(); - for( ULONG nIdx = rNds.GetEndOfInserts().GetIndex() + 1; nIdx < nEnd; ++nIdx) - { - SwGrfNode* pNd = rNds[ nIdx ]->GetGrfNode(); - if( pNd ) - pNd->SaveCompleted( bClearNm ); - } + bRet = pIo->SaveCompleted( pStor ); } if( xOLEChildList.Is() ) @@ -992,7 +1048,8 @@ void SwDocShell::Draw( OutputDevice* pDev, const JobSetup& rSetup, pDev->SetLineColor(); pDev->SetBackground(); BOOL bWeb = 0 != PTR_CAST(SwWebDocShell, this); - ViewShell::PrtOle2( pDoc, SW_MOD()->GetUsrPref(bWeb), pDev, aRect ); + SwPrtOptions aOpts( aEmptyStr ); + ViewShell::PrtOle2( pDoc, SW_MOD()->GetUsrPref(bWeb), aOpts, pDev, aRect ); pDev->Pop(); if( pOrig ) diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index 328a645e115d..0af0d18066dd 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docsh2.cxx,v $ * - * $Revision: 1.51 $ + * $Revision: 1.52 $ * - * last change: $Author: gt $ $Date: 2002-11-18 15:29:50 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1252,11 +1252,14 @@ void SwDocShell::Execute(SfxRequest& rReq) case SID_MAIL_PREPAREEXPORT: { - pWrtShell->StartAllAction(); + //pWrtShell is not set in page preview + if(pWrtShell) + pWrtShell->StartAllAction(); pDoc->UpdateFlds( 0 ); pDoc->EmbedAllLinks(); pDoc->RemoveInvisibleContent(); - pWrtShell->EndAllAction(); + if(pWrtShell) + pWrtShell->EndAllAction(); } break; @@ -1358,6 +1361,7 @@ void SwDocShell::Execute(SfxRequest& rReq) } if(!sStartTemplate.getLength() && pAny) sStartTemplate = pAny->GetName(); + aListBoxEntries.realloc(nIdx); try @@ -1664,7 +1668,8 @@ void SwDocShell::ReloadFromHtml( const String& rStreamName, SwSrcView* pSrcView } sal_Bool bWasBrowseMode = pDoc->IsBrowseMode(); RemoveLink(); - + delete pIo; + pIo = 0; //jetzt muss auch das UNO-Model ueber das neue Doc informiert werden #51535# uno::Reference<text::XTextDocument> xDoc(GetBaseModel(), uno::UNO_QUERY); text::XTextDocument* pxDoc = xDoc.get(); diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx index 84e288d05d0b..3ea2e6eec980 100644 --- a/sw/source/ui/app/docshini.cxx +++ b/sw/source/ui/app/docshini.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docshini.cxx,v $ * - * $Revision: 1.34 $ + * $Revision: 1.35 $ * - * last change: $Author: os $ $Date: 2002-09-26 13:38:35 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -118,6 +118,9 @@ #ifndef _SFXINTITEM_HXX #include <svtools/intitem.hxx> #endif +#ifndef _SVX_ADJITEM_HXX //autogen +#include <svx/adjitem.hxx> +#endif #ifndef _LINGUISTIC_LNGPROPS_HHX_ #include <linguistic/lngprops.hxx> @@ -204,6 +207,12 @@ #ifndef _TOX_HXX #include <tox.hxx> #endif +#ifndef _SW3IO_HXX +#include <sw3io.hxx> // I/O, Hausformat +#endif +#ifndef _SHELLIO_HXX +#include <shellio.hxx> +#endif #ifndef _SWDTFLVR_HXX #include <swdtflvr.hxx> #endif @@ -277,7 +286,7 @@ sal_Bool SwDocShell::InitNew( SvStorage * pStor ) sal_Bool bHTMLTemplSet = sal_False; if( bRet ) { - AddLink(); // pDoc ggf. anlegen + AddLink(); // pDoc / pIo ggf. anlegen sal_Bool bWeb = ISA( SwWebDocShell ); if ( bWeb ) @@ -342,6 +351,12 @@ sal_Bool SwDocShell::InitNew( SvStorage * pStor ) DEFAULTFONT_CJK_TEXT, DEFAULTFONT_CTL_TEXT }; + USHORT aLangTypes[] = + { + RES_CHRATR_LANGUAGE, + RES_CHRATR_CJK_LANGUAGE, + RES_CHRATR_CTL_LANGUAGE + }; for(USHORT i = 0; i < 3; i++) { @@ -369,7 +384,7 @@ sal_Bool SwDocShell::InitNew( SvStorage * pStor ) } else { - const SvxLanguageItem& rLang = (const SvxLanguageItem&)pDoc->GetDefault( nFontWhich ); + const SvxLanguageItem& rLang = (const SvxLanguageItem&)pDoc->GetDefault( aLangTypes[i] ); Font aLangDefFont = OutputDevice::GetDefaultFont( nFontTypes[i], @@ -445,6 +460,7 @@ sal_Bool SwDocShell::InitNew( SvStorage * pStor ) SwDocShell::SwDocShell(SfxObjectCreateMode eMode) : pDoc(0), + pIo(0), pBasePool(0), pFontList(0), SfxObjectShell ( eMode ), @@ -463,6 +479,7 @@ SwDocShell::SwDocShell(SfxObjectCreateMode eMode) : SwDocShell::SwDocShell( SwDoc *pD, SfxObjectCreateMode eMode ): pDoc(pD), + pIo(0), pBasePool(0), pFontList(0), SfxObjectShell ( eMode ), @@ -482,6 +499,7 @@ SwDocShell::SwDocShell( SwDoc *pD, SfxObjectCreateMode eMode ): SwDocShell::~SwDocShell() { RemoveLink(); + delete pIo; delete pFontList; // wir als BroadCaster werden auch unser eigener Listener @@ -513,7 +531,6 @@ void SwDocShell::Init_Impl() // set map unit to twip SetMapUnit( MAP_TWIP ); - } /*-------------------------------------------------------------------- Beschreibung: AddLink @@ -535,6 +552,11 @@ void SwDocShell::AddLink() uno::Reference< text::XTextDocument > xDoc(GetBaseModel(), uno::UNO_QUERY); ((SwXTextDocument*)xDoc.get())->Reactivate(this); + if( !pIo ) + pIo = new Sw3Io( *pDoc ); + else + pIo->SetDoc( *pDoc ); + SetPool(&pDoc->GetAttrPool()); // am besten erst wenn eine sdbcx::View erzeugt wird !!! @@ -641,16 +663,18 @@ sal_Bool SwDocShell::Load(SvStorage* pStor) // break; case SFX_CREATE_MODE_ORGANIZER: + if( bXML ) { - Reader *pReader = bXML ? ReadXML : ReadSw3; - if( pReader ) + if( ReadXML ) { - pReader->SetOrganizerMode( TRUE ); + ReadXML->SetOrganizerMode( TRUE ); SwReader aRdr( *pStor, aEmptyStr, pDoc ); - nErr = aRdr.Read( *pReader ); - pReader->SetOrganizerMode( FALSE ); + nErr = aRdr.Read( *ReadXML ); + ReadXML->SetOrganizerMode( FALSE ); } } + else + nErr = pIo->LoadStyles( pStor ); break; case SFX_CREATE_MODE_INTERNAL: @@ -808,21 +832,22 @@ sal_Bool SwDocShell::LoadFrom(SvStorage* pStor) if( pStor->IsStream( aStreamName ) ) { // Das Laden - Reader *pReader = bXML ? ReadXML : ReadSw3; - if( pReader ) + SwWait aWait( *this, sal_True ); + if( bXML ) { - SwWait aWait( *this, sal_True ); - if( bXML ) + ASSERT( !pBasePool, "wer hat seinen Pool nicht zerstoert?" ); + pBasePool = new SwDocStyleSheetPool( *pDoc, + SFX_CREATE_MODE_ORGANIZER == GetCreateMode() ); + if( ReadXML ) { - ASSERT( !pBasePool, "wer hat seinen Pool nicht zerstoert?" ); - pBasePool = new SwDocStyleSheetPool( *pDoc, - SFX_CREATE_MODE_ORGANIZER == GetCreateMode() ); + ReadXML->SetOrganizerMode( TRUE ); + SwReader aRdr( *pStor, aEmptyStr, pDoc ); + nErr = aRdr.Read( *ReadXML ); + ReadXML->SetOrganizerMode( FALSE ); } - pReader->SetOrganizerMode( TRUE ); - SwReader aRdr( *pStor, aEmptyStr, pDoc ); - nErr = aRdr.Read( *pReader ); - pReader->SetOrganizerMode( FALSE ); } + else + nErr = pIo->LoadStyles( pStor ); } else { @@ -875,11 +900,12 @@ void SwDocShell::SubInitNew() sal_Bool bWeb = ISA(SwWebDocShell); sal_uInt16 nRange[] = { - RES_CHRATR_COLOR, RES_CHRATR_COLOR, - RES_CHRATR_LANGUAGE, RES_CHRATR_LANGUAGE, - RES_CHRATR_CJK_LANGUAGE, RES_CHRATR_CJK_LANGUAGE, - RES_CHRATR_CTL_LANGUAGE, RES_CHRATR_CTL_LANGUAGE, - 0, 0, 0 }; + RES_PARATR_ADJUST, RES_PARATR_ADJUST, + RES_CHRATR_COLOR, RES_CHRATR_COLOR, + RES_CHRATR_LANGUAGE, RES_CHRATR_LANGUAGE, + RES_CHRATR_CJK_LANGUAGE, RES_CHRATR_CJK_LANGUAGE, + RES_CHRATR_CTL_LANGUAGE, RES_CHRATR_CTL_LANGUAGE, + 0, 0, 0 }; if(!bWeb) { nRange[ (sizeof(nRange)/sizeof(nRange[0])) - 3 ] = RES_PARATR_TABSTOP; @@ -910,9 +936,15 @@ void SwDocShell::SubInitNew() sal_uInt16 nNewPos = SW_MOD()->GetUsrPref(FALSE)->GetDefTab(); if( nNewPos ) aDfltSet.Put( SvxTabStopItem( 1, nNewPos, - SVX_TAB_ADJUST_DEFAULT ) ); + SVX_TAB_ADJUST_DEFAULT ) ); } aDfltSet.Put( SvxColorItem( Color( COL_AUTO ), RES_CHRATR_COLOR ) ); + + /* #106748# If the default frame direction of a document is RTL + the default adjusment is to the right. */ + if (FRMDIR_HORI_RIGHT_TOP == GetDefaultFrameDirection(GetAppLanguage())) + aDfltSet.Put(SvxAdjustItem(SVX_ADJUST_RIGHT)); + pDoc->SetDefault( aDfltSet ); pDoc->ResetModified(); } diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx index 79166413f3f1..411f9cae8b8a 100644 --- a/sw/source/ui/app/docst.cxx +++ b/sw/source/ui/app/docst.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docst.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: os $ $Date: 2002-11-15 10:50:50 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -546,6 +546,12 @@ USHORT SwDocShell::Edit( const String &rName, const String &rParent, USHORT nFam if(rParent.Len()) { SwTxtFmtColl* pColl = pWrtShell->FindTxtFmtCollByName( rParent ); + if(!pColl) + { + USHORT nId = SwStyleNameMapper::GetPoolIdFromUIName(rParent, GET_POOLID_TXTCOLL); + if(USHRT_MAX != nId) + pColl = pWrtShell->GetTxtCollFromPool( nId ); + } pDStyle->GetCollection()->SetDerivedFrom( pColl ); pDStyle->PresetParent( rParent ); } @@ -563,6 +569,12 @@ USHORT SwDocShell::Edit( const String &rName, const String &rParent, USHORT nFam if(rParent.Len()) { SwCharFmt* pCFmt = pWrtShell->FindCharFmtByName( rParent ); + if(!pCFmt) + { + USHORT nId = SwStyleNameMapper::GetPoolIdFromUIName(rParent, GET_POOLID_CHRFMT); + if(USHRT_MAX != nId) + pCFmt = pWrtShell->GetCharFmtFromPool( nId ); + } pDStyle->GetCharFmt()->SetDerivedFrom( pCFmt ); pDStyle->PresetParent( rParent ); @@ -581,6 +593,12 @@ USHORT SwDocShell::Edit( const String &rName, const String &rParent, USHORT nFam if(rParent.Len()) { SwFrmFmt* pFFmt = pWrtShell->GetDoc()->FindFrmFmtByName( rParent ); + if(!pFFmt) + { + USHORT nId = SwStyleNameMapper::GetPoolIdFromUIName(rParent, GET_POOLID_FRMFMT); + if(USHRT_MAX != nId) + pFFmt = pWrtShell->GetFrmFmtFromPool( nId ); + } pDStyle->GetFrmFmt()->SetDerivedFrom( pFFmt ); pDStyle->PresetParent( rParent ); } diff --git a/sw/source/ui/app/error.src b/sw/source/ui/app/error.src index 56c405135d6f..217b936235c4 100644 --- a/sw/source/ui/app/error.src +++ b/sw/source/ui/app/error.src @@ -2,9 +2,9 @@ * * $RCSfile: error.src,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: os $ $Date: 2002-10-10 06:06:35 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,7 +88,7 @@ String STR_COMCORE_READERROR TEXT [ spanish ] = "Error de lectura" ; TEXT [ english_us ] = "Read-Error" ; TEXT[ chinese_simplified ] = "璇绘枃浠舵椂鍙戠敓閿欒"; - TEXT[ russian ] = "硒栳赅 镳 黩屙梃"; + TEXT[ russian ] = "硒栳赅 黩屙"; TEXT[ polish ] = "B彻d odczytu"; TEXT[ japanese ] = "瑾伩鍙栥倞銈ㄣ儵銉"; TEXT[ chinese_traditional ] = "璁妾旀鏅傜櫦鐢熼尟瑾"; @@ -116,7 +116,7 @@ String STR_COMCORE_CANT_SHOW TEXT [ finnish ] = "Kuvaa ei voida n鋣tt滗." ; TEXT [ english_us ] = "Graphic cannot be displayed." ; TEXT[ chinese_simplified ] = "鏃犳硶鏄剧ず鍥惧舰"; - TEXT[ russian ] = "需耋眍 镳邃耱噔栩 礤忸珈铈眍"; + TEXT[ russian ] = "湾忸珈铈眍 镱赅玎螯 沭圄梓羼觇 钺牝."; TEXT[ polish ] = "Grafiki nie mo縩a wy渨ietli."; TEXT[ japanese ] = "鍥炽倰琛ㄧず銇с亶銇俱仜銈撱"; TEXT[ chinese_traditional ] = "鐒℃硶椤ず鍦栧舰"; @@ -147,13 +147,13 @@ InfoBox ERR_CLPBRD_WRITE MESSAGE [ spanish ] = "Error al copiar al portapapeles." ; MESSAGE [ english_us ] = "Error while copying to the clipboard." ; MESSAGE[ chinese_simplified ] = "鍦ㄥ鍒舵暟鎹埌鍓创鏉挎椂鍙戠敓閿欒銆"; - MESSAGE[ russian ] = "硒栳赅 镳 觐镨痤忄龛 狍翦 钺戾磬."; + MESSAGE[ russian ] = "硒栳赅 觐镨痤忄龛 狍翦 钺戾磬."; MESSAGE[ polish ] = "B彻d podczas kopiowania do schowka."; MESSAGE[ japanese ] = "銈儶銉冦儣銉溿兗銉夈伀銈炽償銉笺仚銈嬮殯銇偍銉┿兗銆"; MESSAGE[ chinese_traditional ] = "瑜囪＝璩囨枡鍒板壀璨肩翱鏅傜櫦鐢熼尟瑾ゃ"; MESSAGE[ arabic ] = "拖 呜 盟淝 轻溆 裴 轻颓葙."; MESSAGE[ greek ] = "遇茈灬 赆糗 翮 犴糸泷狯 篝 瘃彘耧."; - MESSAGE[ korean ] = "韥措氤措摐鞐 氤奠偓 欷 鞓る."; + MESSAGE[ korean ] = "韥措氤措摐鞐 氤奠偓 欷 鞓る"; MESSAGE[ turkish ] = "Panoya kopyalama hatas."; MESSAGE[ language_user1 ] = " "; MESSAGE[ catalan ] = "S'ha produ飔 un error en copiar al porta-retalls."; @@ -175,14 +175,14 @@ InfoBox ERR_CLPBRD_READ MESSAGE [ spanish ] = "Error al leer del portapapeles." ; MESSAGE [ english_us ] = "Error reading from the clipboard." ; MESSAGE[ chinese_simplified ] = "鍦ㄨ鍙栧壀璐存澘鏃跺彂鐢熼敊璇"; - MESSAGE[ russian ] = "硒栳赅 镳 黩屙梃 桤 狍翦疣 钺戾磬."; + MESSAGE[ russian ] = "硒栳赅 黩屙 桤 狍翦疣 钺戾磬."; MESSAGE[ polish ] = "B彻d odczytu ze schowka."; MESSAGE[ japanese ] = "銈儶銉冦儣銉溿兗銉夈亱銈夎銇垮彇銈嬮殯銇偍銉┿兗銆"; MESSAGE[ chinese_traditional ] = "鍦ㄨ畝鍙栧壀璨肩翱鏅傜櫦鐢熼尟瑾ゃ"; MESSAGE[ arabic ] = "拖 呜 盟淝 轻扪橇 沅 轻颓葙."; MESSAGE[ language_user1 ] = " "; MESSAGE[ greek ] = "遇茈灬 赆糗 翮 犴茔睐箸 狃 麸 瘃彘耧."; - MESSAGE[ korean ] = "韥措氤措摐搿滊秬韯 鞚疥赴 鞓る."; + MESSAGE[ korean ] = "韥措氤措摐搿滊秬韯 鞚疥赴 鞓る"; MESSAGE[ turkish ] = "Panodan okuma hatas."; MESSAGE[ catalan ] = "S'ha produ飔 un error en llegir el porta-retalls."; MESSAGE[ thai ] = "喔箞喔侧笝喔溹复喔斷笧喔ム覆喔斷笀喔侧竵喔勦弗喔脆笡喔氞腑喔｀箤喔"; @@ -203,15 +203,15 @@ Resource RID_SW_ERRHDL TEXT [ italian ] = "Errore nel formato del file" ; TEXT [ portuguese_brazilian ] = "Erro no formato do arquivo" ; TEXT [ portuguese ] = "Encontrado erro de formato no ficheiro" ; - TEXT [ finnish ] = "Tiedostomuotovirhe ilmeni" ; + TEXT [ finnish ] = "Tiedostomuotovirhe ilmeni." ; TEXT [ danish ] = "Opdaget formatfejl i filen" ; TEXT [ french ] = "Erreur de format de fichier" ; TEXT [ swedish ] = "Formatfel uppt鋍kt i filen" ; - TEXT [ dutch ] = "Formaatfout ontdekt in het bestand" ; + TEXT [ dutch ] = "Indelingsfout ontdekt in het bestand" ; TEXT [ spanish ] = "Se ha descubierto un error de formato en el archivo" ; TEXT [ english_us ] = "File format error found" ; TEXT[ chinese_simplified ] = "鍙戠幇浜嗘枃浠舵牸寮忛敊璇"; - TEXT[ russian ] = "吾磬痼驽磬 铠栳赅 纛痨囹 羿殡"; + TEXT[ russian ] = "硒栳赅 纛痨囹 羿殡"; TEXT[ polish ] = "Znaleziono b彻d formatu w pliku"; TEXT[ japanese ] = "銉曘偂銈ゃ儷銇浉寮忋偍銉┿兗銇岃銇ゃ亱銈娿伨銇椼仧銆"; TEXT[ chinese_traditional ] = "鐧肩従浜嗘獢妗堟牸寮忛尟瑾"; @@ -235,11 +235,11 @@ Resource RID_SW_ERRHDL TEXT [ danish ] = "Fejl under l鎠ning af filen " ; TEXT [ french ] = "Erreur de lecture du fichier " ; TEXT [ swedish ] = "Fel vid l鋝ning av fil " ; - TEXT [ dutch ] = "Fout bij lezen van het bestand " ; + TEXT [ dutch ] = "Fout bij lezen van het bestand" ; TEXT [ spanish ] = "Error al leer el archivo " ; TEXT [ english_us ] = "Error reading file " ; TEXT[ chinese_simplified ] = "鍦ㄨ鏂囦欢鏃跺彂鐢熼敊璇 "; - TEXT[ russian ] = "硒栳赅 镳 黩屙梃 羿殡 "; + TEXT[ russian ] = "硒栳赅 黩屙 羿殡 "; TEXT[ polish ] = "B彻d w odczytywaniu pliku "; TEXT[ japanese ] = "銉曘偂銈ゃ儷銇銇垮彇銈娿偍銉┿兗 "; TEXT[ chinese_traditional ] = "璁妾旀鏅傜櫦鐢熼尟瑾 "; @@ -267,7 +267,7 @@ Resource RID_SW_ERRHDL TEXT [ spanish ] = "Error en el archivo de entrada" ; TEXT [ english_us ] = "Input file error" ; TEXT[ chinese_simplified ] = "杈撳叆鐨勬枃浠跺惈鏈夐敊璇"; - TEXT[ russian ] = "硒栳赅 羿殡 忖钿"; + TEXT[ russian ] = "硒栳赅 忖钿 羿殡"; TEXT[ polish ] = "B彻d w pliku wej渃iowym"; TEXT[ japanese ] = "鍏ュ姏銉曘偂銈ゃ儷銇腑銇偍銉┿兗"; TEXT[ chinese_traditional ] = "杓稿叆鐨勬獢妗堝惈鏈夐尟瑾"; @@ -287,7 +287,7 @@ Resource RID_SW_ERRHDL TEXT [ italian ] = "Questo non un file di %PRODUCTNAME Writer" ; TEXT [ portuguese_brazilian ] = "Este n?o ? um arquivo do %PRODUCTNAME Writer" ; TEXT [ portuguese ] = "Este n鉶 um ficheiro do %PRODUCTNAME Writer." ; - TEXT [ finnish ] = "T鋗 ei ole %PRODUCTNAME Writer -tiedosto" ; + TEXT [ finnish ] = "T鋗 ei ole %PRODUCTNAME Writer -tiedosto." ; TEXT [ danish ] = "Filen er ikke en %PRODUCTNAME Writer-fil" ; TEXT [ french ] = "Ceci n'est pas un fichier %PRODUCTNAME Writer" ; TEXT [ swedish ] = "Detta 鋜 inte en %PRODUCTNAME Writer-fil" ; @@ -319,7 +319,7 @@ Resource RID_SW_ERRHDL TEXT [ danish ] = "Uventet filafslutning" ; TEXT [ french ] = "Fin de fichier impr関ue" ; TEXT [ swedish ] = "Ov鋘tat filslut" ; - TEXT [ dutch ] = "Onverwacht bestandeinde" ; + TEXT [ dutch ] = "Onverwacht bestandseinde" ; TEXT [ spanish ] = "Fin inesperado de archivo" ; TEXT [ english_us ] = "Unexpected end of file" ; TEXT[ chinese_simplified ] = "鎰忓鐨勬枃浠剁粨灏"; @@ -340,24 +340,24 @@ Resource RID_SW_ERRHDL TEXT = "Dateien, die mit Kennwort gesch黷zt sind, k鰊nen nicht ge鰂fnet werden." ; TEXT [ English ] = "Files with passwords are not supported" ; TEXT [ norwegian ] = "Passordbeskyttet filer er ikke tilgjengelige" ; - TEXT [ italian ] = "Le password non sono supportate" ; + TEXT [ italian ] = "Impossibile aprire i file protetti da password." ; TEXT [ portuguese_brazilian ] = "Arquivos com senhas n?o s o comportados" ; TEXT [ portuguese ] = "As senhas n鉶 t阭 suporte" ; - TEXT [ finnish ] = "Salasanoilla suojattuja tiedostoja ei tueta" ; + TEXT [ finnish ] = "Salasanoilla suojattuja tiedostoja ei tueta." ; TEXT [ danish ] = "Adgangskoder underst鴗tes ikke" ; - TEXT [ french ] = "Les mots de passe ne sont pas support閟." ; - TEXT [ swedish ] = "L鰏enord st鰀s ej" ; + TEXT [ french ] = "Impossible d'ouvrir les fichiers prot間閟 par des mots de passe !" ; + TEXT [ swedish ] = "Det g錼 inte att 鰌pna filer som 鋜 skyddade med l鰏enord" ; TEXT [ dutch ] = "Wachtwoorden worden niet ondersteund" ; - TEXT [ spanish ] = "Las contrase馻s no se apoyan" ; - TEXT [ english_us ] = "Passwords are not supported." ; - TEXT[ chinese_simplified ] = "涓嶆敮鎸佸瘑鐮"; - TEXT[ russian ] = "相痤腓 礤 镱滗屦骅忄"; + TEXT [ spanish ] = "Los archivos protegidos por contrase馻s no se pueden abrir." ; + TEXT [ english_us ] = "Password-protected files cannot be opened." ; + TEXT[ chinese_simplified ] = "鏃犳硶鎵撳紑鐢ㄥ瘑鐮佷繚鎶ょ殑鏂囦欢銆"; + TEXT[ russian ] = "湾 镱滗屦骅忄 羿殡, 玎眄 镟痤扈"; TEXT[ polish ] = "Has砤 nie b阣 obs硊giwane"; TEXT[ japanese ] = "銉戙偣銉兗銉夈伅鏀彺銇曘倢銇︺亜銇俱仜銈撱"; - TEXT[ chinese_traditional ] = "涓嶆敮鎻村瘑纰"; + TEXT[ chinese_traditional ] = "鐒℃硶闁嬪暉鍙楀埌瀵嗙⒓淇濊鐨勬獢妗堛"; TEXT[ arabic ] = "哚闱 轻友 垌 阙抒仙"; TEXT[ greek ] = "腻 躔矬翮襁驽翎 脲轸秕胥哚 犍溟觑 瘃忉箸"; - TEXT[ korean ] = "鞎旐樃臧 歆鞗愲悩歆 鞎婌姷雼堧嫟."; + TEXT[ korean ] = "鞎旐樃搿 氤挫晥霅 韺岇澕鞚 鞐 靾 鞐嗢姷雼堧嫟."; TEXT[ turkish ] = "辤fre kullan齧 desteklenmiyor"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "No estan permesos els fitxers protegits amb contrasenyes"; @@ -379,7 +379,7 @@ Resource RID_SW_ERRHDL TEXT [ spanish ] = "El archivo no es uno de WinWord6" ; TEXT [ english_us ] = "This is not a WinWord6 file" ; TEXT[ chinese_simplified ] = "杩欎笉鏄竴涓 WinWord6 鏂囦欢"; - TEXT[ russian ] = "蒡铗 羿殡 礤 怆弪 羿殡铎 WinWord6"; + TEXT[ russian ] = "蒡铗 羿殡 礤 怆弪 羿殡铎 WinWor"; TEXT[ polish ] = "Ten plik nie jest plikiem WinWord6"; TEXT[ japanese ] = "銇撱倢銇 WinWord6 銇儠銈°偆銉仹銇亗銈娿伨銇涖倱銆"; TEXT[ chinese_traditional ] = "閫欎笉鏄竴鍊 WinWord6 妾旀"; @@ -407,11 +407,11 @@ Resource RID_SW_ERRHDL TEXT [ danish ] = "Denne fil er blevet gemt med WinWord-indstillingen 'Gem hurtigt'. Deaktiver venligst indstillingen 'Gem hutigt' og gem filen igen med WinWord." ; TEXT [ french ] = "Ce fichier a 閠 enregistr l'aide de l'option 'Enregistrement rapide' de WinWord. Veuillez d閟activer cette option et utiliser WinWord pour enregistrer nouveau le fichier." ; TEXT [ swedish ] = "Denna fil 鋜 sparad med WinWord-alternativet 'snabbspara'. St鋘g av WinWord-alternativet 'Till錿 snabbspara' och spara filen med WinWord igen" ; - TEXT [ dutch ] = "Dit bestand werd met de WinWord- optie \"Snel opslaan\" opgeslagen. Schakel a.u.b in WinWord de optie \"Snel opslaan toestaan\" uit en sla het bestand opnieuw op met WinWord." ; + TEXT [ dutch ] = "Dit bestand is met de WinWord-optie \"Snel opslaan\" opgeslagen. Schakel a.u.b. in WinWord de optie \"Snel opslaan toestaan\" uit en sla het bestand opnieuw op met WinWord." ; TEXT [ spanish ] = "Este archivo ha sido guardado con la opci髇 de WinWord 'guardar r醦idamente' . Por favor desactive en WinWord la opci髇 'permitir guardar r醦idamente' y guarde el archivo de nuevo en WinWord." ; - TEXT [ english_us ] = "This file was saved with WinWord in 'Fast Save' mode. Please uncheck the option 'Allow Fast Saves' and save the file again." ; + TEXT [ english_us ] = "This file was saved with WinWord in 'Fast Save' mode. Please unmark the WinWord option 'Allow Fast Saves' and save the file again." ; TEXT[ chinese_simplified ] = "杩欎釜鏂囦欢瀛樼洏閲囩敤鐨勬槸 WinWord 閫夐」 '蹇熶繚瀛'鏂瑰紡銆傝鍏抽棴杩欎釜閫夐」锛岀劧鍚庡啀閲嶆柊瀛樼洏杩欎釜鏂囦欢銆"; - TEXT[ russian ] = "蒡铗 羿殡 耦躔囗屙 WinWord 镳 镱祛 镟疣戾蝠 '聋耱痤 耦躔囗屙桢'. 项驵塍轳蜞, 铗觌栩 镟疣戾蝠 '朽琊屮栩 猁耱痤 耦躔囗屙桢' 玎眍忸 耦躔囗栩 铗 羿殡 WinWord."; + TEXT[ russian ] = "蒡铗 羿殡 耦躔囗屙 桤 WinWord 疱骅戾 '聋耱痤 耦躔囗屙桢'. 项驵塍轳蜞, 铗觌栩 镟疣戾蝠 '朽琊屮栩 猁耱痤 耦躔囗屙桢' 玎眍忸 耦躔囗栩 铗 羿殡 桤 WinWord."; TEXT[ polish ] = "Ten plik zosta zapisany za pomoc opcji WinWord 'Szybkie zapisywanie'. Prosz w吵筩z w WinWord opcj 'Dopu滄 szybkie zapisywanie' i zapisz plik ponownie w WinWord"; TEXT[ japanese ] = "銇撱伄銉曘偂銈ゃ儷銇 WinWord 銈儣銈枫儳銉炽伄銆岄珮閫熶繚瀛樸嶃仹淇濆瓨銇曘倢銇︺亜銇俱仚銆俉inWord 銇偑銉椼偡銉с兂銆岄珮閫熶繚瀛樸仚銈嬨嶃倰銈儠銇仐銇 WinWord 銇с儠銈°偆銉倰淇濆瓨銇椼仾銇娿仐銇︺亸銇犮仌銇勩"; TEXT[ chinese_traditional ] = "鍎插瓨妾旀鎺＄敤鐨勬槸 WinWord 閬搁爡<蹇熷劜瀛>鏂瑰紡銆傝珛闂滈枆閫欏嬮伕闋咃箰鐒跺緦鍐嶉噸鏂板劜瀛橀欏嬫枃浠躲"; @@ -435,11 +435,11 @@ Resource RID_SW_ERRHDL TEXT [ danish ] = "Fejl under skrivning af midlertidig fil" ; TEXT [ french ] = "Erreur d'閏riture du fichier temporaire" ; TEXT [ swedish ] = "Fel vid skrivning av tempor鋜 fil" ; - TEXT [ dutch ] = "Fout bij het schrijven van tijdelijk bestand" ; + TEXT [ dutch ] = "Fout bij schrijven van tijdelijk bestand" ; TEXT [ spanish ] = "Error al escribir el archivo temporal" ; TEXT [ english_us ] = "Error writing temporary file" ; TEXT[ chinese_simplified ] = "鍦ㄥ啓鍏ユ殏鏃舵枃浠舵椂鍙戠敓閿欒"; - TEXT[ russian ] = "硒栳赅 镳 玎镨耔 怵屐屙眍泐 羿殡"; + TEXT[ russian ] = "硒栳赅 玎镨耔 怵屐屙眍泐 羿殡"; TEXT[ polish ] = "B彻d zapisu pliku tymczasowego"; TEXT[ japanese ] = "銉嗐兂銉濄儵銉儠銈°偆銉伄鏇搞亶杈笺伩涓伄銈ㄣ儵銉"; TEXT[ chinese_traditional ] = "鍦ㄥ鍏ユ毇鏅傛獢妗堟檪鐧肩敓閷"; @@ -461,19 +461,19 @@ Resource RID_SW_ERRHDL TEXT [ portuguese ] = "A 醨ea de inser玢o do ficheiro Ini demasiado extensa" ; TEXT [ french ] = "Zone d'insertion dans le fichier Ini trop grande" ; TEXT [ dutch ] = "Invoegbereik in INI-bestand is te groot" ; - TEXT [ spanish ] = "El 醨ea de inserci髇 en el archivo Ini es demasiado grande" ; + TEXT [ spanish ] = "La secci髇 insertada en el archivo Ini es demasiado grande" ; TEXT [ danish ] = "Importomr錮et i ini-filen er for stort" ; TEXT [ swedish ] = "Importomr錮et i ini-filen 鋜 f鰎 stort" ; - TEXT [ finnish ] = "Ini-tiedostoon lis鋞ty osio on liian suuri" ; + TEXT [ finnish ] = "Ini-tiedostoon lis鋞ty osa on liian suuri." ; TEXT [ english_us ] = "Inserted section in ini file too large" ; TEXT[ chinese_simplified ] = "Ini 鏂囦欢鎻掑叆鍖哄煙澶ぇ"; - TEXT[ russian ] = "吾豚耱 怦蜞怅 羿殡 Ini 耠桫觐 犷朦"; + TEXT[ russian ] = "埋蜞怆屙磬 ini 羿殡 皴牿 耠桫觐 忮腓赅"; TEXT[ polish ] = "Obszar wstawiania do pliku Ini jest za du縴"; TEXT[ japanese ] = "Ini 銉曘偂銈ゃ儷銇尶鍏ョ瘎鍥层亴澶с亶銇欍亷銇俱仚銆"; TEXT[ chinese_traditional ] = "Ini 妾旀鎻掑叆鍗鍩熷お澶"; TEXT[ arabic ] = "湄寝 轻畔吻 蓓 轻汜 Ini 呷硌 滔丘"; TEXT[ greek ] = " 疱耖秣 彘筢泫戕 篝 狁麇唢 ini 暹磲 痫臊 戾丬腌"; - TEXT[ korean ] = "ini 韺岇澕鞐 靷届瀰霅 鞓侅棴鞚 雱堧 韥诫媹雼."; + TEXT[ korean ] = "ini 韺岇澕鞐 靷届瀰霅 甑棴鞚 雱堧 韥诫媹雼."; TEXT[ turkish ] = "Ini dosyas ekleme b鰈黰 鏾k b鼀黭"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "L'鄏ea d'inserci del fitxer ini 閟 massa gran"; @@ -486,14 +486,14 @@ Resource RID_SW_ERRHDL Text [ english_us ] = "File format error found at $(ARG1)(row,col)" ; Text [ italian ] = " stato trovato un errore di formato nel file alla posizione $(ARG1)(riga, colonna)" ; Text [ spanish ] = "Se ha descubierto un error de formato en el archivo en la posici髇 $(ARG1)(fila,columna)" ; - Text [ french ] = "Erreur de format la position $(ARG1)(ligne,colonne) du fichier" ; - Text [ dutch ] = "Formaatfout ontdekt op positie $(ARG1)(cel,kolom) in het bestand" ; + Text [ french ] = "Erreur de format dans le fichier, position $(ARG1)(ligne, colonne)." ; + Text [ dutch ] = "Indelingsfout ontdekt op positie $(ARG1)(cel,kolom) in het bestand" ; Text [ swedish ] = "Formatfel vid position $(ARG1)(rad,kolumn) uppt鋍kt i filen" ; Text [ danish ] = "Der blev opdaget en formatfejl i filen p position $(ARG1)(r鎘ke,spalte)" ; Text [ portuguese ] = "Descoberto erro de formato na posi玢o $(ARG1)(linha, coluna) do ficheiro" ; Text [ portuguese_brazilian ] = "Formatfehler an Position $(ARG1)(Zeile,Spalte) in der Datei entdeckt" ; Text[ chinese_simplified ] = "鏂囦欢鏍煎紡閿欒 $(ARG1)(琛岋紝鍒)"; - Text[ russian ] = " 戾耱 $(ARG1)(耱痤赅,耱铍徨) 钺磬痼驽磬 铠栳赅 纛痨囹 羿殡"; + Text[ russian ] = "硒栳赅 纛痨囹 羿殡 戾耱 $(ARG1)(耱痤赅,耱铍徨)"; Text[ polish ] = "Znaleziono w pliku b彻d formatu przy pozycji $(ARG1)(Wiersz, kolumna)"; Text[ japanese ] = "銉曘偂銈ゃ儷銇 $(ARG1)(琛屻佸垪)銇浉寮忋偍銉┿兗銇岃銇ゃ亱銈娿伨銇椼仧銆"; Text[ chinese_traditional ] = "妾旀鏍煎紡閷 $(ARG1)(琛岋紝鍒)"; @@ -503,7 +503,7 @@ Resource RID_SW_ERRHDL Text[ turkish ] = "Dosya format hatas $(ARG1)(sat齬, s黷un) bulundu"; Text[ language_user1 ] = " "; Text[ catalan ] = "S'ha trobat un error en el format de l'arxiu a $(ARG1)(fila, col.)"; - Text[ finnish ] = "Tiedostomuotovirhe ilmeni kohteessa $(ARG1)(rivi,sarake)"; + Text[ finnish ] = "Tiedostomuotovirhe ilmeni kohteessa $(ARG1)(rivi,sarake)."; Text[ thai ] = "喔炧笟喔｀腹喔涏箒喔氞笟喙佮笩喙夃浮喔溹复喔斷笧喔ム覆喔斷笚喔掂箞 $(ARG1)(喙佮笘喔,喔勦腑喔ム副喔∴笝喙)"; }; String ERR_CODE ( ERRCODE_CLASS_READ , ERR_SWG_NEW_VERSION ) @@ -514,13 +514,13 @@ Resource RID_SW_ERRHDL Text [ italian ] = "Il file stato creato da una versione pi recente" ; Text [ spanish ] = "El archivo se escribi en una versi髇 m醩 nueva" ; Text [ french ] = "Ce fichier a 閠 cr殚 l'aide d'une version plus r閏ente" ; - Text [ dutch ] = "Bestand werd onder een nieuwere versie opgeslagen" ; + Text [ dutch ] = "Bestand is onder een nieuwere versie opgeslagen" ; Text [ swedish ] = "Filen har skrivits i en nyare version" ; Text [ danish ] = "Filen er blevet skrevet af en nyere version" ; Text [ portuguese ] = "O ficheiro foi escrito numa vers鉶 mais moderna" ; Text [ portuguese_brazilian ] = "Datei wurde von einer neueren Version geschrieben" ; Text[ chinese_simplified ] = "鏂囦欢宸茬粡鐢变竴涓柊鐗堟湰鏇存柊"; - Text[ russian ] = "脏殡 磬镨襦 眍忸 忮瘃梃"; + Text[ russian ] = "脏殡 玎镨襦 犷脲 眍忸 忮瘃梃"; Text[ polish ] = "Plik zosta zapisany w nowszej wersji"; Text[ japanese ] = "銉曘偂銈ゃ儷銇柊銇椼亜銉愩兗銈搞儳銉炽仹鏇搞亱銈屻仸銇勩伨銇"; Text[ chinese_traditional ] = "妾旀宸茬稉琚竴鍊嬫柊鐗堟湰鏇存柊"; @@ -539,9 +539,9 @@ Resource RID_SW_ERRHDL TEXT [ English ] = "This isn't a WinWord97 file" ; TEXT[ english_us ] = "This is not a WinWord97 file"; TEXT[ portuguese ] = "N鉶 um ficheiro WinWord97"; - TEXT[ russian ] = "泥眄 羿殡 礤 怆弪 羿殡铎 WinWord97"; + TEXT[ russian ] = "泥眄 羿殡 礤 怆弪 羿殡铎 WinWor"; TEXT[ greek ] = "燥 狁麇唢 狨酎 溴 暹磲 酏痫 WinWord97"; - TEXT[ dutch ] = "Dit is geen WinWord97 bestand"; + TEXT[ dutch ] = "Dit is geen WinWord97-bestand"; TEXT[ french ] = "Il ne s'agit pas d'un fichier WinWord97 !"; TEXT[ spanish ] = "El archivo no es de WinWord97"; TEXT[ italian ] = "Il file non nel formato WinWord97"; @@ -550,7 +550,7 @@ Resource RID_SW_ERRHDL TEXT[ polish ] = "To nie jest plik WinWord97"; TEXT[ portuguese_brazilian ] = "This isn't a WinWord97 file"; TEXT[ japanese ] = "銇撱倢銇 WinWord97 銉曘偂銈ゃ儷銇с伅銇傘倞銇俱仜銈"; - TEXT[ korean ] = "鞚 韺岇澕鞚 WinWord97韺岇澕鞚 鞎勲嫏雼堧嫟"; + TEXT[ korean ] = "鞚 韺岇澕鞚 WinWord97 韺岇澕鞚 鞎勲嫏雼堧嫟"; TEXT[ chinese_simplified ] = "杩欎釜鏂囦欢涓嶆槸涓涓 WinWord97 鏂囦欢"; TEXT[ chinese_traditional ] = "閫欎笉鏄 WinWord97 妾旀"; TEXT[ turkish ] = "This isn't a WinWord97 file"; @@ -565,9 +565,9 @@ Resource RID_SW_ERRHDL TEXT [ English ] = "File format error in sub-document $(ARG1) at $(ARG2)(row,col)" ; TEXT[ english_us ] = "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col)"; TEXT[ portuguese ] = "Erro de formato no sub-documento $(ARG1) do ficheiro, na posi玢o $(ARG2)(linha,coluna)"; - TEXT[ russian ] = " 鬣耱 漕牦戾眚 $(ARG1) 镱玷鲨 $(ARG2)(耱痤赅, 觐腩黻)钺磬痼驽磬 铠栳赅 纛痨囹."; + TEXT[ russian ] = "硒栳赅 纛痨囹 羿殡 镱滗铌箪屙蝈 $(ARG1) 镱玷鲨 $(ARG2)(耱痤赅, 耱铍徨)."; TEXT[ greek ] = "彭麸疬篝珀 蓓 篥茈灬 祜聆镳镞珞珧 麸 狁麇唢 篝 綮揿 赍殪蓓秕 $(ARG1) 篝 栎箸 $(ARG2)(泷犰燹, 篝揠)"; - TEXT[ dutch ] = "Fout in formaat in subdocument $(ARG1) op positie $(ARG2)(rij,kolom)"; + TEXT[ dutch ] = "Indelingsfout in subdocument $(ARG1) op positie $(ARG2)(rij,kolom)"; TEXT[ french ] = "Erreur de format dans le sous-document $(ARG1), position $(ARG2)(ligne,colonne), du fichier."; TEXT[ spanish ] = "En el documento parcial $(ARG1) del archivo existe un error de formato en la posici髇 $(ARG2)(fila,columna)"; TEXT[ italian ] = "Errore di formato nel sottodocumento $(ARG1) del file nel punto $(ARG2)(riga,colonna)"; @@ -576,13 +576,13 @@ Resource RID_SW_ERRHDL TEXT[ polish ] = "Wykryto b彻d w formacie dokumentu podrz阣nego $(ARG1) na pozycji $(ARG2)(wiersz, kolumna)"; TEXT[ portuguese_brazilian ] = "File format error in sub-document $(ARG1) at $(ARG2)(row,col)"; TEXT[ japanese ] = "銉曘偂銈ゃ儷銇 $(ARG2)(琛屻佸垪)銇亗銈嬮儴鍒嗐儔銈儱銉°兂銉 $(ARG1) 銇浉寮忋偍銉┿兗銇岃銇ゃ亱銈娿伨銇椼仧銆"; - TEXT[ korean ] = "韺岇澕鞚 $(ARG2)(頄, 鞐)鞙勳箻鞐 鞛堧姅 攵攵 氍胳劀 $(ARG1)鞚 順曥嫕 鞓る 氚滉铂"; + TEXT[ korean ] = "韺岇澕鞚 $(ARG2)(頄, 鞐)鞙勳箻鞐 鞛堧姅 攵攵 氍胳劀 $(ARG1)鞚 靹滌嫕 鞓る毳 氚滉铂頄堨姷雼堧嫟."; TEXT[ chinese_simplified ] = "鍙戠幇鏂囦欢鐨勫瓙鏂囨。$(ARG1)鍐呭惈閿欒锛屼綅缃湪 $(ARG2)(琛,鍒)"; TEXT[ chinese_traditional ] = "鐧肩従妾旀鐨勫瓙鏂囦欢$(ARG1)鍏у惈閷锛屼綅缃湪 $(ARG2)(琛,娆)"; TEXT[ turkish ] = "File format error in sub-document $(ARG1) at $(ARG2)(row,col)"; TEXT[ arabic ] = "File format error in sub-document $(ARG1) at $(ARG2)(row,col)"; TEXT[ catalan ] = "S'ha descobert un error de format en el fitxer en el subdocument $(ARG1) fins al $(ARG2)(fila, col.)"; - TEXT[ finnish ] = "Tiedoston aliasiakirjan $(ARG1) kohdassa $(ARG2)(rivi,sarake) havaittiin muotoiluvirhe"; + TEXT[ finnish ] = "Tiedoston aliasiakirjan $(ARG1) kohdassa $(ARG2)(rivi,sarake) havaittiin muotoiluvirhe."; TEXT[ thai ] = "喔勦箟喔權笧喔氞福喔灌笡喙佮笟喔氞笢喔脆笖喔炧弗喔侧笖喙冟笝喙佮笩喙夃浮喙冟笝喙喔竵喔覆喔｀涪喙堗腑喔 $(ARG1) 喔椸傅喙 $(ARG2)(喙佮笘喔,喔勦腑喔ム副喔∴笝喙)"; }; // Export-Errors @@ -598,7 +598,7 @@ Resource RID_SW_ERRHDL TEXT [ danish ] = "Fejl under skrivning af filen " ; TEXT [ french ] = "Erreur d'閏riture du fichier " ; TEXT [ swedish ] = "Fel vid skrivning av fil " ; - TEXT [ dutch ] = "Fout bij het schrijven van het bestand " ; + TEXT [ dutch ] = "Fout bij schrijven van bestand" ; TEXT [ spanish ] = "Error al escribir el archivo " ; TEXT [ english_us ] = "Error writing file " ; TEXT[ chinese_simplified ] = "鍐欏叆鏂囦欢鏃跺彂鐢熼敊璇 "; @@ -621,7 +621,7 @@ Resource RID_SW_ERRHDL Text [ dutch ] = "Het AutoTekst-document heeft de verkeerde versie" ; Text [ english_us ] = "Wrong AutoText document version" ; Text [ italian ] = "Il documento di testo automatico presenta una versione errata" ; - Text [ spanish ] = "Versi髇 err髇ea del documento de AutoTexto" ; + Text [ spanish ] = "Versi髇 del documento de texto autom醫ico err髇ea" ; Text [ french ] = "La version de l' AutoTexte utilis閑 est incorrecte" ; Text [ swedish ] = "AutoTextdokumentet har fel version" ; Text [ danish ] = "Forkert AutoTekst dokumentversion" ; @@ -634,7 +634,7 @@ Resource RID_SW_ERRHDL Text[ chinese_traditional ] = "閫欏嬭嚜鍕曞湒鏂囬泦鏂囦欢鐗堟湰鐒℃晥"; Text[ arabic ] = "耪锨 吻仄 徙邮湎 轻湔 轻梳耷祈"; Text[ greek ] = "塑栾 蓐滹箸 麸 邈泷荟秕 刘麸叔殪蓓秕"; - Text[ korean ] = "韹毽 鞛愲彊韰嶌姢韸 氍胳劀 氩勳爠"; + Text[ korean ] = "鞛橂霅 鞛愲彊 韰嶌姢韸 氍胳劀 氩勳爠"; Text[ turkish ] = "Otomatik metin belgesi s黵黰 yanl"; Text[ language_user1 ] = " "; Text[ catalan ] = "Versi incorrecta del document d'Autotext"; @@ -655,7 +655,7 @@ Resource RID_SW_ERRHDL Text [ portuguese ] = " imposs韛el criar o documento" ; Text [ portuguese_brazilian ] = "Das Dokument kann nicht angelegt werden" ; Text[ chinese_simplified ] = "鏃犳硶鐢熸垚杩欎釜鏂囨。銆"; - Text[ russian ] = "念牦戾眚 耦玟囹 礤忸珈铈眍"; + Text[ russian ] = "湾忸珈铈眍 耦玟囹 漕牦戾眚"; Text[ polish ] = "Dokumentu nie mo縩a utworzy"; Text[ japanese ] = "銇撱伄銉夈偔銉ャ儭銉炽儓銇綔鎴愩仹銇嶃伨銇涖倱銆"; Text[ chinese_traditional ] = "鐒℃硶寤虹珛閫欏嬫枃浠"; @@ -680,11 +680,11 @@ Resource RID_SW_ERRHDL TEXT [ danish ] = "Fejl under l鎠ning af midlertidig fil" ; TEXT [ french ] = "Erreur de lecture du fichier temporaire" ; TEXT [ swedish ] = "Fel vid l鋝ning av tempor鋜 fil" ; - TEXT [ dutch ] = "Fout bij het lezen van tijdelijke bestanden" ; + TEXT [ dutch ] = "Fout bij lezen tijdelijke bestanden" ; TEXT [ spanish ] = "Error al leer el archivo temporal" ; TEXT [ english_us ] = "Error reading temporary file" ; TEXT[ chinese_simplified ] = "鍦ㄨ鍙栨殏鏃舵枃浠舵椂鍙戠敓閿欒"; - TEXT[ russian ] = "硒栳赅 镳 黩屙梃 怵屐屙眍泐 羿殡"; + TEXT[ russian ] = "硒栳赅 黩屙 怵屐屙眍泐 羿殡"; TEXT[ polish ] = "B彻d w odczytywaniu pliku tymczasowego"; TEXT[ japanese ] = "銉嗐兂銉濄儵銉儠銈°偆銉銇垮彇銈娿伄闅涖伄銈ㄣ儵銉"; TEXT[ chinese_traditional ] = "璁鍙栨毇鏅傛獢妗堟檪鐧肩敓閷"; @@ -729,7 +729,7 @@ Resource RID_SW_ERRHDL TEXT [ English ] = "Error in writing sub-document $(ARG1)" ; TEXT[ english_us ] = "Error in writing sub-document $(ARG1)"; TEXT[ portuguese ] = "Erro ao escrever o sub-documento $(ARG1)"; - TEXT[ russian ] = "硒栳赅 镳 磬镨襦龛 鬣耱 漕牦戾眚 $(ARG1)"; + TEXT[ russian ] = "硒栳赅 玎镨耔 镱滗铌箪屙蜞 $(ARG1)"; TEXT[ greek ] = "遇茈灬 赆糗 翮 邈泷狯 麸 綮揿狒矧 麸 邈泷荟秕 $(ARG1)"; TEXT[ dutch ] = "Fout bij schrijven van subdocument $(ARG1)"; TEXT[ french ] = "Erreur d'閏riture dans le sous-document $(ARG1)"; @@ -746,7 +746,7 @@ Resource RID_SW_ERRHDL TEXT[ turkish ] = "Error in writing sub-document $(ARG1)"; TEXT[ arabic ] = "Error in writing sub-document $(ARG1)"; TEXT[ catalan ] = "S'ha produ飔 un error en escriure el subdocument $(ARG1)"; - TEXT[ finnish ] = "Aliasiakirjaan $(ARG1) kirjoitettaessa on ilmennyt virhe"; + TEXT[ finnish ] = "Aliasiakirjaan $(ARG1) kirjoitettaessa on ilmennyt virhe."; TEXT[ thai ] = "喔傕箟喔笢喔脆笖喔炧弗喔侧笖喙冟笝喔佮覆喔｀箑喔傕傅喔⑧笝喙喔竵喔覆喔｀涪喙堗腑喔 $(ARG1)"; }; // Import-/Export-Errors @@ -762,17 +762,17 @@ Resource RID_SW_ERRHDL TEXT [ danish ] = "Intern fejl i %PRODUCTNAME Writer-filformatet" ; TEXT [ french ] = "Erreur interne dans le format de fichier %PRODUCTNAME Writer" ; TEXT [ swedish ] = "Internt fel i %PRODUCTNAME Writer-filformatet" ; - TEXT [ dutch ] = "Interne fout in %PRODUCTNAME Writer bestandsformaat" ; + TEXT [ dutch ] = "Interne fout in %PRODUCTNAME Writer-bestandsindeling" ; TEXT [ spanish ] = "Error interno en el formato de archivo de %PRODUCTNAME Writer" ; TEXT [ english_us ] = "Internal error in %PRODUCTNAME Writer file format" ; TEXT[ chinese_simplified ] = "%PRODUCTNAME Writer 鏂囦欢鏍煎紡鍚湁鍐呴儴閿欒"; - TEXT[ russian ] = "硒栳赅 忭篁痂 纛痨囹 羿殡 %PRODUCTNAME Writer"; + TEXT[ russian ] = "马篁疱眄 铠栳赅 纛痨囹 羿殡 %PRODUCTNAME Writer"; TEXT[ polish ] = "Wewn阾rzny b彻d w formacie pliku %PRODUCTNAME Writer"; TEXT[ japanese ] = "%PRODUCTNAME Writer 銉曘偂銈ゃ儷鏇稿紡銇唴閮ㄣ偍銉┿兗"; TEXT[ chinese_traditional ] = "%PRODUCTNAME Writer 妾旀鏍煎紡鍚湁鍏ч儴閷"; TEXT[ arabic ] = "拖 呜 锨吾 蓓 输禹 汜 %PRODUCTNAME Writer"; TEXT[ greek ] = "朋羼殛 篥茈灬 篝 祜聆 狁麇唢 麸 %PRODUCTNAME Writer"; - TEXT[ korean ] = "%PRODUCTNAME Writer 韺岇澕靹滌嫕鞚 雮措秬 鞓る"; + TEXT[ korean ] = "%PRODUCTNAME Writer 韺岇澕 靹滌嫕鞚 雮措秬 鞓る"; TEXT[ turkish ] = "Dahili %PRODUCTNAME Writer dosyas format hatas"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "S'ha produ飔 un error intern en el format del %PRODUCTNAME Writer"; @@ -790,17 +790,17 @@ Resource RID_SW_ERRHDL TEXT [ danish ] = "Intern fejl i %PRODUCTNAME Writer-filformatet" ; TEXT [ french ] = "Erreur interne dans le format de fichier %PRODUCTNAME Writer" ; TEXT [ swedish ] = "Internt fel i %PRODUCTNAME Writer-filformatet" ; - TEXT [ dutch ] = "Interne fout in %PRODUCTNAME Writer bestandsformaat" ; + TEXT [ dutch ] = "Interne fout in %PRODUCTNAME Writer-bestandsindeling" ; TEXT [ spanish ] = "Error interno en el formato de archivo de %PRODUCTNAME Writer" ; TEXT [ english_us ] = "Internal error in %PRODUCTNAME Writer file format" ; TEXT[ chinese_simplified ] = "%PRODUCTNAME Writer 鏂囦欢鏍煎紡鍚湁鍐呴儴閿欒"; - TEXT[ russian ] = "硒栳赅 忭篁痂 纛痨囹 羿殡 %PRODUCTNAME Writer"; + TEXT[ russian ] = "马篁疱眄 铠栳赅 纛痨囹 羿殡 %PRODUCTNAME Writer"; TEXT[ polish ] = "Wewn阾rzny b彻d w formacie pliku %PRODUCTNAME Writer"; TEXT[ japanese ] = "%PRODUCTNAME Writer 銉曘偂銈ゃ儷鏇稿紡銇唴閮ㄣ偍銉┿兗"; TEXT[ chinese_traditional ] = "%PRODUCTNAME Writer 妾旀鏍煎紡鍚湁鍏ч儴閷"; TEXT[ arabic ] = "拖 呜 锨吾 蓓 输禹 汜 %PRODUCTNAME Writer"; TEXT[ greek ] = "朋羼殛 篥茈灬 篝 祜聆 狁麇唢 麸 %PRODUCTNAME Writer"; - TEXT[ korean ] = "%PRODUCTNAME Writer 韺岇澕靹滌嫕鞚 雮措秬 鞓る"; + TEXT[ korean ] = "%PRODUCTNAME Writer 韺岇澕 靹滌嫕鞚 雮措秬 鞓る"; TEXT[ turkish ] = "Dahili %PRODUCTNAME Writer dosyas format hatas"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "S'ha produ飔 un error intern en el format del fitxer %PRODUCTNAME Writer"; @@ -898,7 +898,7 @@ Resource RID_SW_ERRHDL TEXT [ italian ] = "Spazio su disco insufficiente" ; TEXT [ portuguese_brazilian ] = "N?o h? espa?o suficiente em disco" ; TEXT [ portuguese ] = "Espa鏾 do disco insuficiente" ; - TEXT [ finnish ] = "Levytila ei riit" ; + TEXT [ finnish ] = "Levytila ei riit." ; TEXT [ danish ] = "Ikke tilstr鎘kelig diskplads" ; TEXT [ french ] = "Espace insuffisant sur le disque" ; TEXT [ swedish ] = "Inte tillr鋍kligt med diskutrymme" ; @@ -940,7 +940,7 @@ Resource RID_SW_ERRHDL TEXT[ chinese_traditional ] = "W4W 杞夋彌鍣ㄧ櫦鐢熶笉鏄庨尟瑾ゃ"; TEXT[ arabic ] = "拖 呜 垌 阙焰 蓓 葆恃 W4W"; TEXT[ greek ] = "€睐篝 篥茈灬 篝 鲞媵耧 W4W"; - TEXT[ korean ] = "W4W 頃勴劙鞐 鞎岆牑鞝 鞛堨 鞎婌潃 鞓る"; + TEXT[ korean ] = "W4W 頃勴劙鞐 鞎 靾 鞐嗠姅 鞓る"; TEXT[ turkish ] = "W4W filtresinde bilinmeyen hata"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Error desconegut al filtre W4W"; @@ -968,7 +968,7 @@ Resource RID_SW_ERRHDL TEXT[ chinese_traditional ] = "W4W 杞夋彌鍣ㄧ櫦鐢熶笉鏄庨尟瑾ゃ"; TEXT[ arabic ] = "拖 呜 垌 阙焰 蓓 葆恃 W4W"; TEXT[ greek ] = "€睐篝 篥茈灬 篝 鲞媵耧 W4W"; - TEXT[ korean ] = "W4W 頃勴劙鞐 鞎岆牑鞝 鞛堨 鞎婌潃 鞓る"; + TEXT[ korean ] = "W4W 頃勴劙鞐 鞎 靾 鞐嗠姅 鞓る"; TEXT[ turkish ] = "W4W filtresinde bilinmeyen hata"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Error desconegut al filtre W4W"; @@ -986,11 +986,11 @@ Resource RID_SW_ERRHDL TEXT [ danish ] = "Fejl under indl鎠ning af konverteren" ; TEXT [ french ] = "Erreur de chargement du convertisseur" ; TEXT [ swedish ] = "Fel vid laddning av konverteraren" ; - TEXT [ dutch ] = "Fout bij het laden van de converter" ; + TEXT [ dutch ] = "Fout bij laden van converter" ; TEXT [ spanish ] = "Error al cargar el convertidor" ; TEXT [ english_us ] = "Error loading converter" ; TEXT[ chinese_simplified ] = "鍦ㄨ浆鎹㈡椂鍙戠敓閿欒"; - TEXT[ russian ] = "硒栳赅 镳 玎沭箸赍 觐礅屦蝾疣"; + TEXT[ russian ] = "硒栳赅 玎沭箸觇 觐礅屦蝾疣"; TEXT[ polish ] = "B彻d podczas 砤dowania konwertera"; TEXT[ japanese ] = "銈炽兂銉愩兗銈胯銇胯炯銇夸腑銇偍銉┿兗"; TEXT[ chinese_traditional ] = "杓夊叆杞夋彌鍣ㄦ檪鐧肩敓閷"; @@ -1014,11 +1014,11 @@ Resource RID_SW_ERRHDL TEXT [ danish ] = "Fejl under indl鎠ning af konverteren" ; TEXT [ french ] = "Erreur de chargement du convertisseur" ; TEXT [ swedish ] = "Fel vid laddning av konverteraren" ; - TEXT [ dutch ] = "Fout bij het laden van de converter" ; + TEXT [ dutch ] = "Fout bij laden van converter" ; TEXT [ spanish ] = "Error al cargar el convertidor" ; TEXT [ english_us ] = "Error loading converter" ; TEXT[ chinese_simplified ] = "杞崲鏃跺彂鐢熼敊璇"; - TEXT[ russian ] = "硒栳赅 镳 玎沭箸赍 觐礅屦蝾疣"; + TEXT[ russian ] = "硒栳赅 玎沭箸觇 觐礅屦蝾疣"; TEXT[ polish ] = "B彻d podczas 砤dowania konwertera"; TEXT[ japanese ] = "銈炽兂銉愩兗銈胯銇胯炯銇夸腑銇偍銉┿兗"; TEXT[ chinese_traditional ] = "杓夊叆杞夋彌鍣ㄦ檪鐧肩敓閷"; @@ -1034,7 +1034,7 @@ Resource RID_SW_ERRHDL { TEXT = "$(ARG1) hat sich ge鋘dert" ; TEXT [ English ] = "$(ARG1) has changed" ; - Text [ dutch ] = "$(ARG1) is veranderd" ; + Text [ dutch ] = "$(ARG1) is gewijzigd" ; Text [ english_us ] = "$(ARG1) has changed" ; Text [ italian ] = "$(ARG1) cambiato" ; Text [ spanish ] = "$(ARG1) se ha modificado" ; @@ -1054,7 +1054,7 @@ Resource RID_SW_ERRHDL Text[ turkish ] = "$(ARG1) de餴⺶i"; Text[ language_user1 ] = " "; Text[ catalan ] = "$(ARG1) ha canviat"; - Text[ finnish ] = "Kohde $(ARG1) on muuttunut"; + Text[ finnish ] = "Kohde $(ARG1) on muuttunut."; Text[ thai ] = "喙喔涏弗喔掂箞喔⑧笝 $(ARG1) "; }; String ERR_CODE ( ERRCODE_CLASS_PATH , ERR_AUTOPATH_ERROR ) @@ -1077,11 +1077,11 @@ Resource RID_SW_ERRHDL Text[ chinese_traditional ] = "$(ARG1) 涓嶅瓨鍦"; Text[ arabic ] = "$(ARG1) 垌 沔替"; Text[ greek ] = "$(ARG1) 溴 躔荞麇"; - Text[ korean ] = "$(ARG1)鞚(臧) 鞐嗢姷雼堧嫟."; + Text[ korean ] = "$(ARG1)鞚(臧) 鞐嗢姷雼堧嫟"; Text[ turkish ] = "$(ARG1) mevcut de餴l"; Text[ language_user1 ] = " "; Text[ catalan ] = "$(ARG1) no existeix"; - Text[ finnish ] = "Kohdetta $(ARG1) ei ole"; + Text[ finnish ] = "Kohdetta $(ARG1) ei ole olemassa."; Text[ thai ] = "喙勦浮喙堗浮喔 $(ARG1) 喔涪喔灌箞"; }; String ERR_CODE ( ERRCODE_CLASS_NONE , ERR_TBLSPLIT_ERROR ) @@ -1099,7 +1099,7 @@ Resource RID_SW_ERRHDL Text [ portuguese ] = " imposs韛el dividir mais as c閘ulas" ; Text [ portuguese_brazilian ] = "Zellen k?nen nicht mehr geteilt werden" ; Text[ chinese_simplified ] = "鏃犳硶鍒嗛殧鍗曞厓鏍"; - Text[ russian ] = "朽玑栩 麇殛 犷朦 礤忸珈铈眍"; + Text[ russian ] = "湾忸珈铈眍 溧脲 疣玑桠囹 麇殛"; Text[ polish ] = "Kom髍ek nie mo縩a podzieli"; Text[ japanese ] = "銇撱倢浠ヤ笂銈汇儷銈掑垎鍓层仹銇嶃伨銇涖倱"; Text[ chinese_traditional ] = "鐒℃硶鍒嗛枊鍎插瓨鏍"; @@ -1109,7 +1109,7 @@ Resource RID_SW_ERRHDL Text[ turkish ] = "H點reler daha fazla b鰈黱emiyor"; Text[ language_user1 ] = " "; Text[ catalan ] = "Les cel.les no es poden dividir m閟"; - Text[ finnish ] = "Soluja ei voi jakaa enemp滗"; + Text[ finnish ] = "Soluja ei voi jakaa enemp滗."; Text[ thai ] = "喙勦浮喙堗釜喔侧浮喔侧福喔栢箒喔⑧竵喙喔嬥弗喔ム箤喙喔炧复喙堗浮喙喔曕复喔∴箘喔斷箟"; }; String ERR_CODE ( ERRCODE_CLASS_NONE , ERR_TBLINSCOL_ERROR ) @@ -1127,7 +1127,7 @@ Resource RID_SW_ERRHDL Text [ portuguese ] = "Imposs韛el inserir colunas adicionais" ; Text [ portuguese_brazilian ] = "weitere Spalten k?nen nicht eingef?t werden" ; Text[ chinese_simplified ] = "鏃犳硶鎻掑叆鍏跺畠鐨勫垪"; - Text[ russian ] = "念镱腠栩咫 耱铍狯 怦蜞忤螯 礤忸珈铈眍"; + Text[ russian ] = "湾忸珈铈眍 怦蜞忤螯 漕镱腠栩咫 耱铍狯"; Text[ polish ] = "dodatkowych kolumn nie mo縩a wstawi"; Text[ japanese ] = "杩藉姞銇垪銈掓尶鍏ャ仹銇嶃伨銇涖倱"; Text[ chinese_traditional ] = "鐒℃硶鎻掑叆鍏跺畠娆"; @@ -1137,7 +1137,7 @@ Resource RID_SW_ERRHDL Text[ turkish ] = "Daha fazla s黷un eklenemiyor"; Text[ language_user1 ] = " "; Text[ catalan ] = "No es poden inserir columnes addicionals"; - Text[ finnish ] = "Sarakkeita ei voi lis鋞 enemp滗"; + Text[ finnish ] = "Sarakkeita ei voi lis鋞 enemp滗."; Text[ thai ] = "喙勦浮喙堗釜喔侧浮喔侧福喔栢箒喔椸福喔佮竸喔弗喔编浮喔權箤喙喔炧复喙堗浮喙喔曕复喔∴箘喔斷箟"; }; String ERR_CODE ( ERRCODE_CLASS_NONE , ERR_TBLDDECHG_ERROR ) @@ -1152,9 +1152,9 @@ Resource RID_SW_ERRHDL Text [ italian ] = "In una tabella collegata non sono ammesse modifiche alla struttura." ; Text [ spanish ] = "No se puede modificar la estructura de una tabla vinculada" ; Text [ french ] = "La structure d'un tableau ne peut pas 阾re modifi閑 s'il a fait l'objet d'un lien" ; - Text [ dutch ] = "Bij een gekoppelde tabel mag de structuur niet worden veranderd." ; + Text [ dutch ] = "Bij een gekoppelde tabel mag de structuur niet worden gewijzigd." ; Text[ chinese_simplified ] = "涓嶈兘鏇存敼涓涓摼鎺ョ殑琛ㄦ牸缁撴瀯"; - Text[ russian ] = "如戾螯 耱痼牝箴 疋玎眄铋 蜞犭桷 礤朦"; + Text[ russian ] = "湾忸珈铈眍 桤戾龛螯 耱痼牝箴 疋玎眄铋 蜞犭桷"; Text[ polish ] = "Przy po彻czonej tabeli nie wolno zmienia jej struktury"; Text[ japanese ] = "銉兂銈仌銈屻仧琛ㄣ伄妲嬮犮伅澶夋洿銇с亶銇俱仜銈"; Text[ chinese_traditional ] = "涓嶈兘璁婃洿涓鍊嬮ｇ祼鐨勮〃鏍肩祼妲"; @@ -1164,7 +1164,7 @@ Resource RID_SW_ERRHDL Text[ turkish ] = "Ba餷ant齦 bir tablonun yap齭 de餴⺶irilmez"; Text[ language_user1 ] = " "; Text[ catalan ] = "No es pot modificar l'estructura d'una taula enlla鏰da"; - Text[ finnish ] = "Linkitetyn taulukon rakennetta ei voi muokata"; + Text[ finnish ] = "Linkitetyn taulukon rakennetta ei voi muokata."; Text[ thai ] = "喙勦浮喙堗釜喔侧浮喔侧福喔栢笖喔编笖喙佮笡喔ム竾喙佮竵喙夃箘喔傕箓喔勦福喔囙釜喔｀箟喔侧竾喔傕腑喔囙笗喔侧福喔侧竾喔椸傅喙堗箑喔娻阜喙堗腑喔∴箓喔⑧竾喙勦笖喙"; }; // -------------------- Warnings ----------------------------------- @@ -1176,23 +1176,23 @@ Resource RID_SW_ERRHDL Text [ italian ] = "Non stato possibile caricare alcun disegno" ; Text [ spanish ] = "No se pudo cargar ning鷑 dibujo" ; Text [ french ] = "Impossible de charger des dessins" ; - Text [ dutch ] = "Er konden geen tekeningen worden geladen" ; + Text [ dutch ] = "Er kunnen geen tekeningen worden geladen" ; Text [ swedish ] = "Det gick inte att ladda n錱ra teckningar" ; Text [ danish ] = "Det var ikke muligt at indl鎠e nogen tegninger" ; Text [ portuguese ] = "Foi imposs韛el carregar desenhos" ; Text [ portuguese_brazilian ] = "Es konnten keine Zeichnungen geladen werden" ; Text[ chinese_simplified ] = "鏃犳硶瑁呭叆鍥惧儚"; - Text[ russian ] = "青沭箸赅 痂耋黻钼 礤忸珈铈磬"; + Text[ russian ] = "湾忸珈铈眍 镳铟羼螯 痂耋黻"; Text[ polish ] = "痑dne rysunki nie mog硑 zosta za砤dowane"; Text[ japanese ] = "鍥冲舰鎻忕敾銇銇胯炯銇裤仹銇嶃伨銇涖倱銇с仐銇"; Text[ chinese_traditional ] = "鐒℃硶杓夊叆褰卞儚"; Text[ arabic ] = "授醒 释沩 庙 延驺鞘"; Text[ greek ] = "腻 摁犴 漉磲艮 鳇耵 篦邃啭"; - Text[ korean ] = "攴鸽鞚 搿滊摐頃橃 氇豁枅鞀惦媹雼."; + Text[ korean ] = "攴鸽Μ旮半ゼ 搿滊摐頃橃 氇豁枅鞀惦媹雼."; Text[ turkish ] = "莍zim y黭lenemedi"; Text[ language_user1 ] = " "; Text[ catalan ] = "No es poden llegir els dibuixos "; - Text[ finnish ] = "Piirustuksia ei voitu lukea"; + Text[ finnish ] = "Piiroksia ei voitu lukea"; Text[ thai ] = "喙勦浮喙堗釜喔侧浮喔侧福喔栢腑喙堗覆喔權竵喔侧福喔о覆喔斷福喔灌笡喙勦笖喙"; }; String WARN_CODE ( ERRCODE_CLASS_READ , WARN_WW6_FASTSAVE_ERR ) @@ -1211,11 +1211,11 @@ Resource RID_SW_ERRHDL TEXT [ danish ] = "Denne fil er blevet gemt med WinWord-indstillingen 'Gem hurtigt'. Deaktiver venligst indstillingen 'Gem hutigt' og gem filen igen med WinWord." ; TEXT [ french ] = "Ce fichier a 閠 enregistr l'aide de l'option 'Enregistrement rapide' de WinWord. Veuillez d閟activer cette option et utiliser WinWord pour enregistrer nouveau le fichier." ; TEXT [ swedish ] = "Denna fil 鋜 sparad med WinWord-alternativet 'snabbspara'. St鋘g av WinWord-alternativet 'Till錿 snabbspara' och spara filen med WinWord igen" ; - TEXT [ dutch ] = "Dit bestand werd met de WinWord optie \"Snel opslaan\" opgeslagen. Schakel a.u.b in WinWord de optie \"Snel opslaan toestaan\" uit en sla het bestand opnieuw op met WinWord." ; + TEXT [ dutch ] = "Dit bestand is met de WinWord optie \"Snel opslaan\" opgeslagen. Schakel a.u.b. in WinWord de optie \"Snel opslaan toestaan\" uit en sla het bestand opnieuw op met WinWord." ; TEXT [ spanish ] = "Este archivo ha sido guardado con la opci髇 de WinWord 'guardar r醦idamente' . Por favor desactive en WinWord la opci髇 'permitir guardar r醦idamente' y guarde nuevamente el archivo con WinWord" ; - TEXT [ english_us ] = "This file was saved with WinWord in 'Fast Save' mode. Please uncheck the option 'Allow Fast Saves' and save the file again." ; + TEXT [ english_us ] = "This file was saved with WinWord in 'Fast Save' mode. Please unmark the WinWord option 'Allow Fast Saves' and save the file again." ; TEXT[ chinese_simplified ] = "杩欎釜鏂囦欢瀛樼洏閲囩敤鐨勬槸 WinWord 閫夐」 '蹇熶繚瀛'鏂瑰紡銆傝璁惧畾涓嶄娇鐢ㄨ繖涓夐」锛岀劧鍚庡啀閲嶆柊瀛樼洏杩欎釜鏂囦欢銆"; - TEXT[ russian ] = "蒡铗 羿殡 耦躔囗屙 镳 镱祛 镟疣戾蝠 WinWord '聋耱痤 耦躔囗屙桢'. 项驵塍轳蜞, 铗觌栩 镟疣戾蝠 '朽琊屮栩 猁耱痤 耦躔囗屙桢' 玎眍忸 耦躔囗栩 铗 羿殡 WinWord."; + TEXT[ russian ] = "蒡铗 羿殡 耦躔囗屙 桤 WinWord 疱骅戾 '聋耱痤 耦躔囗屙桢'. 项驵塍轳蜞, 铗觌栩 镟疣戾蝠 '朽琊屮栩 猁耱痤 耦躔囗屙桢' 玎眍忸 耦躔囗栩 铗 羿殡 桤 WinWord."; TEXT[ polish ] = "Ten plik zosta zapisany za pomoc opcji WinWord 'Szybkie zapisywanie'. Prosz wy彻cz w WinWord opcj 'Dopu滄 szybkie zapisywanie' i zapisz plik ponownie w WinWord."; TEXT[ japanese ] = "銇撱伄銉曘偂銈ゃ儷銇乄inWord 銈儣銈枫儳銉炽岄珮閫熶繚瀛樸嶃仹淇濆瓨銇曘倢銇︺亜銇俱仚銆俉inWord 銈儣銈枫儳銉炽岄珮閫熶繚瀛樸嶃倰銈儠銇仐銇︺亱銈夈併儠銈°偆銉倰 WinWord 銇т繚瀛樸仐銇亰銇椼仸銇忋仩銇曘亜銆"; TEXT[ chinese_traditional ] = "鍎插瓨妾旀鎺＄敤鐨勬槸 WinWord 閬搁爡<蹇熷劜瀛>鏂瑰紡銆傝珛闂滈枆閫欏嬮伕闋咃紝鐒跺緦鍐嶉噸鏂板劜瀛橀欏嬫獢妗堛"; @@ -1231,7 +1231,7 @@ Resource RID_SW_ERRHDL { TEXT = "Es konnten nicht alle Attribute gelesen werden" ; TEXT [ English ] = "Not all attributes could be read" ; - Text [ dutch ] = "Niet alle attributen konden worden ingelezen" ; + Text [ dutch ] = "Niet alle attributen kunnen worden ingelezen" ; Text [ english_us ] = "Not all attributes could be read" ; Text [ italian ] = "Non stato possibile leggere tutti gli attributi" ; Text [ spanish ] = "No se pudieron leer todos los atributos" ; @@ -1241,7 +1241,7 @@ Resource RID_SW_ERRHDL Text [ portuguese ] = "Foi imposs韛el ler todos os atributos" ; Text [ portuguese_brazilian ] = "Es konnten nicht alle Attribute gelesen werden" ; Text[ chinese_simplified ] = "鏃犳硶璇诲彇鎵鏈夌殑灞炴"; - Text[ russian ] = "埋 囹痂狍螓 镳铟栩囹 礤忸珈铈眍"; + Text[ russian ] = "湾忸珈铈眍 镳铟羼螯 怦 囹痂狍螓"; Text[ polish ] = "Nie wszystkie atrybuty mog硑 zosta odczytane"; Text[ japanese ] = "銇欍伖銇︺伄灞炴с倰瑾伩鍙栥倠銇撱仺銇仹銇嶃伨銇涖倱銇с仐銇"; Text[ chinese_traditional ] = "鐒℃硶璁鍙栨墍鏈夌殑灞"; @@ -1262,13 +1262,13 @@ Resource RID_SW_ERRHDL Text [ italian ] = "Non stato possibile scrivere tutti gli attributi" ; Text [ spanish ] = "No se pudieron grabar todos los atributos" ; Text [ french ] = "Impossible d'閏rire tous les attributs" ; - Text [ dutch ] = "Niet alle attributen konden worden geschreven" ; + Text [ dutch ] = "Niet alle attributen kunnen worden geschreven" ; Text [ swedish ] = "Det gick inte att skriva alla attribut" ; Text [ danish ] = "Det var ikke muligt at skrive alle attributter" ; Text [ portuguese ] = "Foi imposs韛el gravar todos os atributos" ; Text [ portuguese_brazilian ] = "Es konnten nicht alle Attribute geschrieben werden" ; Text[ chinese_simplified ] = "涓嶈兘鍐欏叆鎵鏈夌殑灞炴"; - Text[ russian ] = "埋 囹痂狍螓 玎镨襦螯 礤忸珈铈眍"; + Text[ russian ] = "湾忸珈铈眍 玎镨襦螯 怦 囹痂狍螓"; Text[ polish ] = "Nie wszystkie atrybuty mog硑 zosta zapisane"; Text[ japanese ] = "銇欍伖銇︺伄灞炴с倰瑷橀尣銇欍倠銇撱仺銇仹銇嶃伨銇涖倱銇с仐銇"; Text[ chinese_traditional ] = "涓嶈兘瀵叆鎵鏈夌殑灞"; @@ -1286,7 +1286,7 @@ Resource RID_SW_ERRHDL /* ### ACHTUNG: Neuer Text in Resource? Einige OLE-Objekte konnten nur als Grafiken 黚ernommen werden : Einige OLE-Objekte konnten nur als Grafiken 砨ernommen werden */ TEXT = "Einige OLE-Objekte konnten nur als Grafiken 黚ernommen werden" ; TEXT [ English ] = "Some OLE Objects could only be loaded as graphics" ; - Text [ dutch ] = "Enkele OLE-objecten konden alleen als grafische objecten worden overgenomen" ; + Text [ dutch ] = "Enkele OLE-objecten kunnen alleen als grafische objecten worden overgenomen" ; Text [ english_us ] = "Some OLE objects could only be loaded as graphics" ; Text [ italian ] = "Alcuni oggetti OLE sono stati prelevati solo come immagini" ; Text [ spanish ] = "Algunos objetos OLE se pudieron incluir s髄o como im醙enes" ; @@ -1296,13 +1296,13 @@ Resource RID_SW_ERRHDL Text [ portuguese ] = "Alguns dos objectos OLE puderam ser apenas carregados como imagens" ; Text [ portuguese_brazilian ] = "Einige OLE-Objekte konnten nur als Grafiken ?ernommen werden" ; Text[ chinese_simplified ] = "涓浜 OLE 瀵硅薄鍙兘浠ュ浘鍍忔柟寮忚鍏"; - Text[ russian ] = "青沭箸赅 礤觐蝾瘥 钺牝钼 OLE 忸珈铈磬 蝾朦觐 赅麇耱忮 痂耋黻钼"; + Text[ russian ] = "青沭箸赅 礤觐蝾瘥 OLE 钺牝钼 忸珈铈磬 蝾朦觐 忤溴 痂耋黻钼"; Text[ polish ] = "Niekt髍e obiekty OLE mog zosta za砤dowane tylko jako grafiki"; Text[ japanese ] = "OLE 銈儢銈搞偋銈儓銇亜銇忋仱銇嬨伅鍥炽仺銇椼仸銇椼亱瑾伩杈笺倎銇俱仜銈撱"; Text[ chinese_traditional ] = "涓浜 OLE 鐗╀欢鍙兘浠ュ湒褰㈡柟寮忚杓"; Text[ arabic ] = "徙 磉 沅 轻沣咪 守软 融 咔其鞘 OLE 裴 哐渔闱"; Text[ greek ] = "体耖贶 犴糸赍哽屙 OLE 祓弩犴 磲 鲲耵稞 禳盹 泷狯殛"; - Text[ korean ] = "鞚茧秬 OLE 臧滌泊霌れ潃 攴鸽灅頂届溂搿滌劀毵 鞝侅毄霅 靾 鞛堨姷雼堧嫟."; + Text[ korean ] = "鞚茧秬 OLE 臧滌泊霌れ潃 攴鸽鞙茧靹滊 鞝侅毄霅 靾 鞛堨姷雼堧嫟."; Text[ turkish ] = "Baz OLE nesneleri yaln齴ca grafik olarak y黭lenebildi"; Text[ language_user1 ] = " "; Text[ catalan ] = "Alguns objectes OLE nom閟 s'han pogut incloure com a imatges"; @@ -1318,19 +1318,19 @@ Resource RID_SW_ERRHDL Text [ italian ] = "Alcuni oggetti OLE sono stati prelevati solo come immagini" ; Text [ spanish ] = "Algunos objetos OLE se pudieron incluir s髄o como im醙enes" ; Text [ french ] = "Certains objets OLE ont pu 阾re charg閟 uniquement sous forme d'images" ; - Text [ dutch ] = "Enkele OLE-objecten konden alleen als grafische objecten worden overgenomen" ; + Text [ dutch ] = "Enkele OLE-objecten kunnen alleen als grafische objecten worden overgenomen" ; Text [ swedish ] = "N錱ra OLE-objekt kunde bara 鰒ertas som grafik" ; Text [ danish ] = "Nogle OLE-objekter kunne kun overtages som grafik" ; Text [ portuguese ] = "Alguns dos objectos OLE foram carregados apenas como imagens" ; Text [ portuguese_brazilian ] = "Einige OLE-Objekte konnten nur als Grafiken ?ernommen werden" ; Text[ chinese_simplified ] = "涓浜 OLE 瀵硅薄鏃犳硶琚瓨鐩樹负鍥惧舰"; - Text[ russian ] = "青沭箸赅 礤觐蝾瘥 钺牝钼 OLE 忸珈铈磬 蝾朦觐 赅麇耱忮 痂耋黻钼"; + Text[ russian ] = "青沭箸赅 礤觐蝾瘥 OLE 钺牝钼 忸珈铈磬 蝾朦觐 忤溴 痂耋黻钼"; Text[ polish ] = "Niekt髍e obiekty OLE mog硑 zosta za砤dowane tylko jako grafiki"; Text[ japanese ] = "OLE 銈儢銈搞偋銈儓銇亜銇忋仱銇嬨伅銆佸洺銇ㄣ仐銇︺仐銇嬩繚瀛樸仹銇嶃伨銇涖倱銇с仐銇"; Text[ chinese_traditional ] = "涓浜 OLE 鐗╀欢鐒℃硶鍎插瓨鐐哄湒褰"; Text[ arabic ] = "徙 磉 沅 轻沣咪 守软 融 咔其鞘 OLE 裴 哐渔闱"; Text[ greek ] = "体耖贶 犴糸赍哽屙 OLE 祓弩犴 磲 鲲耵稞 禳盹 泷狯殛"; - Text[ korean ] = "鞚茧秬 OLE 臧滌泊霌れ潃 攴鸽灅頂届溂搿滌劀毵 鞝侅毄霅 靾 鞛堨姷雼堧嫟."; + Text[ korean ] = "鞚茧秬 OLE 臧滌泊霌れ潃 攴鸽鞙茧靹滊 鞝侅毄霅 靾 鞛堨姷雼堧嫟."; Text[ turkish ] = "Baz OLE nesneleri yaln齴ca grafik olarak y黭lenebildi"; Text[ language_user1 ] = " "; Text[ catalan ] = "Alguns objectes OLE nom閟 s'han pogut incloure com a imatges"; @@ -1342,7 +1342,7 @@ Resource RID_SW_ERRHDL /* ### ACHTUNG: Neuer Text in Resource? Dokument konnte nicht vollst鋘dig geladen werden : Dokument konnte nicht vollst鮪dig geladen werden */ TEXT = "Dokument konnte nicht vollst鋘dig geladen werden" ; TEXT [ English ] = "Document could not be loaded completely" ; - Text [ dutch ] = "Document kon niet volledig worden geladen" ; + Text [ dutch ] = "Document kan niet volledig worden geladen" ; Text [ english_us ] = "Document could not be completely loaded" ; Text [ italian ] = "Non stato possibile caricare il file completamente" ; Text [ spanish ] = "No se pudo cargar completamente el documento" ; @@ -1352,7 +1352,7 @@ Resource RID_SW_ERRHDL Text [ portuguese ] = "Foi imposs韛el carregar o documento completamente" ; Text [ portuguese_brazilian ] = "Dokument konnte nicht vollst?ndig geladen werden" ; Text[ chinese_simplified ] = "鏃犳硶瀹屽叏瑁呭叆鏂囨。"; - Text[ russian ] = "项腠铖螯 玎沭箸栩 漕牦戾眚 礤忸珈铈眍"; + Text[ russian ] = "湾忸珈铈眍 镱腠铖螯 玎沭箸栩 漕牦戾眚"; Text[ polish ] = "Dokument nie m骻 zosta ca砶owicie za砤dowany"; Text[ japanese ] = "銉夈偔銉ャ儭銉炽儓銈掑畬鍏ㄣ伀瑾伩杈笺伩銇с亶銇俱仜銈撱仹銇椼仧"; Text[ chinese_traditional ] = "鐒℃硶瀹屽叏杓夊叆鏂囦欢"; @@ -1374,13 +1374,13 @@ Resource RID_SW_ERRHDL Text [ italian ] = "Non stato possibile salvare il file completamente" ; Text [ spanish ] = "No se pudo guardar completamente el documento" ; Text [ french ] = "Le document n'a pas pu 阾re enregistr dans son int間ralit" ; - Text [ dutch ] = "Document kon niet volledig worden opgeslagen" ; + Text [ dutch ] = "Document kan niet volledig worden opgeslagen" ; Text [ swedish ] = "Det gick inte att spara dokumentet fullst鋘digt" ; Text [ danish ] = "Det var ikke muligt at gemme dokumentet helt" ; Text [ portuguese ] = "Foi imposs韛el guardar o documento completamente" ; Text [ portuguese_brazilian ] = "Dokument konnte nicht vollst?ndig gespeichert werden" ; Text[ chinese_simplified ] = "鏃犳硶瀹屾暣鍦板瓨鐩樻枃妗"; - Text[ russian ] = "项腠铖螯 耦躔囗栩 漕牦戾眚 礤忸珈铈眍"; + Text[ russian ] = "湾忸珈铈眍 镱腠铖螯 耦躔囗栩 漕牦戾眚"; Text[ polish ] = "Dokument nie m骻 zosta ca砶owicie zapisany"; Text[ japanese ] = "銉夈偔銉ャ儭銉炽儓銈掑畬鍏ㄣ伀淇濆瓨銇с亶銇俱仜銈撱仹銇椼仧"; Text[ chinese_traditional ] = "鐒℃硶瀹屾暣鍎插瓨鏂囦欢"; @@ -1399,9 +1399,9 @@ Resource RID_SW_ERRHDL Text [ English ] = "This HTML document contains %PRODUCTNAME Basic macros.\nThey were not saved because of the current export options." ; Text[ english_us ] = "This HTML document contains %PRODUCTNAME Basic macros.\nThey were not saved with the current export settings."; Text[ portuguese ] = "O documento HTML cont閙 macros %PRODUCTNAME Basic.\nEstas n鉶 foram guardadas com as defini珲es de exporta玢o activas."; - Text[ russian ] = "蒡铗 漕牦戾眚 HTML 耦溴疰栩 爨牮铖 %PRODUCTNAME Basic.\n雾 礤 耦躔囗桦桉 蝈牦扈 磬耱痤殛囔 耧铕蜞."; + Text[ russian ] = "蒡 忮-耱疣龛鲟 耦溴疰栩 爨牮铖 %PRODUCTNAME Basic.\n雾 礤 猁腓 耦躔囗屙 桤-玎 磬耱痤尻 箨噻囗睇 潆 耧铕蜞 漕牦戾眚钼."; Text[ greek ] = "燥 葶泷狯 HTML 疱耖蓣彘 灬犟镥眙镫蒡 麸 %PRODUCTNAME Basic.\n刘糨 溴 狃镨珀妪翮赆 戾 糸 赳蓣秕箦 聃桁唧彘 彘筢泫戕."; - Text[ dutch ] = "Dit HTML document bevat %PRODUCTNAME Basic-macro's.\nDeze konden niet worden opgeslagen met de actuele exportinstellingen."; + Text[ dutch ] = "Dit HTML-document bevat %PRODUCTNAME Basic-macro's.\nDeze kunnen niet worden opgeslagen met de huidige exportinstellingen."; Text[ french ] = "Le document HTML contient des macros %PRODUCTNAME Basic.\nCelles-ci n'ont pas 閠 enregistr閑s avec les param鑤res d'export actifs."; Text[ spanish ] = "El documento HTML contiene macros %PRODUCTNAME Basic.\nNo se guardaron con la configuraci髇 actual de exportaci髇."; Text[ italian ] = "Il documento HTML contiene macro %PRODUCTNAME Basic che\nnon sono state salvate con le impostazioni attuali di esportazione."; @@ -1426,7 +1426,7 @@ Resource RID_SW_ERRHDL TEXT [ English ] = "Error in writing sub-document $(ARG1)" ; TEXT[ english_us ] = "Error in writing sub-document $(ARG1)"; TEXT[ portuguese ] = "Erro ao escrever o sub-documento $(ARG1)"; - TEXT[ russian ] = "硒栳赅 镳 磬镨襦龛 鬣耱 漕牦戾眚 $(ARG1)"; + TEXT[ russian ] = "硒栳赅 玎镨耔 镱滗铌箪屙蜞 $(ARG1)"; TEXT[ greek ] = "遇茈灬 赆糗 翮 赆翎泷狯鲛 麸 綮揿狒矧 麸 赍殪蓓秕 $(ARG1)"; TEXT[ dutch ] = "Fout bij schrijven van subdocument $(ARG1)"; TEXT[ french ] = "Erreur d'閏riture dans le sous-document $(ARG1)"; @@ -1443,7 +1443,7 @@ Resource RID_SW_ERRHDL TEXT[ turkish ] = "Error in writing sub-document $(ARG1)"; TEXT[ arabic ] = "Error in writing sub-document $(ARG1)"; TEXT[ catalan ] = "S'ha produ飔 un error en escriure el subdocument $(ARG1)"; - TEXT[ finnish ] = "Aliasiakirjaan $(ARG1) kirjoitettaessa on ilmennyt virhe"; + TEXT[ finnish ] = "Aliasiakirjaan $(ARG1) kirjoitettaessa on ilmennyt virhe."; TEXT[ thai ] = "喔傕箟喔笢喔脆笖喔炧弗喔侧笖喙冟笝喔佮覆喔｀箑喔傕傅喔⑧笝喙喔竵喔覆喔｀涪喙堗腑喔 $(ARG1)"; }; String ERR_CODE ( ERRCODE_CLASS_WRITE , WARN_FORMAT_FILE_ROWCOL ) @@ -1452,9 +1452,9 @@ Resource RID_SW_ERRHDL TEXT [ English ] = "File format error in sub-document $(ARG1) at $(ARG2)(row,col)" ; TEXT[ english_us ] = "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col)"; TEXT[ portuguese ] = "Erro de formato no sub-documento $(ARG1) do ficheiro, na posi玢o(ARG2)(linha,coluna)"; - TEXT[ russian ] = " 鬣耱 漕牦戾眚 $(ARG1) 镱玷鲨 $(ARG2)(耱痤赅,觐腩黻)钺磬痼驽磬 铠栳赅 纛痨囹."; + TEXT[ russian ] = "硒栳赅 纛痨囹 羿殡 镱滗铌箪屙蝈 $(ARG1) 镱玷鲨 $(ARG2)(耱痤赅,镱玷鲨)."; TEXT[ greek ] = "彭麸疬篝珀 篥茈灬 祜聆镳镞珞珧 篝 狁麇唢 篝 綮揿 赍殪蓓秕 $(ARG1) 篝 栎箸 $(ARG2)(泷犰燹,篝揠)"; - TEXT[ dutch ] = "Fout in formaat in subdocument $(ARG1) op positie $(ARG2)(rij,kolom)"; + TEXT[ dutch ] = "Indelingsfout in subdocument $(ARG1) op positie $(ARG2)(rij,kolom)"; TEXT[ french ] = "Erreur de format dans le sous-document $(ARG1), position $(ARG2)(ligne,colonne), du fichier."; TEXT[ spanish ] = "En el documento parcial $(ARG1) del archivo existe un error de formato en la posici髇 $(ARG2)(fila,columna)"; TEXT[ italian ] = "Errore di formato nel sottodocumento $(ARG1) del file nel punto $(ARG2)(riga,colonna)"; @@ -1463,13 +1463,13 @@ Resource RID_SW_ERRHDL TEXT[ polish ] = "Wykryto b彻d w formacie dokumentu podrz阣nego $(ARG1) na pozycji $(ARG2)(wiersz, kolumna)"; TEXT[ portuguese_brazilian ] = "File format error in sub-document $(ARG1) at $(ARG2)(row,col)"; TEXT[ japanese ] = "銉曘偂銈ゃ儷銇 $(ARG2)(琛屻佸垪) 銇亗銈嬮儴鍒嗐儔銈儱銉°兂銉 $(ARG1) 銇浉寮忋偍銉┿兗銇岃銇ゃ亱銈娿伨銇椼仧銆"; - TEXT[ korean ] = "韺岇澕鞚 $(ARG2)(頄,鞐) 鞙勳箻鞐 鞛堧姅 攵攵 氍胳劀 $(ARG1)鞚 順曥嫕 鞓る 氚滉铂"; + TEXT[ korean ] = "韺岇澕鞚 $(ARG2)(頄,鞐) 鞙勳箻鞐 鞛堧姅 攵攵 氍胳劀 $(ARG1)鞚 靹滌嫕 鞓る毳 氚滉铂頄堨姷雼堧嫟."; TEXT[ chinese_simplified ] = "鍙戠幇鏂囦欢鐨勫瓙鏂囨。$(ARG1)鍐呭惈閿欒锛屼綅缃湪 $(ARG2)(琛,鍒)"; TEXT[ chinese_traditional ] = "鐧肩従妾旀鐨勫瓙鏂囦欢$(ARG1)鍏у惈閷锛屼綅缃湪 $(ARG2)(琛,娆)"; TEXT[ turkish ] = "File format error in sub-document $(ARG1) at $(ARG2)(row,col)"; TEXT[ arabic ] = "File format error in sub-document $(ARG1) at $(ARG2)(row,col)"; TEXT[ catalan ] = "S'ha descobert un error de format en el arxiu en el subdocument $(ARG1) fins al $(ARG2)(fila,col.)"; - TEXT[ finnish ] = "Tiedoston aliasiakirjan $(ARG1) kohdassa $(ARG2)(rivi,sarake) havaittiin muotoiluvirhe"; + TEXT[ finnish ] = "Tiedoston aliasiakirjan $(ARG1) kohdassa $(ARG2)(rivi,sarake) havaittiin muotoiluvirhe."; TEXT[ thai ] = "喔勦箟喔權笧喔氞福喔灌笡喙佮笟喔氞笢喔脆笖喔炧弗喔侧笖喙冟笝喙佮笩喙夃浮喙冟笝喙喔竵喔覆喔｀涪喙堗腑喔 $(ARG1) 喔椸傅喙 $(ARG2)(喙佮笘喔,喔勦腑喔ム副喔∴笝喙)"; }; String ERR_CODE ( ERRCODE_CLASS_WRITE , WARN_UNCONVERTABLE_CHARS ) @@ -1478,12 +1478,12 @@ Resource RID_SW_ERRHDL TEXT [ English ] = "These characters could not be exported using the chosen character encoding: $(ARG1)" ; TEXT[ english_us ] = "The following characters could not be displayed in the selected character set: $(ARG1)"; TEXT[ portuguese ] = "Foi imposs韛el representar os seguintes caracteres no conjunto seleccionado: $(ARG1)"; - TEXT[ russian ] = "橡邃耱噔栩 耠邃簋 珥嚓 恹狃囗眍 磬犷疱 礤忸珈铈眍: $(ARG1)"; + TEXT[ russian ] = "湾忸珈铈眍 镱赅玎螯 耠邃簋 耔焘铍 恹狃囗眍 磬犷疱: $(ARG1)"; TEXT[ greek ] = "These characters could not be exported using the chosen character encoding: $(ARG1)"; - TEXT[ dutch ] = "De volgende tekens konden niet in de gekozen tekenset worden weergegeven: $(ARG1)"; + TEXT[ dutch ] = "De volgende tekens kunnen niet in de gekozen tekenset worden weergegeven: $(ARG1)"; TEXT[ french ] = "Impossible de repr閟enter les caract鑢es suivants dans le jeu de caract鑢es s閘ectionn : $(ARG1)"; TEXT[ spanish ] = "Los siguientes caracteres no se pudieron representar en el juego de caracteres seleccionado: $(ARG1)"; - TEXT[ finnish ] = "These characters could not be exported using the chosen character encoding: $(ARG1)"; + TEXT[ finnish ] = "Seuraavia merkkej ei voida n鋣tt滗 valitussa merkist鰏s: $(ARG1)"; TEXT[ italian ] = "Impossibile rappresentare i caratteri seguenti con il set di caratteri selezionato: $(ARG1)"; TEXT[ danish ] = "F鴏gende tegn kunne ikke vises i det valgte tegns鎡: ($Arg1)"; TEXT[ swedish ] = "F鰈jande tecken gick inte att visa i den valda teckenupps鋞tningen: $(ARG1)"; @@ -1502,3 +1502,27 @@ Resource RID_SW_ERRHDL + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/app/makefile.mk b/sw/source/ui/app/makefile.mk index b419dcfdd9b0..acee75194580 100644 --- a/sw/source/ui/app/makefile.mk +++ b/sw/source/ui/app/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: hjs $ $Date: 2002-06-17 10:43:50 $ +# last change: $Author: hr $ $Date: 2003-03-27 15:42:34 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -152,7 +152,7 @@ $(SLO)$/swmodule.obj : $(INCCOM)$/swdll0.hxx .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" $(INCCOM)$/swdll0.hxx: makefile.mk - echo #define DLL_NAME \"libsw$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@ + echo \#define DLL_NAME \"$(DLLPRE)sw$(UPD)$(DLLPOSTFIX)$(DLLPOST)\" >$@ .ELSE # "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" $(INCCOM)$/swdll0.hxx: makefile.mk echo #define DLL_NAME "sw$(UPD)$(DLLPOSTFIX).DLL" >$@ diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src index a789017b4eb5..ab6528df5291 100644 --- a/sw/source/ui/app/mn.src +++ b/sw/source/ui/app/mn.src @@ -2,9 +2,9 @@ * * $RCSfile: mn.src,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: kz $ $Date: 2002-12-05 10:28:05 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -121,7 +121,7 @@ String MN_TAB_POPUPMENU Text[ chinese_traditional ] = "琛ㄦ牸"; Text[ arabic ] = "滔驷"; Text[ greek ] = "羞磲赆"; - Text[ korean ] = "鞁滍姼"; + Text[ korean ] = "響"; Text[ turkish ] = "Tablo"; Text[ catalan ] = "Taula"; Text[ thai ] = "喔曕覆喔｀覆喔"; @@ -185,7 +185,7 @@ Menu MN_TAB_POPUPMENU HelpID = FN_SET_MODOPT_TBLNUMFMT ; Text = "Zahlen~erkennung" ; Text [ ENGLISH ] = "Number recognition" ; - Text[ english_us ] = "~Number recognition"; + Text[ english_us ] = "~Number Recognition"; Text[ portuguese ] = "~Reconhecer n鷐eros"; Text[ russian ] = "朽耧铉磬忄龛 麒皴"; Text[ greek ] = "另徙睨駘轶 狁殍忐"; @@ -599,7 +599,7 @@ Menu MN_PPREVIEW_POPUPMENU Text[ arabic ] = "轻厝勤 陀 轻阙琼渖"; Text[ language_user1 ] = "唔; 唔?邮谘?庙?厝勤?\\婷礓 阙琼渖 轻蛰蜕 奕?厝勤叔?靠靠"; Text[ greek ] = "抨酏瘗箸 瘃镥痖箨珞珧"; - Text[ korean ] = "韼橃澊歆氙鸽Μ氤搓赴銆鞚胳噭"; + Text[ korean ] = "鞚胳噭"; Text[ turkish ] = "Yazd齬"; Text[ catalan ] = "Imprimeix"; Text[ finnish ] = "Tulosta"; @@ -644,18 +644,18 @@ Menu MN_PPREVIEW_POPUPMENU Text[ russian ] = "Close Preview"; Text[ greek ] = "Close Preview"; Text[ dutch ] = "Close Preview"; - Text[ french ] = "Close Preview"; - Text[ spanish ] = "Close Preview"; + Text[ french ] = "Fermer l'aper鐄"; + Text[ spanish ] = "Cerrar Vista preliminar"; Text[ finnish ] = "Close Preview"; - Text[ italian ] = "Close Preview"; + Text[ italian ] = "Chiudi anteprima"; Text[ danish ] = "Close Preview"; - Text[ swedish ] = "Close Preview"; + Text[ swedish ] = "St鋘g f鰎handsgranskning"; Text[ polish ] = "Close Preview"; Text[ portuguese_brazilian ] = "Close Preview"; - Text[ japanese ] = "Close Preview"; + Text[ japanese ] = "銉椼儸銉撱儱銉笺倰闁夈仒銈"; Text[ korean ] = "氙鸽Μ 氤搓赴 雼赴"; - Text[ chinese_simplified ] = "Close Preview"; - Text[ chinese_traditional ] = "Close Preview"; + Text[ chinese_simplified ] = "鍏抽棴椤甸潰棰勮"; + Text[ chinese_traditional ] = "闂滈枆闋愯"; Text[ turkish ] = "Close Preview"; Text[ arabic ] = "Close Preview"; Text[ catalan ] = "Close Preview"; @@ -665,3 +665,5 @@ Menu MN_PPREVIEW_POPUPMENU }; + + diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx index 04071991b0b0..92640ed7fed7 100644 --- a/sw/source/ui/app/swmodul1.cxx +++ b/sw/source/ui/app/swmodul1.cxx @@ -2,9 +2,9 @@ * * $RCSfile: swmodul1.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: os $ $Date: 2002-12-04 12:20:07 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,9 +78,6 @@ #ifndef _SFXDISPATCH_HXX #include <sfx2/dispatch.hxx> #endif -#ifndef _SFX_HELP_HXX -#include <sfx2/sfxhelp.hxx> -#endif #ifndef _SFX_CHILDWIN_HXX #include <sfx2/childwin.hxx> #endif @@ -115,15 +112,6 @@ #ifndef _SVX_DATACCESSDESCRIPTOR_HXX_ #include <svx/dataaccessdescriptor.hxx> #endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ -#include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef _COMPHELPER_PROCESSFACTORY_HXX_ -#include <comphelper/processfactory.hxx> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif #ifndef _SBASLTID_HRC //autogen #include <offmgr/sbasltid.hrc> @@ -155,9 +143,6 @@ #ifndef _SVX_BRSHITEM_HXX //autogen #include <svx/brshitem.hxx> #endif -#ifndef _SVTOOLS_TEMPLDLG_HXX -#include <svtools/templdlg.hxx> -#endif #ifndef _SV_MSGBOX_HXX #include <vcl/msgbox.hxx> #endif @@ -204,21 +189,12 @@ #ifndef _DOC_HXX #include <doc.hxx> #endif -#ifndef _MAILMRGE_HXX -#include "mailmrge.hxx" -#endif #ifndef _CMDID_H #include <cmdid.h> #endif #ifndef _APP_HRC #include <app.hrc> #endif -#ifndef _FLDTDLG_HXX -#include <fldtdlg.hxx> -#endif -#ifndef _DBCONFIG_HXX -#include <dbconfig.hxx> -#endif #include "helpid.h" using namespace ::rtl; @@ -228,7 +204,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::view; -using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; #define C2U(char) rtl::OUString::createFromAscii(char) @@ -579,42 +554,6 @@ SwChapterNumRules* SwModule::GetChapterNumRules() return pChapterNumRules; } -/*-------------------------------------------------------------------- - Beschreibung: - --------------------------------------------------------------------*/ - -void SwModule::ExecDB(SfxRequest &rReq) -{ - const SfxItemSet *pArgs = rReq.GetArgs(); - - sal_uInt16 nSlot(rReq.GetSlot()); - - switch (nSlot) - { - case FN_QRY_MERGE: - { - SwView* pView = GetView(); - BOOL bUseCurrentDocument = 0!= pView; - BOOL bQuery = !pArgs||SFX_ITEM_SET != pArgs->GetItemState(nSlot); - if(pView && bQuery) - { - SfxViewFrame* pFrame = pView->GetViewFrame(); - SfxHelp::OpenHelpAgent( pFrame->GetFrame(), HID_MAIL_MERGE_SELECT ); - SwMailMergeCreateFromDlg* pDlg = new SwMailMergeCreateFromDlg( - &pFrame->GetWindow()); - if(RET_OK == pDlg->Execute()) - bUseCurrentDocument = pDlg->IsThisDocument(); - else - break; - } - GenerateFormLetter(bUseCurrentDocument); - } - break; - default: - ASSERT(!this, falscher Dispatcher); - return; - } -} /*-------------------------------------------------------------------- Beschreibung: Schaut nach ob's min eine View gibt @@ -966,132 +905,4 @@ void SwModule::CheckSpellChanges( sal_Bool bOnlineSpelling, // pSpell->SetSpellAllAgain( sal_False ); } } -/* -----------------27.11.2002 12:12----------------- - * - * --------------------------------------------------*/ -void SwModule::GenerateFormLetter(BOOL bUseCurrentDocument) -{ - if(bUseCurrentDocument) - { - SwView* pView = GetView(); - if(!pView) - { - DBG_ERROR("no SwView available?") - return; - } - if(!pView->GetWrtShell().IsAnyDatabaseFieldInDoc()) - { - //check availability of data sources (except biblio source) - Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); - Reference<XNameAccess> xDBContext; - if( xMgr.is() ) - { - Reference<XInterface> xInstance = xMgr->createInstance( - OUString::createFromAscii( "com.sun.star.sdb.DatabaseContext" )); - xDBContext = Reference<XNameAccess>(xInstance, UNO_QUERY) ; - } - if(!xDBContext.is()) - return ; - Sequence < OUString > aNames = xDBContext->getElementNames(); - if(!aNames.getLength() || - (1 == aNames.getLength() && - aNames.getConstArray()[0] == GetDBConfig()->GetBibliographySource().sDataSource)) - { - QueryBox aQuery( - &pView->GetViewFrame()->GetWindow(), - SW_RES(MSG_DATA_SOURCES_UNAVAILABLE)); - if(RET_OK == aQuery.Execute()) - { - pView->GetViewFrame()->GetDispatcher()->Execute( - SID_ADDRESS_DATA_SOURCE, SFX_CALLMODE_SYNCHRON); - } - else - return; - } - - - QueryBox aQuery( - &pView->GetViewFrame()->GetWindow(), - SW_RES(MSG_INS_MERGE_FIELDS)); - if(RET_OK == aQuery.Execute()) - { - //call insert fields with active database field page - SfxViewFrame* pVFrame = pView->GetViewFrame(); - if(!pVFrame->GetChildWindow( FN_INSERT_FIELD )) - pVFrame->ToggleChildWindow(FN_INSERT_FIELD); - SfxChildWindow* pChild = pVFrame->GetChildWindow( FN_INSERT_FIELD ); - SwFldDlg* pFldDlg = (SwFldDlg*)pChild->GetWindow(); - pFldDlg->ActivateDatabasePage(); - } - return; - } - else - { - // check whether the - String sSource; - if(!pView->GetWrtShell().IsFieldDataSourceAvailable(sSource)) - { - WarningBox aWarning( &pView->GetViewFrame()->GetWindow(), - SW_RES(MSG_MERGE_SOURCE_UNAVAILABLE)); - String sTmp(aWarning.GetMessText()); - sTmp.SearchAndReplaceAscii("%1", sSource); - aWarning.SetMessText(sTmp); - aWarning.Execute(); - return ; - } - } - SwNewDBMgr* pNewDBMgr = NULL; - pNewDBMgr = pView->GetWrtShell().GetNewDBMgr(); - - SwDBData aData; - SwWrtShell &rSh = pView->GetWrtShell(); - aData = rSh.GetDBData(); - rSh.EnterStdMode(); // Wechsel in Textshell erzwingen; ist fuer - // das Mischen von DB-Feldern notwendig. - GetView()->AttrChangedNotify( &rSh ); - pNewDBMgr->SetMergeType( DBMGR_MERGE ); - - if (pNewDBMgr) - { - Sequence<PropertyValue> aProperties(3); - PropertyValue* pValues = aProperties.getArray(); - pValues[0].Name = C2U("DataSourceName"); - pValues[1].Name = C2U("Command"); - pValues[2].Name = C2U("CommandType"); - pValues[0].Value <<= aData.sDataSource; - pValues[1].Value <<= aData.sCommand; - pValues[2].Value <<= aData.nCommandType; - pNewDBMgr->ExecuteFormLetter(GetView()->GetWrtShell(), - aProperties, TRUE); - } - } - else - { - //call documents and template dialog - SfxApplication* pSfxApp = SFX_APP(); - Window* pTopWin = pSfxApp->GetTopWindow(); - SvtDocumentTemplateDialog* pDocTemplDlg = new SvtDocumentTemplateDialog( pTopWin ); - pDocTemplDlg->SelectTemplateFolder(); - - int nRet = pDocTemplDlg->Execute(); - sal_Bool bNewWin = sal_False; - if ( nRet == RET_OK ) - { - if ( pTopWin != pSfxApp->GetTopWindow() ) - { - // the dialogue opens a document -> a new TopWindow appears - pTopWin = pSfxApp->GetTopWindow(); - bNewWin = sal_True; - } - } - - delete pDocTemplDlg; - if ( bNewWin ) - // after the destruction of the dialogue its parent comes to top, - // but we want that the new document is on top - pTopWin->ToTop(); - -// return; - } -} diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx index 35a84ee47a4b..ab505097079e 100644 --- a/sw/source/ui/app/swmodule.cxx +++ b/sw/source/ui/app/swmodule.cxx @@ -2,9 +2,9 @@ * * $RCSfile: swmodule.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: os $ $Date: 2002-12-06 13:59:21 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -344,6 +344,10 @@ #ifndef _SVX_RUBYDLG_HXX_ #include <svx/rubydialog.hxx> #endif +// OD 14.02.2003 #107424# +#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX +#include <svtools/colorcfg.hxx> +#endif #include <svtools/moduleoptions.hxx> @@ -444,6 +448,11 @@ SwModule::SwModule( SvFactory* pFact, // OWeakObject* ( new ScannerEventListener( this ) ), UNO_QUERY ); // } } + + // OD 14.02.2003 #107424# - init color configuration + // member <pColorConfig> is created and the color configuration is applied + // at the view options. + GetColorConfig(); } //************************************************************************ @@ -586,6 +595,7 @@ void SwDLL::RegisterControls() SvxHyperlinkDlgWrapper::RegisterChildWindow( sal_False, pMod ); SvxFontWorkChildWindow::RegisterChildWindow( sal_False, pMod ); SwFldDlgWrapper::RegisterChildWindow( sal_False, pMod ); + SwFldDataOnlyDlgWrapper::RegisterChildWindow( sal_False, pMod ); SvxContourDlgChildWindow::RegisterChildWindow( sal_False, pMod ); SwInsertChartChild::RegisterChildWindow( sal_False, pMod ); SwNavigationChild::RegisterChildWindowContext( pMod ); diff --git a/sw/source/ui/chrdlg/ccoll.src b/sw/source/ui/chrdlg/ccoll.src index 24033763a2bc..c9729d49e496 100644 --- a/sw/source/ui/chrdlg/ccoll.src +++ b/sw/source/ui/chrdlg/ccoll.src @@ -2,9 +2,9 @@ * * $RCSfile: ccoll.src,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: os $ $Date: 2002-01-10 14:17:43 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,18 +85,19 @@ TabPage TP_CONDCOLL Text[ french ] = "Options"; Text[ spanish ] = "Opciones"; Text[ italian ] = "Opzioni"; - Text[ danish ] = "Settings"; + Text[ danish ] = "Indstillinger"; Text[ swedish ] = "Alternativ"; Text[ polish ] = "Opcje"; Text[ portuguese_brazilian ] = "Settings"; - Text[ japanese ] = "锝碉緦锞燂郊锝緷"; + Text[ japanese ] = "銈儣銈枫儳銉"; Text[ korean ] = "鞓奠厴"; Text[ chinese_simplified ] = "閫夐」"; Text[ chinese_traditional ] = "閬搁爡"; Text[ turkish ] = "Settings"; Text[ arabic ] = "雾茄鞘"; - Text[ catalan ] = "Opciones"; - Text[ finnish ] = "Mukauta"; + Text[ catalan ] = "Opcions"; + Text[ finnish ] = "Asetukset"; + Text[ thai ] = "喔曕副喔о箑喔ム阜喔竵"; }; CheckBox CB_CONDITION { @@ -108,7 +109,7 @@ TabPage TP_CONDCOLL Disable = TRUE ; Text [ english_us ] = "~Conditional Style" ; Text [ italian ] = "Come modello condizionato" ; - Text [ spanish ] = "C~omo estilo condicional" ; + Text [ spanish ] = "~Estilo condicional" ; Text [ french ] = "Co~mme style conditionnel" ; Text [ dutch ] = "~Als conditioneel opmaakprofiel" ; Text [ swedish ] = "som villkorlig m~all" ; @@ -116,17 +117,18 @@ TabPage TP_CONDCOLL Text [ portuguese_brazilian ] = "~Als bedingte Vorlage" ; Text [ portuguese ] = "~Estilo condicional" ; Text[ chinese_simplified ] = "褰撲綔鏈夋潯浠剁殑鏍峰紡(~C)"; - Text[ russian ] = "枢 篑腩忭 耱桦"; + Text[ russian ] = "玉腩忭 耱桦"; Text[ polish ] = "Jako warunkowy szablon"; - Text[ japanese ] = "鏉′欢浠樸亶锝斤線锝诧緳銇ㄣ仐銇(~C)"; + Text[ japanese ] = "鏉′欢浠樸亶銈广偪銈ゃ儷銇ㄣ仐銇(~C)"; Text[ chinese_traditional ] = "鐣朵綔鏈夋浠剁殑妯ｅ紡(~C)"; Text[ arabic ] = "咪阖 阍焰"; Text[ greek ] = "衮 孱狁酤戾盹 瘃躔"; - Text[ korean ] = "臁瓣贝鞝 鞙犿槙(~C)"; + Text[ korean ] = "臁瓣贝攵 鞀ろ儉鞚(~C)"; Text[ turkish ] = "~Ko⺷llu bi鏸m olarak"; - Text[ language_user1 ] = "\"Vorlagen\" Styles are capitalized. EM15.5.00"; - Text[ catalan ] = "C~omo estilo condicional"; + Text[ language_user1 ] = "\"Vor; \"Vorlagen\" Styles are capitalized. EM15.5.00"; + Text[ catalan ] = "~Estil condicional"; Text[ finnish ] = "~Ehdollinen Tyyli"; + Text[ thai ] = "喔ム副喔佮俯喔撪赴喙~喔囙阜喙堗腑喔權箘喔"; }; FixedText FT_CONTEXT { @@ -147,15 +149,16 @@ TabPage TP_CONDCOLL Text[ chinese_simplified ] = "涓婁笅鏂(~X)"; Text[ russian ] = "~暑眚尻耱"; Text[ polish ] = "Kontekst"; - Text[ japanese ] = "锝猴緷锞冿椒锝斤緞(~X)"; + Text[ japanese ] = "銈炽兂銉嗐偔銈广儓(~X)"; Text[ chinese_traditional ] = "涓婁笅鏂(~X)"; Text[ arabic ] = "轻禹寝"; Text[ greek ] = "绣耖廛腚镯"; Text[ korean ] = "雮挫毄(~X)"; Text[ turkish ] = "Ba餷am"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Contexto"; + Text[ catalan ] = "Conte~xt"; Text[ finnish ] = "~Konteksti"; + Text[ thai ] = "喔氞福喔脆笟~喔"; }; FixedText FT_USED { @@ -174,17 +177,18 @@ TabPage TP_CONDCOLL Text [ portuguese ] = "Estilos em uso" ; Text [ portuguese_brazilian ] = "Verwendete Vorlage" ; Text[ chinese_simplified ] = "浣跨敤鐨勬牱寮"; - Text[ russian ] = "橡桁屙屙睇 耱桦"; + Text[ russian ] = "锐镱朦珞屐 耱桦"; Text[ polish ] = "U縴te style"; - Text[ japanese ] = "浣跨敤銇欍倠锝斤線锝诧緳"; + Text[ japanese ] = "浣跨敤銇欍倠銈广偪銈ゃ儷"; Text[ chinese_traditional ] = "浣跨敤鐨勬ǎ寮"; Text[ arabic ] = "娩闱 揄 轻怯饰锨"; Text[ greek ] = "碰狁祜箪蓓 瘃躔"; - Text[ korean ] = "鞙犿槙鞚 鞝侅毄霅橃棃鞀惦媹雼."; + Text[ korean ] = "靷毄霅 鞀ろ儉鞚"; Text[ turkish ] = "Uygulanan bi鏸m"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Estilos utilizados"; - Text[ finnish ] = "K?ytetyt tyylit"; + Text[ catalan ] = "Estils aplicats"; + Text[ finnish ] = "K鋣tetyt tyylit"; + Text[ thai ] = "喔ム副喔佮俯喔撪赴喔涏福喔班涪喔膏竵喔曕箤"; }; Control TB_CONDCOLLS { @@ -203,27 +207,28 @@ TabPage TP_CONDCOLL Text = "A~bsatzvorlagen" ; Text [ English ] = "Styles" ; Disable = TRUE ; - Text [ dutch ] = "~Alineaprofielen" ; + Text [ dutch ] = "~Alinea-opmaakprofielen" ; Text [ english_us ] = "~Paragraph Styles" ; Text [ italian ] = "Modelli di paragrafo" ; Text [ spanish ] = "Es~tilos de p醨rafo" ; - Text [ french ] = "Styles de ~paragraphe" ; + Text [ french ] = "Styles de paragraphe" ; Text [ swedish ] = "St~yckeformatmallar" ; - Text [ danish ] = "Afsnitstypografier" ; + Text [ danish ] = "A~fsnitstypografier" ; Text [ portuguese ] = "E~stilos de par醙rafo" ; Text [ portuguese_brazilian ] = "Absatzvorlagen" ; Text[ chinese_simplified ] = "娈佃惤鏍峰紡(~P)"; Text[ russian ] = "羊桦 噌玎鲟"; Text[ polish ] = "Style akapitu"; - Text[ japanese ] = "娈佃惤锝斤線锝诧緳(~P)"; + Text[ japanese ] = "娈佃惤銈广偪銈ゃ儷(~P)"; Text[ chinese_traditional ] = "娈佃惤妯ｅ紡(~P)"; Text[ arabic ] = "娩闱 蒉焉"; Text[ greek ] = "旭躔 疳襻泷荟秕"; - Text[ korean ] = "雼澖 靹滌嫕(~P)"; + Text[ korean ] = "雼澖 鞀ろ儉鞚(~P)"; Text[ turkish ] = "Paragraf bi鏸mi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Es~tilos de p醨rafo"; - Text[ finnish ] = "Paragraph Styles"; + Text[ catalan ] = "Es~tils de par鄃raf"; + Text[ finnish ] = "Kappale~tyylit"; + Text[ thai ] = "喔ム副喔佮俯喔撪赴~喔⑧箞喔斧喔權箟喔"; }; ListBox LB_STYLE { @@ -255,9 +260,9 @@ TabPage TP_CONDCOLL Disable = TRUE ; Text [ dutch ] = "~Verwijderen" ; Text [ english_us ] = "Re~move" ; - Text [ italian ] = "~Rimuovi" ; - Text [ spanish ] = "~Eliminar" ; - Text [ french ] = "~Supprimer" ; + Text [ italian ] = "Ri~muovi" ; + Text [ spanish ] = "~Borrar" ; + Text [ french ] = "Supprimer" ; Text [ swedish ] = "Ta ~bort" ; Text [ danish ] = "Fjern" ; Text [ portuguese ] = "~Remover" ; @@ -272,8 +277,9 @@ TabPage TP_CONDCOLL Text[ korean ] = "鞝滉卑(~M)"; Text[ turkish ] = "~Kald齬"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Eliminar"; + Text[ catalan ] = "Ex~treu"; Text[ finnish ] = "~Poista"; + Text[ thai ] = "喙喔覆喔腑~喔"; }; PushButton PB_ASSIGN { @@ -286,24 +292,25 @@ TabPage TP_CONDCOLL Text [ dutch ] = "~Toewijzen" ; Text [ english_us ] = "~Apply" ; Text [ italian ] = "~Assegna" ; - Text [ spanish ] = "~Asignar" ; + Text [ spanish ] = "~Aplicar" ; Text [ french ] = "~Assigner" ; Text [ swedish ] = "Till~dela" ; Text [ danish ] = "Tildel" ; Text [ portuguese ] = "~Atribuir" ; Text [ portuguese_brazilian ] = "~Zuweisen" ; Text[ chinese_simplified ] = "鎸囧畾(~A)"; - Text[ russian ] = "~袜珥圜栩"; + Text[ russian ] = "~橡桁屙栩"; Text[ polish ] = "P~rzypisz"; Text[ japanese ] = "鍓层倞褰撱仸(~A)"; Text[ chinese_traditional ] = "鎸囧畾(~A)"; Text[ arabic ] = "授眄"; Text[ greek ] = "另糸篝镞鏖箸"; - Text[ korean ] = "歆鞝(~A)"; + Text[ korean ] = "鞝侅毄(~A)"; Text[ turkish ] = "~Ata"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Asignar"; - Text[ finnish ] = "~K?yt?"; + Text[ catalan ] = "~Aplica"; + Text[ finnish ] = "K鋨yt"; + Text[ thai ] = "喙儈喔娻箟"; }; StringArray STR_REGIONS { @@ -561,9 +568,9 @@ TabPage TP_CONDCOLL < "Encabezamiento de la hoja" ; > ; < "Tabla" ; > ; < "Marco" ; > ; - < "羠ea" ; > ; + < "Secci髇" ; > ; < "Nota al pie" ; > ; - < "Nota al final" ; > ; + < "Nota final" ; > ; < "Encabezamiento" ; > ; < "Pie de p醙ina" ; > ; < "1 nivel del esquema" ; > ; @@ -576,16 +583,16 @@ TabPage TP_CONDCOLL < "8 nivel del esquema" ; > ; < "9 nivel del esquema" ; > ; < "10 nivel del esquema" ; > ; - < "1 nivel de la numeraci髇" ; > ; + < "1er nivel de la numeraci髇" ; > ; < "2 nivel de la numeraci髇" ; > ; - < "3 nivel de la numeraci髇" ; > ; + < "3er nivel de la numeraci髇" ; > ; < "4 nivel de la numeraci髇" ; > ; < "5 nivel de la numeraci髇" ; > ; < "6 nivel de la numeraci髇" ; > ; < "7 nivel de la numeraci髇" ; > ; < "8 nivel de la numeraci髇" ; > ; - < "9 nivel de la numeraci髇" ; > ; - < "10 nivel de numeraci髇" ; > ; + < "9 nivel de numeraci髇" ; > ; + < "10 nivel de la numeraci髇" ; > ; }; itemlist [ french ] = { @@ -628,26 +635,26 @@ TabPage TP_CONDCOLL < "Eindnoot" ; > ; < "Koptekst" ; > ; < "Voettekst" ; > ; - < "1. niveau overzicht" ; > ; - < "2. niveau overzicht" ; > ; - < "3. niveau overzicht" ; > ; - < "4. niveau overzicht" ; > ; - < "5. niveau nummering" ; > ; - < "6. niveau overzicht" ; > ; - < "7. niveau overzicht" ; > ; - < "8. niveau overzicht" ; > ; - < "9. niveau overzicht" ; > ; - < "10. niveau overzicht" ; > ; - < "1. niveau nummering" ; > ; - < "2.niveau nummering" ; > ; - < "3.niveau nummering" ; > ; - < "4. niveau nummering" ; > ; - < "5. niveau nummering" ; > ; - < "6. niveau nummering" ; > ; - < "7. niveau nummering" ; > ; - < "8. niveau nummering" ; > ; - < "9. niveau nummering" ; > ; - < "10. niveau nummering" ; > ; + < "1e niveau overzicht" ; > ; + < "2e niveau overzicht" ; > ; + < "3e niveau overzicht" ; > ; + < "4e niveau overzicht" ; > ; + < "5e niveau nummering" ; > ; + < "6e niveau overzicht" ; > ; + < "7e niveau overzicht" ; > ; + < "8e niveau overzicht" ; > ; + < "9e niveau overzicht" ; > ; + < "10e niveau overzicht" ; > ; + < "1e niveau nummering" ; > ; + < "2e niveau nummering" ; > ; + < "3e niveau nummering" ; > ; + < "4e niveau nummering" ; > ; + < "5e niveau nummering" ; > ; + < "6e niveau nummering" ; > ; + < "7e niveau nummering" ; > ; + < "8e niveau nummering" ; > ; + < "9e niveau nummering" ; > ; + < "10e niveau nummering" ; > ; }; ItemList [ chinese_simplified ] = { @@ -685,31 +692,31 @@ TabPage TP_CONDCOLL < "洛瘐龛 觐腩眚栩箅 蜞犭桷" ; > ; < "亦犭桷" ; > ; < "朽礻" ; > ; - < "吾豚耱" ; > ; + < "朽玟咫" ; > ; < "秧铖赅" ; > ; < "暑眦邂 耥铖赅" ; > ; < "洛瘐龛 觐腩眚栩箅" ; > ; < "丸骓栝 觐腩眚栩箅" ; > ; - < "1- 箴钼屙 耱痼牝箴" ; > ; - < "2-铋 箴钼屙 耱痼牝箴" ; > ; - < "3-栝 箴钼屙 耱痼牝箴" ; > ; - < "4- 箴钼屙 耱痼牝箴" ; > ; - < "5- 箴钼屙 耱痼牝箴" ; > ; - < "6-铋 箴钼屙 耱痼牝箴" ; > ; - < "7-铋 箴钼屙 耱痼牝箴" ; > ; - < "8-铋 箴钼屙 耱痼牝箴" ; > ; - < "9- 箴钼屙 耱痼牝箴" ; > ; - < "10- 箴钼屙 耱痼牝箴" ; > ; - < "1- 箴钼屙 眢戾疣鲨" ; > ; - < "2-铋 箴钼屙 眢戾疣鲨" ; > ; - < "3-栝 箴钼屙 眢戾疣鲨" ; > ; - < "4- 箴钼屙 眢戾疣鲨" ; > ; - < "5- 箴钼屙 眢戾疣鲨" ; > ; - < "6-铋 箴钼屙 眢戾疣鲨" ; > ; - < "7-铋 箴钼屙 眢戾疣鲨" ; > ; - < "8-铋 箴钼屙 眢戾疣鲨" ; > ; - < "9- 箴钼屙 眢戾疣鲨" ; > ; - < "10- 箴钼屙 眢戾疣鲨" ; > ; + < "1- 箴钼屙 耱痼牝箴" ; > ; + < "2- 箴钼屙 耱痼牝箴" ; > ; + < "3- 箴钼屙 耱痼牝箴" ; > ; + < "4- 箴钼屙 耱痼牝箴" ; > ; + < "5- 箴钼屙 耱痼牝箴" ; > ; + < "6- 箴钼屙 耱痼牝箴" ; > ; + < "7- 箴钼屙 耱痼牝箴" ; > ; + < "8- 箴钼屙 耱痼牝箴" ; > ; + < "9- 箴钼屙 耱痼牝箴" ; > ; + < "10- 箴钼屙 耱痼牝箴" ; > ; + < "1- 箴钼屙 眢戾疣鲨" ; > ; + < "2- 箴钼屙 眢戾疣鲨" ; > ; + < "3- 箴钼屙 眢戾疣鲨" ; > ; + < "4- 箴钼屙 眢戾疣鲨" ; > ; + < "5- 箴钼屙 眢戾疣鲨" ; > ; + < "6- 箴钼屙 眢戾疣鲨" ; > ; + < "7- 箴钼屙 眢戾疣鲨" ; > ; + < "8- 箴钼屙 眢戾疣鲨" ; > ; + < "9- 箴钼屙 眢戾疣鲨" ; > ; + < "10- 箴钼屙 眢戾疣鲨" ; > ; }; ItemList [ polish ] = { @@ -744,34 +751,34 @@ TabPage TP_CONDCOLL }; ItemList [ japanese ] = { - < "琛ㄣ伄锞嶏蒋锞锞" ; > ; + < "琛ㄣ伄銉樸儍銉" ; > ; < "琛" ; > ; < "鏋" ; > ; < "绡勫洸" ; > ; < "鑴氭敞" ; > ; < "鏂囨湯鑴氭敞" ; > ; - < "锞嶏蒋锞锞" ; > ; - < "锞岋蒋锞" ; > ; - < "1锞氾緧锞烇緳鐩伄锝憋匠锞勶緱锝诧緷" ; > ; - < "2锞氾緧锞烇緳鐩伄锝憋匠锞勶緱锝诧緷" ; > ; - < "3锞氾緧锞烇緳鐩伄锝憋匠锞勶緱锝诧緷" ; > ; - < "4锞氾緧锞烇緳鐩伄锝憋匠锞勶緱锝诧緷" ; > ; - < "5锞氾緧锞烇緳鐩伄锝憋匠锞勶緱锝诧緷" ; > ; - < "6锞氾緧锞烇緳鐩伄锝憋匠锞勶緱锝诧緷" ; > ; - < "7锞氾緧锞烇緳鐩伄锝憋匠锞勶緱锝诧緷" ; > ; - < "8锞氾緧锞烇緳鐩伄锝憋匠锞勶緱锝诧緷" ; > ; - < "9锞氾緧锞烇緳鐩伄锝憋匠锞勶緱锝诧緷" ; > ; - < "10锞氾緧锞烇緳鐩伄锝憋匠锞勶緱锝诧緷" ; > ; - < "1锞氾緧锞烇緳鐩伄鐣彿浠樸亼" ; > ; - < "2锞氾緧锞烇緳鐩伄鐣彿浠樸亼" ; > ; - < "3锞氾緧锞烇緳鐩伄鐣彿浠樸亼" ; > ; - < "4锞氾緧锞烇緳鐩伄鐣彿浠樸亼" ; > ; - < "5锞氾緧锞烇緳鐩伄鐣彿浠樸亼" ; > ; - < "6锞氾緧锞烇緳鐩伄鐣彿浠樸亼" ; > ; - < "7锞氾緧锞烇緳鐩伄鐣彿浠樸亼" ; > ; - < "8锞氾緧锞烇緳鐩伄鐣彿浠樸亼" ; > ; - < "9锞氾緧锞烇緳鐩伄鐣彿浠樸亼" ; > ; - < "10锞氾緧锞烇緳鐩伄鐣彿浠樸亼" ; > ; + < "銉樸儍銉" ; > ; + < "銉曘儍銈" ; > ; + < "1銉儥銉洰銇偄銈︺儓銉┿偆銉" ; > ; + < "2銉儥銉洰銇偄銈︺儓銉┿偆銉" ; > ; + < "3銉儥銉洰銇偄銈︺儓銉┿偆銉" ; > ; + < "4銉儥銉洰銇偄銈︺儓銉┿偆銉" ; > ; + < "5銉儥銉洰銇偄銈︺儓銉┿偆銉" ; > ; + < "6銉儥銉洰銇偄銈︺儓銉┿偆銉" ; > ; + < "7銉儥銉洰銇偄銈︺儓銉┿偆銉" ; > ; + < "8銉儥銉洰銇偄銈︺儓銉┿偆銉" ; > ; + < "9銉儥銉洰銇偄銈︺儓銉┿偆銉" ; > ; + < "10銉儥銉洰銇偄銈︺儓銉┿偆銉" ; > ; + < "1銉儥銉洰銇暘鍙蜂粯銇" ; > ; + < "2銉儥銉洰銇暘鍙蜂粯銇" ; > ; + < "3銉儥銉洰銇暘鍙蜂粯銇" ; > ; + < "4銉儥銉洰銇暘鍙蜂粯銇" ; > ; + < "5銉儥銉洰銇暘鍙蜂粯銇" ; > ; + < "6銉儥銉洰銇暘鍙蜂粯銇" ; > ; + < "7銉儥銉洰銇暘鍙蜂粯銇" ; > ; + < "8銉儥銉洰銇暘鍙蜂粯銇" ; > ; + < "9銉儥銉洰銇暘鍙蜂粯銇" ; > ; + < "10銉儥銉洰銇暘鍙蜂粯銇" ; > ; }; ItemList [ chinese_traditional ] = { @@ -868,34 +875,34 @@ TabPage TP_CONDCOLL }; ItemList [ korean ] = { - < "鞁滍姼 毹鸽Μ毵" ; > ; + < "響 毹鸽Μ毵" ; > ; < "響" ; > ; - < "韰岆憪毽" ; > ; + < "頂勲爤鞛" ; > ; < "甑棴" ; > ; - < "氚旊嫢旮" ; > ; + < "臧侅＜" ; > ; < "氙胳＜" ; > ; < "毹鸽Μ旮" ; > ; < "氚旊嫢旮" ; > ; - < " 1氩堨Ц 雼る嫧瓿" ; > ; - < " 2氩堨Ц 雼る嫧瓿" ; > ; - < " 3氩堨Ц 雼る嫧瓿" ; > ; - < " 4氩堨Ц 雼る嫧瓿" ; > ; - < " 5氩堨Ц 雼る嫧瓿" ; > ; - < " 6氩堨Ц 雼る嫧瓿" ; > ; - < " 7氩堨Ц 雼る嫧瓿" ; > ; - < " 8氩堨Ц 雼る嫧瓿" ; > ; - < " 9氩堨Ц 雼る嫧瓿" ; > ; - < "10氩堨Ц 雼る嫧瓿" ; > ; - < " 1氩堨Ц 雼硠 氩堩樃 毵り赴旮" ; > ; - < " 2氩堨Ц 雼硠 氩堩樃 毵り赴旮" ; > ; - < " 3氩堨Ц 雼硠 氩堩樃 毵り赴旮" ; > ; - < " 4氩堨Ц 雼硠 氩堩樃 毵り赴旮" ; > ; - < " 5氩堨Ц 雼硠 氩堩樃 毵り赴旮" ; > ; - < " 6氩堨Ц 雼硠 氩堩樃 毵り赴旮" ; > ; - < " 7氩堨Ц 雼硠 氩堩樃 毵り赴旮" ; > ; - < " 8氩堨Ц 雼硠 氩堩樃 毵り赴旮" ; > ; - < " 9氩堨Ц 雼硠 氩堩樃 毵り赴旮" ; > ; - < "10氩堨Ц 雼硠 氩堩樃 毵り赴旮" ; > ; + < "1. 臧滌殧 靾橃" ; > ; + < "2. 臧滌殧 靾橃" ; > ; + < "3. 臧滌殧 靾橃" ; > ; + < "4. 臧滌殧 靾橃" ; > ; + < "5. 臧滌殧 靾橃" ; > ; + < "6. 臧滌殧 靾橃" ; > ; + < "7. 臧滌殧 靾橃" ; > ; + < "8. 臧滌殧 靾橃" ; > ; + < "9. 臧滌殧 靾橃" ; > ; + < "10. 臧滌殧 靾橃" ; > ; + < "1氩堨Ц 氩堩樃 毵り赴旮 靾橃" ; > ; + < "2氩堨Ц 氩堩樃 毵り赴旮 靾橃" ; > ; + < "3氩堨Ц 氩堩樃 毵り赴旮 靾橃" ; > ; + < "4氩堨Ц 氩堩樃 毵り赴旮 靾橃" ; > ; + < "5氩堨Ц 氩堩樃 毵り赴旮 靾橃" ; > ; + < "6氩堨Ц 氩堩樃 毵り赴旮 靾橃" ; > ; + < "7氩堨Ц 氩堩樃 毵り赴旮 靾橃" ; > ; + < "8氩堨Ц 氩堩樃 毵り赴旮 靾橃" ; > ; + < "9氩堨Ц 氩堩樃 毵り赴旮 靾橃" ; > ; + < "10氩堨Ц 氩堩樃 毵り赴旮 靾橃" ; > ; }; ItemList [ turkish ] = { @@ -961,66 +968,97 @@ TabPage TP_CONDCOLL }; ItemList [ catalan ] = { - < "Encabezamiento de la hoja" ; > ; - < "Tabla" ; > ; - < "Marco" ; > ; - < "Area" ; > ; - < "Nota al pie" ; > ; - < "Nota al final" ; > ; - < "Encabezamiento" ; > ; - < "Pie de p醙ina" ; > ; - < "1 nivel del esquema" ; > ; - < "2 nivel del esquema" ; > ; - < "3 nivel del esquema" ; > ; - < "4 nivel del esquema" ; > ; - < "5 nivel del esquema" ; > ; - < "6 nivel del esquema" ; > ; - < "7 nivel del esquema" ; > ; - < "8 nivel del esquema" ; > ; - < "9 nivel del esquema" ; > ; - < "10 nivel del esquema" ; > ; - < "1 nivel de la numeraci髇" ; > ; - < "2 nivel de la numeraci髇" ; > ; - < "3 nivel de la numeraci髇" ; > ; - < "4 nivel de la numeraci髇" ; > ; - < "5 nivel de la numeraci髇" ; > ; - < "6 nivel de la numeraci髇" ; > ; - < "7 nivel de la numeraci髇" ; > ; - < "8 nivel de la numeraci髇" ; > ; - < "9 nivel de la numeraci髇" ; > ; - < "10 nivel de numeraci髇" ; > ; + < "Encap鏰lament de la fulla" ; > ; + < "Taula" ; > ; + < "Marc" ; > ; + < "纑ea" ; > ; + < "Nota al peu" ; > ; + < "Nota final" ; > ; + < "Encap鏰lament" ; > ; + < "Peu de p鄃ina" ; > ; + < "1r nivell de contorn" ; > ; + < "2n nivell de contorn" ; > ; + < "3r nivell de contorn" ; > ; + < "4t nivell de contorn" ; > ; + < "5 nivell de contorn" ; > ; + < "6 nivell de contorn" ; > ; + < "7 nivell de contorn" ; > ; + < "8 nivell de contorn" ; > ; + < "9 nivell de contorn" ; > ; + < "10 nivel del esquema" ; > ; + < "1r nivell de la numeraci" ; > ; + < "2n nivell de la numeraci" ; > ; + < "3r nivell de la numeraci" ; > ; + < "4t nivell de la numeraci" ; > ; + < "5 nivell de la numeraci" ; > ; + < "6 nivell de la numeraci" ; > ; + < "7 nivell de la numeraci" ; > ; + < "8 nivell de la numeraci" ; > ; + < "9 nivell de la numeraci" ; > ; + < "10 nivell de la numeraci" ; > ; }; ItemList [ finnish ] = { - < "Taulukon yl?otsikko" ; > ; + < "Taulukon yl鋞unniste" ; > ; < "Taulukko" ; > ; < "Kehys" ; > ; - < "Osio" ; > ; + < "Osa" ; > ; < "Alaviite" ; > ; - < "Loppuhuomautus" ; > ; - < "Yl?otsikko" ; > ; - < "Alaselite" ; > ; - < " 1. j?sennystaso" ; > ; - < " 2. j?sennystaso" ; > ; - < " 3. j?sennystaso" ; > ; - < " 4. j?sennystaso" ; > ; - < " 5. j?sennystaso" ; > ; - < " 6. j?sennystaso" ; > ; - < " 7. j?sennystaso" ; > ; - < " 8. j?sennystaso" ; > ; - < " 9. j?sennystaso" ; > ; - < "10. j?sennystaso" ; > ; + < "Loppuviite" ; > ; + < "Yl鋞unniste" ; > ; + < "Alatunniste" ; > ; + < " 1. j鋝ennystaso" ; > ; + < " 2. j鋝ennystaso" ; > ; + < " 3. j鋝ennystaso" ; > ; + < " 4. j鋝ennystaso" ; > ; + < " 5. j鋝ennystaso" ; > ; + < " 6. j鋝ennystaso" ; > ; + < " 7. j鋝ennystaso" ; > ; + < " 8. j鋝ennystaso" ; > ; + < " 9. j鋝ennystaso" ; > ; + < "10. j鋝ennystaso" ; > ; < " 1. numerointitaso" ; > ; < " 2. numerointitaso" ; > ; < " 3. numerointitaso" ; > ; < " 4. numerointitaso" ; > ; < " 5. numerointitaso" ; > ; < " 6. numerointitaso" ; > ; - < " 7. j?sennystaso" ; > ; - < " 8. j?sennystaso" ; > ; - < " 9. j?sennystaso" ; > ; + < " 7. numerointitaso" ; > ; + < " 8. numerointitaso" ; > ; + < " 9. numerointitaso" ; > ; < "10. numerointitaso" ; > ; }; + ItemList [ thai ] = + { + < "喔箞喔о笝喔副喔о笗喔侧福喔侧竾" ; > ; + < "喔曕覆喔｀覆喔" ; > ; + < "喔佮福喔笟" ; > ; + < "喔箞喔о笝" ; > ; + < "喙喔娻复喔囙腑喔｀福喔" ; > ; + < "喔箟喔侧竾喔复喔囙笚喙夃覆喔⑧箑喔｀阜喙堗腑喔" ; > ; + < "喔箞喔о笝喔副喔" ; > ; + < "喔箞喔о笝喔椸箟喔侧涪" ; > ; + < "喔｀赴喔斷副喔氞箑喔勦箟喔侧福喙堗覆喔囙笚喔掂箞 1" ; > ; + < "喔｀赴喔斷副喔氞箑喔勦箟喔侧福喙堗覆喔囙笚喔掂箞 2" ; > ; + < "喔｀赴喔斷副喔氞箑喔勦箟喔侧福喙堗覆喔囙笚喔掂箞 3" ; > ; + < "喔｀赴喔斷副喔氞箑喔勦箟喔侧福喙堗覆喔囙笚喔掂箞 4" ; > ; + < "喔｀赴喔斷副喔氞箑喔勦箟喔侧福喙堗覆喔囙笚喔掂箞 5" ; > ; + < "喔｀赴喔斷副喔氞箑喔勦箟喔侧福喙堗覆喔囙笚喔掂箞 6" ; > ; + < "喔｀赴喔斷副喔氞箑喔勦箟喔侧福喙堗覆喔囙笚喔掂箞 7" ; > ; + < "喔｀赴喔斷副喔氞箑喔勦箟喔侧福喙堗覆喔囙笚喔掂箞 8" ; > ; + < "喔｀赴喔斷副喔氞箑喔勦箟喔侧福喙堗覆喔囙笚喔掂箞 9" ; > ; + < "喔｀赴喔斷副喔氞箑喔勦箟喔侧福喙堗覆喔囙笚喔掂箞 10" ; > ; + < "喔｀赴喔斷副喔氞弗喔赤笖喔编笟喔曕副喔о箑喔ム競喔椸傅喙 1" ; > ; + < "喔｀赴喔斷副喔氞弗喔赤笖喔编笟喔曕副喔о箑喔ム競喔椸傅喙 2" ; > ; + < "喔｀赴喔斷副喔氞弗喔赤笖喔编笟喔曕副喔о箑喔ム競喔椸傅喙 3" ; > ; + < "喔｀赴喔斷副喔氞弗喔赤笖喔编笟喔曕副喔о箑喔ム競喔椸傅喙 4" ; > ; + < "喔｀赴喔斷副喔氞弗喔赤笖喔编笟喔曕副喔о箑喔ム競喔椸傅喙 5" ; > ; + < "喔｀赴喔斷副喔氞弗喔赤笖喔编笟喔曕副喔о箑喔ム競喔椸傅喙 6" ; > ; + < "喔｀赴喔斷副喔氞弗喔赤笖喔编笟喔曕副喔о箑喔ム競喔椸傅喙 7" ; > ; + < "喔｀赴喔斷副喔氞弗喔赤笖喔编笟喔曕副喔о箑喔ム競喔椸傅喙 8" ; > ; + < "喔｀赴喔斷副喔氞弗喔赤笖喔编笟喔曕副喔о箑喔ム競喔椸傅喙 9" ; > ; + < "喔｀赴喔斷副喔氞弗喔赤笖喔编笟喔曕副喔о箑喔ム競喔椸傅喙 10" ; > ; + }; }; String STR_NOTEMPL { @@ -1045,8 +1083,9 @@ TabPage TP_CONDCOLL Text[ greek ] = "<赆磔磲>"; Text[ korean ] = "<鞐嗢潓>"; Text[ turkish ] = "<yok>"; - Text[ catalan ] = "<ninguno>"; - Text[ finnish ] = "<ei mit??n>"; + Text[ catalan ] = "<cap>"; + Text[ finnish ] = "<ei mit滗n>"; + Text[ thai ] = "<喙勦浮喙堗浮喔>"; }; }; // ********************************************************************** EOF @@ -1065,3 +1104,12 @@ TabPage TP_CONDCOLL + + + + + + + + + diff --git a/sw/source/ui/chrdlg/chardlg.src b/sw/source/ui/chrdlg/chardlg.src index be197f38ed4c..ff2de6f97762 100644 --- a/sw/source/ui/chrdlg/chardlg.src +++ b/sw/source/ui/chrdlg/chardlg.src @@ -2,9 +2,9 @@ * * $RCSfile: chardlg.src,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: os $ $Date: 2001-12-18 14:03:25 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,9 +74,9 @@ TabDialog DLG_CHAR Text [ italian ] = "Carattere" ; Text [ portuguese_brazilian ] = "Caractere" ; Text [ portuguese ] = "Caracteres" ; - Text [ finnish ] = "Merkki" ; + Text [ finnish ] = "Fontti" ; Text [ danish ] = "Tegn" ; - Text [ french ] = "Caract鑢e" ; + Text [ french ] = "Caract鑢es" ; Text [ swedish ] = "Tecken" ; Text [ dutch ] = "Teken" ; Text [ spanish ] = "Caracteres" ; @@ -115,7 +115,8 @@ TabDialog DLG_CHAR Text[ greek ] = "民犰灬麸箦轳"; Text[ korean ] = "旮昙"; Text[ turkish ] = "Yaz齮ipi"; - Text[ catalan ] = "Fuente"; + Text[ catalan ] = "Tipus de lletra"; + Text[ thai ] = "喔曕副喔о腑喔编竵喔┼福"; }; PageItem { @@ -145,7 +146,8 @@ TabDialog DLG_CHAR Text[ greek ] = "碰 麽襻牯揆"; Text[ korean ] = "旮昙 須臣"; Text[ turkish ] = "Yaz齮ipi efektleri"; - Text[ catalan ] = "Efectos de fuente"; + Text[ catalan ] = "Efectes de lletra"; + Text[ thai ] = "喔ム副喔佮俯喔撪赴喔炧复喙喔ㄠ俯喔傕腑喔囙笗喔编抚喔副喔佮俯喔"; }; PageItem { @@ -155,13 +157,13 @@ TabDialog DLG_CHAR Text [ ENGLISH ] = "Position" ; Text[ english_us ] = "Position"; Text[ portuguese ] = "Posi玢o"; - Text[ russian ] = "项玷鲨"; + Text[ russian ] = "项腩驽龛"; Text[ greek ] = "容箸"; Text[ dutch ] = "Positie"; Text[ french ] = "Position"; Text[ spanish ] = "Posici髇"; Text[ italian ] = "Posizione"; - Text[ danish ] = "Start_ved"; + Text[ danish ] = "Position"; Text[ swedish ] = "Position"; Text[ polish ] = "Pozycja"; Text[ portuguese_brazilian ] = "Position"; @@ -171,8 +173,9 @@ TabDialog DLG_CHAR Text[ chinese_traditional ] = "浣嶇疆"; Text[ turkish ] = "Pozisyon"; Text[ arabic ] = "轻沔众"; - Text[ catalan ] = "Posici髇"; + Text[ catalan ] = "Posici"; Text[ finnish ] = "Sijainti"; + Text[ thai ] = "喔曕赋喙佮斧喔權箞喔"; }; PageItem { @@ -188,18 +191,19 @@ TabDialog DLG_CHAR Text[ french ] = "Mise en page asiatique"; Text[ spanish ] = "Dise駉 asi醫ico"; Text[ italian ] = "Layout asiatico"; - Text[ danish ] = "Asian layout"; + Text[ danish ] = "Asiatisk layout"; Text[ swedish ] = "Asiatisk layout"; Text[ polish ] = "Uk砤d azjatycki"; Text[ portuguese_brazilian ] = "Asian layout"; Text[ japanese ] = "鏃ユ湰瑾炪儸銈ゃ偄銈︺儓"; - Text[ korean ] = "鞎勳嫓鞎 霠堨澊鞎勳泝"; + Text[ korean ] = "頃滉竴 旮鞛愱即"; Text[ chinese_simplified ] = "涓棩闊╃増寮"; Text[ chinese_traditional ] = "涓棩闊撶増寮"; Text[ turkish ] = "Asian layout"; Text[ arabic ] = "饰仨 掠礞"; - Text[ catalan ] = "Dise駉 asi醫ico"; + Text[ catalan ] = "Disseny asi鄑ic"; Text[ finnish ] = "Aasialainen asettelu"; + Text[ thai ] = "喙喔勦箟喔侧箓喔勦福喔囙箒喔氞笟喙喔箑喔娻傅喔"; }; PageItem { @@ -226,8 +230,9 @@ TabDialog DLG_CHAR Text[ greek ] = "震羼-簖礓弩"; Text[ korean ] = "頃橃澊韻茧韥"; Text[ turkish ] = "Hyperlink"; - Text[ catalan ] = "Hiperenlace"; + Text[ catalan ] = "Hiperenlla"; Text[ finnish ] = "Hyperlinkki"; + Text[ thai ] = "喙喔娻阜喙堗腑喔∴箓喔⑧竾喔弗喔侧涪喔∴复喔曕复"; }; PageItem { @@ -257,12 +262,13 @@ TabDialog DLG_CHAR Text[ greek ] = "贮眙"; Text[ korean ] = "氚瓣步"; Text[ turkish ] = "Artalan"; - Text[ catalan ] = "Fondo"; + Text[ catalan ] = "Fons"; + Text[ thai ] = "喔炧阜喙夃笝喔弗喔编竾"; }; }; }; Text[ chinese_simplified ] = "瀛楃"; - Text[ russian ] = "琼嚓"; + Text[ russian ] = "仞梏"; Text[ polish ] = "Znak"; Text[ japanese ] = "鏂囧瓧"; Text[ language_user1 ] = "桦: 谚焘铍 - -"; @@ -273,7 +279,8 @@ TabDialog DLG_CHAR Text[ greek ] = "揍襻牯揆弪"; Text[ korean ] = "氍胳瀽"; Text[ turkish ] = "Karakter"; - Text[ catalan ] = "Caracteres"; + Text[ catalan ] = "Car郼ters"; + Text[ thai ] = "喔曕副喔о腑喔编竵喔傕福喔"; }; TabDialog DLG_DRAWCHAR { @@ -327,7 +334,8 @@ TabDialog DLG_DRAWCHAR Text[ greek ] = "民犰灬麸箦轳"; Text[ korean ] = "旮昙"; Text[ turkish ] = "Yaz齮ipi"; - Text[ catalan ] = "Fuente"; + Text[ catalan ] = "Tipus de lletra"; + Text[ thai ] = "喔曕副喔о腑喔编竵喔┼福"; }; }; }; @@ -342,7 +350,8 @@ TabDialog DLG_DRAWCHAR Text[ greek ] = "民犰灬麸箦轳"; Text[ korean ] = "旮昙"; Text[ turkish ] = "Yaz齮ipi"; - Text[ catalan ] = "Fuente"; + Text[ catalan ] = "Tipus de lletra"; + Text[ thai ] = "喔曕副喔о腑喔编竵喔┼福"; }; TabPage TP_CHAR_URL { @@ -376,8 +385,9 @@ TabPage TP_CHAR_URL Text[ greek ] = "震羼-簖礓弩"; Text[ korean ] = "頃橃澊韻茧韥"; Text[ turkish ] = "Hyperlink"; - Text[ catalan ] = "Hiperenlace"; + Text[ catalan ] = "Hiperenlla"; Text[ finnish ] = "Hyperlinkki"; + Text[ thai ] = "喙喔娻阜喙堗腑喔∴箓喔⑧竾喔弗喔侧涪喔∴复喔曕复"; }; FixedText FT_URL { @@ -386,9 +396,9 @@ TabPage TP_CHAR_URL Text = "U~RL" ; Text [ English ] = "U~RL" ; Text [ english_us ] = "~URL" ; - Text [ italian ] = "U~RL" ; + Text [ italian ] = "URL" ; Text [ spanish ] = "~URL" ; - Text [ french ] = "U~RL" ; + Text [ french ] = "URL" ; Text [ dutch ] = "U~RL" ; Text [ swedish ] = "U~RL" ; Text [ danish ] = "URL" ; @@ -407,6 +417,7 @@ TabPage TP_CHAR_URL Text[ turkish ] = "U~RL"; Text[ catalan ] = "~URL"; Text[ finnish ] = "~URL-osoite"; + Text[ thai ] = "~URL"; }; Edit ED_URL { @@ -427,12 +438,12 @@ TabPage TP_CHAR_URL Text [ swedish ] = "~V鋖j ut..." ; Text [ danish ] = "Gennemse..." ; Text [ italian ] = "~Sfoglia..." ; - Text [ spanish ] = "~Seleccionar..." ; + Text [ spanish ] = "~Buscar..." ; Text [ french ] = "~S閘ectionner..." ; Text [ dutch ] = "~Selecteren..." ; Text [ portuguese ] = "~Pesquisar..." ; Text[ chinese_simplified ] = "閫夋嫨(~B)..."; - Text[ russian ] = "~蔓狃囹..."; + Text[ russian ] = "~吾珙..."; Text[ polish ] = "Przegl筪aj..."; Text[ japanese ] = "閬告姙(~B)..."; Text[ chinese_traditional ] = "閬告搰(~B)..."; @@ -442,8 +453,9 @@ TabPage TP_CHAR_URL Text[ greek ] = "~硼殡镢..."; Text[ korean ] = "靹犿儩(~B)..."; Text[ turkish ] = "A~ra⺶齬..."; - Text[ catalan ] = "~Seleccionar..."; - Text[ finnish ] = "~Selaa"; + Text[ catalan ] = "~Selecciona..."; + Text[ finnish ] = "~Selaa..."; + Text[ thai ] = "喙~喔｀傅喔⑧竵喔斷腹..."; }; FixedText FT_TEXT { @@ -456,10 +468,10 @@ TabPage TP_CHAR_URL Text[ russian ] = "义犟"; Text[ greek ] = "叔哽屙"; Text[ dutch ] = "~Tekst"; - Text[ french ] = "~Texte"; + Text[ french ] = "Texte"; Text[ spanish ] = "Texto"; Text[ italian ] = "Testo"; - Text[ danish ] = "Tekst"; + Text[ danish ] = "Te~kst"; Text[ swedish ] = "Te~xt"; Text[ polish ] = "Tekst"; Text[ portuguese_brazilian ] = "H~inweis"; @@ -469,8 +481,9 @@ TabPage TP_CHAR_URL Text[ chinese_traditional ] = "鏂囧瓧(~X)"; Text[ turkish ] = "B~ilgi"; Text[ arabic ] = "湔"; - Text[ catalan ] = "Texto"; + Text[ catalan ] = "Te~xt"; Text[ finnish ] = "Teks~ti"; + Text[ thai ] = "喔傕箟喔瓇喔勦抚喔侧浮"; }; Edit ED_TEXT { @@ -489,7 +502,7 @@ TabPage TP_CHAR_URL Text [ english_us ] = "~Name" ; Text [ italian ] = "~Nome" ; Text [ spanish ] = "~Nombre" ; - Text [ french ] = "~Nom" ; + Text [ french ] = "Nom" ; Text [ dutch ] = "~Naam" ; Text [ swedish ] = "~Namn" ; Text [ danish ] = "Navn" ; @@ -506,8 +519,9 @@ TabPage TP_CHAR_URL Text[ greek ] = "柬镬"; Text[ korean ] = "鞚措(~N)"; Text[ turkish ] = "~Ad"; - Text[ catalan ] = "~Nombre"; + Text[ catalan ] = "~Nom"; Text[ finnish ] = "~Nimi"; + Text[ thai ] = "~喔娻阜喙堗腑"; }; Edit ED_NAME { @@ -528,12 +542,12 @@ TabPage TP_CHAR_URL Text [ swedish ] = "Ra~m" ; Text [ danish ] = "Frame" ; Text [ italian ] = "~Frame" ; - Text [ spanish ] = "~Frame" ; + Text [ spanish ] = "~Marco destino" ; Text [ french ] = "~Frame" ; Text [ dutch ] = "~Frame" ; Text [ portuguese ] = "~Frame" ; Text[ chinese_simplified ] = "妗嗗璞(~T)"; - Text[ russian ] = "~枢漯"; + Text[ russian ] = "~责彘"; Text[ polish ] = "Frame"; Text[ japanese ] = "銉曘儸銉笺儬(~T)"; Text[ chinese_traditional ] = "瑷婃(~T)"; @@ -543,8 +557,9 @@ TabPage TP_CHAR_URL Text[ greek ] = "须徇箝"; Text[ korean ] = "頂勲爤鞛(~T)"; Text[ turkish ] = "~Frame"; - Text[ catalan ] = "~Frame"; + Text[ catalan ] = "~Marc"; Text[ finnish ] = "~Kohdekehys"; + Text[ thai ] = "喔佮福喔笟喙~喔涏箟喔侧斧喔∴覆喔"; }; ComboBox LB_TARGET { @@ -582,8 +597,9 @@ TabPage TP_CHAR_URL Text[ greek ] = "缅泔睃翎..."; Text[ korean ] = "鞚措菠韸(~E)..."; Text[ turkish ] = "Olaylar..."; - Text[ catalan ] = "~Acontecimientos..."; - Text[ finnish ] = "~Tapahtumat"; + Text[ catalan ] = "~Esdeveniments..."; + Text[ finnish ] = "Tapa~htumat..."; + Text[ thai ] = "喙~喔笗喔膏竵喔侧福喔撪箤..."; }; FixedLine FL_STYLE { @@ -601,7 +617,7 @@ TabPage TP_CHAR_URL Text [ portuguese_brazilian ] = "Zeichenvorlagen" ; Text [ portuguese ] = "Estilos de caracteres" ; Text[ chinese_simplified ] = "瀛楃鏍峰紡"; - Text[ russian ] = "羊桦 珥嚓钼"; + Text[ russian ] = "羊桦 蝈犟蜞 汨镥瘃覃腙"; Text[ polish ] = "Style znaku"; Text[ japanese ] = "鏂囧瓧銈广偪銈ゃ儷"; Text[ chinese_traditional ] = "瀛楀厓妯ｅ紡"; @@ -609,10 +625,11 @@ TabPage TP_CHAR_URL Text[ dutch ] = "Tekenopmaakprofielen"; Text[ chinese_simplified ] = "瀛楃鏍峰紡"; Text[ greek ] = "郁蹼 麽襻牯揆"; - Text[ korean ] = "氍胳瀽 韰滍攲毽"; + Text[ korean ] = "氍胳瀽 鞀ろ儉鞚"; Text[ turkish ] = "Karakter bi鏸mi"; - Text[ catalan ] = "Estilos de caracteres"; + Text[ catalan ] = "Estils de car郼ters"; Text[ finnish ] = "Merkkityylit"; + Text[ thai ] = "喔ム副喔佮俯喔撪赴喔曕副喔о腑喔编竵喔傕福喔"; }; FixedText FT_VISITED { @@ -620,28 +637,29 @@ TabPage TP_CHAR_URL Size = MAP_APPFONT ( 73 , 8 ) ; Text = "~Besuchter Link" ; Text [ English ] = "Visited link" ; - Text [ dutch ] = "B~ezochte Link" ; + Text [ dutch ] = "B~ezochte koppeling" ; Text [ english_us ] = "~Visited links" ; - Text [ italian ] = "Per il ~sito visitato" ; - Text [ spanish ] = "V韓culos ~visitados" ; + Text [ italian ] = "Per il sito visitato" ; + Text [ spanish ] = "Enlaces ~visitados" ; Text [ french ] = "Lien ~visit" ; Text [ swedish ] = "~Anv鋘d l鋘k" ; - Text [ danish ] = "Bes鴊t hyperlink" ; + Text [ danish ] = "B~es鴊t hyperlink" ; Text [ portuguese_brazilian ] = "~Besuchte Links" ; Text [ portuguese ] = "Liga玢o ~visitada" ; Text[ chinese_simplified ] = "宸茬粡璁块棶杩囩殑閾炬帴(~V)"; - Text[ russian ] = "项皴眄 耨觇"; + Text[ russian ] = "橡铖祛蝠屙磬"; Text[ polish ] = "Odwiedzone 彻cze"; - Text[ japanese ] = "闁嬨亜銇熴亾銇ㄣ伄銇傘倠銉兂銈(~V)"; + Text[ japanese ] = "瑷倢銇熴儶銉炽偗(~V)"; Text[ chinese_traditional ] = "瑷晱閬庣殑鎹峰緫(~V)"; Text[ arabic ] = "茄嗜秦 尤 翼茄叔"; - Text[ dutch ] = "B~ezochte Link"; + Text[ dutch ] = "B~ezochte koppeling"; Text[ chinese_simplified ] = "宸茬粡璁块棶杩囩殑閾炬帴(~V)"; Text[ greek ] = "吁礓蒹彘 痫 蓣秕 屦轶赍鲨暹"; Text[ korean ] = "氚╇頃 毵來伂(~V)"; Text[ turkish ] = "~Kullan齦m hyperlink"; - Text[ catalan ] = "V韓culos ~visitados"; - Text[ finnish ] = "~K?ydyt linkit"; + Text[ catalan ] = "Enlla鏾s ~visitats"; + Text[ finnish ] = "A~vatut linkit"; + Text[ thai ] = "喔曕副喔о箑喔娻阜喙堗腑喔∴箓喔⑧竾喔椸傅喙堗浮喔侧釜喔灌箞"; }; ListBox LB_VISITED { @@ -661,26 +679,27 @@ TabPage TP_CHAR_URL Text [ English ] = "Unvisited link" ; Text [ english_us ] = "Unvisited ~links" ; Text [ italian ] = "Per il sito non ~visitato" ; - Text [ spanish ] = "V韓culos no v~isitados" ; - Text [ french ] = "Lien ~non visit" ; - Text [ dutch ] = "N~iet-bezochte Link" ; + Text [ spanish ] = "Enlaces no v~isitados" ; + Text [ french ] = "Lien non visit" ; + Text [ dutch ] = "N~iet-bezochte koppeling" ; Text [ swedish ] = "~Oanv鋘d l鋘k" ; - Text [ danish ] = "Ubes鴊t hyperlink" ; + Text [ danish ] = "Ube~s鴊t hyperlink" ; Text [ portuguese_brazilian ] = "~Unbesuchte Links" ; Text [ portuguese ] = "~Liga玢o n鉶 visitada" ; Text[ chinese_simplified ] = "灏氭湭璁块棶杩囩殑閾炬帴(~L)"; - Text[ russian ] = "湾镱皴眄 耨觇"; + Text[ russian ] = "湾镳铖祛蝠屙磬"; Text[ polish ] = "Nieodwiedzone 彻cze"; - Text[ japanese ] = "闁嬨亜銇熴亾銇ㄣ伄銇亜銉兂銈(~L)"; + Text[ japanese ] = "瑷倢銇︺亜銇亜銉兂銈(~L)"; Text[ chinese_traditional ] = "鏈í鍟忛亷鐨勬嵎寰(~L)"; Text[ arabic ] = "茄嗜秦 徙 碛绒 翼茄叔"; - Text[ dutch ] = "N~iet-bezochte Link"; + Text[ dutch ] = "N~iet-bezochte koppeling"; Text[ chinese_simplified ] = "灏氭湭璁块棶杩囩殑閾炬帴(~L)"; Text[ greek ] = "吁礓蒹彘 鼯襁 屦唧赍"; Text[ korean ] = "氚╇頃橃 鞎婌潃 毵來伂(~L)"; Text[ turkish ] = "Kullan齦~mam hyperlink"; - Text[ catalan ] = "V韓culos no v~isitados"; - Text[ finnish ] = "~K?ym?tt??t linkit"; + Text[ catalan ] = "Enlla鏾s no v~isitats"; + Text[ finnish ] = "Avaamattomat ~linkit"; + Text[ thai ] = "~喔曕副喔о箑喔娻阜喙堗腑喔∴箓喔⑧竾喔椸傅喙堗箘喔∴箞喔∴覆喔腹喙"; }; ListBox LB_NOT_VISITED { @@ -695,3 +714,20 @@ TabPage TP_CHAR_URL }; + + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/chrdlg/chrdlg.src b/sw/source/ui/chrdlg/chrdlg.src index 601d5259d401..9e7683d260a1 100644 --- a/sw/source/ui/chrdlg/chrdlg.src +++ b/sw/source/ui/chrdlg/chrdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: chrdlg.src,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: kz $ $Date: 2001-08-14 15:58:26 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -72,20 +72,21 @@ String STR_TEXTCOLL_HEADER TEXT [ danish ] = "(Afsnitstypografi: " ; TEXT [ french ] = " (Style de paragraphe : " ; TEXT [ swedish ] = "(Styckeformatmall: " ; - TEXT [ dutch ] = "(Alinea-opmaakprofiel: " ; + TEXT [ dutch ] = "(Alinea-opmaakprofiel:" ; TEXT [ spanish ] = "(Estilo de p醨rafo: " ; TEXT [ english_us ] = "(Paragraph Style: " ; TEXT[ chinese_simplified ] = "(娈佃惤鏍峰紡锛 "; TEXT[ russian ] = "(羊桦 噌玎鲟: "; TEXT[ polish ] = "(Styl akapitu: "; - TEXT[ japanese ] = " (娈佃惤锝斤線锝诧緳锛 "; + TEXT[ japanese ] = " (娈佃惤銈广偪銈ゃ儷锛 "; TEXT[ chinese_traditional ] = "(娈佃惤妯ｅ紡锛 "; TEXT[ arabic ] = "(溷 蒉焉: "; TEXT[ greek ] = "(旭躔 疳襻泷荟秕: "; - TEXT[ korean ] = "(雼澖 鞙犿槙: "; + TEXT[ korean ] = " (雼澖 鞀ろ儉鞚: "; TEXT[ turkish ] = "(Paragraf bi鏸mi: "; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "(Estilo de p醨rafo: "; + TEXT[ catalan ] = "(Estil de par鄃raf: "; + TEXT[ thai ] = "(喔ム副喔佮俯喔撪赴喔⑧箞喔斧喔權箟喔: "; }; String STR_PAGEFMT_HEADER { @@ -99,20 +100,21 @@ String STR_PAGEFMT_HEADER TEXT [ danish ] = "(Sidetypografi: " ; TEXT [ french ] = "(Style de page : " ; TEXT [ swedish ] = "(Sidformatmall: " ; - TEXT [ dutch ] = "(Pagina-opmaakprofiel: " ; + TEXT [ dutch ] = "(Pagina-opmaakprofiel:" ; TEXT [ spanish ] = "(Estilo de p醙ina: " ; TEXT [ english_us ] = "(Page Style: " ; TEXT[ chinese_simplified ] = "(椤甸潰鏍峰紡锛 "; TEXT[ russian ] = "(羊桦 耱疣龛鳆: "; TEXT[ polish ] = "(Styl strony: "; - TEXT[ japanese ] = " (锞嶏緹锝帮郊锞烇浇锞锝诧緳锛 "; + TEXT[ japanese ] = " (銉氥兗銈搞偣銈裤偆銉細 "; TEXT[ chinese_traditional ] = "(闋侀潰妯ｅ紡锛 "; TEXT[ arabic ] = "(耷崛 轻蛰蜕: "; TEXT[ greek ] = "(旭躔 箦脒溽: "; - TEXT[ korean ] = " (飒 鞙犿槙: "; + TEXT[ korean ] = " (韼橃澊歆 鞀ろ儉鞚: "; TEXT[ turkish ] = "(Sayfa bi鏸mi: "; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "(Estilo de p醙ina: "; + TEXT[ catalan ] = "(Estil de p鄃ina: "; + TEXT[ thai ] = "(喔ム副喔佮俯喔撪赴喔笝喙夃覆: "; }; String SW_STR_NONE { @@ -130,7 +132,7 @@ String SW_STR_NONE Text [ spanish ] = "[Ninguno]" ; Text [ english_us ] = "[None]" ; Text[ chinese_simplified ] = "[鏃燷"; - Text[ russian ] = "[铃鏬"; + Text[ russian ] = "[湾騗"; Text[ polish ] = "[brak]"; Text[ japanese ] = "[銇仐]"; Text[ language_user1 ] = "桦? 徨"; @@ -139,7 +141,8 @@ String SW_STR_NONE Text[ greek ] = "[梳磔磲]"; Text[ korean ] = "[鞐嗢潓]"; Text[ turkish ] = "[yok]"; - Text[ catalan ] = "[Ninguno]"; + Text[ catalan ] = "[Cap]"; + Text[ thai ] = "[喙勦浮喙堗浮喔礭"; }; InfoBox MSG_ILLEGAL_PAGENUM { @@ -152,24 +155,25 @@ InfoBox MSG_ILLEGAL_PAGENUM MESSAGE [ italian ] = "Impossibile usare il numero pagina alla pagina corrente. I numeri pari possono essere usati sulle pagine sinistre, i numeri dispari sulle pagine destre." ; MESSAGE [ portuguese_brazilian ] = "N?ero de p?gina n?o pode ser aplicado ? p?gina atual. N?eros pares podem ser utilizados em p?ginas esquerdas, n?eros ?mpares em p?ginas direitas." ; MESSAGE [ portuguese ] = "N鷐ero de p醙ina n鉶 pode ser atribu韉o p醙ina actual. Nas p醙inas da esquerda podem apenas ser usados n鷐eros pares e nas p醙inas da direita n鷐eros 韒pares." ; - MESSAGE [ finnish ] = "K鋝itelt鋠鋖le sivulle ei voi lis鋞 sivunumeroita. Parillisia numeroita voi k鋣tt滗 vasemmanpuoleisilla sivuilla, parittomia numeroita oikeanpuoleisilla." ; + MESSAGE [ finnish ] = "K鋝itelt鋠鋖le sivulle ei voi lis鋞 sivunumeroa. Parillisia numeroita voi k鋣tt滗 vasemmanpuoleisilla sivuilla, parittomia numeroita oikeanpuoleisilla." ; MESSAGE [ danish ] = "Sidetallet kan ikke inds鎡tes. Der m kun bruges lige sidetal p venstre side og ulige sidetal p h鴍re sider." ; MESSAGE [ french ] = "Le num閞o de page ne peut 阾re assign cette page. Les nombres pairs ne peuvent 阾re utilis閟 que sur des pages de gauche, les nombres impairs que sur celles de droite." ; MESSAGE [ swedish ] = "Sidnumret kan inte s鋞tas in p den h鋜 sidan. P v鋘stersidor f錼 bara j鋗na nummer anv鋘das, p h鰃ersidor bara udda nummer." ; - MESSAGE [ dutch ] = "Dit paginanummer kan niet aan de actiuele pagina worden toegewezen. Linkerpagina's krijgen even nummers, rechterpagina's oneven nummers." ; + MESSAGE [ dutch ] = "Dit paginanummer kan niet aan de huidige pagina worden toegewezen. Linkerpagina's krijgen even nummers, rechterpagina's oneven nummers." ; MESSAGE [ spanish ] = "El n鷐ero de la p醙ina no se puede colocar. En p醙inas izquierdas se pueden utilizar solo n鷐eros pares, en las derechas solo impares." ; MESSAGE [ english_us ] = "Page numbers cannot be applied to the current page. Even numbers can be used on left pages, odd numbers on right pages." ; MESSAGE[ chinese_simplified ] = "鏃犳硶璁惧畾椤电爜銆傚湪宸﹂〉涓婂彧鍏佽閲囩敤鍋舵暟椤电爜锛屽湪鍙抽〉涓婂彧鍏佽閲囩敤濂囨暟椤电爜銆"; - MESSAGE[ russian ] = "皖戾疣 耱疣龛 镳铖蜞忤螯 礤忸珈铈眍. 脲忸 耱铕铐 祛泱 猁螯 镳铖蜞怆屙 蝾朦觐 麇蝽, 镳噔铋 - 蝾朦觐 礤麇蝽 鲨麴."; + MESSAGE[ russian ] = "湾忸珈铈眍 镱耱噔栩 眍戾 溧眄铋 耱疣龛鳆. 袜 脲恹 耱疣龛鲟 祛泱 猁螯 镳铖蜞怆屙 蝾朦觐 麇蝽, 磬 镳噔 - 蝾朦觐 礤麇蝽 鲨麴."; MESSAGE[ polish ] = "Nie mo縩a nanie滄 numeru stron. Na lewych stronach mo縩a nanie滄 tylko parzyste numery stron, na prawych tylko nieparzyste numery stron."; - MESSAGE[ japanese ] = "锞嶏緹锝帮郊锞炵暘鍙枫伅閬╃敤銇с亶銇俱仜銈撱傚乏锞嶏緹锝帮郊锞炪伀銇伓鏁般佸彸锞嶏緹锝帮郊锞炪伀銇鏁般倰浣跨敤銇椼伨銇欍"; + MESSAGE[ japanese ] = "銉氥兗銈哥暘鍙枫伅閬╃敤銇с亶銇俱仜銈撱傚乏銉氥兗銈搞伀銇伓鏁般佸彸銉氥兗銈搞伀銇鏁般倰浣跨敤銇椼伨銇欍"; MESSAGE[ chinese_traditional ] = "鐒℃硶瑷畾闋佺⒓銆傚湪宸﹂爜鍙兘澶犺ō瀹氬伓鏁革紝鍦ㄥ彸闋佸彧鑳借ō瀹氬鏁搞"; MESSAGE[ arabic ] = "崆 磴咪 畔亚 醚耷 轻蛰颓 蓓 轻蛰蜕 轻颓犴. 卺 轻蛰颓 轻碛鸯 碛阃 惹邮蜗倾 醚耷 益添 蒉亍 孚犰 轻蛰颓 轻磴潇 醚耷 菅享 蒉."; MESSAGE[ greek ] = "腻 暹磲 漉磲酎 磲 麸痫桢翮桢 狁殍禳 箦脒溽. 渝 狁轶翦褫 箦脒溴 屦轸褫疱翎 麸痫栎翮箸 禳盹 骢泾 狁殍忐 箦脒溽, 屙 箦 溴铋? "; - MESSAGE[ korean ] = "飒 氩堩樃電 靹れ爼頃 靾 鞐嗢姷雼堧嫟. 歆濎垬 飒 氩堩樃電 鞕检 飒届棎毵 靷毄霅橁碃, 頇靾 飒 氩堩樃電 鞓るジ飒 飒届棎毵 靷毄霅╇媹雼."; + MESSAGE[ korean ] = "韼橃澊歆 氩堩樃電 靹れ爼頃 靾 鞐嗢姷雼堧嫟. 歆濎垬 韼橃澊歆 氩堩樃電 鞕检 韼橃澊歆鞐愲 靷毄霅橁碃, 頇靾 韼橃澊歆 氩堩樃電 鞓るジ飒 韼橃澊歆鞐愲 靷毄霅╇媹雼."; MESSAGE[ turkish ] = "Sayfa numaras verilemiyor. Sol sayfalarda yaln齴ca 鏸ft sayfa numaralar, sa sayfalarda ise yaln齴ca tek sayfa numaralar kullan齦abilir."; MESSAGE[ language_user1 ] = " "; - MESSAGE[ catalan ] = "El n鷐ero de la p醙ina no se puede colocar. En p醙inas izquierdas se pueden utilizar solo n鷐eros pares, en las derechas solo impares."; + MESSAGE[ catalan ] = "El n鷐ero de la p鄃ina no es pot colocar. A les p鄃ines esquerres nom閟 es poden utilitzar n鷐eros parells, a la dreta imparells."; + MESSAGE[ thai ] = "喙勦浮喙堗釜喔侧浮喔侧福喔栢箖喔娻箟喙喔ム競喔笝喙夃覆喙勦笡喔⑧副喔囙斧喔權箟喔侧笡喔编笀喔堗父喔氞副喔權箘喔斷箟 喔覆喔∴覆喔｀笘喙冟笂喙夃箑喔ム競喔勦腹喙堗箖喔權斧喔權箟喔侧笅喙夃覆喔⑧箘喔斷箟, 喙喔ム競喔勦傅喙堗箖喔權斧喔權箟喔侧競喔о覆"; }; @@ -178,3 +182,11 @@ InfoBox MSG_ILLEGAL_PAGENUM + + + + + + + + diff --git a/sw/source/ui/chrdlg/drpcps.src b/sw/source/ui/chrdlg/drpcps.src index 37f9e1254ba1..5b0e5ee7d589 100644 --- a/sw/source/ui/chrdlg/drpcps.src +++ b/sw/source/ui/chrdlg/drpcps.src @@ -2,9 +2,9 @@ * * $RCSfile: drpcps.src,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: os $ $Date: 2001-12-18 14:19:36 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -115,7 +115,8 @@ TabDialog DLG_DROPCAPS Text[ korean ] = "雼澖 觳鞛 鞛レ嫕"; Text[ turkish ] = "Ba㭎arfler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Iniciales"; + Text[ catalan ] = "Caplletres"; + Text[ thai ] = "喔曕副喔о腑喔编竵喔┼福喔傕付喙夃笝喔曕箟喔權笚喔掂箞喔∴傅喔傕笝喔侧笖喙冟斧喔嵿箞"; }; }; }; @@ -129,7 +130,8 @@ TabDialog DLG_DROPCAPS Text[ korean ] = "雼澖 觳鞛 鞛レ嫕"; Text[ turkish ] = "Ba㭎arfler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Iniciales"; + Text[ catalan ] = "Caplletres"; + Text[ thai ] = "喔曕副喔о腑喔编竵喔┼福喔傕付喙夃笝喔曕箟喔權笚喔掂箞喔∴傅喔傕笝喔侧笖喙冟斧喔嵿箞"; }; // TabPage ****************************************************************** TabPage TP_DROPCAPS @@ -162,8 +164,9 @@ TabPage TP_DROPCAPS Text[ korean ] = "雼澖 觳鞛 鞛レ嫕 響滌嫓"; Text[ turkish ] = "Ba harfleri vurgula"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Mostrar iniciales"; + Text[ catalan ] = "Visualitza les caplletres"; Text[ finnish ] = "N鋣t anfangit"; + Text[ thai ] = "喙佮釜喔斷竾喔溹弗喔曕副喔о腑喔编竵喔┼福喔傕付喙夃笝喔曕箟喔權笚喔掂箞喔∴傅喔傕笝喔侧笖喙冟斧喔嵿箞"; }; CheckBox CB_WORD { @@ -175,7 +178,7 @@ TabPage TP_DROPCAPS Text [ portuguese_brazilian ] = "Ganzes ~Wort" ; Text [ swedish ] = "Helt ~ord" ; Text [ danish ] = "Helt ord" ; - Text [ italian ] = "~Parola intera" ; + Text [ italian ] = "Parola intera" ; Text [ spanish ] = "Toda la pala~bra" ; Text [ french ] = "~Mot entier" ; Text [ dutch ] = "Heel ~woord" ; @@ -187,11 +190,12 @@ TabPage TP_DROPCAPS Text[ chinese_traditional ] = "鏁村嬪瓧(~W)"; Text[ arabic ] = "哚闵 咔汜"; Text[ greek ] = "想腌耒 胼铉"; - Text[ korean ] = "鞝勳泊 雼柎(~W)"; + Text[ korean ] = "雼柎(~W)"; Text[ turkish ] = "Tam s鰖c黭"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Toda la pala~bra"; + Text[ catalan ] = "~Tota la paraula"; Text[ finnish ] = "~Koko sana"; + Text[ thai ] = "喔勦赋~喔椸副喙夃竾喔浮喔"; }; FixedText FT_DROPCAPS { @@ -209,7 +213,7 @@ TabPage TP_DROPCAPS Text [ portuguese_brazilian ] = "Anzahl der Ze~ichen" ; Text [ portuguese ] = "N鷐ero de ~caracteres" ; Text[ chinese_simplified ] = "瀛楃鏁扮洰(~C)"; - Text[ russian ] = "暑腓麇耱忸 珥嚓钼"; + Text[ russian ] = "暑腓麇耱忸 耔焘铍钼"; Text[ polish ] = "Liczba znak體"; Text[ japanese ] = "鏂囧瓧鏁(~C)"; Text[ chinese_traditional ] = "瀛楀厓鏁哥洰(~C)"; @@ -218,8 +222,9 @@ TabPage TP_DROPCAPS Text[ korean ] = "氍胳瀽 靾(~C):"; Text[ turkish ] = "Karakter say齭"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~N鷐ero de caracteres"; - Text[ finnish ] = "~Merkkien m??r?"; + Text[ catalan ] = "~Nombre car郼ters"; + Text[ finnish ] = "~Merkkien m滗r"; + Text[ thai ] = "喔堗赋喔權抚喔檦喔曕副喔о腑喔编竵喔傕福喔:"; }; NumericField FLD_DROPCAPS { @@ -246,7 +251,7 @@ TabPage TP_DROPCAPS Text [ italian ] = "Righe" ; Text [ portuguese_brazilian ] = "~Linhas" ; Text [ portuguese ] = "~Linhas" ; - Text [ finnish ] = "~Viivat" ; + Text [ finnish ] = "~Rivit" ; Text [ danish ] = "R鎘ker" ; Text [ french ] = "~Hauteur (en lignes)" ; Text [ swedish ] = "~Rader" ; @@ -254,7 +259,7 @@ TabPage TP_DROPCAPS Text [ spanish ] = "~L韓eas" ; Text [ english_us ] = "~Lines" ; Text[ chinese_simplified ] = "琛(~L)"; - Text[ russian ] = "羊痤觇"; + Text[ russian ] = "羊痤~觇"; Text[ polish ] = "Wiersze"; Text[ japanese ] = "琛(~L)"; Text[ chinese_traditional ] = "琛(~L)"; @@ -263,7 +268,8 @@ TabPage TP_DROPCAPS Text[ korean ] = "靹(~L)"; Text[ turkish ] = "Sat齬 adedi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~L韓eas"; + Text[ catalan ] = "~L韓ies"; + Text[ thai ] = "~喔氞福喔｀笚喔编笖"; }; NumericField FLD_LINES { @@ -290,7 +296,7 @@ TabPage TP_DROPCAPS Text [ italian ] = "D~istanza dal testo" ; Text [ portuguese_brazilian ] = "D~ist?ncia" ; Text [ portuguese ] = "~Dist鈔cia do texto" ; - Text [ finnish ] = "Et?isyys tekstiin" ; + Text [ finnish ] = "Et鋓syys tekstist" ; Text [ danish ] = "Afstand til tekst" ; Text [ french ] = "~蒫art du texte" ; Text [ swedish ] = "A~vst錸d till text" ; @@ -298,16 +304,17 @@ TabPage TP_DROPCAPS Text [ spanish ] = "~Distancia hasta el texto" ; Text [ english_us ] = "Space to text" ; Text[ chinese_simplified ] = "鑷虫枃瀛楃殑璺濈"; - Text[ russian ] = "朽耨蝾龛 铗 蝈犟蜞"; + Text[ russian ] = "朽耨蝾龛 漕 蝈犟蜞"; Text[ polish ] = "Odst阷 od tekstu"; Text[ japanese ] = "銉嗐偔銈广儓銇俱仹銇枔闅"; Text[ chinese_traditional ] = "鑷虫枃瀛楃殑璺濈"; Text[ arabic ] = "轻阌禽 褪 轻湔"; Text[ greek ] = "羱瘘篝狍 狃 麸 赍哽屙"; - Text[ korean ] = "韰嶌姢韸胳棎 雽頃 臧勱博"; + Text[ korean ] = "韰嶌姢韸胳檧鞚 臧勱博"; Text[ turkish ] = "Metne uzakl齥"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Distancia hasta el texto"; + Text[ catalan ] = "Espai per al text"; + Text[ thai ] = "喔｀赴喔⑧赴喔箞喔侧竾喔傕箟喔竸喔о覆喔"; }; MetricField FLD_DISTANCE { @@ -353,7 +360,8 @@ TabPage TP_DROPCAPS Text[ korean ] = "靹れ爼"; Text[ turkish ] = "Ayarlar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Configuraci髇"; + Text[ catalan ] = "Configuraci"; + Text[ thai ] = "喔佮赋喔笝喔"; }; Control CNT_PICT { @@ -374,7 +382,7 @@ TabPage TP_DROPCAPS Text [ portuguese ] = "~Texto" ; Text [ finnish ] = "~Teksti" ; Text [ danish ] = "Initialtekst" ; - Text [ french ] = "~Autre caract鑢e" ; + Text [ french ] = "~Texte" ; Text [ swedish ] = "Anfangs~text" ; Text [ dutch ] = "~Initialentekst" ; Text [ spanish ] = "Te~xto" ; @@ -386,10 +394,11 @@ TabPage TP_DROPCAPS Text[ chinese_traditional ] = "澶у瀛(~T)"; Text[ arabic ] = "轻湔"; Text[ greek ] = "叔哽屙"; - Text[ korean ] = "韰嶌姢韸(~T)"; + Text[ korean ] = "雼澖 觳 氍胳瀽 鞛レ嫕鞚 韰嶌姢韸(~T)"; Text[ turkish ] = "Ba㭎arf metni"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Te~xto"; + Text[ catalan ] = "~Text"; + Text[ thai ] = "~喔傕箟喔竸喔о覆喔"; }; Edit EDT_TEXT { @@ -411,24 +420,25 @@ TabPage TP_DROPCAPS Text [ italian ] = "Modello di carattere" ; Text [ portuguese_brazilian ] = "Es~tilo" ; Text [ portuguese ] = "Es~tilo de caracteres" ; - Text [ finnish ] = "~Merkist? tyyli" ; + Text [ finnish ] = "~Merkkityyli" ; Text [ danish ] = "Tegntypografi" ; - Text [ french ] = "~Style de caract鑢es" ; + Text [ french ] = "Style de caract鑢es" ; Text [ swedish ] = "Tecken~formatmall" ; Text [ dutch ] = "~Tekenopmaakprofiel" ; Text [ spanish ] = "E~stilo de car醕ter" ; Text [ english_us ] = "Character St~yle" ; Text[ chinese_simplified ] = "瀛楃鏍峰紡(~Y)"; - Text[ russian ] = "~羊桦 珥嚓钼"; + Text[ russian ] = "~羊桦 耔焘铍"; Text[ polish ] = "Styl znaku"; Text[ japanese ] = "鏂囧瓧銈广偪銈ゃ儷(~Y)"; Text[ chinese_traditional ] = "瀛楀厓妯ｅ紡(~Y)"; Text[ arabic ] = "溷 轻猛演"; Text[ greek ] = "郁蹼 麽襻牯揆"; - Text[ korean ] = "氍胳瀽 韰滍攲毽(~Y)"; + Text[ korean ] = "氍胳瀽 鞀ろ儉鞚(~Y)"; Text[ turkish ] = "Karakter ~bi鏸mi"; - Text[ language_user1 ] = "All \"Vorlage\"/Styles are always written with capital S. 10.5.00EM"; - Text[ catalan ] = "E~stilo de car醕ter"; + Text[ language_user1 ] = "All ; All \"Vorlage\"/Styles are always written with capital S. 10.5.00EM"; + Text[ catalan ] = "E~stil de car郼ter"; + Text[ thai ] = "喔ム副喔亊喔┼笓喔班笗喔编抚喔副喔佮競喔｀赴"; }; ListBox BOX_TEMPLATE { @@ -463,10 +473,30 @@ TabPage TP_DROPCAPS Text[ korean ] = "雮挫毄"; Text[ turkish ] = "葭erik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Contenido"; + Text[ catalan ] = "Contingut"; Text[ finnish ] = "Sis鋖t"; + Text[ thai ] = "喙喔權阜喙夃腑喔覆"; }; }; // ********************************************************************** EOF + + + + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/chrdlg/numpara.src b/sw/source/ui/chrdlg/numpara.src index 186725e6f29c..fb824e583ce5 100644 --- a/sw/source/ui/chrdlg/numpara.src +++ b/sw/source/ui/chrdlg/numpara.src @@ -2,9 +2,9 @@ * * $RCSfile: numpara.src,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: os $ $Date: 2002-11-06 10:14:32 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -93,7 +93,7 @@ TabPage TP_NUMPARA Text[ chinese_traditional ] = "绶ㄨ櫉妯ｅ紡"; Text[ arabic ] = "溷 轻恃揄"; Text[ greek ] = "郁蹼 狁哞扃箸"; - Text[ korean ] = "氩堩樃 毵り赴旮 韰滍攲毽"; + Text[ korean ] = "氩堩樃 毵り赴旮 鞀ろ儉鞚"; Text[ turkish ] = "Numaralama bi鏸mi"; Text[ language_user1 ] = " "; Text[ catalan ] = "Estil de numeraci"; @@ -196,7 +196,7 @@ TabPage TP_NUMPARA }; StringList [ finnish ] = { - < "Ei mit??n" ; > ; + < "Ei mit滗n" ; > ; }; StringList [ thai ] = { @@ -261,7 +261,7 @@ TabPage TP_NUMPARA Text[ turkish ] = "Bu paragraf ile yeniden baa"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Torna a comen鏰r en aquest par鄃raf"; - Text[ finnish ] = "~Aloita alusta t鋗鋘 kappaleen kohdalla"; + Text[ finnish ] = "A~loita alusta t鋗鋘 kappaleen kohdalla"; Text[ thai ] = "喙喔｀复喙垀喔∴笚喔掂箞喔⑧箞喔斧喔權箟喔侧笝喔掂箟喙冟斧喔∴箞"; }; TriStateBox CB_NUMBER_NEW_START @@ -276,8 +276,8 @@ TabPage TP_NUMPARA Text [ portuguese_brazilian ] = "~Beginnen mit:" ; Text [ swedish ] = "~B鰎ja med" ; Text [ danish ] = "~Begynd med" ; - Text [ italian ] = "Inizia con..." ; - Text [ spanish ] = "Empezar con" ; + Text [ italian ] = "Ini~zia con" ; + Text [ spanish ] = "~Empezar con" ; Text [ french ] = "Commencer avec" ; Text [ dutch ] = "~Beginnen met" ; Text[ chinese_simplified ] = "寮濮嬩粠(~S)"; @@ -333,7 +333,7 @@ TabPage TP_NUMPARA Text[ chinese_traditional ] = "琛岀法铏"; Text[ arabic ] = "恃揄 轻糜匮"; Text[ greek ] = "榴哞扃箸 泷犰忐"; - Text[ korean ] = "頄 氩堩樃 毵り赴旮"; + Text[ korean ] = "欷 氩堩樃 毵り赴旮"; Text[ turkish ] = "Sat齬 numaralama"; Text[ language_user1 ] = " "; Text[ catalan ] = "Numeraci de l韓ies"; @@ -357,7 +357,7 @@ TabPage TP_NUMPARA Text [ dutch ] = "~De regels van deze alinea meetellen." ; Text [ portuguese ] = "~Incluir as linhas deste par醙rafo" ; Text[ chinese_simplified ] = "鍖呮嫭杩欎釜娈佃惤鐨勮(~I)"; - Text[ russian ] = "痒栩囹, 怅膻鬣 耱痤觇 钽 噌玎鲟"; + Text[ russian ] = "腕戾痤忄螯 耱痤觇"; Text[ polish ] = "９cznie z wierszami tego akapitu"; Text[ japanese ] = "銇撱伄娈佃惤銇鏁般倰鍚倎銈(~I)"; Text[ chinese_traditional ] = "鍖呮嫭閫欏嬫钀界殑琛(~I)"; @@ -387,7 +387,7 @@ TabPage TP_NUMPARA Text [ french ] = "Recommencer avec ce paragraphe" ; Text [ dutch ] = "~Bij deze alinea opnieuw beginnen" ; Text[ chinese_simplified ] = "鍦ㄨ繖涓钀藉閲嶆柊寮濮(~A)"; - Text[ russian ] = "袜鬣螯 钽 噌玎鲟"; + Text[ russian ] = "袜鬣螯 钽 噌玎鲟 耥钼"; Text[ polish ] = "Zacznij p~onownie od tego akapitu"; Text[ japanese ] = "銇撱伄娈佃惤銇ф柊銇椼亸闁嬪(~A)"; Text[ chinese_traditional ] = "寰為欏嬫钀介噸鏂伴枊濮(~A)"; @@ -397,7 +397,7 @@ TabPage TP_NUMPARA Text[ turkish ] = "Bu paragraf ile yeniden baa"; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna a comen鏰r en ~aquest par鄃raf"; - Text[ finnish ] = "~Aloita t鋝s kappaleessa uudestaan"; + Text[ finnish ] = "Aloi~ta alusta t鋗鋘 kappaleen kohdalla"; Text[ thai ] = "喙喔｀复喙垀喔∴笚喔掂箞喔⑧箞喔斧喔權箟喔侧笝喔掂箟"; }; FixedText FT_RESTART_NO @@ -427,7 +427,7 @@ TabPage TP_NUMPARA Text[ turkish ] = "~Baang de餰ri:"; Text[ language_user1 ] = " "; Text[ catalan ] = "Comen鏰 ~amb:"; - Text[ finnish ] = "~Aloitus:"; + Text[ finnish ] = "Alo~itus:"; Text[ thai ] = "喙~喔｀复喙堗浮喔斷箟喔о涪"; }; NumericField NF_RESTART_PARA @@ -451,3 +451,19 @@ TabPage TP_NUMPARA + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/chrdlg/paradlg.src b/sw/source/ui/chrdlg/paradlg.src index e6d9157d6646..ef21c8e36830 100644 --- a/sw/source/ui/chrdlg/paradlg.src +++ b/sw/source/ui/chrdlg/paradlg.src @@ -2,9 +2,9 @@ * * $RCSfile: paradlg.src,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: obo $ $Date: 2001-11-16 23:10:24 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -97,25 +97,26 @@ TabDialog DLG_PARA Text [ italian ] = "Paragrafo" ; Text [ portuguese_brazilian ] = "Par?grafo" ; Text [ portuguese ] = "Avan鏾s e espa鏰mento" ; - Text [ finnish ] = "Sisennykset ja v?lit" ; + Text [ finnish ] = "Sisennykset ja v鋖it" ; Text [ danish ] = "Indrykning og mellemrum" ; Text [ french ] = "Retraits et 閏arts" ; Text [ swedish ] = "Indrag och avst錸d" ; - Text [ dutch ] = "Inspringen en afstanden" ; + Text [ dutch ] = "Inspringing en afstanden" ; Text [ spanish ] = "Sangr韆s y espacios" ; Text [ english_us ] = "Indents & Spacing" ; PageResID = TP_PARA_STD ; Text[ chinese_simplified ] = "缂╄繘鍜岄棿闅"; Text[ russian ] = "悟耱箫 桧蝈疴嚯"; Text[ polish ] = "Wci阠ia i odst阷y"; - Text[ japanese ] = "锝诧緷锞冿緸锞濓緞銇ㄨ闁撻殧"; + Text[ japanese ] = "銈ゃ兂銉囥兂銉堛仺琛岄枔闅"; Text[ chinese_traditional ] = "绺帓鍜岄枔闅"; Text[ arabic ] = "轻乓峭 媲崾惹谙"; Text[ greek ] = "朋秣蒡 赆 狃矬糗箦轵"; - Text[ korean ] = "霌れ棳鞊瓣赴鞕 臧勱博"; + Text[ korean ] = "霌れ棳鞊瓣赴 氚 臧勱博"; Text[ turkish ] = "Girinti ve aral齥lar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sangr韆s y espacios"; + Text[ catalan ] = "Sagnats & Espaiat"; + Text[ thai ] = "喔｀赴喔⑧赴喙喔⑧阜喙夃腑喔囙箒喔ム赴喔｀赴喔⑧赴喔箞喔侧竾"; }; PageItem { @@ -139,11 +140,12 @@ TabDialog DLG_PARA Text[ chinese_traditional ] = "灏嶉綂"; Text[ arabic ] = "轻阃切巧"; Text[ greek ] = "郁镞鏖箸"; - Text[ korean ] = "鞝曤牞"; + Text[ korean ] = "毵烄钉"; Text[ turkish ] = "Hizalama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Alineaci髇"; + Text[ catalan ] = "Alineament"; Text[ finnish ] = "Tasaus"; + Text[ thai ] = "喔堗副喔斷笗喔赤箒喔笝喙堗竾"; }; PageItem { @@ -164,7 +166,7 @@ TabDialog DLG_PARA Text [ english_us ] = "Text Flow" ; PageResID = TP_PARA_EXT ; Text[ chinese_simplified ] = "鎹㈣鍜屽垎椤"; - Text[ russian ] = "项腩驽龛 磬 耱疣龛鲥"; + Text[ russian ] = "袜 耱疣龛鲥"; Text[ polish ] = "Tekst"; Text[ japanese ] = "浣撹"; Text[ chinese_traditional ] = "鎻涜鍜屽垎闋"; @@ -173,7 +175,8 @@ TabDialog DLG_PARA Text[ greek ] = "扬 赍殪蓓秕"; Text[ korean ] = "韰嶌姢韸 頋愲"; Text[ turkish ] = "Metin ak"; - Text[ catalan ] = "Flujo del texto"; + Text[ catalan ] = "Flux del text"; + Text[ thai ] = "喔佮覆喔｀箘喔弗喔傕腑喔囙競喙夃腑喔勦抚喔侧浮"; }; PageItem { @@ -182,24 +185,25 @@ TabDialog DLG_PARA Text [ ENGLISH ] = "Asian typography" ; Text[ english_us ] = "Asian Typography"; Text[ portuguese ] = "Tipografia asi醫ica"; - Text[ russian ] = "犁栲蝰觇 梏螓"; + Text[ russian ] = "犁栲蝰觐 铘铕祀屙桢"; Text[ greek ] = "馏檐糸赙 趱痫泷狯哚"; Text[ dutch ] = "Aziatische typografie"; Text[ french ] = "Typographie asiatique"; Text[ spanish ] = "Tipograf韆 asi醫ica"; Text[ italian ] = "Tipografia asiatica"; - Text[ danish ] = "Asian typography"; + Text[ danish ] = "Asiatisk typografi"; Text[ swedish ] = "Asiatisk typografi"; 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"; Text[ arabic ] = "糜徭 轻厝勤 轻掠礞砩"; - Text[ catalan ] = "Tipograf韆 asi醫ica"; + Text[ catalan ] = "Tipografia asi鄑ica"; Text[ finnish ] = "Aasialaiset merkit"; + Text[ thai ] = "喔佮覆喔｀笧喔脆浮喔炧箤喙佮笟喔氞箑喔箑喔娻傅喔"; }; PageItem { @@ -222,11 +226,12 @@ TabDialog DLG_PARA Text[ chinese_traditional ] = "绶ㄨ櫉"; Text[ arabic ] = "轻恃揄"; Text[ greek ] = "榴哞扃箸"; - Text[ korean ] = "氩堩樃毵り赴旮"; + Text[ korean ] = "氩堩樃 毵り赴旮"; Text[ turkish ] = "Numaralama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇"; + Text[ catalan ] = "Numeraci"; Text[ finnish ] = "Numerointi"; + Text[ thai ] = "喔ム赋喔斷副喔氞笗喔编抚喙喔ム競"; }; PageItem { @@ -248,14 +253,15 @@ TabDialog DLG_PARA Text[ chinese_simplified ] = "鍒惰〃绗"; Text[ russian ] = "亦狍鲨"; Text[ polish ] = "Tabulator"; - Text[ japanese ] = "锞锞岋緸"; - Text[ chinese_traditional ] = "瑁借〃绗"; + Text[ japanese ] = "銈裤儢"; + Text[ chinese_traditional ] = "瀹氫綅閸"; Text[ arabic ] = "卺倾 滔驷"; Text[ greek ] = "郁珉镨蒴珧"; Text[ korean ] = "韮"; Text[ turkish ] = "Sekmeler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Tabulaciones"; + Text[ catalan ] = "Pestanyes"; + Text[ thai ] = "喔｀赴喔⑧赴喔佮副喙夃笝"; }; PageItem { @@ -277,14 +283,15 @@ TabDialog DLG_PARA Text[ chinese_simplified ] = "瀛楅澶у啓"; Text[ russian ] = "馏赈桷"; Text[ polish ] = "Inicja硑"; - Text[ japanese ] = "锞勶緸锞涳蒋锞岋緹锝凤浆锝緦锞"; + Text[ japanese ] = "銉夈儹銉冦儣銈儯銉冦儣"; Text[ chinese_traditional ] = "瀛楅澶у"; Text[ arabic ] = "轻猛演 轻怯叔崆犴"; Text[ greek ] = "榴鏖泷莒灬翎"; Text[ korean ] = "雼澖 觳鞛 鞛レ嫕"; Text[ turkish ] = "Ba㭎arfler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Iniciales"; + Text[ catalan ] = "Caplletres"; + Text[ thai ] = "喔曕副喔о腑喔编竵喔┼福喔傕付喙夃笝喔曕箟喔權笚喔掂箞喔∴傅喔傕笝喔侧笖喙冟斧喔嵿箞"; }; PageItem { @@ -300,7 +307,7 @@ TabDialog DLG_PARA Text [ french ] = "Bordure" ; Text [ swedish ] = "Inramning" ; Text [ dutch ] = "Omranding" ; - Text [ spanish ] = "Borde" ; + Text [ spanish ] = "Bordes" ; Text [ english_us ] = "Borders" ; PageResID = TP_BORDER ; Text[ chinese_simplified ] = "杈规"; @@ -313,7 +320,8 @@ TabDialog DLG_PARA Text[ korean ] = "韰岆憪毽"; Text[ turkish ] = "Kenarl齥"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Borde"; + Text[ catalan ] = "Vores"; + Text[ thai ] = "喙喔箟喔權競喔笟"; }; PageItem { @@ -342,7 +350,8 @@ TabDialog DLG_PARA Text[ korean ] = "氚瓣步"; Text[ turkish ] = "Artalan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fondo"; + Text[ catalan ] = "Fons"; + Text[ thai ] = "喔炧阜喙夃笝喔弗喔编竾"; }; }; }; @@ -356,7 +365,8 @@ TabDialog DLG_PARA Text[ korean ] = "雼澖"; Text[ turkish ] = "Paragraf"; Text[ language_user1 ] = " "; - Text[ catalan ] = "P醨rafo"; + Text[ catalan ] = "Par鄃raf"; + Text[ thai ] = "喔⑧箞喔斧喔權箟喔"; }; TabDialog DLG_DRAWPARA { @@ -391,7 +401,7 @@ TabDialog DLG_DRAWPARA Text [ italian ] = "Rientri e spaziature" ; Text [ portuguese_brazilian ] = "Par?grafo" ; Text [ portuguese ] = "Avan鏾s e espa鏰mento" ; - Text [ finnish ] = "Sisennykset ja v?lit" ; + Text [ finnish ] = "Sisennykset ja v鋖it" ; Text [ danish ] = "Indrykning og mellemrum" ; Text [ french ] = "Retraits et 閏arts" ; Text [ swedish ] = "Indrag och avst錸d" ; @@ -402,14 +412,15 @@ TabDialog DLG_DRAWPARA Text[ chinese_simplified ] = "缂╄繘鍜岄棿闅"; Text[ russian ] = "悟耱箫 桧蝈疴嚯"; Text[ polish ] = "Wci阠ia i odst阷y"; - Text[ japanese ] = "锝诧緷锞冿緸锞濓緞銇ㄨ闁撻殧"; + Text[ japanese ] = "銈ゃ兂銉囥兂銉堛仺琛岄枔闅"; Text[ chinese_traditional ] = "绺帓鍜岄枔闅"; Text[ arabic ] = "轻乓峭 媲崾惹谙"; Text[ language_user1 ] = " "; Text[ greek ] = "朋秣蒡 赆 狃矬糗箦轵"; - Text[ korean ] = "霌れ棳鞊瓣赴鞕 臧勱博"; + Text[ korean ] = "霌れ棳鞊瓣赴 氚 臧勱博"; Text[ turkish ] = "Girinti ve aral齥lar"; - Text[ catalan ] = "Sangr韆s y espacios"; + Text[ catalan ] = "Sagnats & Espaiat"; + Text[ thai ] = "喔｀赴喔⑧赴喙喔⑧阜喙夃腑喔囙箒喔ム赴喔｀赴喔⑧赴喔箞喔侧竾"; }; #if SUPD>352 PageItem @@ -437,8 +448,9 @@ TabDialog DLG_DRAWPARA Text[ korean ] = "毵烄钉"; Text[ turkish ] = "Hizalama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Alineaci髇"; + Text[ catalan ] = "Alineament"; Text[ finnish ] = "Tasaus"; + Text[ thai ] = "喔堗副喔斷笗喔赤箒喔笝喙堗竾"; }; #endif PageItem @@ -448,24 +460,25 @@ TabDialog DLG_DRAWPARA Text [ ENGLISH ] = "Asian typography" ; Text[ english_us ] = "Asian Typography"; Text[ portuguese ] = "Tipografia asi醫ica"; - Text[ russian ] = "犁栲蝰觇 梏螓"; + Text[ russian ] = "犁栲蝰觐 铘铕祀屙桢"; Text[ greek ] = "馏獒糸贽 趱痫泷狯哚"; Text[ dutch ] = "Aziatische typografie"; Text[ french ] = "Typographie asiatique"; Text[ spanish ] = "Tipograf韆 asi醫ica"; Text[ italian ] = "Tipografia asiatica"; - Text[ danish ] = "Asian typography"; + Text[ danish ] = "Asiatisk typografi"; Text[ swedish ] = "Asiatisk typografi"; 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"; Text[ arabic ] = "糜徭 轻厝勤 轻掠礞砩"; - Text[ catalan ] = "Tipograf韆 asi醫ica"; + Text[ catalan ] = "Tipografia asi鄑ica"; Text[ finnish ] = "Aasialaiset merkit"; + Text[ thai ] = "喔佮覆喔｀笧喔脆浮喔炧箤喙佮笟喔氞箑喔箑喔娻傅喔"; }; PageItem { @@ -487,14 +500,15 @@ TabDialog DLG_DRAWPARA Text[ chinese_simplified ] = "鍒惰〃绗"; Text[ russian ] = "亦狍鲨"; Text[ polish ] = "Tabulator"; - Text[ japanese ] = "锞锞岋緸"; - Text[ chinese_traditional ] = "瑁借〃绗"; + Text[ japanese ] = "銈裤儢"; + Text[ chinese_traditional ] = "瀹氫綅閸"; Text[ arabic ] = "卺倾 滔驷"; Text[ greek ] = "郁珉镨蒴珧"; Text[ korean ] = "韮"; Text[ turkish ] = "Sekmeler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Tabulaciones"; + Text[ catalan ] = "Pestanyes"; + Text[ thai ] = "喔｀赴喔⑧赴喔佮副喙夃笝"; }; }; }; @@ -508,7 +522,8 @@ TabDialog DLG_DRAWPARA Text[ korean ] = "雼澖"; Text[ turkish ] = "Paragraf"; Text[ language_user1 ] = " "; - Text[ catalan ] = "P醨rafo"; + Text[ catalan ] = "Par鄃raf"; + Text[ thai ] = "喔⑧箞喔斧喔權箟喔"; }; @@ -519,3 +534,6 @@ TabDialog DLG_DRAWPARA + + + diff --git a/sw/source/ui/chrdlg/swbreak.src b/sw/source/ui/chrdlg/swbreak.src index 00d07da2453f..324600f22a6e 100644 --- a/sw/source/ui/chrdlg/swbreak.src +++ b/sw/source/ui/chrdlg/swbreak.src @@ -2,9 +2,9 @@ * * $RCSfile: swbreak.src,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: kz $ $Date: 2001-08-14 16:05:32 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -119,7 +119,7 @@ ModalDialog DLG_BREAK Text [ portuguese ] = "~Quebra de linha" ; Text [ finnish ] = "~Rivinvaihto" ; Text [ danish ] = "Linjeskift" ; - Text [ french ] = "R~envoi la ligne" ; + Text [ french ] = "Renvoi la ligne" ; Text [ swedish ] = "~Radbrytning" ; Text [ dutch ] = "~Regeleinde" ; Text [ spanish ] = "Salto de ~l韓ea" ; @@ -127,16 +127,17 @@ ModalDialog DLG_BREAK TabStop = TRUE ; Group = TRUE ; Text[ chinese_simplified ] = "鎹㈣(~L)"; - Text[ russian ] = "朽琊 耱痤觇"; + Text[ russian ] = "襄疱眍 耱痤觇"; Text[ polish ] = "Podzia ~wierszy"; Text[ japanese ] = "鏀硅(~L)"; Text[ chinese_traditional ] = "鎻涜(~L)"; Text[ arabic ] = "萸蔗 糜匮"; Text[ greek ] = "岭脶戕 泷犰燹"; - Text[ korean ] = "臧滍枆(~L)"; + Text[ korean ] = "欷 氚旉繄(~L)"; Text[ turkish ] = "Sat齬 sonu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Salto de ~l韓ea"; + Text[ catalan ] = "Salt de ~l韓ia"; + Text[ thai ] = "喙佮笟喙堗竾~喔氞福喔｀笚喔编笖"; }; RadioButton RB_PAGE { @@ -145,7 +146,7 @@ ModalDialog DLG_BREAK Text = "~Seitenumbruch" ; Text [ ENGLISH ] = "~Page break" ; Text [ norwegian ] = "~Sideskift" ; - Text [ italian ] = "In~terruzione pagina" ; + Text [ italian ] = "Interruzione pagina" ; Text [ portuguese_brazilian ] = "~Quebra de p?gina" ; Text [ portuguese ] = "~Quebra de p醙ina" ; Text [ finnish ] = "~Sivunvaihto" ; @@ -160,14 +161,15 @@ ModalDialog DLG_BREAK Text[ chinese_simplified ] = "鎹㈤〉(~P)"; Text[ russian ] = "朽琊 耱疣龛鳆"; Text[ polish ] = "Podzia stron"; - Text[ japanese ] = "鏀癸緧锞燂桨锝硷緸(~P)"; + Text[ japanese ] = "鏀广儦銉笺偢(~P)"; Text[ chinese_traditional ] = "鎻涢爜(~P)"; Text[ arabic ] = "萸蔗 蛰颓"; Text[ greek ] = "岭脶戕 箦脒溽"; - Text[ korean ] = "飒 雮橂垊旮(~P)"; + Text[ korean ] = "韼橃澊歆 雮橂垊旮(~P)"; Text[ turkish ] = "~Sayfa sonu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Salto de ~p醙ina"; + Text[ catalan ] = "Salt de ~p鄃ina"; + Text[ thai ] = "喙佮笟喙堗竾~喔笝喙夃覆"; }; RadioButton RB_COL { @@ -179,7 +181,7 @@ ModalDialog DLG_BREAK Text [ italian ] = "Interr~uzione colonna" ; Text [ portuguese_brazilian ] = "~Quebra de coluna" ; Text [ portuguese ] = "~Quebra de coluna" ; - Text [ finnish ] = "~Sarakkeen vaihto" ; + Text [ finnish ] = "Palstan ~vaihto" ; Text [ danish ] = "Spalteskift" ; Text [ french ] = "Saut de ~colonne" ; Text [ swedish ] = "Kolumnbrytning" ; @@ -188,7 +190,7 @@ ModalDialog DLG_BREAK Text [ english_us ] = "~Column break" ; TabStop = TRUE ; Text[ chinese_simplified ] = "鎹㈡爮(~C)"; - Text[ russian ] = "朽琊 觐腩黻"; + Text[ russian ] = "朽琊 耱铍狯"; Text[ polish ] = "Podzia kolumny"; Text[ japanese ] = "鏀规(~C)"; Text[ chinese_traditional ] = "鎻涙瑒(~C)"; @@ -197,7 +199,8 @@ ModalDialog DLG_BREAK Text[ korean ] = "鞐 雮橂垊旮(~C)"; Text[ turkish ] = "S黷un sonu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Salto de colu~mna"; + Text[ catalan ] = "~Salt de columna"; + Text[ thai ] = "喙佮笟喙堗竾~喔勦腑喔ム副喔∴笝喙"; }; FixedLine FL_BREAK { @@ -223,10 +226,11 @@ ModalDialog DLG_BREAK Text[ chinese_traditional ] = "椤炲瀷"; Text[ arabic ] = "轻滏"; Text[ greek ] = "札痫"; - Text[ korean ] = "順曧儨"; + Text[ korean ] = "順曥嫕"; Text[ turkish ] = "T黵"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Tipo"; + Text[ catalan ] = "Tipus"; + Text[ thai ] = "喔娻笝喔脆笖"; }; FixedText FT_COLL { @@ -238,9 +242,9 @@ ModalDialog DLG_BREAK Text [ italian ] = "Modello" ; Text [ portuguese_brazilian ] = "~Estilo" ; Text [ portuguese ] = "~Estilo" ; - Text [ finnish ] = "~Tyyli" ; + Text [ finnish ] = "T~yyli" ; Text [ danish ] = "Typografi" ; - Text [ french ] = "~Style" ; + Text [ french ] = "Style" ; Text [ swedish ] = "~Formatmall" ; Text [ dutch ] = "~Profiel" ; Text [ spanish ] = "~Estilo" ; @@ -248,16 +252,17 @@ ModalDialog DLG_BREAK Group = TRUE ; Left = TRUE ; Text[ chinese_simplified ] = "鏍峰紡(~S)"; - Text[ russian ] = "剜犭铐"; + Text[ russian ] = "羊桦"; Text[ polish ] = "Szablon"; - Text[ japanese ] = "锝斤線锝诧緳(~S)"; + Text[ japanese ] = "銈广偪銈ゃ儷(~S)"; Text[ chinese_traditional ] = "妯ｅ紡(~S)"; Text[ arabic ] = "溷"; Text[ greek ] = "旭躔"; - Text[ korean ] = "鞙犿槙(~S)"; + Text[ korean ] = "鞀ろ儉鞚(~S)"; Text[ turkish ] = "~Bi鏸m"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Estilo"; + Text[ catalan ] = "~Estil"; + Text[ thai ] = "~喔ム副喔佮俯喔撪赴"; }; ListBox LB_COLL { @@ -324,7 +329,7 @@ ModalDialog DLG_BREAK }; StringList [ russian ] = { - < "[铃鏬" ; > ; + < "[湾騗" ; > ; }; StringList [ polish ] = { @@ -360,7 +365,11 @@ ModalDialog DLG_BREAK }; StringList [ catalan ] = { - < "[Sin]" ; > ; + < "[Cap]" ; > ; + }; + StringList [ thai ] = + { + < "[喙勦浮喙堗浮喔礭" ; > ; }; }; CheckBox CB_PAGENUM @@ -385,14 +394,15 @@ ModalDialog DLG_BREAK Text[ chinese_simplified ] = "鏇存敼椤电爜(~N)"; Text[ russian ] = "如戾龛螯 眍戾 耱疣龛鳆"; Text[ polish ] = "Zmie numer strony"; - Text[ japanese ] = "锞嶏緹锝帮郊锞炵暘鍙枫伄澶夋洿(~N)"; + Text[ japanese ] = "銉氥兗銈哥暘鍙枫伄澶夋洿(~N)"; Text[ chinese_traditional ] = "璁婃洿闋佺⒓(~N)"; Text[ arabic ] = "售眄 艳 轻蛰蜕"; Text[ greek ] = "岭脶戕 狁殍祜 箦脒溽"; - Text[ korean ] = "飒 銆氩堩樃 氤瓴(~N)"; + Text[ korean ] = "韼橃澊歆 氩堩樃 氤瓴(~N)"; Text[ turkish ] = "Sayfa numaras齨 de餴⺶ir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Cam~biar n鷐ero de p醙ina"; + Text[ catalan ] = "Can~via n鷐ero de p鄃ina"; + Text[ thai ] = "喙喔涏弗喔掂箞喔⑧笝喙~喔ム競喔笝喙夃覆"; }; NumericField ED_PAGENUM { @@ -419,7 +429,8 @@ ModalDialog DLG_BREAK Text[ korean ] = "雮橂垊旮 靷届瀰"; Text[ turkish ] = "Kesme ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar salto"; + Text[ catalan ] = "Insereix un salt"; + Text[ thai ] = "喙佮笚喔｀竵喔曕副喔о箒喔氞箞喔"; }; @@ -428,3 +439,14 @@ ModalDialog DLG_BREAK + + + + + + + + + + + diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src index 5369c5a0a3c0..5b6ce0faf8b5 100644 --- a/sw/source/ui/config/optdlg.src +++ b/sw/source/ui/config/optdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: optdlg.src,v $ * - * $Revision: 1.87 $ + * $Revision: 1.88 $ * - * last change: $Author: kz $ $Date: 2002-12-05 10:28:22 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -119,7 +119,7 @@ TabPage TP_CONTENT_OPT Text [ ENGLISH ] = "Guides while moving" ; Text[ english_us ] = "Guides ~while moving"; Text[ portuguese ] = "G~uias ao mover"; - Text[ russian ] = "袜镳噔桢 镳 镥疱戾龛"; + Text[ russian ] = "袜镳噔桢 ~镳 镥疱戾龛"; Text[ greek ] = "嘛玷玺殛蒡 泷犰燧 赆糗 翮 戾翎赀礴~箸"; Text[ dutch ] = "Hulpli~jnen bij verplaatsen"; Text[ french ] = "Rep鑢es lors du d閜lacement"; @@ -158,7 +158,7 @@ TabPage TP_CONTENT_OPT Text[ polish ] = "Proste uchwyty"; Text[ portuguese_brazilian ] = "Simple control points"; Text[ japanese ] = "銈枫兂銉椼儷銇儚銉炽儔銉(~P)"; - Text[ korean ] = "雼澕 頃鸽摛(~P)"; + Text[ korean ] = "雼垳 頃鸽摛(~P)"; Text[ chinese_simplified ] = "鏍囧噯鎺х偣(~P)"; Text[ chinese_traditional ] = "妯欐簴鎺ч粸(~P)"; Text[ turkish ] = "Simple control points"; @@ -246,7 +246,7 @@ TabPage TP_CONTENT_OPT Text[ chinese_traditional ] = "姘村钩鍚戞嵅杌(~O)"; Text[ arabic ] = "匝碡 释秧 轻蛰蜕 幂揄丘"; Text[ greek ] = "像殒糸 泷犰燹 挲腴箸"; - Text[ korean ] = "靾橅弶 鞀ろ伂搿(~O)"; + Text[ korean ] = "靾橅弶 鞀ろ伂搿 毵夒寑(~O)"; Text[ turkish ] = "Yatay kayd齬ma ~鐄bu饀"; Text[ language_user1 ] = " "; Text[ finnish ] = "Vaakavierityspalkki"; @@ -275,7 +275,7 @@ TabPage TP_CONTENT_OPT Text[ chinese_traditional ] = "鍨傜洿寮忔嵅杌(~V)"; Text[ arabic ] = "匝碡 释秧 轻蛰蜕 衙禹丘"; Text[ greek ] = "梳翎挈聃~鲧 泷犰燹 挲腴箸"; - Text[ korean ] = "靾橃 鞀ろ伂搿(~V)"; + Text[ korean ] = "靾橃 鞀ろ伂搿 毵夒寑(~V)"; Text[ turkish ] = "Di~key kayd齬ma 鐄bu饀"; Text[ language_user1 ] = " "; Text[ finnish ] = "Pystyvierityspalkki"; @@ -292,17 +292,17 @@ TabPage TP_CONTENT_OPT Text[ russian ] = "R~uler"; Text[ greek ] = "R~uler"; Text[ dutch ] = "R~uler"; - Text[ french ] = "R~uler"; - Text[ spanish ] = "R~uler"; + Text[ french ] = "R鑗le"; + Text[ spanish ] = "R~egla"; Text[ finnish ] = "R~uler"; - Text[ italian ] = "R~uler"; + Text[ italian ] = "Rig~hello"; Text[ danish ] = "R~uler"; - Text[ swedish ] = "R~uler"; + Text[ swedish ] = "Linjal"; Text[ polish ] = "R~uler"; Text[ portuguese_brazilian ] = "R~uler"; - Text[ japanese ] = "R~uler"; + Text[ japanese ] = "銉兗銉(~U)"; Text[ korean ] = "雸堦笀鞛"; - Text[ chinese_simplified ] = "R~uler"; + Text[ chinese_simplified ] = "鏍囧昂(~U)"; Text[ chinese_traditional ] = "妯欏昂"; Text[ turkish ] = "R~uler"; Text[ arabic ] = "R~uler"; @@ -431,7 +431,7 @@ TabPage TP_CONTENT_OPT Text[ chinese_traditional ] = "骞虫粦鎹插嫊(~M)"; Text[ arabic ] = "轻释秧 轻阖擎"; Text[ greek ] = "琉犭 挲腴箸"; - Text[ korean ] = "靻岉攧韸 鞀ろ伂搿(~M)"; + Text[ korean ] = "鞀ろ伂搿る皵毳 鞙犾棸頃橁矊 臁办爼(~M)"; Text[ turkish ] = "Yava kayd齬ma"; Text[ language_user1 ] = " "; Text[ finnish ] = "Tasainen vieritys"; @@ -463,7 +463,7 @@ TabPage TP_CONTENT_OPT Text[ chinese_traditional ] = "椤ず"; Text[ arabic ] = "刨迩"; Text[ greek ] = "旭镡镫"; - Text[ korean ] = "響滌嫓"; + Text[ korean ] = "響滌嫓頃 雮挫毄"; Text[ turkish ] = "G鰎黱t黮e"; Text[ language_user1 ] = " "; Text[ catalan ] = "Mostra"; @@ -495,7 +495,7 @@ TabPage TP_CONTENT_OPT Text[ chinese_traditional ] = "鍦栧舰鍜岀墿浠(~G)"; Text[ arabic ] = "真 孢瞧淝"; Text[ greek ] = "民狯殛 赆 犴糸赍哽屙"; - Text[ korean ] = "攴鸽灅頂疥臣 臧滌泊(~G)"; + Text[ korean ] = "攴鸽 氚 臧滌泊(~G)"; Text[ turkish ] = "Grafik ve nesneler"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Imatges i objectes"; @@ -571,7 +571,7 @@ TabPage TP_CONTENT_OPT Text [ swedish ] = "F~鋖tnamn" ; Text [ danish ] = "Feltnavne" ; Text [ italian ] = "Nome di campo" ; - Text [ spanish ] = "Nombres del campo" ; + Text [ spanish ] = "~C骴igos de campo" ; Text [ french ] = "Noms des champs" ; Text [ dutch ] = "Veldnaa~m" ; Text [ portuguese_brazilian ] = "F~eldnamen" ; @@ -583,7 +583,7 @@ TabPage TP_CONTENT_OPT Text[ chinese_traditional ] = "娆勪綅鍚嶇ū(~F)"; Text[ arabic ] = "糜闱 轻娃"; Text[ greek ] = "享狒 疱溥"; - Text[ korean ] = "頃勲摐 旖旊摐(~F)"; + Text[ korean ] = "頃勲摐 鞚措(~F)"; Text[ turkish ] = "Alan adlar"; Text[ language_user1 ] = " "; Text[ finnish ] = "Kentt鋕oodit"; @@ -723,7 +723,7 @@ TabPage TP_OPTPRINT_PAGE Text[ chinese_traditional ] = "鍏у"; Text[ arabic ] = "轻阃舒砬"; Text[ greek ] = "绣耖鬻屙"; - Text[ korean ] = "雮挫毄"; + Text[ korean ] = "鞚胳噭 雮挫毄"; Text[ turkish ] = "葭erik"; Text[ language_user1 ] = " "; Text[ catalan ] = "Contingut"; @@ -755,7 +755,7 @@ TabPage TP_OPTPRINT_PAGE Text[ chinese_traditional ] = "鍦栧舰(~G)"; Text[ arabic ] = "真"; Text[ greek ] = "民狯殛"; - Text[ korean ] = "攴鸽灅頂(~G)"; + Text[ korean ] = "攴鸽(~G)"; Text[ turkish ] = "Grafik"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Imatges"; @@ -809,7 +809,7 @@ TabPage TP_OPTPRINT_PAGE Text [ spanish ] = "~Dibujos" ; Text [ english_us ] = "Dra~wings" ; Text[ chinese_simplified ] = "缁樺浘(~W)"; - Text[ russian ] = "需耋黻"; + Text[ russian ] = "需駘箜觇"; Text[ polish ] = "Rysunki"; Text[ japanese ] = "鍥冲舰鎻忕敾(~W)"; Text[ chinese_traditional ] = "绻湒(~W)"; @@ -972,7 +972,7 @@ TabPage TP_OPTPRINT_PAGE Text[ chinese_traditional ] = "宸﹂爜(~L)"; Text[ arabic ] = "轻蛰颓 轻碛鸯"; Text[ greek ] = "榴轶翦褫 箦脒溴"; - Text[ korean ] = "鞕检(~L)"; + Text[ korean ] = "鞕检 韼橃澊歆(~L)"; Text[ turkish ] = "Sol sayfalar"; Text[ language_user1 ] = " "; Text[ catalan ] = "P鄃ines ~esquerra"; @@ -1002,7 +1002,7 @@ TabPage TP_OPTPRINT_PAGE Text[ chinese_traditional ] = "鍙抽爜(~R)"; Text[ arabic ] = "轻蛰颓 轻磴潇"; Text[ greek ] = "腻铋蒡 箦脒溴"; - Text[ korean ] = "鞓るジ飒(~R)"; + Text[ korean ] = "鞓るジ飒 韼橃澊歆(~R)"; Text[ turkish ] = "Sa sayfalar"; Text[ language_user1 ] = " "; Text[ catalan ] = "P鄃ines dre~ta"; @@ -1032,7 +1032,7 @@ TabPage TP_OPTPRINT_PAGE Text[ chinese_traditional ] = "鍙嶅悜(~V)"; Text[ arabic ] = "仁咽砣 阙哝"; Text[ greek ] = "另暨篝耧鲠"; - Text[ korean ] = "鞐溂搿(~V)"; + Text[ korean ] = "毵堨毵 韼橃澊歆攵韯(~V)"; Text[ turkish ] = "Ters s齬a"; Text[ language_user1 ] = " "; Text[ catalan ] = "In~vertit"; @@ -1060,7 +1060,7 @@ TabPage TP_OPTPRINT_PAGE Text[ chinese_traditional ] = "灏忔墜鍐(~U)"; Text[ arabic ] = "湓焉"; Text[ greek ] = "旭矬疠牯秕"; - Text[ korean ] = "韺滍攲霠(~U)"; + Text[ korean ] = "敫岆鞀堨柎(~U)"; Text[ turkish ] = "Bror"; Text[ language_user1 ] = " "; Text[ finnish ] = "Esite"; @@ -1087,7 +1087,7 @@ TabPage TP_OPTPRINT_PAGE TabStop = TRUE ; Group = TRUE ; Text[ chinese_simplified ] = "鏃(~N)"; - Text[ russian ] = "~湾"; + Text[ russian ] = "湾~"; Text[ polish ] = "Brak"; Text[ japanese ] = "銇仐(~N)"; Text[ chinese_traditional ] = "鐒(~N)"; @@ -1153,7 +1153,7 @@ TabPage TP_OPTPRINT_PAGE Text[ chinese_traditional ] = "鏂囦欢鐨勭祼鏉熶綅缃(~M)"; Text[ arabic ] = "溴琼 轻阌输"; Text[ greek ] = "暂腼 赍殪蓓秕"; - Text[ korean ] = "氍胳劀鞚 雭(~M)"; + Text[ korean ] = "氍胳劀 雭(~M)"; Text[ turkish ] = "Belge ~sonu"; Text[ language_user1 ] = " "; Text[ catalan ] = "Final del docu~ment"; @@ -1278,7 +1278,7 @@ TabPage TP_OPTPRINT_PAGE Text[ chinese_traditional ] = "鐢㈢敓鍠爡鍒楀嵃浣滄キ(~I)"; Text[ arabic ] = "配郧 尜瞧 厝勤 菅享"; Text[ greek ] = "溺扉秕胥哚 戾祜睐燧睐 羼汜箝 尻酏瘗箸"; - Text[ korean ] = "臧侁皝鞚 鞚胳噭 鞛戩梾毵岆摛旮(~I)"; + Text[ korean ] = "臧滊硠 鞚胳噭 鞛戩梾 毵岆摛旮(~I)"; Text[ turkish ] = "Bi~reysel yazd齬ma ieri olu⺶ur"; Text[ finnish ] = "Luo ~yksitt鋓set tulostusty鰐"; Text[ catalan ] = "Crea ~tasques individuals d'impressi"; @@ -1305,7 +1305,7 @@ TabPage TP_OPTPRINT_PAGE Text[ polish ] = "Zasobnik papieru z ustaw~ie drukarki"; Text[ portuguese_brazilian ] = "da impressora ~setup"; Text[ japanese ] = "銉椼儶銉炽偪瑷畾銇敤绱欍儓銉偆銈掍娇鐢ㄣ仚銈(~P)"; - Text[ korean ] = "頂勲Π韯 靹れ爼鞐 霐半ジ 鞖╈ 瓿店笁(~P)"; + Text[ korean ] = "頂勲Π韯 靹れ爼鞚 鞖╈頃潉 靷毄(~P)"; Text[ chinese_simplified ] = "閲囩敤鎵撳嵃鏈鸿瀹氱殑绾稿紶鏉ユ簮(~P)"; Text[ chinese_traditional ] = "鎺＄敤鍗拌〃姗熻ō瀹氱殑绱欏嫉渚嗘簮(~P)"; Text[ turkish ] = "Yaz齝 ayarlar齨 kullan"; @@ -1402,7 +1402,7 @@ TabPage TP_STD_FONT Text[ greek ] = "箩箝贻 泷犰灬麸箦轳蒡"; Text[ dutch ] = "Standaardlettertypen (%1)"; Text[ french ] = "Polices standard (%1)"; - Text[ spanish ] = "Fuentes predeterminadas (%1)"; + Text[ spanish ] = "Fuentes b醩icas (%1)"; Text[ finnish ] = "Perusfontit (%1)"; Text[ italian ] = "Caratteri standard (%1)"; Text[ danish ] = "Standardskrifttyper (%1)"; @@ -1410,7 +1410,7 @@ TabPage TP_STD_FONT Text[ polish ] = "Czcionki podstawowe (%1)"; Text[ portuguese_brazilian ] = "Fontes padrao"; Text[ japanese ] = "鏃㈠畾銇儠銈┿兂銉(%1)"; - Text[ korean ] = "旮半掣 旮昙"; + Text[ korean ] = "旮半掣 旮昙 (%1)"; Text[ chinese_simplified ] = "鏍囧噯瀛椾綋 (%1)"; Text[ chinese_traditional ] = "妯欐簴瀛楀瀷 (%1)"; Text[ turkish ] = "Standart yaz齮ipi"; @@ -1441,7 +1441,7 @@ TabPage TP_STD_FONT Text[ chinese_traditional ] = "妯欐簴(~F)"; Text[ arabic ] = "揄怯"; Text[ greek ] = "旭镥痖腼戕"; - Text[ korean ] = "響滌(~F)"; + Text[ korean ] = "旮半掣臧(~F)"; Text[ turkish ] = "~Standart"; Text[ language_user1 ] = " "; Text[ finnish ] = "Oletus"; @@ -1473,7 +1473,7 @@ TabPage TP_STD_FONT Text[ chinese_traditional ] = "妯欓(~G)"; Text[ arabic ] = "轻阡媲"; Text[ greek ] = "硼殛弼犭咪"; - Text[ korean ] = "毹鸽Μ旮(~G)"; + Text[ korean ] = "鞝滊(~G)"; Text[ turkish ] = "~Ba齥"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Encap鏰lament"; @@ -1535,7 +1535,7 @@ TabPage TP_STD_FONT Text[ chinese_traditional ] = "妯欑堡(~A)"; Text[ arabic ] = "视沩 舒猪晚"; Text[ greek ] = "硼殂襻鲛"; - Text[ korean ] = "霛茧波(~A)"; + Text[ korean ] = "旌§厴(~A)"; Text[ turkish ] = "~Resim yaz齭"; Text[ language_user1 ] = " "; Text[ catalan ] = "L~legenda"; @@ -1688,9 +1688,9 @@ TabPage TP_STD_FONT Text[ polish ] = "Azjatyckie"; Text[ portuguese_brazilian ] = "Asian"; Text[ japanese ] = "銈€偢銈㈣鍥借獮"; - Text[ korean ] = "鞎勳嫓鞎勱秾 鞏胳柎"; + Text[ korean ] = "霃欖枒甓 鞏胳柎"; Text[ chinese_simplified ] = "涓棩闊"; - Text[ chinese_traditional ] = "涓棩闊"; + Text[ chinese_traditional ] = "涓棩闊撹獮瑷"; Text[ turkish ] = "Asian"; Text[ arabic ] = "Asian"; Text[ catalan ] = "Asi鄑ic"; @@ -1713,9 +1713,9 @@ TabPage TP_STD_FONT Text[ swedish ] = "CTL"; Text[ polish ] = "CTL"; Text[ japanese ] = "瑜囧悎鏂囧瓧瑷瑾"; - Text[ korean ] = "CTL"; - Text[ chinese_simplified ] = "澶嶆潅鐨勬枃瀛"; - Text[ chinese_traditional ] = "瑜囬洔鐨勬枃瀛"; + Text[ korean ] = "氤淀暕 氍胳瀽 鞏胳柎(CTL)"; + Text[ chinese_simplified ] = "澶嶆潅鐨勬枃瀛楃増寮"; + Text[ chinese_traditional ] = "瑜囬洔鐨勬枃瀛楃増寮"; Text[ turkish ] = "CTL"; Text[ arabic ] = "CTL"; Text[ portuguese_brazilian ] = "Complexidade de scripts"; @@ -1738,7 +1738,7 @@ TabPage TP_STD_FONT Text[ polish ] = "Zachodnie"; Text[ portuguese_brazilian ] = "Western"; Text[ japanese ] = "瑗挎磱璜稿浗瑾"; - Text[ korean ] = "靹滌枒鞏搓秾 鞏胳柎"; + Text[ korean ] = "靹滌枒甓 鞏胳柎"; Text[ chinese_simplified ] = "瑗挎枃"; Text[ chinese_traditional ] = "瑗挎枃"; Text[ turkish ] = "Western"; @@ -1765,7 +1765,7 @@ TabPage TP_OPTTABLE_PAGE Text [ English ] = "Defaults" ; Text[ english_us ] = "Default"; Text[ portuguese ] = "Padr鉶"; - Text[ russian ] = "羊囗溧痱"; + Text[ russian ] = "项 箪铍鬣龛"; Text[ greek ] = "旭镥痖腼戕"; Text[ dutch ] = "Standaard"; Text[ french ] = "Par d閒aut"; @@ -1776,7 +1776,7 @@ TabPage TP_OPTTABLE_PAGE Text[ polish ] = "Domy渓nie"; Text[ portuguese_brazilian ] = "Defaults"; Text[ japanese ] = "妯欐簴"; - Text[ korean ] = "旮半掣"; + Text[ korean ] = "旮半掣臧"; Text[ chinese_simplified ] = "鏍囧噯"; Text[ chinese_traditional ] = "妯欐簴"; Text[ turkish ] = "Defaults"; @@ -1808,7 +1808,7 @@ TabPage TP_OPTTABLE_PAGE Text[ chinese_traditional ] = "妯欓(~E)"; Text[ arabic ] = "轻阡媲"; Text[ greek ] = "硼殛弼犭咪"; - Text[ korean ] = "響滌牅(~E)"; + Text[ korean ] = "鞝滊(~E)"; Text[ language_user1 ] = " "; Text[ turkish ] = "Ba齥"; Text[ finnish ] = "O~tsikko"; @@ -1862,13 +1862,13 @@ TabPage TP_OPTTABLE_PAGE Text[ spanish ] = "No ~dividir"; Text[ english_us ] = "Do not split"; Text[ chinese_simplified ] = "涓嶅垎闅"; - Text[ russian ] = "湾 疣玟咫螯"; + Text[ russian ] = "湾 疣鐍溴螯"; Text[ polish ] = "Nie dziel"; Text[ japanese ] = "鍒嗗壊銇椼仾銇"; Text[ chinese_traditional ] = "涓嶅垎闁"; Text[ arabic ] = "认驿 兽禹"; Text[ greek ] = "~歪 扃 溟衢皴桢"; - Text[ korean ] = "攵勲Μ頃橃 鞎婌潓"; + Text[ korean ] = "雮橂垊歆 鞎婌潓"; Text[ language_user1 ] = " "; Text[ turkish ] = "B鰈me"; Text[ finnish ] = "膌 jaa"; @@ -1949,7 +1949,7 @@ TabPage TP_OPTTABLE_PAGE TabStop = TRUE ; Text[ english_us ] = "Number recognition"; Text[ portuguese ] = "R~econhecimento de n鷐eros"; - Text[ russian ] = "朽耧铉磬忄龛 麒皴"; + Text[ russian ] = "朽耧額珥噔囗桢 麒皴"; Text[ dutch ] = "G~etalherkening"; Text[ french ] = "R~econnaissance des nombres"; Text[ spanish ] = "Reconocimiento de n鷐eros"; @@ -1979,7 +1979,7 @@ TabPage TP_OPTTABLE_PAGE TabStop = TRUE ; Text[ english_us ] = "Number format recognition"; Text[ portuguese ] = "Reconhecimento do ~formato num閞ico"; - Text[ russian ] = "朽耧铉磬龛 麒耠钼钽 纛痨囹"; + Text[ russian ] = "朽耧铉磬忄龛 麒耠钼钽 ~纛痨囹"; Text[ dutch ] = "Herkenning ~getalnotatie"; Text[ french ] = "Reconnaissance du format num閞ique"; Text[ spanish ] = "Reconocimiento del formato ~num閞ico"; @@ -1993,7 +1993,7 @@ TabPage TP_OPTTABLE_PAGE Text[ chinese_traditional ] = "璀樺垾鏁稿瓧鏍煎紡"; Text[ arabic ] = "授秧 输禹 轻醚耷"; Text[ greek ] = "另徙睨耖箸 祜聆掾 狁殍祜"; - Text[ korean ] = "靾瀽 順曥嫕 鞚胳嫕"; + Text[ korean ] = "靾瀽 響滉赴 順曥嫕 鞚胳嫕"; Text[ language_user1 ] = " "; Text[ turkish ] = "Say format tan齧a"; Text[ finnish ] = "Lukumuodon tunnistus"; @@ -2049,7 +2049,7 @@ TabPage TP_OPTTABLE_PAGE Text[ polish ] = "Obs硊ga klawiatury"; Text[ portuguese_brazilian ] = "Keyboard handling"; Text[ japanese ] = "銈兗銉溿兗銉夋搷浣"; - Text[ korean ] = "韨る炒霌 臁办瀾"; + Text[ korean ] = "韨る炒霌 靷毄"; Text[ chinese_simplified ] = "閿洏鎿嶄綔"; Text[ chinese_traditional ] = "浣跨敤閸电洡"; Text[ turkish ] = "Keyboard handling"; @@ -2078,7 +2078,7 @@ TabPage TP_OPTTABLE_PAGE Text[ polish ] = "Przesu kom髍ki"; Text[ portuguese_brazilian ] = "Shift and arrow key pressed"; Text[ japanese ] = "銈汇儷銇Щ鍕"; - Text[ korean ] = "頄 鞚措彊"; + Text[ korean ] = "靺 鞚措彊"; Text[ chinese_simplified ] = "绉诲姩鍗曞厓鏍"; Text[ chinese_traditional ] = "绉诲嫊鍎插瓨鏍"; Text[ turkish ] = "Shift and arrow key pressed"; @@ -2153,7 +2153,7 @@ TabPage TP_OPTTABLE_PAGE Text[ chinese_traditional ] = "娆(~C)"; Text[ arabic ] = "阢嫦"; Text[ greek ] = "郁揠"; - Text[ korean ] = "雼(~C)"; + Text[ korean ] = "鞐(~C)"; Text[ turkish ] = "S~黷un"; Text[ language_user1 ] = " "; Text[ finnish ] = "Sarake"; @@ -2196,7 +2196,7 @@ TabPage TP_OPTTABLE_PAGE Text[ polish ] = "Wstaw wiersz"; Text[ portuguese_brazilian ] = "Insert"; Text[ japanese ] = "銈汇儷銇尶鍏"; - Text[ korean ] = "靷届瀰"; + Text[ korean ] = "靺 靷届瀰"; Text[ chinese_simplified ] = "鎻掑叆鍗曞厓鏍"; Text[ chinese_traditional ] = "鎻掑叆鍎插瓨鏍"; Text[ turkish ] = "Insert"; @@ -2226,7 +2226,7 @@ TabPage TP_OPTTABLE_PAGE Text[ chinese_traditional ] = "鍒(~W)"; Text[ arabic ] = "蛰"; Text[ greek ] = "民犰燹"; - Text[ korean ] = "欷(~W)"; + Text[ korean ] = "頄(~W)"; Text[ turkish ] = "S~at齬"; Text[ language_user1 ] = " "; Text[ finnish ] = "Ri~vi"; @@ -2313,7 +2313,7 @@ TabPage TP_OPTTABLE_PAGE Text[ polish ] = "Efekt przesuwania"; Text[ portuguese_brazilian ] = "Behaviour while moving"; Text[ japanese ] = "銈点偆銈哄鏇存檪銇綔鐢"; - Text[ korean ] = "鞚措彊鞁滌棎 鞗歆侅瀯"; + Text[ korean ] = "韥赴 氤瓴 鞁 鞛戨彊"; Text[ chinese_simplified ] = "绉诲姩鏃舵墽琛岀殑鎿嶄綔"; Text[ chinese_traditional ] = "绉诲嫊鏅傚煼琛岀殑鍕曚綔"; Text[ turkish ] = "Behaviour while moving"; @@ -2373,7 +2373,7 @@ TabPage TP_OPTTABLE_PAGE Text[ polish ] = "Zmiany maj wp硑w tylko na obszary przyleg砮."; Text[ portuguese_brazilian ] = "Ver?nderungen einer Zeile bzw. Spalte wirken sich nur auf den direkten Nachbarn aus"; Text[ japanese ] = "澶夋洿銇殻鎺ョ瘎鍥层仩銇戙伀浣滅敤銇欍倠"; - Text[ korean ] = "氤瓴 靷暛鞚 歆侅爲鞝侅溂搿 鞚胳爲頃 鞓侅棴鞐愲 鞓來枼鞚 氙胳供雼堧嫟."; + Text[ korean ] = "氤瓴 靷暛鞚 鞚胳爲 鞓侅棴鞐愲 鞛戩毄"; Text[ chinese_simplified ] = "琛屽垪鐨勬洿鏀瑰彧浼氬奖鍝嶅埌鐩存帴杩炴帴鐨勫尯鍩熴"; Text[ chinese_traditional ] = "娆勫垪鐨勮畩鏇村儏鍍呮渻褰遍熆鍒扮洿鎺ラｇ祼鐨勫崁鍩熴"; Text[ turkish ] = "Sat齬 ya da s黷unlar 鼁erinde yap齦an de餴㱮klikler yaln齴ca biti㱮k birimleri etkiler"; @@ -2403,7 +2403,7 @@ TabPage TP_OPTTABLE_PAGE Text[ chinese_traditional ] = "鍥哄畾鎴愭瘮渚(~X)"; Text[ arabic ] = "饲仁 闶淝尤"; Text[ greek ] = "郁徼羼, 犴犭镢~殛"; - Text[ korean ] = "瓿犾爼霅,牍勲(~X)"; + Text[ korean ] = "瓿犾爼 牍勲(~X)"; Text[ turkish ] = "Sabi~t orant齦"; Text[ language_user1 ] = " "; Text[ finnish ] = "Kiinte, su~hteellinen"; @@ -2432,7 +2432,7 @@ TabPage TP_OPTTABLE_PAGE Text[ polish ] = "Zmiany maj wp硑w na ca彻 tabel."; Text[ portuguese_brazilian ] = "Ver?nderungen einer Zeile bzw. Spalte wirken sich auf die gesamte Tabelle aus"; Text[ japanese ] = "澶夋洿銇〃鍏ㄤ綋銇綔鐢ㄣ仚銈"; - Text[ korean ] = "氤瓴 靷暛鞚 鞝勳泊 鞁滍姼鞐 鞝侅毄霅╇媹雼."; + Text[ korean ] = "氤瓴 靷暛鞚 氇摖 響滌棎 鞝侅毄霅╇媹雼"; Text[ chinese_simplified ] = "琛屽垪鐨勬洿鏀逛細褰卞搷鍒版暣涓〃鏍笺"; Text[ chinese_traditional ] = "娆勫垪鐨勮畩鏇存渻褰遍熆鍒版暣鍊嬭〃鏍"; Text[ turkish ] = "Sat齬 ya da s黷unlar 鼁erinde yap齦an de餴㱮klikler tablonun t黰黱 etkiler"; @@ -2491,7 +2491,7 @@ TabPage TP_OPTTABLE_PAGE Text[ polish ] = "Zmiany maj wp硑w na rozmiar tabeli."; Text[ portuguese_brazilian ] = "Ver?nderungen einer Zeile bzw. Spalte wirken sich auf die Tabellengr?e aus"; Text[ japanese ] = "澶夋洿銇〃銇偟銈ゃ偤銇綔鐢ㄣ仚銈"; - Text[ korean ] = "氤瓴 靷暛鞚 鞁滍姼 韥赴鞐 鞝侅毄霅╇媹雼."; + Text[ korean ] = "氤瓴 靷暛鞚 響 韥赴鞐 鞝侅毄霅╇媹雼"; Text[ chinese_simplified ] = "涓琛屽拰鍒楃殑鏇存敼浼氬奖鍝嶈〃鏍肩殑澶у皬銆"; Text[ chinese_traditional ] = "涓鍊嬫瑒鍒楃殑璁婃洿鏈冨奖闊胯〃鏍肩殑澶у皬"; Text[ turkish ] = "Sat齬 ya da s黷unlar 鼁erinde yap齦an de餴㱮klikler tablo boyutunu etkiler"; @@ -2533,7 +2533,7 @@ TabPage TP_OPTSHDWCRSR Text[ polish ] = "Wy渨ietl"; Text[ portuguese_brazilian ] = "Unprintable Characters"; Text[ japanese ] = "鍗板埛銇曘倢銇亜鏂囧瓧銈勮鍙枫伄琛ㄧず銉婚潪琛ㄧず"; - Text[ korean ] = "雼澖 旮绊樃 響滌嫓"; + Text[ korean ] = "響滌嫓頃 雮挫毄"; Text[ chinese_simplified ] = "鏄剧ず鍐呭"; Text[ chinese_traditional ] = "椤ず鍏у"; Text[ turkish ] = "Yazd齬齦mayan karakterler"; @@ -2567,7 +2567,7 @@ TabPage TP_OPTSHDWCRSR Text[ chinese_traditional ] = "娈佃惤鐨勭祼鏉熶綅缃(~R)"; Text[ arabic ] = "溴琼 蒉焉"; Text[ greek ] = "暂腼 疳襻泷荟秕"; - Text[ korean ] = "雼澖 毵堨毵(~R)"; + Text[ korean ] = "雼澖 雭(~R)"; Text[ turkish ] = "Paragraf sonu"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Fi de par鄃raf"; @@ -2651,13 +2651,13 @@ TabPage TP_OPTSHDWCRSR Text [ spanish ] = "Espacios proteg~idos" ; Text [ english_us ] = "Non-breaking s~paces" ; Text[ chinese_simplified ] = "鍙椾繚鎶ょ殑绌烘牸瀛楃(~P)"; - Text[ russian ] = "湾疣玑桠帼 镳钺咫"; + Text[ russian ] = "湾疣玑桠鄜桢 镳钺咫"; Text[ polish ] = "Spacje bez podzia硊"; Text[ japanese ] = "淇濊銇曘倢銇熴偣銉氥兗銈(~P)"; Text[ chinese_traditional ] = "鍙椾繚璀风殑绌烘牸瀛楀厓(~P)"; Text[ arabic ] = "猛演 阌禽 阃沩"; Text[ greek ] = "旭飤篝狒艴屙镩 麽襻牯揆弪 赍睨"; - Text[ korean ] = "瓿惦氨 氤错樃"; + Text[ korean ] = "欷 氚旉繄頃橃 鞎婋姅 瓿惦氨"; Text[ turkish ] = "B鰈黱emez bouklar"; Text[ language_user1 ] = " "; Text[ catalan ] = "E~spais que no es poden separar"; @@ -2711,7 +2711,7 @@ TabPage TP_OPTSHDWCRSR Text [ spanish ] = "~Saltos" ; Text [ english_us ] = "Brea~ks" ; Text[ chinese_simplified ] = "鎹㈣绗(~K)"; - Text[ russian ] = "朽琊"; + Text[ russian ] = "朽~琊"; Text[ polish ] = "Podzia~硑"; Text[ japanese ] = "鏀硅(~K)"; Text[ chinese_traditional ] = "鎻涜绗(~K)"; @@ -2810,7 +2810,7 @@ TabPage TP_OPTSHDWCRSR Text[ chinese_traditional ] = "鐩存帴瀹氫綅娓告"; Text[ arabic ] = "隳匝 闳窃"; Text[ greek ] = "㈧弩矧 漶镬葆"; - Text[ korean ] = "歆侅爲锛嶌护靹"; + Text[ korean ] = "歆侅爲 臁办爼 旎れ劀"; Text[ turkish ] = "Serbest imle"; Text[ language_user1 ] = " "; Text[ finnish ] = "Suora kohdistin"; @@ -2841,7 +2841,7 @@ TabPage TP_OPTSHDWCRSR Text[ chinese_traditional ] = "鐩存帴瀹氫綅娓告(~D)"; Text[ arabic ] = "隳匝 闳窃"; Text[ greek ] = "㈧弩矧 漶镬葆"; - Text[ korean ] = "旎れ劀 鞙勳箻 歆侅爲 臁办爼(~D)"; + Text[ korean ] = "歆侅爲 臁办爼 旎れ劀 頇滌劚(~D)"; Text[ turkish ] = "Serbest imle"; Text[ language_user1 ] = " "; Text[ finnish ] = "Suora ko~hdistin"; @@ -2931,7 +2931,7 @@ TabPage TP_OPTSHDWCRSR Text[ chinese_traditional ] = "娈佃惤宸﹂枔闅(~L)"; Text[ arabic ] = "迩阍 轻蒉焉 轻庙友"; Text[ greek ] = "狁轶翦顸 疱耖棹耖 疳襻泷荟秕"; - Text[ korean ] = "膦岇浮 雼澖鞐氨(~L)"; + Text[ korean ] = "鞕检 雼澖 鞐氨(~L)"; Text[ turkish ] = "Sol ~paragraf kenar"; Text[ language_user1 ] = " "; Text[ finnish ] = "Kappalee~n vasen reunus "; @@ -2989,7 +2989,7 @@ TabPage TP_OPTSHDWCRSR Text[ chinese_traditional ] = "瀹氫綅閸靛拰绌烘牸(~N)"; Text[ arabic ] = "卺倾鞘 滔驷 婷脱 阌禽"; Text[ greek ] = "郁珉镨蒴弪 赆 赍碥"; - Text[ korean ] = "韮臣 臧勱博(~N)"; + Text[ korean ] = "韮 氚 瓿惦氨(~N)"; Text[ turkish ] = "Sekmeler ve ~bouklar"; Text[ language_user1 ] = " "; Text[ finnish ] = "Sarkaimet ~ja v鋖it"; @@ -3015,7 +3015,7 @@ TabPage TP_OPTSHDWCRSR Text[ polish ] = "Kursor w chronionych obszarach"; Text[ portuguese_brazilian ] = "Cursor in protected areas"; Text[ japanese ] = "淇濊绡勫洸銇搞伄銈兗銈姐儷閫插叆"; - Text[ korean ] = "氤错樃霅 鞓侅棴鞚 旎れ劀"; + Text[ korean ] = "氤错樃 鞓侅棴鞐愳劀 旎れ劀 靹れ爼"; Text[ chinese_simplified ] = "鍏夋爣瀹氫綅鍦ㄤ繚鎶ゅ尯鍩"; Text[ chinese_traditional ] = "娓告鍦ㄤ繚璀峰崁鍩熶箣涓"; Text[ turkish ] = "Cursor in protected areas"; @@ -3045,7 +3045,7 @@ TabPage TP_OPTSHDWCRSR Text[ polish ] = "Dopu滄"; Text[ portuguese_brazilian ] = "~Allow cursor in protected areas"; Text[ japanese ] = "瑷卞彲銇欍倠"; - Text[ korean ] = "項堦皜"; + Text[ korean ] = "項堨毄"; Text[ chinese_simplified ] = "鍏佽"; Text[ chinese_traditional ] = "鍏佽ū"; Text[ turkish ] = "輒lecin korumal b鰈黰lere girmesine izin ver"; @@ -3080,3 +3080,8 @@ TabPage TP_OPTSHDWCRSR + + + + + diff --git a/sw/source/ui/config/optload.src b/sw/source/ui/config/optload.src index e63c8182a410..a0342b0ecc42 100644 --- a/sw/source/ui/config/optload.src +++ b/sw/source/ui/config/optload.src @@ -2,9 +2,9 @@ * * $RCSfile: optload.src,v $ * - * $Revision: 1.56 $ + * $Revision: 1.57 $ * - * last change: $Author: kz $ $Date: 2002-09-05 19:39:28 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,7 +85,7 @@ TabPage TP_OPTLOAD_PAGE Text[ portuguese ] = "Actualizar"; Text[ russian ] = "吾眍怆屙桢"; Text[ greek ] = "彭珈蓠"; - Text[ dutch ] = "Actualiseren"; + Text[ dutch ] = "Bijwerken"; Text[ french ] = "Actualisation"; Text[ spanish ] = "Actualizaci髇"; Text[ italian ] = "Aggiorna"; @@ -94,13 +94,14 @@ TabPage TP_OPTLOAD_PAGE Text[ polish ] = "Aktualizacja"; Text[ portuguese_brazilian ] = "Updating"; Text[ japanese ] = "鏇存柊"; - Text[ korean ] = "鞐呺嵃鞚错姼"; + Text[ korean ] = "鞐呺嵃鞚错姼 靹れ爼"; Text[ chinese_simplified ] = "鏇存柊"; Text[ chinese_traditional ] = "鏇存柊"; Text[ turkish ] = "Updating"; Text[ arabic ] = "释享"; Text[ finnish ] = "P鋓vit"; - Text[ catalan ] = "S'est actualitzant"; + Text[ catalan ] = "Actualitza"; + Text[ thai ] = "喔涏福喔编笟喔涏福喔膏竾"; }; FixedText FT_LINK { @@ -112,8 +113,8 @@ TabPage TP_OPTLOAD_PAGE Text[ portuguese ] = "Actualizar liga珲es ao carregar"; Text[ russian ] = "吾眍怆螯 耨觇 镳 玎沭箸赍"; Text[ greek ] = "彭珈蓠 篚礓蒹妁 赆糗 翮 鳇耵"; - Text[ dutch ] = "Koppelingen bij het laden actualiseren"; - Text[ french ] = "Actualiser les liens lors du chargement"; + Text[ dutch ] = "Koppelingen bij het laden bijwerken"; + Text[ french ] = "Actualiser les liens au chargement"; Text[ spanish ] = "Actualizar v韓culos al cargar"; Text[ italian ] = "Aggiorna collegamenti durante il caricamento"; Text[ danish ] = "Opdater k鎑er ved indl鎠ning"; @@ -121,13 +122,14 @@ TabPage TP_OPTLOAD_PAGE Text[ polish ] = "Aktualizuj 彻cza podczas 砤dowania"; Text[ portuguese_brazilian ] = "Update links when loading"; Text[ japanese ] = "銉夈偔銉ャ儭銉炽儓瑾伩杈笺伩鏅傘伀銉兂銈伄鏇存柊"; - Text[ korean ] = "搿滊摐鞁滌棎 毵來伂 鞐呺嵃鞚错姼"; + Text[ korean ] = "搿滊摐 鞁滌棎 毵來伂 鞐呺嵃鞚错姼"; Text[ chinese_simplified ] = "鍦ㄨ鍏ユ椂鏇存柊閾炬帴"; Text[ chinese_traditional ] = "杓夊叆鏅傛洿鏂版嵎寰"; Text[ turkish ] = "Update links when loading"; Text[ arabic ] = "释享 轻茄嗜秦鞘 阡 轻释沩"; Text[ finnish ] = "P鋓vit linkit ladattaessa"; Text[ catalan ] = "Actualitza els enlla鏾s en carregar"; + Text[ thai ] = "喔涏福喔编笟喔涏福喔膏竾喔佮覆喔｀箑喔娻阜喙堗腑喔∴箓喔⑧竾喔傕笓喔班箓喔弗喔"; }; RadioButton RB_ALWAYS { @@ -157,6 +159,7 @@ TabPage TP_OPTLOAD_PAGE Text[ language_user1 ] = " "; Text[ finnish ] = "~Aina"; Text[ catalan ] = "~Sempre"; + Text[ thai ] = "喙~喔浮喔"; }; RadioButton RB_REQUEST { @@ -171,7 +174,7 @@ TabPage TP_OPTLOAD_PAGE Text[ danish ] = "~P foresp鴕gsel"; Text[ french ] = "Sur de~mande"; Text[ swedish ] = "~P beg鋜an"; - Text[ dutch ] = "Op aan~vraag"; + Text[ dutch ] = "Op aanvraa~g"; Text[ spanish ] = "A ~petici髇"; Text[ english_us ] = "~On request"; Text[ chinese_simplified ] = "鍦ㄨ闂悗鏇存柊(~O)"; @@ -181,11 +184,12 @@ TabPage TP_OPTLOAD_PAGE Text[ chinese_traditional ] = "鍍呭湪瑭㈠晱寰屾洿鏂(~O)"; Text[ arabic ] = "融 轻怯瘦忧"; Text[ greek ] = "渝 孓翮箸"; - Text[ korean ] = "鞖旍箔鞁滌棎(~O)"; + Text[ korean ] = "鞖旍箔頃橂┐(~O)"; Text[ turkish ] = "輘tek 鼁erine"; Text[ language_user1 ] = " "; Text[ finnish ] = "~Pyynn鰏t"; - Text[ catalan ] = "S~ota petici"; + Text[ catalan ] = "A ~petici"; + Text[ thai ] = "喙~喔∴阜喙堗腑喔｀箟喔竾喔傕腑"; }; RadioButton RB_NEVER { @@ -204,7 +208,7 @@ TabPage TP_OPTLOAD_PAGE Text[ spanish ] = "~Nunca"; Text[ english_us ] = "~Never"; Text[ chinese_simplified ] = "姘镐笉鏇存柊(~N)"; - Text[ russian ] = "丸觐沅"; + Text[ russian ] = "丸觐~沅"; Text[ polish ] = "Nigdy"; Text[ japanese ] = "銇椼仾銇(~N)"; Text[ chinese_traditional ] = "姘镐笉鏇存柊(~N)"; @@ -213,8 +217,9 @@ TabPage TP_OPTLOAD_PAGE Text[ korean ] = "鞎堩暔(~N)"; Text[ turkish ] = "Hi鏱ir zaman"; Text[ language_user1 ] = " "; - Text[ finnish ] = "~Ei koskaan"; + Text[ finnish ] = "Ei koskaa~n"; Text[ catalan ] = "~Mai"; + Text[ thai ] = "喙剘喔∴箞喙喔勦涪"; }; FixedText FT_FIELD { @@ -226,23 +231,24 @@ TabPage TP_OPTLOAD_PAGE Text[ portuguese ] = "Automaticamente"; Text[ russian ] = "棱蝾爨蜩麇耜"; Text[ greek ] = "绣溥 赆 溟徙褴祆狒"; - Text[ dutch ] = "Velden en diagrammen actualiseren"; + Text[ dutch ] = "Velden en diagrammen bijwerken"; Text[ french ] = "Automatique"; - Text[ spanish ] = "Autom醫ico"; - Text[ finnish ] = "P鋓vit automaattisesti"; + Text[ spanish ] = "Autom醫icamente"; + Text[ finnish ] = "Automaattisesti"; Text[ italian ] = "In modo automatico"; Text[ danish ] = "Automatisk"; Text[ swedish ] = "Automatiskt"; Text[ polish ] = "Automatycznie"; Text[ portuguese_brazilian ] = "Refresh links"; Text[ japanese ] = "鑷嫊"; - Text[ korean ] = "鞛愲彊鞙茧"; + Text[ korean ] = "鞛愲彊"; Text[ chinese_simplified ] = "鑷姩"; Text[ chinese_traditional ] = "鑷嫊"; Text[ turkish ] = "Alan ve 㧐malar"; Text[ arabic ] = "娃驷 嫜渔 软卿砩"; - Text[ catalan ] = "Autom鄑ic"; + Text[ catalan ] = "Camps i diagrames"; Text[ language_user1 ] = " "; + Text[ thai ] = "喔涏福喔编笟喔涏福喔膏竾喔副喔曕箓喔權浮喔编笗喔"; }; CheckBox CB_AUTO_UPDATE_FIELDS { @@ -257,20 +263,21 @@ TabPage TP_OPTLOAD_PAGE Text[ dutch ] = "V~eldopdrachten"; Text[ french ] = "Champs"; Text[ spanish ] = "~Campos"; - Text[ finnish ] = "~Kent鋞"; + Text[ finnish ] = "Kent~鋞"; Text[ italian ] = "~Comandi di campo"; Text[ danish ] = "Fe~lter"; Text[ swedish ] = "F鋖t~kommandon"; Text[ polish ] = "Pola"; Text[ portuguese_brazilian ] = "Update fields automatically"; Text[ japanese ] = "銉曘偅銉笺儷銉(~F)"; - Text[ korean ] = "頃勲摐 氇呺牴鞏(~F)"; + Text[ korean ] = "頃勲摐(~F)"; Text[ chinese_simplified ] = "瀛楁鎸囦护(~F)"; Text[ chinese_traditional ] = "娆勪綅鎸囦护(~F)"; Text[ turkish ] = "Alan 鲳elerini otomatik olarak g黱celle"; Text[ arabic ] = "释享 轻娃驷 梳耷祈丘"; - Text[ catalan ] = "Actualizar ~campos autom醫icamente"; + Text[ catalan ] = "Actualitza ~camps autom鄑icament"; Text[ language_user1 ] = " "; + Text[ thai ] = "喙~喔傕笗喔傕箟喔浮喔灌弗"; }; CheckBox CB_AUTO_UPDATE_CHARTS { @@ -297,8 +304,9 @@ TabPage TP_OPTLOAD_PAGE Text[ chinese_traditional ] = "鍦栬〃(~C)"; Text[ turkish ] = "辝malar otomatik olarak g黱celle"; Text[ arabic ] = "释享 轻延驺 轻软卿砩 梳耷祈丘"; - Text[ catalan ] = "Actualizar ~diagramas autom醫icamente"; + Text[ catalan ] = "Actualitza ~diagrames autom鄑icament"; Text[ language_user1 ] = " "; + Text[ thai ] = "喙亊喔溹笝喔犩腹喔∴复"; }; FixedLine FL_CAPTION { @@ -316,7 +324,7 @@ TabPage TP_OPTLOAD_PAGE Text[ spanish ] = "Etiqueta"; Text[ english_us ] = "Caption"; Text[ chinese_simplified ] = "鏍囩"; - Text[ russian ] = "项滹桉"; + Text[ russian ] = "袜玮囗桢"; Text[ polish ] = "Etykieta"; Text[ japanese ] = "鍥宠〃鐣彿"; Text[ chinese_traditional ] = "妯欑堡"; @@ -325,8 +333,9 @@ TabPage TP_OPTLOAD_PAGE Text[ korean ] = "旌§厴"; Text[ language_user1 ] = " "; Text[ turkish ] = "Resim yaz齭"; - Text[ finnish ] = "Kuva~otsikko"; + Text[ finnish ] = "Kuvaotsikko"; Text[ catalan ] = "Etiqueta"; + Text[ thai ] = "喔勦赋喔氞福喔｀涪喔侧涪喔犩覆喔"; }; CheckBox CB_CAPTION { @@ -341,7 +350,7 @@ TabPage TP_OPTLOAD_PAGE Text[ danish ] = "~Automatisk"; Text[ french ] = "Automatique"; Text[ swedish ] = "~Automatiskt"; - Text[ dutch ] = "~Automatisch"; + Text[ dutch ] = "A~utomatisch"; Text[ spanish ] = "~Autom醫ico"; Text[ english_us ] = "Automatic"; Text[ chinese_simplified ] = "鑷姩"; @@ -356,6 +365,7 @@ TabPage TP_OPTLOAD_PAGE Text[ turkish ] = "~Otomatik"; Text[ finnish ] = "Automaattinen"; Text[ catalan ] = "~Autom鄑ic"; + Text[ thai ] = "喔副喔曕箓喔權浮喔编笗喔"; }; FixedText TXT_OPTIONS { @@ -380,11 +390,12 @@ TabPage TP_OPTLOAD_PAGE Text[ chinese_traditional ] = "閬告搰鐗╀欢锛"; Text[ arabic ] = "俏薯茄 轻咔其鞘:"; Text[ greek ] = "硼殡~镢 犴糸赍殪蓓秕:"; - Text[ korean ] = "臧滌泊 靹犿儩"; + Text[ korean ] = "臧滌泊 靹犿儩:"; Text[ language_user1 ] = " "; Text[ turkish ] = "~Nesne se鏸mi:"; Text[ finnish ] = "Objektin valinta:"; - Text[ catalan ] = "~Selecci髇 objeto:"; + Text[ catalan ] = "~Selecci objecte:"; + Text[ thai ] = "喙喔ム阜喔竵喔о副喔曕笘喔:"; }; PushButton PB_OPTIONS { @@ -418,6 +429,7 @@ TabPage TP_OPTLOAD_PAGE Text[ arabic ] = "轻炮锨锨"; Text[ finnish ] = "Asetukset"; Text[ catalan ] = "Par鄊etres"; + Text[ thai ] = "喔佮赋喔笝喔"; }; FixedText FT_METRIC { @@ -443,10 +455,11 @@ TabPage TP_OPTLOAD_PAGE Text[ chinese_traditional ] = "瀹氶噺鍠綅"; Text[ arabic ] = "嫱仙 轻揄怯"; Text[ greek ] = "~田碥溽 燧赳珞珧"; - Text[ korean ] = "靾橃箻 雼渼"; + Text[ korean ] = "旃橃垬 雼渼"; Text[ turkish ] = "謑琰 birimi"; Text[ language_user1 ] = " "; Text[ catalan ] = "Unitat de mesura"; + Text[ thai ] = "喔笝喙堗抚喔⑧浮喔侧笗喔｀抚喔编笖"; }; ListBox LB_METRIC { @@ -468,22 +481,23 @@ TabPage TP_OPTLOAD_PAGE Text [ french ] = "Espace entre les tabulations"; Text [ swedish ] = "Tabulatorav~st錸d"; Text [ dutch ] = "~Tabstop"; - Text [ spanish ] = "Distancia entre tabuladores"; + Text [ spanish ] = "~Espacio entre tabuladores"; Text [ english_us ] = "Tab stops"; Text[ chinese_simplified ] = "鍒惰〃绗﹂棿闅"; Text[ russian ] = "剜 蜞狍鲨"; Text[ polish ] = "Tabulatory"; Text[ japanese ] = "銈裤儢闁撻殧"; Text [ norwegian ] = "Standard tabulatoravstand" ; - Text [ finnish ] = "Sarkainkeskeytykset" ; + Text [ finnish ] = "Sarkaimet" ; Group = TRUE ; Text[ chinese_traditional ] = "瀹氫綅閸甸枔闅"; Text[ arabic ] = "卺倾鞘 轻滔驷"; Text[ greek ] = "琉飤篝荏彘 篝珉镨弭"; - Text[ korean ] = "韮 瓯半Μ"; + Text[ korean ] = "韮 臧勱博"; Text[ turkish ] = "Sekme dura瘕"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Distancia entre tabuladores"; + Text[ catalan ] = "Dist鄋cia entre tabuladors"; + Text[ thai ] = "喔曕副喔о斧喔⑧父喔斷福喔班涪喔班竵喔编箟喔"; }; MetricField MF_TAB { @@ -523,11 +537,12 @@ TabPage TP_OPTLOAD_PAGE Text[ chinese_traditional ] = "鐩稿"; Text[ arabic ] = "舒禽"; Text[ greek ] = "吁焘狒玺"; - Text[ korean ] = "順疙櫂"; + Text[ korean ] = "順疙櫂靹"; Text[ turkish ] = "Uyumluluk"; Text[ language_user1 ] = " "; Text[ finnish ] = "Yhteensopivuus"; Text[ catalan ] = "Compatibilitat"; + Text[ thai ] = "喔勦抚喔侧浮喙喔傕箟喔侧竵喔编笝喙勦笖喙"; }; CheckBox CB_MERGE_PARA_DIST { @@ -537,8 +552,8 @@ TabPage TP_OPTLOAD_PAGE Text [ English ] = "Add ~distances between paragraphs and tables" ; Text[ english_us ] = "Add spacing between paragraphs and tables in the current document"; Text[ portuguese ] = "Somar ~espa鏰mento entre par醙rafos e tabelas no documento activo"; - Text[ russian ] = "央铈栩 蝈牦 漕牦戾眚 怦 桧蝈疴嚯 噌玎鲥 蜞犭桷"; - Text[ dutch ] = "In het actuele document alle ~afstanden tussen alinea's en tabellen optellen"; + Text[ russian ] = "念徉忤螯 蝈牦 漕牦戾眚 桧蝈疴嚯 噌玎鲥 蜞犭桷"; + Text[ dutch ] = "~In het huidige document alle afstanden tussen alinea's en tabellen optellen"; Text[ french ] = "Additionner les espaces entre paragraphes et tableaux dans le document actif"; Text[ spanish ] = "Sumar ~espacios de p醨rafos y tablas en el documento actual"; Text[ italian ] = "Aggiungi distanze tra i paragrafi e le tabelle nel documento attuale"; @@ -551,11 +566,12 @@ TabPage TP_OPTLOAD_PAGE Text[ chinese_traditional ] = "宸查枊鍟撴枃浠剁殑鎵鏈夋钀介枔闅斿強琛ㄦ牸闁撻殧鐩稿姞"; Text[ arabic ] = "胖禽 阌禽 轻嗜勤 裴 哚 蒉亚 嫣锨驷 轻阌输 轻颓犴"; Text[ greek ] = "㈣耧轶灬 豉 ~狃矬糗箦 豉 疳襻泷荟 赆 豉 痖碥犍 篝 赳蓣镯 葶泷狯"; - Text[ korean ] = "順勳灛 氍胳劀鞐 鞛堧姅 氇摖 雼澖鞚 臧勱博瓿 響 臧勱博 頃╈偘"; + Text[ korean ] = "順勳灛 氍胳劀鞐愳劀 雼澖瓿 響 靷澊鞐 鞛堧姅 氇摖 臧勱博鞚 於旉皜"; Text[ turkish ] = "A琮k belgedeki t黰 paragraf ve tablo aral齥lar齨 topla"; Text[ language_user1 ] = " "; Text[ finnish ] = "Lis滗 v鋖it k鋣t鰏s olevan asiakirjan kappaleiden ja taulukoiden v鋖iin"; - Text[ catalan ] = "Sumar ~espacios de p醨rafos y tablas en el documento actual"; + Text[ catalan ] = "Suma ~espais de par鄃rafs i taules en el document actual"; + Text[ thai ] = "喙喔炧复喙堗浮喔｀赴喔⑧赴喔箞喔侧竾喔｀赴喔抚喙堗覆喔囙涪喙堗腑喔笝喙夃覆喔佮副喔氞笗喔侧福喔侧竾喙冟笝喙喔竵喔覆喔｀笡喔编笀喔堗父喔氞副喔"; }; CheckBox CB_MERGE_PARA_DIST_PAGESTART { @@ -565,9 +581,9 @@ TabPage TP_OPTLOAD_PAGE Text [ English ] = "Add distances at the beginning of pages" ; Text[ english_us ] = "Add paragraph and table spacing at tops of pages"; Text[ portuguese ] = "A~dicionar espa鏾s de par醙rafos e tabelas no in韈io das p醙inas"; - Text[ russian ] = "央铈栩 桧蝈疴嚯 噌玎鲥 蜞犭桷 磬鬣脲 耱疣龛鳆"; + Text[ russian ] = "念徉忤螯 桧蝈疴嚯 噌玎鲥 蜞犭桷 磬鬣脲 耱疣龛鳆"; Text[ greek ] = "㈣耧轶灬 豉 狃矬糗箦 豉 疳襻泷荟 赆 豉 痖碥犍 篝珥 狁鬓 翮 箦脒溽"; - Text[ dutch ] = "~Alinea- en tabellenafstanden invoegen aan paginabegin."; + Text[ dutch ] = "A~linea- en tabellenafstanden invoegen aan paginabegin."; Text[ french ] = "Additionner les ~espaces entre paragraphes et tableaux en d閎ut de page"; Text[ spanish ] = "Su~mar espacios de tablas y p醨rafos en los comienzos de p醙inas"; Text[ italian ] = "Aggiungi distanze paragrafi e tabelle a inizio pagina."; @@ -576,14 +592,15 @@ TabPage TP_OPTLOAD_PAGE Text[ polish ] = "Dodaj odst阷y od a~kapit體 i tabel na pocz箃ku stron"; Text[ portuguese_brazilian ] = "Add distances at the beginning of pages"; Text[ japanese ] = "銉氥兗銈搞伄濮嬨倎銇钀介枔闅斻仺琛ㄩ枔闅斻倰浠樸亼銈"; - Text[ korean ] = "韼橃澊歆 鞁滌瀾攵攵勳潣 雼澖 臧勱博瓿 響 臧勱博 頃╈偘"; + Text[ korean ] = "韼橃澊歆 鞁滌瀾 攵攵勳溂搿 雼澖瓿 響滌潣 臧勱博鞚 於旉皜"; Text[ chinese_simplified ] = "鍦ㄩ〉棣栦綅缃姞鍏ユ钀藉拰琛ㄦ牸鐨勯棿闅"; Text[ chinese_traditional ] = "鍦ㄩ爜棣栦綅缃姞鍏ユ钀借垏琛ㄦ牸涔嬮枔鐨勯枔闅"; Text[ arabic ] = "胖禽 轻蒉焉 媸惹谙 轻滔擎 裴 认琼 轻蛰颓"; Text[ turkish ] = "Paragraf ve tablo aral齥lar齨 sayfa baar齨a ekle"; Text[ language_user1 ] = " "; Text[ finnish ] = "Lis滗 kappaleiden ja taulukoiden v鋖it sivujen alkuun"; - Text[ catalan ] = "Su~mar espacios de tablas y p醨rafos a los comienzos de p醙inas"; + Text[ catalan ] = "Su~ma espais de taules i par鄃rafs a l'inici de p鄃ines"; + Text[ thai ] = "喙喔炧复喙堗浮喔｀赴喔⑧赴喔箞喔侧竾喔⑧箞喔斧喔權箟喔侧箒喔ム赴喔曕覆喔｀覆喔囙笚喔掂箞喔箞喔о笝喔氞笝喔傕腑喔囙斧喔權箟喔"; }; CheckBox CB_TAB_ALIGNMENT { @@ -595,7 +612,7 @@ TabPage TP_OPTLOAD_PAGE Text[ portuguese ] = "Alinhar posi玢o de tabula玢o"; Text[ russian ] = "蔓痤忭螯 镱玷鲨 蜞狍鲨"; Text[ greek ] = "觺麸喵轶 栎箸 篝珉镨蒴"; - Text[ dutch ] = "~Tabpositie defini雛en"; + Text[ dutch ] = "Ta~bpositie defini雛en"; Text[ french ] = "Aligner la position de tabulation"; Text[ spanish ] = "Ajustar posici髇 de tabulador"; Text[ italian ] = "Allinea posizione tabulazione"; @@ -604,13 +621,14 @@ TabPage TP_OPTLOAD_PAGE Text[ polish ] = "Wyr體naj pozycj tabulatora"; Text[ portuguese_brazilian ] = "Align tab stop position"; Text[ japanese ] = "銈裤儢銇綅缃倰鎻冦亪銈"; - Text[ korean ] = "韮 鞝曥 鞙勳箻鞐 毵烄稊旮"; + Text[ korean ] = "韮 鞙勳箻毳 毵烄钉"; Text[ chinese_simplified ] = "璋冩暣鍒惰〃閿綅缃"; Text[ chinese_traditional ] = "瑾挎暣瀹氫綅閸典綅缃"; Text[ turkish ] = "Align tab stop position"; Text[ arabic ] = "Align tab stop position"; - Text[ catalan ] = "Align tab stop position"; - Text[ finnish ] = "Tasaa sarkainkeskeytyksen sijainti"; + Text[ catalan ] = "Alinia la posici d'aturada dels tabuladors"; + Text[ finnish ] = "Tasaa sarkainkohdan sijainti"; + Text[ thai ] = "喔堗副喔斷笗喔赤箒喔笝喙堗竾喔涪喔膏笖喔｀赴喔⑧赴喔佮副喙夃笝"; }; }; /**************************************************************************/ @@ -654,7 +672,7 @@ TabPage TP_OPTCAPTION_PAGE Text[ french ] = "Tableau %PRODUCTNAME Writer"; Text[ swedish ] = "Tabell %PRODUCTNAME Writer"; Text[ dutch ] = "%PRODUCTNAME Writer tabel"; - Text[ spanish ] = "%PRODUCTNAME Writer Tabla"; + Text[ spanish ] = "%PRODUCTNAME Writer - Tabla"; Text[ english_us ] = "%PRODUCTNAME Writer Table"; Text[ chinese_simplified ] = "%PRODUCTNAME Writer 琛ㄦ牸"; Text[ russian ] = "%PRODUCTNAME Writer - 亦犭桷"; @@ -663,11 +681,12 @@ TabPage TP_OPTCAPTION_PAGE Text[ chinese_traditional ] = "%PRODUCTNAME Writer 琛ㄦ牸"; Text[ arabic ] = "滔驷 %PRODUCTNAME Writer"; Text[ greek ] = "羞磲赆 麸 %PRODUCTNAME Writer"; - Text[ korean ] = "%PRODUCTNAME Writer 鞀ろ攧霠堧摐鞁滍姼"; + Text[ korean ] = "%PRODUCTNAME Writer 響"; Text[ language_user1 ] = " "; Text[ turkish ] = "%PRODUCTNAME Writer Tablosu"; Text[ finnish ] = "%PRODUCTNAME Writer -taulukko"; - Text[ catalan ] = "%PRODUCTNAME Writer Tabla"; + Text[ catalan ] = "%PRODUCTNAME Writer Taula"; + Text[ thai ] = "喔曕覆喔｀覆喔 Writer %PRODUCTNAME "; }; String STR_FRAME { @@ -680,10 +699,10 @@ TabPage TP_OPTCAPTION_PAGE Text[ french ] = "Cadre %PRODUCTNAME Writer"; Text[ swedish ] = "Ram %PRODUCTNAME Writer"; Text[ dutch ] = "%PRODUCTNAME Writer kader"; - Text[ spanish ] = "%PRODUCTNAME Writer Marco"; + Text[ spanish ] = "%PRODUCTNAME Writer - Marco"; Text[ english_us ] = "%PRODUCTNAME Writer Frame"; Text[ chinese_simplified ] = "%PRODUCTNAME Writer 妗"; - Text[ russian ] = "%PRODUCTNAME Writer - 朽礻"; + Text[ russian ] = "%PRODUCTNAME Writer - 吗彗赅"; Text[ polish ] = "%PRODUCTNAME Writer - Ramka"; Text[ japanese ] = "%PRODUCTNAME Writer 鏋"; Text[ chinese_traditional ] = "%PRODUCTNAME Writer 瑷婃"; @@ -693,7 +712,8 @@ TabPage TP_OPTCAPTION_PAGE Text[ language_user1 ] = " "; Text[ turkish ] = "%PRODUCTNAME Writer 莈r鏴vesi"; Text[ finnish ] = "%PRODUCTNAME Writer -kehys"; - Text[ catalan ] = "%PRODUCTNAME Writer Marco"; + Text[ catalan ] = "%PRODUCTNAME Writer Marc"; + Text[ thai ] = "喔佮福喔笟 Writer %PRODUCTNAME "; }; String STR_GRAPHIC { @@ -706,20 +726,21 @@ TabPage TP_OPTCAPTION_PAGE Text[ french ] = "Image %PRODUCTNAME Writer"; Text[ swedish ] = "Grafik %PRODUCTNAME Writer"; Text[ dutch ] = "%PRODUCTNAME Writer afbeelding"; - Text[ spanish ] = "%PRODUCTNAME Writer Imagen"; + Text[ spanish ] = "%PRODUCTNAME Writer - Imagen"; Text[ english_us ] = "%PRODUCTNAME Writer Graphics"; Text[ chinese_simplified ] = "%PRODUCTNAME Writer 鍥惧舰"; - Text[ russian ] = "%PRODUCTNAME Writer - 需耋眍"; + Text[ russian ] = "%PRODUCTNAME Writer - 灭圄梓羼觇 钺牝"; Text[ polish ] = "%PRODUCTNAME Writer - Grafika"; Text[ japanese ] = "%PRODUCTNAME Writer 鍥"; Text[ chinese_traditional ] = "%PRODUCTNAME Writer 鍦栧舰"; Text[ arabic ] = "延闵 %PRODUCTNAME Writer"; Text[ greek ] = "民狯殛 麸 %PRODUCTNAME Writer"; - Text[ korean ] = "%PRODUCTNAME Writer 攴鸽灅頂"; + Text[ korean ] = "%PRODUCTNAME Writer 攴鸽"; Text[ language_user1 ] = " "; Text[ turkish ] = "%PRODUCTNAME Writer Grafi餴"; Text[ finnish ] = "%PRODUCTNAME Writer -grafiikka"; - Text[ catalan ] = "%PRODUCTNAME Writer Imagen "; + Text[ catalan ] = "%PRODUCTNAME Writer Imatge "; + Text[ thai ] = "喔佮福喔侧笩喔脆竸 Writer %PRODUCTNAME "; }; String STR_OLE { @@ -731,11 +752,11 @@ TabPage TP_OPTCAPTION_PAGE Text[ danish ] = "Yderligere OLE-objekter"; Text[ french ] = "Autres objets OLE"; Text[ swedish ] = "Andra OLE-objekt"; - Text[ dutch ] = "Meer OLE objecten"; + Text[ dutch ] = "Meer OLE-objecten"; Text[ spanish ] = "Otros objetos OLE"; Text[ english_us ] = "Further OLE objects"; Text[ chinese_simplified ] = "鍏跺畠 OLE 瀵硅薄"; - Text[ russian ] = "念镱腠栩咫 钺牝 OLE"; + Text[ russian ] = "念镱腠栩咫 OLE 钺牝"; Text[ polish ] = "Pozosta砮 obiekty OLE"; Text[ japanese ] = "銇濄伄浠栥伄 OLE 銈儢銈搞偋銈儓"; Text[ chinese_traditional ] = "鍏跺畠 OLE 鐗╀欢"; @@ -745,7 +766,8 @@ TabPage TP_OPTCAPTION_PAGE Text[ language_user1 ] = " "; Text[ turkish ] = "Di餰r OLE nesneleri"; Text[ finnish ] = "Muut OLE-objektit"; - Text[ catalan ] = "Otros objetos OLE"; + Text[ catalan ] = "Objectes OLE addicionals"; + Text[ thai ] = "喔о副喔曕笘喔 OLE 喙喔炧复喙堗浮喙喔曕复喔"; }; FixedText TXT_CATEGORY @@ -776,7 +798,8 @@ TabPage TP_OPTCAPTION_PAGE Text[ korean ] = "氩旍＜"; Text[ language_user1 ] = " "; Text[ turkish ] = "Kategori"; - Text[ catalan ] = "~Categoria"; + Text[ catalan ] = "Categoria"; + Text[ thai ] = "喔涏福喔班箑喔犩笚"; }; ComboBox BOX_CATEGORY { @@ -814,7 +837,8 @@ TabPage TP_OPTCAPTION_PAGE Text[ korean ] = "氩堩樃 毵り赴旮(~N)"; Text[ language_user1 ] = " "; Text[ turkish ] = "Numaralama"; - Text[ catalan ] = "Nu~meraci髇"; + Text[ catalan ] = "Nu~meraci"; + Text[ thai ] = "~喔ム赋喔斷副喔氞笗喔编抚喙喔ム競"; }; ListBox BOX_FORMAT { @@ -843,16 +867,17 @@ TabPage TP_OPTCAPTION_PAGE Text [ english_us ] = "Caption" ; Left = TRUE ; Text[ chinese_simplified ] = "鏍囩"; - Text[ russian ] = "项滹桉"; + Text[ russian ] = "袜玮囗桢"; Text[ polish ] = "Etykieta"; Text[ japanese ] = "銉嗐偔銈广儓"; Text[ chinese_traditional ] = "妯欑堡"; Text[ arabic ] = "轻视沩 轻舒猪晚"; Text[ greek ] = "硼殂襻鲛"; - Text[ korean ] = "霛茧波"; + Text[ korean ] = "旌§厴"; Text[ language_user1 ] = " "; Text[ turkish ] = "Resim yaz齭"; - Text[ catalan ] = "~Etiqueta"; + Text[ catalan ] = "Llegenda"; + Text[ thai ] = "喔勦赋喔氞福喔｀涪喔侧涪喔犩覆喔"; }; Edit EDT_TEXT { @@ -890,7 +915,8 @@ TabPage TP_OPTCAPTION_PAGE Text[ korean ] = "鞙勳箻"; Text[ language_user1 ] = " "; Text[ turkish ] = "Konum"; - Text[ catalan ] = "~Posici髇"; + Text[ catalan ] = "~Posici"; + Text[ thai ] = "喔曕赋喙佮斧喔權箞喔"; }; ListBox BOX_POS { @@ -925,8 +951,9 @@ TabPage TP_OPTCAPTION_PAGE Text[ korean ] = "靾橃"; Text[ language_user1 ] = " "; Text[ turkish ] = "D鼁ey"; - Text[ finnish ] = "Taso "; - Text[ catalan ] = "~Nivel"; + Text[ finnish ] = "Taso"; + Text[ catalan ] = "Nivell"; + Text[ thai ] = "喔｀赴喔斷副喔"; }; ListBox LB_LEVEL { @@ -989,7 +1016,7 @@ TabPage TP_OPTCAPTION_PAGE }; StringList [ russian ] = { - < "铃" ; > ; + < "湾" ; > ; }; StringList [ polish ] = { @@ -1027,6 +1054,10 @@ TabPage TP_OPTCAPTION_PAGE { < "Cap" ; > ; }; + StringList [ thai ] = + { + < "喙勦浮喙堗浮喔" ; > ; + }; }; FixedText FT_SEPARATOR { @@ -1054,7 +1085,8 @@ TabPage TP_OPTCAPTION_PAGE Text[ language_user1 ] = " "; Text[ turkish ] = "Ay齬ma i䌷t."; Text[ finnish ] = "Erotin"; - Text[ catalan ] = "~Separador"; + Text[ catalan ] = "Separador"; + Text[ thai ] = "喔曕副喔о箒喔⑧竵"; }; Edit ED_SEPARATOR { @@ -1098,7 +1130,8 @@ TabPage TP_OPTCAPTION_PAGE Text[ greek ] = "氧桁唧彘"; Text[ korean ] = "靹れ爼"; Text[ turkish ] = "Ayarlar"; - Text[ catalan ] = "Par鄊etres"; + Text[ catalan ] = "Configuraci"; + Text[ thai ] = "喔佮赋喔笝喔"; }; String STR_BEGINNING { @@ -1122,10 +1155,11 @@ TabPage TP_OPTCAPTION_PAGE Text[ chinese_traditional ] = "鍦ㄨ捣濮嬩綅缃"; Text[ arabic ] = "蓓 轻认琼"; Text[ greek ] = "郁珥 狁鬓"; - Text[ korean ] = "鞁滌瀾鞐"; + Text[ korean ] = "鞁滌瀾鞐愳劀"; Text[ language_user1 ] = " "; Text[ turkish ] = "Baangta"; - Text[ catalan ] = "Al principio"; + Text[ catalan ] = "A l'inici"; + Text[ thai ] = "喔椸傅喙堗笀喔膏笖喙喔｀复喙堗浮喔曕箟喔"; }; String STR_END { @@ -1139,7 +1173,7 @@ TabPage TP_OPTCAPTION_PAGE Text [ danish ] = "Ved slutningen" ; Text [ french ] = " la fin" ; Text [ swedish ] = "I slutet" ; - Text [ dutch ] = "Aan het einde" ; + Text [ dutch ] = "Aan einde" ; Text [ spanish ] = "Al final" ; Text [ english_us ] = "At the end" ; Text[ chinese_simplified ] = "鍦ㄧ粨鏉熶綅缃"; @@ -1149,10 +1183,11 @@ TabPage TP_OPTCAPTION_PAGE Text[ chinese_traditional ] = "鍦ㄧ祼鏉熶綅缃"; Text[ arabic ] = "蓓 轻溴琼"; Text[ greek ] = "郁 糨腼"; - Text[ korean ] = "毵堨毵夓棎"; + Text[ korean ] = "雭濎棎靹"; Text[ language_user1 ] = " "; Text[ turkish ] = "Sonda"; Text[ catalan ] = "Al final"; + Text[ thai ] = "喔椸傅喙堗笀喔膏笖喔父喔斷笚喙夃覆喔"; }; String STR_ABOVE { @@ -1179,7 +1214,8 @@ TabPage TP_OPTCAPTION_PAGE Text[ korean ] = "鞙"; Text[ language_user1 ] = " "; Text[ turkish ] = "Yukar齞a"; - Text[ catalan ] = "Encima"; + Text[ catalan ] = "A sobre"; + Text[ thai ] = "喔傕箟喔侧竾喔氞笝"; }; String STR_CP_BELOW { @@ -1206,19 +1242,21 @@ TabPage TP_OPTCAPTION_PAGE Text[ korean ] = "鞎勲灅"; Text[ language_user1 ] = " "; Text[ turkish ] = "A瘕da"; - Text[ catalan ] = "Debajo"; + Text[ catalan ] = "Sota"; + Text[ thai ] = "喔傕箟喔侧竾喔ム箞喔侧竾"; }; Text[ chinese_simplified ] = "鏍囩"; - Text[ russian ] = "项滹桉"; + Text[ russian ] = "袜玮囗桢"; Text[ polish ] = "Etykieta"; Text[ japanese ] = "鍥宠〃鐣彿"; Text[ chinese_traditional ] = "妯欑堡"; Text[ arabic ] = "视沩 舒猪晚"; Text[ greek ] = "硼殂襻鲛"; - Text[ korean ] = "霛茧波"; + Text[ korean ] = "旌§厴"; Text[ language_user1 ] = " "; Text[ turkish ] = "Resim yaz齭"; - Text[ catalan ] = "Etiqueta"; + Text[ catalan ] = "Llegenda"; + Text[ thai ] = "喔勦赋喔氞福喔｀涪喔侧涪喔犩覆喔"; }; StringArray STR_ARR_METRIC @@ -1400,7 +1438,7 @@ StringArray STR_ARR_METRIC < "宁殪" ; FUNIT_INCH ; > ; < "泽螓" ; FUNIT_FOOT ; > ; < "惕腓" ; FUNIT_MILE ; > ; - < "翔觇" ; FUNIT_PICA ; > ; + < "相殛" ; FUNIT_PICA ; > ; < "翌麝" ; FUNIT_POINT ; > ; }; ItemList [ polish ] = @@ -1472,7 +1510,7 @@ StringArray STR_ARR_METRIC < "inch" ; FUNIT_INCH ; > ; < "feet" ; FUNIT_FOOT ; > ; < "mile" ; FUNIT_MILE ; > ; - < "響滌 攴滉博 頇滌瀽" ; FUNIT_PICA ; > ; + < "韺岇澊旃" ; FUNIT_PICA ; > ; < "鞝" ; FUNIT_POINT ; > ; }; ItemList [ turkish ] = @@ -1501,16 +1539,28 @@ StringArray STR_ARR_METRIC }; ItemList [ catalan ] = { - < "Mil?l?metre" ; FUNIT_MM ; > ; - < "Cent韒etre" ; FUNIT_CM ; > ; - < "Metre" ; FUNIT_M ; > ; - < "Quil騧etre" ; FUNIT_KM ; > ; - < "Polzada" ; FUNIT_INCH ; > ; - < "Peu" ; FUNIT_FOOT ; > ; + < "Mil韒etres" ; FUNIT_MM ; > ; + < "Cent韒etres" ; FUNIT_CM ; > ; + < "Metres" ; FUNIT_M ; > ; + < "Kil騧etres" ; FUNIT_KM ; > ; + < "Polzades" ; FUNIT_INCH ; > ; + < "Peus" ; FUNIT_FOOT ; > ; < "Milles" ; FUNIT_MILE ; > ; - < "Pica" ; FUNIT_PICA ; > ; + < "Piques" ; FUNIT_PICA ; > ; < "Punt" ; FUNIT_POINT ; > ; }; + ItemList [ thai ] = + { + < "喔∴复喔ム弗喔脆箑喔∴笗喔" ; FUNIT_MM ; > ; + < "喙喔嬥箛喔權笗喔脆箑喔∴笗喔" ; FUNIT_CM ; > ; + < "喙喔∴笗喔" ; FUNIT_M ; > ; + < "喔佮复喙傕弗喙喔∴笗喔" ; FUNIT_KM ; > ; + < "喔權复喙夃抚" ; FUNIT_INCH ; > ; + < "喔熰父喔" ; FUNIT_FOOT ; > ; + < "喙勦浮喔ム箤" ; FUNIT_MILE ; > ; + < "喔炧复喔勦覆" ; FUNIT_PICA ; > ; + < "喔炧箟喔涪喔椸箤" ; FUNIT_POINT ; > ; + }; }; @@ -1537,3 +1587,6 @@ ItemList [ catalan ] = + + + diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 855599f0b73e..f9d49a712205 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: optpage.cxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: fme $ $Date: 2002-12-10 09:42:45 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1080,14 +1080,15 @@ BOOL SwTableOptionsTabPage::FillItemSet( SfxItemSet& rSet ) if(pWrtShell && SwWrtShell::SEL_TBL & pWrtShell->GetSelectionType()) { pWrtShell->SetTblChgMode(eMode); + static USHORT __READONLY_DATA aInva[] = + { FN_TABLE_MODE_FIX, + FN_TABLE_MODE_FIX_PROP, + FN_TABLE_MODE_VARIABLE, + 0 + }; + pWrtShell->GetView().GetViewFrame()->GetBindings().Invalidate( aInva ); } - static USHORT __READONLY_DATA aInva[] = - { FN_TABLE_MODE_FIX, - FN_TABLE_MODE_FIX_PROP, - FN_TABLE_MODE_VARIABLE, - 0 - }; - pWrtShell->GetView().GetViewFrame()->GetBindings().Invalidate( aInva ); + bRet = TRUE; } diff --git a/sw/source/ui/config/redlopt.src b/sw/source/ui/config/redlopt.src index 2fcf10dd5f9d..a66d5c2be17c 100644 --- a/sw/source/ui/config/redlopt.src +++ b/sw/source/ui/config/redlopt.src @@ -2,9 +2,9 @@ * * $RCSfile: redlopt.src,v $ * - * $Revision: 1.42 $ + * $Revision: 1.43 $ * - * last change: $Author: rt $ $Date: 2001-11-16 22:58:45 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -92,7 +92,7 @@ TabPage TP_REDLINE_OPT Text [ danish ] = "Tekstvisning" ; Text [ italian ] = "Rappresentazione testo" ; Text [ spanish ] = "Ver texto" ; - Text [ french ] = "Repr閟entation du texte" ; + Text [ french ] = "Affichage du texte" ; Text [ dutch ] = "Tekstweergave" ; Text[ chinese_simplified ] = "鏂囧瓧鏄剧ず"; Text[ russian ] = "项赅 蝈犟蜞"; @@ -104,8 +104,9 @@ TabPage TP_REDLINE_OPT Text[ korean ] = "韰嶌姢韸 響滌嫓"; Text[ turkish ] = "Metin g鰎黱黰"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ver texto"; + Text[ catalan ] = "Visualitzaci del text"; Text[ finnish ] = "Tekstin n鋣tt"; + Text[ thai ] = "喙佮釜喔斷竾喔溹弗喔傕箟喔竸喔о覆喔"; }; FixedText FT_CHG_INSERT { @@ -115,14 +116,14 @@ TabPage TP_REDLINE_OPT Text [ English ] = "Insert" ; Text[ english_us ] = "Insertions"; Text[ portuguese ] = "Inserir"; - Text[ russian ] = "埋蜞忤螯"; + Text[ russian ] = "埋蜞怅"; Text[ greek ] = "砰筢泫戕"; - Text[ dutch ] = "Insert"; + Text[ dutch ] = "Invoegen"; Text[ french ] = "Ins閞er"; Text[ spanish ] = "Insertar"; - Text[ finnish ] = "Insert"; + Text[ finnish ] = "Lis鋣kset"; Text[ italian ] = "Inserisci"; - Text[ danish ] = "Insert"; + Text[ danish ] = "S鎡 ind"; Text[ swedish ] = "Infoga"; Text[ polish ] = "Wstaw"; Text[ portuguese_brazilian ] = "Insert"; @@ -132,7 +133,8 @@ TabPage TP_REDLINE_OPT Text[ chinese_traditional ] = "鎻掑叆"; Text[ turkish ] = "Insert"; Text[ arabic ] = "Insert"; - Text[ catalan ] = "Insert"; + Text[ catalan ] = "Insereix"; + Text[ thai ] = "喙佮笚喔｀竵"; }; FixedText FT_INS_ATTR { @@ -142,14 +144,14 @@ TabPage TP_REDLINE_OPT Text [ English ] = "Attributes" ; Text[ english_us ] = "Attributes"; Text[ portuguese ] = "A~tributos"; - Text[ russian ] = "莉痂狍螓"; + Text[ russian ] = "~莉痂狍螓"; Text[ greek ] = "射辄~翮翦"; - Text[ dutch ] = "~Attributen"; + Text[ dutch ] = "Attri~buten"; Text[ french ] = "A~ttributs"; - Text[ spanish ] = "~Atributos"; + Text[ spanish ] = "Atributos"; Text[ italian ] = "Attributi"; - Text[ danish ] = "Attributes"; - Text[ swedish ] = "A~ttribut"; + Text[ danish ] = "Attri~butter"; + Text[ swedish ] = "~Attribut"; Text[ polish ] = "Atrybuty"; Text[ portuguese_brazilian ] = "Attributes"; Text[ japanese ] = "灞炴"; @@ -158,8 +160,9 @@ TabPage TP_REDLINE_OPT Text[ chinese_traditional ] = "灞"; Text[ turkish ] = "Attributes"; Text[ arabic ] = "轻鱼鞘"; - Text[ catalan ] = "Attributes"; + Text[ catalan ] = "Atributs"; Text[ finnish ] = "M滗ritteet"; + Text[ thai ] = "喔勦父喔撪弗喔编竵喔┼笓喔"; }; ListBox LB_INS_ATTR { @@ -211,17 +214,17 @@ TabPage TP_REDLINE_OPT }; StringList [ language_user1 ] = { - < "[Keine]" ; > ; + < "[Kei; [Keine]" ; > ; < "Fett" ; > ; - < "Kursiv" ; > ; - < "Unterstrichen" ; > ; - < "Doppelt unterstrichen" ; > ; - < "Durchstreichen" ; > ; - < "Versalien" ; > ; - < "Gemeine" ; > ; - < "Kapit鋖chen" ; > ; - < "Titelschrift" ; > ; - < "Hintergrundfarbe" ; > ; + < "Kurs; Kursiv" ; > ; + < "Unte; Unterstrichen" ; > ; + < "Dopp; Doppelt unterstrichen" ; > ; + < "Durc; Durchstreichen" ; > ; + < "Vers; Versalien" ; > ; + < "Geme; Gemeine" ; > ; + < "Kapi; Kapit鋖chen" ; > ; + < "Tite; Titelschrift" ; > ; + < "Hint; Hintergrundfarbe" ; > ; }; StringList [ portuguese ] = { @@ -239,12 +242,12 @@ TabPage TP_REDLINE_OPT }; StringList [ russian ] = { - < "[铃鏬" ; > ; + < "[湾騗" ; > ; < "畦痦" ; > ; < "鼠瘃桠" ; > ; < "项澉屦觏篁" ; > ; < "拟铋眍 镱澉屦觇忄龛" ; > ; - < "青麇痍眢螯" ; > ; + < "青麇痍桠囗桢" ; > ; < "橡铒桉睇" ; > ; < "羊痤黜" ; > ; < "枢镨蝈朦" ; > ; @@ -276,7 +279,7 @@ TabPage TP_REDLINE_OPT < "Hoofdletters" ; > ; < "Kleine letters" ; > ; < "Klein-kapitaal" ; > ; - < "Letterype titel" ; > ; + < "Lettertype titel" ; > ; < "Achtergrondkleur" ; > ; }; StringList [ french ] = @@ -304,7 +307,7 @@ TabPage TP_REDLINE_OPT < "May鷖culas" ; > ; < "Min鷖culas" ; > ; < "Versalitas" ; > ; - < "Caracteres de t韙ulo" ; > ; + < "T韙ulo" ; > ; < "Color de fondo" ; > ; }; StringList [ italian ] = @@ -325,15 +328,15 @@ TabPage TP_REDLINE_OPT { < "[Ingen]" ; > ; < "Fed" ; > ; - < ", Kursiv" ; > ; + < "Kursiv" ; > ; < "Understreget" ; > ; < "Dobbelt understreget" ; > ; + < "Gennemstreget" ; > ; < "Store bogstaver" ; > ; < "Sm bogstaver" ; > ; < "Kapit鎙er" ; > ; < "Titelskrift" ; > ; < "Baggrundsfarve" ; > ; - < "Baggrundsfarve" ; > ; }; StringList [ swedish ] = { @@ -388,7 +391,7 @@ TabPage TP_REDLINE_OPT < "澶ф枃瀛" ; > ; < "灏忔枃瀛" ; > ; < "灏忓瀷澶ф枃瀛" ; > ; - < "锞锝诧緞锞欐枃瀛" ; > ; + < "銈裤偆銉堛儷鏂囧瓧" ; > ; < "鑳屾櫙鑹" ; > ; }; StringList [ korean ] = @@ -398,12 +401,12 @@ TabPage TP_REDLINE_OPT < "鞚错儰毽泊" ; > ; < "氚戩" ; > ; < "鞚挫 氚戩" ; > ; - < "毵愳唽" ; > ; + < "旆唽靹" ; > ; < "雽氍胳瀽" ; > ; < "靻岆鞛" ; > ; < "鞀る旌" ; > ; < "鞝滊 旮昙" ; > ; - < "氚瓣步 旎煬" ; > ; + < "氚瓣步 靸夓儊" ; > ; }; StringList [ chinese_simplified ] = { @@ -431,7 +434,7 @@ TabPage TP_REDLINE_OPT < "灏忓瀛楁瘝" ; > ; < "灏忓瀷澶у瀛楁瘝" ; > ; < "妯欓鏂囧瓧" ; > ; - < "鑳屾櫙椤旇壊" ; > ; + < "鑳屾櫙椤忚壊" ; > ; }; StringList [ turkish ] = { @@ -463,32 +466,46 @@ TabPage TP_REDLINE_OPT }; StringList [ catalan ] = { - < "[Ninguno]" ; > ; - < "Negrita" ; > ; + < "[Cap]" ; > ; + < "Negreta" ; > ; < "Cursiva" ; > ; - < "Subrayado" ; > ; - < "Subrayado doble" ; > ; - < "May鷖culas" ; > ; - < "Min鷖culas" ; > ; - < "Versalitas" ; > ; - < "Caracteres del t韙ulo" ; > ; - < "Color de fondo" ; > ; - < "Hintergrundfarbe" ; > ; + < "Subratllat" ; > ; + < "Subratllat: doble" ; > ; + < "Barrat" ; > ; + < "Maj鷖cules" ; > ; + < "Min鷖cules" ; > ; + < "Versaletes" ; > ; + < "Tipus de lletra del t韙ol" ; > ; + < "Color de fons" ; > ; }; StringList [ finnish ] = { - < "[Tuntematon]" ; > ; - < "Lihavointi" ; > ; - < "Kursivointi" ; > ; - < "Alleviivaa" ; > ; + < "[Ei mit滗n]" ; > ; + < "Lihavoitu" ; > ; + < "Kursivoitu" ; > ; + < "Alleviivaus" ; > ; < "Alleviivaus: kaksinkertainen" ; > ; < "Yliviivaus" ; > ; - < "Kirjaimet" ; > ; + < "Isot kirjaimet" ; > ; + < "Pienet kirjaimet" ; > ; < "Pienet kirjaimet" ; > ; - < "Pienet alkukirjaimet" ; > ; < "Otsikon fontti" ; > ; < "Taustav鋜i" ; > ; }; + StringList [ thai ] = + { + < "[喙勦浮喙堗浮喔礭" ; > ; + < "喔笝喔" ; > ; + < "喙喔傅喔⑧竾" ; > ; + < "喔傕傅喔斷箑喔箟喔權箖喔曕箟" ; > ; + < "喔傕傅喔斷箑喔箟喔權箖喔曕箟: 喔勦腹喙" ; > ; + < "喔傕傅喔斷笚喔编笟" ; > ; + < "喔曕副喔о笧喔脆浮喔炧箤喙冟斧喔嵿箞" ; > ; + < "喔曕副喔о笧喔脆浮喔炧箤喙喔ム箛喔" ; > ; + < "喔曕副喔о笧喔脆浮喔炧箤喙冟斧喔嵿箞喔傕笝喔侧笖喙喔ム箛喔" ; > ; + < "喔曕副喔о腑喔编竵喔┼福喔娻阜喙堗腑喙喔｀阜喙堗腑喔" ; > ; + < "喔傅喔炧阜喙夃笝喔弗喔编竾" ; > ; + }; }; FixedText FT_INS_COL { @@ -500,23 +517,24 @@ TabPage TP_REDLINE_OPT Text [ english_us ] = "Color" ; Text [ portuguese_brazilian ] = "Farbe" ; Text [ swedish ] = "~F鋜g" ; - Text [ danish ] = "Farve" ; - Text [ italian ] = "~Colore" ; - Text [ spanish ] = "~Color" ; - Text [ french ] = "~Couleur" ; - Text [ dutch ] = "~Kleur" ; + Text [ danish ] = "Far~ve" ; + Text [ italian ] = "Colore" ; + Text [ spanish ] = "Color" ; + Text [ french ] = "Couleur" ; + Text [ dutch ] = "Kl~eur" ; Text[ chinese_simplified ] = "棰滆壊"; Text[ russian ] = "肘弪"; Text[ polish ] = "Kolor"; Text[ japanese ] = "鑹"; - Text[ chinese_traditional ] = "椤旇壊"; + Text[ chinese_traditional ] = "椤忚壊"; Text[ arabic ] = "轻徭"; Text[ greek ] = "遵"; - Text[ korean ] = "靸"; + Text[ korean ] = "靸夓儊"; Text[ turkish ] = "~Renk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Color"; - Text[ finnish ] = "~S鋠y"; + Text[ catalan ] = "Color"; + Text[ finnish ] = "V鋜i"; + Text[ thai ] = "喔傅"; }; ListBox LB_INS_COL { @@ -540,7 +558,7 @@ TabPage TP_REDLINE_OPT Text[ french ] = "Ins閞er"; Text[ spanish ] = "Insertar"; Text[ italian ] = "Inserisci"; - Text[ danish ] = "Insert"; + Text[ danish ] = "S鎡 ind"; Text[ swedish ] = "Infoga"; Text[ polish ] = "Wstaw"; Text[ portuguese_brazilian ] = "Insert"; @@ -550,8 +568,9 @@ TabPage TP_REDLINE_OPT Text[ chinese_traditional ] = "鎻掑叆"; Text[ turkish ] = "Insert"; Text[ arabic ] = "畔亚"; - Text[ catalan ] = "Insert"; + Text[ catalan ] = "Insereix"; Text[ finnish ] = "Lis滗"; + Text[ thai ] = "喙佮笚喔｀竵"; }; FixedText FT_CHG_DELETE { @@ -561,14 +580,14 @@ TabPage TP_REDLINE_OPT Text [ English ] = "Delete" ; Text[ english_us ] = "Deletions"; Text[ portuguese ] = "Eliminar"; - Text[ russian ] = "愉嚯栩"; + Text[ russian ] = "愉嚯屙"; Text[ greek ] = "拈徙襻鲛"; - Text[ dutch ] = "Delete"; + Text[ dutch ] = "Wissen"; Text[ french ] = "Supprimer"; - Text[ spanish ] = "Eliminar"; - Text[ finnish ] = "Delete"; + Text[ spanish ] = "Borrar"; + Text[ finnish ] = "Poistot"; Text[ italian ] = "Elimina"; - Text[ danish ] = "Delete"; + Text[ danish ] = "Slet"; Text[ swedish ] = "Radera"; Text[ polish ] = "Usu"; Text[ portuguese_brazilian ] = "Delete"; @@ -578,7 +597,8 @@ TabPage TP_REDLINE_OPT Text[ chinese_traditional ] = "鍒櫎"; Text[ turkish ] = "Delete"; Text[ arabic ] = "Delete"; - Text[ catalan ] = "Delete"; + Text[ catalan ] = "Supressions"; + Text[ thai ] = "喔ム笟"; }; FixedText FT_DEL_ATTR { @@ -588,24 +608,25 @@ TabPage TP_REDLINE_OPT Text [ English ] = "Attributes" ; Text[ english_us ] = "Attributes"; Text[ portuguese ] = "A~tributos"; - Text[ russian ] = "莉痂狍螓"; + Text[ russian ] = "莉痂~狍螓"; Text[ greek ] = "射辄翮翦"; - Text[ dutch ] = "~Attributen"; + Text[ dutch ] = "Attr~ibuten"; Text[ french ] = "Attributs"; - Text[ spanish ] = "~Atributos"; + Text[ spanish ] = "Atributos"; Text[ italian ] = "Attributi"; - Text[ danish ] = "Attributes"; + Text[ danish ] = "Attrib~utter"; Text[ swedish ] = "Attrib~ut"; Text[ polish ] = "Atrybuty"; Text[ portuguese_brazilian ] = "Attributes"; Text[ japanese ] = "灞炴"; - Text[ korean ] = "鞏错姼毽钒韸!"; + Text[ korean ] = "靻嶌劚"; Text[ chinese_simplified ] = "灞炴"; Text[ chinese_traditional ] = "灞"; Text[ turkish ] = "Attributes"; Text[ arabic ] = "轻鱼鞘"; - Text[ catalan ] = "Attributes"; + Text[ catalan ] = "Atributs"; Text[ finnish ] = "M滗ritteet"; + Text[ thai ] = "喔勦父喔撪弗喔编竵喔┼笓喔"; }; ListBox LB_DEL_ATTR { @@ -624,22 +645,23 @@ TabPage TP_REDLINE_OPT Text[ portuguese ] = "~Cor"; Text[ russian ] = "肘弪"; Text[ greek ] = "遵~"; - Text[ dutch ] = "~Kleur"; + Text[ dutch ] = "K~leur"; Text[ french ] = "Couleur"; - Text[ spanish ] = "~Color"; - Text[ italian ] = "~Colore"; - Text[ danish ] = "Color"; + Text[ spanish ] = "Color"; + Text[ italian ] = "Colore"; + Text[ danish ] = "F~arve"; Text[ swedish ] = "F~鋜g"; Text[ polish ] = "Kolor"; Text[ portuguese_brazilian ] = "Color"; Text[ japanese ] = "鑹"; - Text[ korean ] = "旎煬"; + Text[ korean ] = "靸夓儊"; Text[ chinese_simplified ] = "褰╄壊"; Text[ chinese_traditional ] = "褰╄壊"; Text[ turkish ] = "Color"; Text[ arabic ] = "轻徭"; Text[ catalan ] = "Color"; - Text[ finnish ] = "V鋜i"; + Text[ finnish ] = "V~鋜i"; + Text[ thai ] = "喔傅"; }; ListBox LB_DEL_COL { @@ -661,9 +683,9 @@ TabPage TP_REDLINE_OPT Text[ greek ] = "拈徙襻鲛"; Text[ dutch ] = "Wissen"; Text[ french ] = "Supprimer"; - Text[ spanish ] = "Eliminar"; + Text[ spanish ] = "Borrar"; Text[ italian ] = "Elimina"; - Text[ danish ] = "Delete"; + Text[ danish ] = "Slet"; Text[ swedish ] = "Radera"; Text[ polish ] = "Usu"; Text[ portuguese_brazilian ] = "Delete"; @@ -673,8 +695,9 @@ TabPage TP_REDLINE_OPT Text[ chinese_traditional ] = "鍒櫎"; Text[ turkish ] = "Delete"; Text[ arabic ] = "托"; - Text[ catalan ] = "Delete"; + Text[ catalan ] = "Suprimeix"; Text[ finnish ] = "Poista"; + Text[ thai ] = "喔ム笟"; }; FixedText FT_CHG_CHANGE { @@ -686,22 +709,23 @@ TabPage TP_REDLINE_OPT Text[ portuguese ] = "Modificar atributos"; Text[ russian ] = "如戾礤龛 囹痂狍蝾"; Text[ greek ] = "择镳镳镞珞 殇辄翮翎"; - Text[ dutch ] = "Attributes changed"; + Text[ dutch ] = "Attributenwijziging"; Text[ french ] = "Modification des attributs"; Text[ spanish ] = "Modificaci髇 de atributos"; - Text[ finnish ] = "Attributes changed"; + Text[ finnish ] = "Muutetut m滗ritteet"; Text[ italian ] = "Cambia attributi"; - Text[ danish ] = "Attributes changed"; + Text[ danish ] = "Attribut鎛dring"; Text[ swedish ] = "Attribut鋘dring"; Text[ polish ] = "Modyfikacja atrybut體"; Text[ portuguese_brazilian ] = "Attributes changed"; Text[ japanese ] = "灞炴с伄澶夋洿"; - Text[ korean ] = "靻嶌劚鞚 氤瓴诫悩鞐堨姷雼堧嫟"; + Text[ korean ] = "靻嶌劚 氤瓴"; Text[ chinese_simplified ] = "灞炴ф洿鏀"; Text[ chinese_traditional ] = "灞ц畩鏇"; Text[ turkish ] = "Attributes changed"; Text[ arabic ] = "Attributes changed"; - Text[ catalan ] = "Attributes changed"; + Text[ catalan ] = "Atributs canviats"; + Text[ thai ] = "喙喔涏弗喔掂箞喔⑧笝喔勦父喔撪弗喔编竵喔┼笓喔"; }; FixedText FT_CHG_ATTR { @@ -711,24 +735,25 @@ TabPage TP_REDLINE_OPT Text [ English ] = "Attributes" ; Text[ english_us ] = "Attributes"; Text[ portuguese ] = "A~tributos"; - Text[ russian ] = "莉痂狍螓"; + Text[ russian ] = "莉痂醻篁"; Text[ greek ] = "射辄翮魚弪"; Text[ dutch ] = "~Attributen"; Text[ french ] = "Attributs"; - Text[ spanish ] = "~Atributos"; + Text[ spanish ] = "Atributos"; Text[ italian ] = "Attributi"; - Text[ danish ] = "Attributes"; + Text[ danish ] = "Attributt~er"; Text[ swedish ] = "Attri~but"; Text[ polish ] = "Atrybuty"; Text[ portuguese_brazilian ] = "Attributes"; Text[ japanese ] = "灞炴"; - Text[ korean ] = "鞏错姼毽钒韸"; + Text[ korean ] = "靻嶌劚"; Text[ chinese_simplified ] = "灞炴"; Text[ chinese_traditional ] = "灞"; Text[ turkish ] = "Attributes"; Text[ arabic ] = "轻鱼鞘"; - Text[ catalan ] = "Attributes"; + Text[ catalan ] = "Atributs"; Text[ finnish ] = "M滗ritteet"; + Text[ thai ] = "喔勦父喔撪弗喔编竵喔┼笓喔"; }; ListBox LB_CHG_ATTR { @@ -749,20 +774,21 @@ TabPage TP_REDLINE_OPT Text[ greek ] = "讆颃灬"; Text[ dutch ] = "~Kleur"; Text[ french ] = "Couleur"; - Text[ spanish ] = "~Color"; - Text[ italian ] = "~Colore"; - Text[ danish ] = "Color"; + Text[ spanish ] = "Color"; + Text[ italian ] = "Colore"; + Text[ danish ] = "Fa~rve"; Text[ swedish ] = "F鋨rg"; Text[ polish ] = "Kolor"; Text[ portuguese_brazilian ] = "Color"; Text[ japanese ] = "鑹"; - Text[ korean ] = "旎煬"; + Text[ korean ] = "靸夓儊"; Text[ chinese_simplified ] = "褰╄壊"; Text[ chinese_traditional ] = "褰╄壊"; Text[ turkish ] = "Color"; Text[ arabic ] = "轻徭"; Text[ catalan ] = "Color"; - Text[ finnish ] = "~S鋠y"; + Text[ finnish ] = "V鋜~i"; + Text[ thai ] = "喔傅"; }; ListBox LB_CHG_COL { @@ -786,7 +812,7 @@ TabPage TP_REDLINE_OPT Text[ french ] = "Attributs"; Text[ spanish ] = "Atributos"; Text[ italian ] = "Attributi"; - Text[ danish ] = "Attributes"; + Text[ danish ] = "Attributter"; Text[ swedish ] = "Attribut"; Text[ polish ] = "Atrybuty"; Text[ portuguese_brazilian ] = "Attributes"; @@ -796,8 +822,9 @@ TabPage TP_REDLINE_OPT Text[ chinese_traditional ] = "灞"; Text[ turkish ] = "Attributes"; Text[ arabic ] = "轻鱼鞘"; - Text[ catalan ] = "Attributes"; + Text[ catalan ] = "Atributs"; Text[ finnish ] = "M滗ritteet"; + Text[ thai ] = "喔勦父喔撪弗喔编竵喔┼笓喔"; }; FixedLine FL_LC { @@ -809,7 +836,7 @@ TabPage TP_REDLINE_OPT Text [ english_us ] = "Lines changed" ; Text [ portuguese_brazilian ] = "Ge?nderte Zeilen" ; Text [ swedish ] = "膎drade rader" ; - Text [ danish ] = "苙drede r鎘ker" ; + Text [ danish ] = "苙drede linjer" ; Text [ italian ] = "Righe modificate" ; Text [ spanish ] = "L韓eas modificadas" ; Text [ french ] = "Lignes modifi閑s" ; @@ -821,11 +848,12 @@ TabPage TP_REDLINE_OPT Text[ chinese_traditional ] = "宸茬稉璁婃洿鐨勮"; Text[ arabic ] = "糜匮 阙厢"; Text[ greek ] = "择镳镳镩珈蓓弪 泷犰燧"; - Text[ korean ] = "氤瓴诫悳銆頄."; + Text[ korean ] = "氤瓴诫悳 欷"; Text[ turkish ] = "De餴⺶irilen sat齬lar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "L韓eas modificadas"; - Text[ finnish ] = "Muutetut viivat "; + Text[ catalan ] = "L韓ies modificades"; + Text[ finnish ] = "Muutetut rivit"; + Text[ thai ] = "喙喔涏弗喔掂箞喔⑧笝喔氞福喔｀笚喔编笖"; }; FixedText FT_MARKPOS { @@ -837,7 +865,7 @@ TabPage TP_REDLINE_OPT Text [ english_us ] = "Mar~k" ; Text [ portuguese_brazilian ] = "Markierung" ; Text [ swedish ] = "Markeri~ng" ; - Text [ danish ] = "Markering" ; + Text [ danish ] = "Markeri~ng" ; Text [ italian ] = "Contrassegno" ; Text [ spanish ] = "~Marca" ; Text [ french ] = "Marque" ; @@ -849,11 +877,12 @@ TabPage TP_REDLINE_OPT Text[ chinese_traditional ] = "妯欒(~K)"; Text[ arabic ] = "轻释享"; Text[ greek ] = "愚灬~眢"; - Text[ korean ] = "毵堩伂 響滌嫓(~K)"; + Text[ korean ] = "靹犿儩 響滌嫓(~K)"; Text[ turkish ] = "蔺aret"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Marca"; - Text[ finnish ] = "Mark"; + Text[ catalan ] = "Mar~ca"; + Text[ finnish ] = "~Merkint"; + Text[ thai ] = "喔椸赋喙喔勦福喔粪箞喔竾喔珇喔∴覆喔"; }; ListBox LB_MARKPOS { @@ -944,8 +973,8 @@ TabPage TP_REDLINE_OPT stringlist [ dutch ] = { < "[Geen]" ; > ; - < "Linker rand" ; > ; - < "Rechter rand" ; > ; + < "Linkerrand" ; > ; + < "Rechterrand" ; > ; < "Buitenste rand" ; > ; < "Binnenste rand" ; > ; }; @@ -959,7 +988,7 @@ TabPage TP_REDLINE_OPT }; StringList [ russian ] = { - < "[铃鏬" ; > ; + < "[湾騗" ; > ; < "隋恹 牮嚅" ; > ; < "橡噔 牮嚅" ; > ; < "袜痼骓 牮嚅" ; > ; @@ -1031,19 +1060,27 @@ TabPage TP_REDLINE_OPT }; StringList [ catalan ] = { - < "[Ninguno]" ; > ; - < "Margen izquierdo" ; > ; - < "Margen derecho" ; > ; - < "Margen exterior" ; > ; - < "Margen interior" ; > ; + < "[Cap]" ; > ; + < "Marge esquerre" ; > ; + < "Marge dret" ; > ; + < "Marge exterior" ; > ; + < "Marge interior" ; > ; }; StringList [ finnish ] = { - < "[Ei mit??n]" ; > ; - < "Vasen marginaali" ; > ; - < "Oikea marginaali" ; > ; - < "Ulkomarginaali" ; > ; - < "Sisempi marginaali" ; > ; + < "[Ei mit滗n]" ; > ; + < "Vasen reunus" ; > ; + < "Oikea reunus" ; > ; + < "Ulompi reunus" ; > ; + < "Sisempi reunus" ; > ; + }; + StringList [ thai ] = + { + < "[喙勦浮喙堗浮喔礭" ; > ; + < "喔｀赴喔⑧赴喔傕腑喔氞笅喙夃覆喔" ; > ; + < "喔｀赴喔⑧赴喔傕腑喔氞競喔о覆" ; > ; + < "喔｀赴喔⑧赴喔傕腑喔氞笝喔竵" ; > ; + < "喔｀赴喔⑧赴喔傕腑喔氞箖喔" ; > ; }; }; FixedText FT_LC_COL @@ -1055,24 +1092,25 @@ TabPage TP_REDLINE_OPT Text [ english_us ] = "~Color" ; Text [ portuguese_brazilian ] = "Farbe" ; Text [ swedish ] = "F鋜~g" ; - Text [ danish ] = "Farve" ; + Text [ danish ] = "~Farve" ; Text [ italian ] = "Colore" ; - Text [ spanish ] = "~Color" ; - Text [ french ] = "~Couleur" ; - Text [ dutch ] = "~Kleur" ; + Text [ spanish ] = "Color" ; + Text [ french ] = "Couleur" ; + Text [ dutch ] = "Kle~ur" ; Text [ portuguese ] = "Co~r" ; Text[ chinese_simplified ] = "棰滆壊(~C)"; Text[ russian ] = "肘弪"; Text[ polish ] = "Kolor"; Text[ japanese ] = "鑹(~C)"; - Text[ chinese_traditional ] = "椤旇壊(~C)"; + Text[ chinese_traditional ] = "椤忚壊(~C)"; Text[ arabic ] = "轻徭"; Text[ greek ] = "遵"; Text[ korean ] = "靸夓儊(~C)"; Text[ turkish ] = "Renk"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Color"; - Text[ finnish ] = "Color"; + Text[ finnish ] = "~V鋜i"; + Text[ thai ] = "~喔傅"; }; ListBox LB_LC_COL { @@ -1102,15 +1140,16 @@ TabPage TP_REDLINE_OPT Text[ chinese_simplified ] = "渚濅綔鑰呰瀹"; Text[ russian ] = "项 噔蝾痼"; Text[ polish ] = "Wed硊g autora"; - Text[ japanese ] = "浣滄垚鑰呫伖銇"; + Text[ japanese ] = "浣滄垚鑰呭垾"; Text[ chinese_traditional ] = "渚濅綔鑰呰ō瀹"; Text[ arabic ] = "陀 轻隳彷"; Text[ greek ] = "梳糗 篚眙荜翮"; - Text[ korean ] = "鞛戩劚鞛愳棎 霐半澕"; + Text[ korean ] = "鞛戩劚鞛愱皜 靹れ爼"; Text[ turkish ] = "Yazana g鰎e"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Seg鷑 autor"; - Text[ finnish ] = "Laatija"; + Text[ catalan ] = "Per l'autor"; + Text[ finnish ] = "Tekij"; + Text[ thai ] = "喙傕笖喔⑧笢喔灌箟喙喔傕傅喔⑧笝"; }; String STR_NOTHING { @@ -1126,7 +1165,7 @@ TabPage TP_REDLINE_OPT Text [ french ] = "[Aucun(e)]" ; Text [ dutch ] = "[Geen]" ; Text[ chinese_simplified ] = "[鏃燷"; - Text[ russian ] = "[铃鏬"; + Text[ russian ] = "[湾騗"; Text[ polish ] = "[Brak]"; Text[ japanese ] = "[銇仐]"; Text[ greek ] = "[梳磔磲]"; @@ -1134,8 +1173,9 @@ TabPage TP_REDLINE_OPT Text[ chinese_traditional ] = "[鐒"; Text[ arabic ] = "[认驿]"; Text[ turkish ] = "[Yok]"; - Text[ catalan ] = "[Ning鷑]"; + Text[ catalan ] = "[Cap]"; Text[ finnish ] = "[Ei mit滗n]"; + Text[ thai ] = "[喙勦浮喙堗浮喔礭"; }; }; @@ -1154,3 +1194,10 @@ TabPage TP_REDLINE_OPT + + + + + + + diff --git a/sw/source/ui/config/usrpref.cxx b/sw/source/ui/config/usrpref.cxx index fd44e2e5427e..46fb59e346eb 100644 --- a/sw/source/ui/config/usrpref.cxx +++ b/sw/source/ui/config/usrpref.cxx @@ -2,9 +2,9 @@ * * $RCSfile: usrpref.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: os $ $Date: 2002-09-20 12:09:53 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -94,6 +94,9 @@ #ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include <com/sun/star/uno/Sequence.hxx> #endif +#ifndef _UNOTOOLS_LOCALEDATAWRAPPER_HXX +#include <unotools/localedatawrapper.hxx> +#endif using namespace utl; using namespace rtl; @@ -116,11 +119,14 @@ SwMasterUsrPref::SwMasterUsrPref(BOOL bWeb) : pWebColorConfig(bWeb ? new SwWebColorConfig(*this) : 0), nFldUpdateFlags(0), nLinkUpdateMode(0), - eHScrollMetric(FUNIT_CM), - eVScrollMetric(FUNIT_CM), bIsHScrollMetricSet(sal_False), bIsVScrollMetricSet(sal_False) { + MeasurementSystem eSystem = GetAppLocaleData().getMeasurementSystemEnum(); + eUserMetric = MEASURE_METRIC == eSystem ? FUNIT_CM : FUNIT_INCH; + eHScrollMetric = eUserMetric; + eVScrollMetric = eUserMetric; + aContentConfig.Load(); aLayoutConfig.Load(); aGridConfig.Load(); @@ -411,7 +417,7 @@ void SwLayoutViewConfig::Load() case 11: { sal_Int32 nVal; pValues[nProp] >>= nVal; - rParent.SetZoom(nVal); + rParent.SetZoom((USHORT)nVal); } break;// "Zoom/Value", case 12: @@ -534,8 +540,8 @@ void SwGridConfig::Load() case 2: rParent.SetSynchronize(bSet); break;// "Option/Synchronize", case 3: aSnap.Width() = MM100_TO_TWIP(nSet); break;// "Resolution/XAxis", case 4: aSnap.Height() = MM100_TO_TWIP(nSet); break;// "Resolution/YAxis", - case 5: rParent.SetDivisionX(nSet); break;// "Subdivision/XAxis", - case 6: rParent.SetDivisionY(nSet); break;// "Subdivision/YAxis" + case 5: rParent.SetDivisionX((short)nSet); break;// "Subdivision/XAxis", + case 6: rParent.SetDivisionY((short)nSet); break;// "Subdivision/YAxis" } } } diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx index 9238f58585e9..11bf6102e040 100644 --- a/sw/source/ui/config/viewopt.cxx +++ b/sw/source/ui/config/viewopt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewopt.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: fme $ $Date: 2002-12-05 10:06:50 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -113,8 +113,8 @@ #ifndef _CRSTATE_HXX #include <crstate.hxx> #endif -#ifndef _SVX_COLORCFG_HXX -#include <svx/colorcfg.hxx> +#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX +#include <svtools/colorcfg.hxx> #endif #ifndef INCLUDED_SVTOOLS_ACCESSIBILITYOPTIONS_HXX #include <svtools/accessibilityoptions.hxx> @@ -776,66 +776,66 @@ Color& SwViewOption::GetScriptIndicatorColor() /* -----------------------------23.04.2002 17:41------------------------------ ---------------------------------------------------------------------------*/ -void SwViewOption::ApplyColorConfigValues(const svx::ColorConfig& rConfig ) +void SwViewOption::ApplyColorConfigValues(const svtools::ColorConfig& rConfig ) { - aDocColor.SetColor(rConfig.GetColorValue(svx::DOCCOLOR).nColor); + aDocColor.SetColor(rConfig.GetColorValue(svtools::DOCCOLOR).nColor); - svx::ColorConfigValue aValue = rConfig.GetColorValue(svx::DOCBOUNDARIES); + svtools::ColorConfigValue aValue = rConfig.GetColorValue(svtools::DOCBOUNDARIES); aDocBoundColor.SetColor(aValue.nColor); nAppearanceFlags = 0; if(aValue.bIsVisible) nAppearanceFlags |= VIEWOPT_DOC_BOUNDARIES; - aAppBackgroundColor.SetColor(rConfig.GetColorValue(svx::APPBACKGROUND).nColor); + aAppBackgroundColor.SetColor(rConfig.GetColorValue(svtools::APPBACKGROUND).nColor); - aValue = rConfig.GetColorValue(svx::OBJECTBOUNDARIES); + aValue = rConfig.GetColorValue(svtools::OBJECTBOUNDARIES); aObjectBoundColor.SetColor(aValue.nColor); if(aValue.bIsVisible) nAppearanceFlags |= VIEWOPT_OBJECT_BOUNDARIES; - aValue = rConfig.GetColorValue(svx::TABLEBOUNDARIES); + aValue = rConfig.GetColorValue(svtools::TABLEBOUNDARIES); aTableBoundColor.SetColor(aValue.nColor); if(aValue.bIsVisible) nAppearanceFlags |= VIEWOPT_TABLE_BOUNDARIES; - aValue = rConfig.GetColorValue(svx::WRITERIDXSHADINGS); + aValue = rConfig.GetColorValue(svtools::WRITERIDXSHADINGS); aIndexShadingsColor.SetColor(aValue.nColor); if(aValue.bIsVisible) nAppearanceFlags |= VIEWOPT_INDEX_SHADINGS; - aValue = rConfig.GetColorValue(svx::LINKS); + aValue = rConfig.GetColorValue(svtools::LINKS); aLinksColor.SetColor(aValue.nColor); if(aValue.bIsVisible) nAppearanceFlags |= VIEWOPT_LINKS; - aValue = rConfig.GetColorValue(svx::LINKSVISITED); + aValue = rConfig.GetColorValue(svtools::LINKSVISITED); aVisitedLinksColor.SetColor(aValue.nColor); if(aValue.bIsVisible) nAppearanceFlags |= VIEWOPT_VISITED_LINKS; - aDirectCursorColor.SetColor(rConfig.GetColorValue(svx::WRITERDIRECTCURSOR).nColor); + aDirectCursorColor.SetColor(rConfig.GetColorValue(svtools::WRITERDIRECTCURSOR).nColor); - aTextGridColor.SetColor(rConfig.GetColorValue(svx::WRITERTEXTGRID).nColor); + aTextGridColor.SetColor(rConfig.GetColorValue(svtools::WRITERTEXTGRID).nColor); - aSpellColor.SetColor(rConfig.GetColorValue(svx::SPELL).nColor); + aSpellColor.SetColor(rConfig.GetColorValue(svtools::SPELL).nColor); - aFontColor.SetColor(rConfig.GetColorValue(svx::FONTCOLOR).nColor); + aFontColor.SetColor(rConfig.GetColorValue(svtools::FONTCOLOR).nColor); - aValue = rConfig.GetColorValue(svx::WRITERFIELDSHADINGS); + aValue = rConfig.GetColorValue(svtools::WRITERFIELDSHADINGS); aFieldShadingsColor.SetColor(aValue.nColor); if(aValue.bIsVisible) nAppearanceFlags |= VIEWOPT_FIELD_SHADINGS; - aValue = rConfig.GetColorValue(svx::WRITERSECTIONBOUNDARIES); + aValue = rConfig.GetColorValue(svtools::WRITERSECTIONBOUNDARIES); aSectionBoundColor.SetColor(aValue.nColor); if(aValue.bIsVisible) nAppearanceFlags |= VIEWOPT_SECTION_BOUNDARIES; - aValue = rConfig.GetColorValue(svx::WRITERPAGEBREAKS); + aValue = rConfig.GetColorValue(svtools::WRITERPAGEBREAKS); aPageBreakColor.SetColor(aValue.nColor); - aNotesIndicatorColor.SetColor(rConfig.GetColorValue(svx::WRITERNOTESINDICATOR).nColor); - aScriptIndicatorColor.SetColor(rConfig.GetColorValue(svx::WRITERSCRIPTINDICATOR).nColor); + aNotesIndicatorColor.SetColor(rConfig.GetColorValue(svtools::WRITERNOTESINDICATOR).nColor); + aScriptIndicatorColor.SetColor(rConfig.GetColorValue(svtools::WRITERSCRIPTINDICATOR).nColor); } /* -----------------------------23.04.2002 17:48------------------------------ @@ -848,31 +848,31 @@ void SwViewOption::SetAppearanceFlag(sal_Int32 nFlag, BOOL bSet, BOOL bSaveInCon nAppearanceFlags &= ~nFlag; if(bSaveInConfig) { - //create an editable svx::ColorConfig and store the change - svx::EditableColorConfig aEditableConfig; + //create an editable svtools::ColorConfig and store the change + svtools::EditableColorConfig aEditableConfig; struct FlagToConfig_Impl { sal_Int32 nFlag; - svx::ColorConfigEntry eEntry; + svtools::ColorConfigEntry eEntry; }; static const FlagToConfig_Impl aFlags[] = { - VIEWOPT_DOC_BOUNDARIES , svx::DOCBOUNDARIES , - VIEWOPT_OBJECT_BOUNDARIES , svx::OBJECTBOUNDARIES , - VIEWOPT_TABLE_BOUNDARIES , svx::TABLEBOUNDARIES , - VIEWOPT_INDEX_SHADINGS , svx::WRITERIDXSHADINGS , - VIEWOPT_LINKS , svx::LINKS , - VIEWOPT_VISITED_LINKS , svx::LINKSVISITED , - VIEWOPT_FIELD_SHADINGS , svx::WRITERFIELDSHADINGS , - VIEWOPT_SECTION_BOUNDARIES , svx::WRITERSECTIONBOUNDARIES , - 0 , svx::ColorConfigEntryCount + VIEWOPT_DOC_BOUNDARIES , svtools::DOCBOUNDARIES , + VIEWOPT_OBJECT_BOUNDARIES , svtools::OBJECTBOUNDARIES , + VIEWOPT_TABLE_BOUNDARIES , svtools::TABLEBOUNDARIES , + VIEWOPT_INDEX_SHADINGS , svtools::WRITERIDXSHADINGS , + VIEWOPT_LINKS , svtools::LINKS , + VIEWOPT_VISITED_LINKS , svtools::LINKSVISITED , + VIEWOPT_FIELD_SHADINGS , svtools::WRITERFIELDSHADINGS , + VIEWOPT_SECTION_BOUNDARIES , svtools::WRITERSECTIONBOUNDARIES , + 0 , svtools::ColorConfigEntryCount }; sal_uInt16 nPos = 0; while(aFlags[nPos].nFlag) { if(0 != (nFlag&aFlags[nPos].nFlag)) { - svx::ColorConfigValue aValue = aEditableConfig.GetColorValue(aFlags[nPos].eEntry); + svtools::ColorConfigValue aValue = aEditableConfig.GetColorValue(aFlags[nPos].eEntry); aValue.bIsVisible = bSet; aEditableConfig.SetColorValue(aFlags[nPos].eEntry, aValue); } diff --git a/sw/source/ui/dbui/dbinsdlg.src b/sw/source/ui/dbui/dbinsdlg.src index acc390014853..6168c335acd2 100644 --- a/sw/source/ui/dbui/dbinsdlg.src +++ b/sw/source/ui/dbui/dbinsdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: dbinsdlg.src,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: kz $ $Date: 2002-12-05 10:27:11 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -98,7 +98,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL Text[ dutch ] = "Gegevens invoegen als"; Text[ chinese_simplified ] = "鎻掑叆鏁版嵁鐨勬柟寮忥細"; Text[ greek ] = "砰筢泫戕 溴滹燧睐 :"; - Text[ korean ] = "搿 雿办澊韯 靷届瀰:"; + Text[ korean ] = "雿办澊韯 靷届瀰:"; Text[ turkish ] = "Eklenecek verilerin t黵:"; Text[ catalan ] = "Insereix la data com:"; Text[ finnish ] = "Lis滗 tiedot muodossa:"; @@ -130,7 +130,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL Text[ dutch ] = "T~abel"; Text[ chinese_simplified ] = "琛ㄦ牸(~A)"; Text[ greek ] = "羞磲赆"; - Text[ korean ] = "鞁滍姼(~A)"; + Text[ korean ] = "響(~A)"; Text[ turkish ] = "T~ablo"; Text[ catalan ] = "T~aula"; Text[ finnish ] = "~Taulukko"; @@ -482,21 +482,21 @@ ModalDialog DLG_AP_INSERT_DB_SEL Text [ ENGLISH ] = "Tab~le column(s)" ; Text [ english_us ] = "Tab~le column(s)" ; Text [ portuguese_brazilian ] = "Tabe~lle" ; - Text [ swedish ] = "Tabe~ll" ; + Text [ swedish ] = "Tabe~llkolumn(er)" ; Text [ danish ] = "Tabel" ; - Text [ italian ] = "Tabe~lla" ; - Text [ spanish ] = "Tab~la" ; - Text [ french ] = "Tab~le" ; + Text [ italian ] = "Colonna/e tabe~lla" ; + Text [ spanish ] = "Columnas de tab~la" ; + Text [ french ] = "Colonnes de table" ; Text [ dutch ] = "Tabe~l" ; Text [ portuguese ] = "Ta~bela" ; - Text[ chinese_simplified ] = "琛ㄦ牸(~L)"; + Text[ chinese_simplified ] = "琛ㄦ牸鍒(~L)"; Text[ russian ] = "亦犭桷"; Text[ polish ] = "Tabela"; - Text[ japanese ] = "琛(~L)"; - Text[ chinese_traditional ] = "琛ㄦ牸(~L)"; + Text[ japanese ] = "銉嗐兗銉栥儷銇垪(~L)"; + Text[ chinese_traditional ] = "琛ㄦ牸娆(~L)"; Text[ arabic ] = "轻滔驷"; Text[ dutch ] = "Tabe~l"; - Text[ chinese_simplified ] = "琛ㄦ牸(~L)"; + Text[ chinese_simplified ] = "琛ㄦ牸鍒(~L)"; Text[ greek ] = "羞磲赆"; Text[ korean ] = "響滌潣 鞐(~L)"; Text[ turkish ] = "~Tablo"; @@ -631,7 +631,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL Text[ dutch ] = "~Eigenschappen..."; Text[ chinese_simplified ] = "灞炴(~O)..."; Text[ greek ] = "射辄翮翦..."; - Text[ korean ] = "霌彪鞝曤炒(~O)..."; + Text[ korean ] = "霌彪 鞝曤炒(~O)..."; Text[ turkish ] = "謣zelikler..."; Text[ catalan ] = "Pr~opietats..."; Text[ finnish ] = "~Ominaisuudet..."; @@ -650,7 +650,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL Text [ swedish ] = "Aut~oFormat..." ; Text [ danish ] = "AutoFormat..." ; Text [ italian ] = "Formatt. auto..." ; - Text [ spanish ] = "~Autoformato..." ; + Text [ spanish ] = "~Formateado autom醫ico..." ; Text [ french ] = "Aut~oFormat..." ; Text [ dutch ] = "Aut~oOpmaak..." ; Text[ chinese_simplified ] = "鑷姩鏍煎紡(~O)..."; @@ -733,3 +733,5 @@ ModalDialog DLG_AP_INSERT_DB_SEL + + diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 354dc9354280..6da197207297 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dbmgr.cxx,v $ * - * $Revision: 1.63 $ + * $Revision: 1.64 $ * - * last change: $Author: os $ $Date: 2002-12-09 13:58:30 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -90,6 +90,9 @@ #ifndef _COM_SUN_STAR_CONTAINER_XCHILD_HPP_ #include <com/sun/star/container/XChild.hpp> #endif +#ifndef _COM_SUN_STAR_TEXT_MAILMERGEEVENT_ +#include <com/sun/star/text/MailMergeEvent.hpp> +#endif #ifndef _SFXVIEWFRM_HXX #include <sfx2/viewfrm.hxx> #endif @@ -223,9 +226,6 @@ #ifndef _HINTIDS_HXX #include <hintids.hxx> #endif -#ifndef _DBHELPER_DBCONVERSION_HXX_ -#include <connectivity/dbconversion.hxx> -#endif #ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #endif @@ -280,8 +280,9 @@ #ifndef _NUMUNO_HXX #include <svtools/numuno.hxx> #endif -#include "mailmrge.hxx" +#include "mailmrge.hxx" +#include <unomailmerge.hxx> #ifndef _SFXEVENT_HXX #include <sfx2/event.hxx> @@ -301,6 +302,7 @@ using namespace svx; using namespace ::com::sun::star; +using namespace com::sun::star::text; using namespace com::sun::star::uno; using namespace com::sun::star::container; using namespace com::sun::star::frame; @@ -417,6 +419,7 @@ BOOL lcl_GetColumnCnt(SwDSParam* pParam, BOOL SwNewDBMgr::MergeNew(USHORT nOpt, SwWrtShell& rSh, const ODataAccessDescriptor& _rDescriptor) { + SetMergeType( nOpt ); DBG_ASSERT(!bInMerge && !pImpl->pMergeData, "merge already activated!") @@ -432,10 +435,10 @@ BOOL SwNewDBMgr::MergeNew(USHORT nOpt, SwWrtShell& rSh, if ( _rDescriptor.has(daCursor) ) _rDescriptor[daCursor] >>= xResSet; - if ( _rDescriptor.has(daSelection) ) + if ( _rDescriptor.has(daSelection) ) _rDescriptor[daSelection] >>= aSelection; - if ( _rDescriptor.has(daConnection) ) - _rDescriptor[daConnection] >>= xConnection; + if ( _rDescriptor.has(daConnection) ) + _rDescriptor[daConnection] >>= xConnection; if(!aData.sDataSource.getLength() || !aData.sCommand.getLength() || !xResSet.is()) { @@ -554,8 +557,16 @@ BOOL SwNewDBMgr::MergeNew(USHORT nOpt, SwWrtShell& rSh, { SfxDispatcher *pDis = rSh.GetView().GetViewFrame()->GetDispatcher(); SfxBoolItem aMerge(FN_QRY_MERGE, TRUE); + + // !! Currently (Jan-2003) silent is defined by supplying *any* + // !! item!! (Thus according to OS it would be silent even when + // !! other items then SID_SILENT would be supplied!) + // !! Therefore it has to be the 0 pointer when not silent. + SfxBoolItem aMergeSilent(SID_SILENT, TRUE); + SfxBoolItem *pMergeSilent = IsMergeSilent() ? &aMergeSilent : 0; + pDis->Execute(SID_PRINTDOC, - SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, &aMerge, 0L); + SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD, &aMerge, pMergeSilent, 0L); } break; @@ -859,7 +870,9 @@ BOOL SwNewDBMgr::GetColumnNames(ListBox* pListBox, SwNewDBMgr::SwNewDBMgr() : pImpl(new SwNewDBMgr_Impl(*this)), + pMergeEvtSrc(NULL), bInMerge(FALSE), + bMergeSilent(FALSE), nMergeType(DBMGR_INSERT), bInitDBFields(FALSE) { @@ -918,6 +931,16 @@ BOOL SwNewDBMgr::MergePrint( SwView& rView, { pSh->ViewShell::UpdateFlds(); ++rOpt.nMergeAct; + + // launch MailMergeEvent if required + const SwXMailMerge *pEvtSrc = GetMailMergeEvtSrc(); + if (pEvtSrc) + { + Reference< XInterface > xRef( (XMailMergeBroadcaster *) pEvtSrc ); + text::MailMergeEvent aEvt( xRef, rView.GetDocShell()->GetModel() ); + pEvtSrc->LaunchMailMergeEvent( aEvt ); + } + rView.SfxViewShell::Print( rProgress ); // ggf Basic-Macro ausfuehren if( rOpt.IsPrintSingleJobs() && bRet ) @@ -1035,7 +1058,8 @@ BOOL SwNewDBMgr::MergeMailing(SwWrtShell* pSh) PrintMonitor aPrtMonDlg(&pSh->GetView().GetEditWin(), TRUE); aPrtMonDlg.aDocName.SetText(pSh->GetView().GetDocShell()->GetTitle(22)); aPrtMonDlg.aCancel.SetClickHdl(LINK(this, SwNewDBMgr, PrtCancelHdl)); - aPrtMonDlg.Show(); + if (!IsMergeSilent()) + aPrtMonDlg.Show(); OfficeApplication* pOffApp = OFF_APP(); SfxRequest aReq( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, pOffApp->GetPool() ); @@ -1161,7 +1185,8 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSh) aPrtMonDlg.aDocName.SetText(pSh->GetView().GetDocShell()->GetTitle(22)); aPrtMonDlg.aCancel.SetClickHdl(LINK(this, SwNewDBMgr, PrtCancelHdl)); - aPrtMonDlg.Show(); + if (!IsMergeSilent()) + aPrtMonDlg.Show(); SwDocShell *pDocSh = pSh->GetView().GetDocShell(); // Progress, um KeyInputs zu unterbinden @@ -1233,6 +1258,15 @@ BOOL SwNewDBMgr::MergeMailFiles(SwWrtShell* pSh) // alle versteckten Felder/Bereiche entfernen pDoc->RemoveInvisibleContent(); + // launch MailMergeEvent if required + const SwXMailMerge *pEvtSrc = GetMailMergeEvtSrc(); + if (pEvtSrc) + { + Reference< XInterface > xRef( (XMailMergeBroadcaster *) pEvtSrc ); + text::MailMergeEvent aEvt( xRef, xDocSh->GetModel() ); + pEvtSrc->LaunchMailMergeEvent( aEvt ); + } + SfxMedium* pDstMed = new SfxMedium( aTempFile.GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READWRITE, TRUE ); @@ -2153,7 +2187,6 @@ void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh, if(pImpl->pMergeDialog->Execute() == RET_OK) { - SetMergeType( pImpl->pMergeDialog->GetMergeType() ); aDescriptor[daSelection] <<= pImpl->pMergeDialog->GetSelection(); Reference<XResultSet> xResSet = pImpl->pMergeDialog->GetResultSet(); @@ -2161,7 +2194,7 @@ void SwNewDBMgr::ExecuteFormLetter( SwWrtShell& rSh, aDescriptor[daCursor] <<= xResSet; OFF_APP()->NotifyEvent(SfxEventHint(SW_EVENT_MAIL_MERGE, rSh.GetView().GetViewFrame()->GetObjectShell())); - MergeNew(GetMergeType(), + MergeNew(pImpl->pMergeDialog->GetMergeType() , rSh, aDescriptor); // reset the cursor inside diff --git a/sw/source/ui/dbui/dbui.src b/sw/source/ui/dbui/dbui.src index fa2f39587a19..443462cfa927 100644 --- a/sw/source/ui/dbui/dbui.src +++ b/sw/source/ui/dbui/dbui.src @@ -2,9 +2,9 @@ * * $RCSfile: dbui.src,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: kz $ $Date: 2001-11-16 23:00:22 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -108,15 +108,16 @@ ModalDialog DLG_DBSELECTION Text[ chinese_simplified ] = "閫夋嫨鏁版嵁搴"; Text[ russian ] = "蔓犷 徉琨 溧眄"; Text[ polish ] = "Wyb髍 bazy danych"; - Text[ japanese ] = "锞冿緸锝帮線锞嶏緸锝帮浇銇伕鎶"; + Text[ japanese ] = "銉囥兗銈裤儥銉笺偣銇伕鎶"; Text[ chinese_traditional ] = "閬告搰璩囨枡搴"; Text[ arabic ] = "俏薯茄 耷谙 轻软卿鞘"; Text[ greek ] = "硼殡镢 廛箸 溴滹燧睐"; Text[ korean ] = "雿办澊韯半矤鞚挫姢 靹犿儩"; Text[ turkish ] = "Veritaban se鏸mi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Seleccionar base de datos"; + Text[ catalan ] = "Selecciona base de dades"; Text[ finnish ] = "Tietokantavalinta"; + Text[ thai ] = "喙喔ム阜喔竵喔愢覆喔權競喙夃腑喔∴腹喔"; }; // DLG_PRINTMONITOR ------------------------------------------------------ ModelessDialog DLG_PRINTMONITOR @@ -176,11 +177,12 @@ ModelessDialog DLG_PRINTMONITOR Text[ chinese_traditional ] = "鍌抽佸埌"; Text[ arabic ] = "硎 厝勤叔 哕"; Text[ greek ] = "尻趱瘙礤翎 "; - Text[ korean ] = "於滊牓 順曥嫕"; + Text[ korean ] = "鞚胳噭 欷"; Text[ turkish ] = "驱kt t黵"; Text[ language_user1 ] = " "; - Text[ catalan ] = "se est imprimiendo en"; + Text[ catalan ] = "s'est imprimint en"; Text[ finnish ] = "tulostuu tulostimessa"; + Text[ thai ] = "喔佮赋喔ム副喔囙笧喔脆浮喔炧箤喔氞笝"; }; FixedText FT_SENDING { @@ -200,7 +202,7 @@ ModelessDialog DLG_PRINTMONITOR TEXT[ portuguese_brazilian ] = "is being send at"; TEXT[ portuguese ] = "est a ser enviado para"; TEXT[ danish ] = "bliver sendt til"; - TEXT[ french ] = "est en cours d'envoi "; + TEXT[ french ] = "va 阾re envoy "; TEXT[ swedish ] = "skickas till"; TEXT[ dutch ] = "wordt verzonden aan"; TEXT[ spanish ] = "se env韆 a"; @@ -212,11 +214,12 @@ ModelessDialog DLG_PRINTMONITOR TEXT[ chinese_traditional ] = "瀵勭櫦绲"; TEXT[ arabic ] = "硎 叛忧徨 裴"; TEXT[ greek ] = "狃矬糨腚弭衢 瘃矧"; - TEXT[ korean ] = "锛庯紟鞐 鞝勳啞"; + TEXT[ korean ] = "氤措偞電 欷"; TEXT[ turkish ] = "Al齝"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "se env韆 a"; - TEXT[ finnish ] = "l?hetet??n kohteelle"; + TEXT[ catalan ] = "s'est enviant a"; + TEXT[ finnish ] = "l鋒etet滗n kohteelle"; + TEXT[ thai ] = "喔佮赋喔ム副喔囙笘喔灌竵喔箞喔囙箘喔涏涪喔编竾"; }; FixedText FT_PRINTER { @@ -267,21 +270,22 @@ ModelessDialog DLG_PRINTMONITOR Text[ danish ] = "Send-monitor"; Text[ french ] = "Moniteur d'envoi"; Text[ swedish ] = "Skicka monitor"; - Text[ dutch ] = "Monitor verzenden"; - Text[ spanish ] = "Enviar-Monitor"; + Text[ dutch ] = "Monitor \"Verzenden\""; + Text[ spanish ] = "Monitor de env韔"; Text[ english_us ] = "Send-Monitor"; Text[ chinese_simplified ] = "瀵勫彂-鐩戣鍣"; - Text[ russian ] = "悟镳噔赅 蝈牦泐 桤钺疣驽龛"; + Text[ russian ] = "悟镳噔赅 桤钺疣驽龛 疣磬"; Text[ polish ] = "Pokaz stanu przesy砤nia"; - Text[ japanese ] = "閫佷俊锞擄締锞锝"; + Text[ japanese ] = "閫佷俊銉€儖銈裤兗"; Text[ chinese_traditional ] = "瀵勭櫦-鐩ｈ鍣"; Text[ arabic ] = "阊寝 轻叛忧"; Text[ greek ] = "琉矬麸朕-翔"; Text[ korean ] = "鞝勳啞 氇媹韯"; Text[ turkish ] = "G鰊derme ekran"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enviar-Monitor"; - Text[ finnish ] = "L?hetysvalvonta"; + Text[ catalan ] = "Monitor d'enviament"; + Text[ finnish ] = "L鋒etysvalvonta"; + Text[ thai ] = "喔堗腑喔犩覆喔炧竵喔侧福喔箞喔"; }; Text [ portuguese ] = "Monitor de impress鉶" ; Text [ english_us ] = "Print monitor" ; @@ -291,19 +295,20 @@ ModelessDialog DLG_PRINTMONITOR Text [ italian ] = "Controllo stampa" ; Text [ spanish ] = "Monitor de impresi髇" ; Text [ french ] = "Moniteur d'impression" ; - Text [ dutch ] = "Opslaan-monitor" ; + Text [ dutch ] = "Monitor \"Opslaan\"" ; Text[ chinese_simplified ] = "鎵撳嵃鐩戣"; - Text[ russian ] = "杨躔囗屙桢 蝈牦泐 桤钺疣驽龛"; + Text[ russian ] = "襄鬣螯 桤钺疣驽龛 疣磬"; Text[ polish ] = "Pokaz stanu zapisu"; - Text[ japanese ] = "锞掞緭锞橈緭锞嗭線锝"; + Text[ japanese ] = "銉°儮銉儮銉嬨偪銉"; Text[ chinese_traditional ] = "鍒楀嵃鐩ｈ"; Text[ arabic ] = "阊寝 轻洼"; Text[ language_user1 ] = " "; Text[ greek ] = "琉镨揸艴箸-翔"; Text[ korean ] = "鞝鞛 氇媹韯"; Text[ turkish ] = "Yazd齬ma ekran"; - Text[ catalan ] = "Monitor de impresi髇"; + Text[ catalan ] = "Monitor d'impressi"; Text[ finnish ] = "Tulostuksenvalvonta"; + Text[ thai ] = "喔堗腑喔犩覆喔炧竵喔侧福喔炧复喔∴笧喙"; }; String STR_DB_EMAIL @@ -318,7 +323,7 @@ String STR_DB_EMAIL Text[ french ] = "E-mail"; Text[ swedish ] = "E-post"; Text[ dutch ] = "E-mail"; - Text[ spanish ] = "E-mail"; + Text[ spanish ] = "Correo-e"; Text[ chinese_simplified ] = "鐢靛瓙閭欢"; Text[ russian ] = "蓦尻蝠铐磬 镱黩"; Text[ polish ] = "e-mail"; @@ -326,11 +331,12 @@ String STR_DB_EMAIL Text[ chinese_traditional ] = "闆诲瓙閮典欢"; Text[ arabic ] = "妊硐 裴呤焰漤"; Text[ greek ] = "E-mail"; - Text[ korean ] = "锛-锛璦il"; + Text[ korean ] = "鞝勳瀽 氅旍澕"; Text[ turkish ] = "E-posta"; Text[ language_user1 ] = " "; - Text[ catalan ] = "E-mail"; - Text[ finnish ] = "S?hk?osti"; + Text[ catalan ] = "correu electr騨ic"; + Text[ finnish ] = "S鋒k鰌osti"; + Text[ thai ] = "喔傅喙喔∴弗喙"; }; @@ -341,3 +347,11 @@ String STR_DB_EMAIL + + + + + + + + diff --git a/sw/source/ui/dialog/abstract.src b/sw/source/ui/dialog/abstract.src index 42750bce2796..7f4283547aac 100644 --- a/sw/source/ui/dialog/abstract.src +++ b/sw/source/ui/dialog/abstract.src @@ -2,9 +2,9 @@ * * $RCSfile: abstract.src,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: rt $ $Date: 2001-08-07 15:33:27 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -99,10 +99,11 @@ ModalDialog DLG_INSERT_ABSTRACT Text[ dutch ] = "Eigenschappen"; Text[ chinese_simplified ] = "灞炴"; Text[ greek ] = "射辄翮翦"; - Text[ korean ] = "霌彪鞝曤炒"; + Text[ korean ] = "霌彪 鞝曤炒"; Text[ turkish ] = "謟ellikler"; - Text[ catalan ] = "Propiedades"; + Text[ catalan ] = "Propietats"; Text[ finnish ] = "Ominaisuudet"; + Text[ thai ] = "喔勦父喔撪釜喔∴笟喔编笗喔"; }; FixedText FT_LEVEL { @@ -117,21 +118,22 @@ ModalDialog DLG_INSERT_ABSTRACT Text [ italian ] = "Livelli di capitolo inclusi" ; Text [ spanish ] = "Niveles del cap韙ulo incluidos" ; Text [ french ] = "Niveaux de plan inclure" ; - Text [ dutch ] = "Aantal overzichtsniveau's" ; + Text [ dutch ] = "Aantal overzichtsniveaus" ; Text [ portuguese ] = "N韛eis de cap韙ulo inclu韉os" ; Text[ chinese_simplified ] = "鍖呭惈鐨勭珷鑺傚ぇ绾茬骇"; - Text[ russian ] = "玛膻麇眄 箴钼龛 疣玟咫钼"; + Text[ russian ] = "玛膻麇眄 箴钼龛 耱痼牝箴"; Text[ polish ] = "９cznie z poziomami rozdzia硊"; - Text[ japanese ] = "鎶藉嚭銇欍倠绔狅練锞嶏緸锞欐暟"; + Text[ japanese ] = "鎶藉嚭銇欍倠绔犮儸銉欍儷鏁"; Text[ chinese_traditional ] = "鍖呭惈鐨勭珷绡澶х侗"; Text[ arabic ] = "阌舒砬 轻菡 轻阒沅"; - Text[ dutch ] = "Aantal overzichtsniveau's"; + Text[ dutch ] = "Aantal overzichtsniveaus"; Text[ chinese_simplified ] = "鍖呭惈鐨勭珷鑺傚ぇ绾茬骇"; Text[ greek ] = "吁祓羼殡犰忉睃戾磲 屦唣邃 赍鲠脶啭"; - Text[ korean ] = "甏霠悳銆鞛レ垬欷."; + Text[ korean ] = "韽暔霅 鞛レ潣 臧滌殧 靾橃 靾"; Text[ turkish ] = "Dahil edilen b鰈黰 d鼁eyleri"; - Text[ catalan ] = "Niveles del cap韙ulo incluidos"; - Text[ finnish ] = "Sis鋖lytetyt rajaustasot"; + Text[ catalan ] = "Nivells del cap韙ol inclosos"; + Text[ finnish ] = "Sis鋖lytetyt j鋝ennystasot"; + Text[ thai ] = "喔｀抚喔∴福喔班笖喔编笟喙喔勦箟喔侧福喙堗覆喔"; }; NumericField NF_LEVEL { @@ -165,7 +167,7 @@ ModalDialog DLG_INSERT_ABSTRACT Text [ dutch ] = "Alinea's per kop" ; Text [ portuguese ] = "Par醙rafos por cap韙ulo" ; Text[ chinese_simplified ] = "姣忕珷鑺傚寘鍚殑娈佃惤"; - Text[ russian ] = "泪玎鲥 汶噔"; + Text[ russian ] = "泪玎鲥 箴钼礤"; Text[ polish ] = "Akapity w rozdziale"; Text[ japanese ] = "绔犮亗銇熴倞銇钀芥暟"; Text[ chinese_traditional ] = "姣忕珷绡鍖呭惈鐨勬钀"; @@ -173,10 +175,11 @@ ModalDialog DLG_INSERT_ABSTRACT Text[ dutch ] = "Alinea's per kop"; Text[ chinese_simplified ] = "姣忕珷鑺傚寘鍚殑娈佃惤"; Text[ greek ] = "嗅褴泷狯镩 犴 赍鲕脶轱"; - Text[ korean ] = "鞛ル嫻 雼澖"; + Text[ korean ] = "頃 鞛 雼 頃橃渼 靾橃 靾"; Text[ turkish ] = "Beher b鰈黰 paragraf say齭"; - Text[ catalan ] = "P醨rafos por cap韙ulo"; + Text[ catalan ] = "Subpunts per nivell"; Text[ finnish ] = "Alipisteit tasolla"; + Text[ thai ] = "喔堗父喔斷涪喙堗腑喔⑧笗喙堗腑喔｀赴喔斷副喔"; }; NumericField NF_PARA { @@ -206,23 +209,24 @@ ModalDialog DLG_INSERT_ABSTRACT Text [ swedish ] = "Utdraget inneh錶ler det utvalda antalet stycken fr錸 de inkluderade kapitelniv錯rna." ; Text [ danish ] = "Abstractet indeholder det valgte antal afsnit fra de inkluderede kapitelniveauer." ; Text [ italian ] = "Il sunto contiene il numero di paragrafi scelto dai livelli di capitolo inclusi." ; - Text [ spanish ] = "En el extracto aparece la cantidad deseada de p醨rafos de los niveles de los cap韙ulos incluidos." ; + Text [ spanish ] = "En el resumen aparece el n鷐ero de los p醨rafos seleccionados de los niveles de los cap韙ulos incluidos." ; Text [ french ] = "La synth鑣e reprendra, pour chaque niveau de plan inclus, le nombre de paragraphes indiqu." ; - Text [ dutch ] = "In het extract verschijnt het geselecteerde aantal alinea磗 van de erbij betrokken overzichtsniveaus." ; + Text [ dutch ] = "In het overzicht verschijnt het geselecteerde aantal alinea's van de erbij betrokken overzichtsniveaus." ; Text [ portuguese ] = "O Abstracto cont閙 a quantidade de par醙rafos seleccionada dos n韛eis de cap韙ulos inclu韉os." ; Text[ chinese_simplified ] = "浠庡寘鎷殑绔犺妭绾т腑閫夊嚭鐨勪竴瀹氭暟鐩殑娈佃惤鏄剧ず鍦ㄦ憳瑕佷腑銆"; - Text[ russian ] = " 橡铖祛蝠 镱忤蝰 恹狃囗眍 麒耠 噌玎鲥 桤 怅膻麇眄 箴钼礤 汶噔"; + Text[ russian ] = " 镳邃耱噔脲龛 耦溴疰栩 恹狃囗眍 麒耠 噌玎鲥 桤 怅膻麇眄 箴钼礤 耱痼牝箴"; Text[ polish ] = "Abstrakt zawiera wybran ilo滄 akapit體 z awieraj筩ych w彻czone poziomy akapitu."; - Text[ japanese ] = "瑕佺磩銇伅銆佹寚瀹氭暟銇钀姐亴鍚勭珷锞氾緧锞烇緳銇嬨倝鎶藉嚭銇曘倢銇俱仚銆"; + Text[ japanese ] = "瑕佺磩銇伅銆佹寚瀹氭暟銇钀姐亴鍚勭珷銉儥銉亱銈夋娊鍑恒仌銈屻伨銇欍"; Text[ chinese_traditional ] = "鎽樿妯″紡椤ず鐩搁棞绔犵瘈涓伕鍙栫殑涓瀹氭暩鐩殑娈佃惤"; Text[ arabic ] = "渔 碣逖 蓓 轻梳雾 谙 轻蒉亚 轻薯 抒 释享襄 沅 软 阌舒砬 轻菡驷 轻阒沅."; - Text[ dutch ] = "In het extract verschijnt het geselecteerde aantal alinea磗 van de erbij betrokken overzichtsniveaus."; + Text[ dutch ] = "In het overzicht verschijnt het geselecteerde aantal alinea's van de erbij betrokken overzichtsniveaus."; Text[ chinese_simplified ] = "浠庡寘鎷殑绔犺妭绾т腑閫夊嚭鐨勪竴瀹氭暟鐩殑娈佃惤鏄剧ず鍦ㄦ憳瑕佷腑銆"; Text[ greek ] = "郁 Abstract 屐鲠磉驽翎 麸 屦殡邈燧盹 痣掼矧 疳襻泷荟 狃 翎 篚祓羼殡犰忉睃戾磲 屦唣邃 赍鲠脶啭."; - Text[ korean ] = "鞖旍暯鞐愳劀電 甏霠悳 鞛 靾橃鞐愳劀 靹犿儩頃 雼澖鞚 靾橁皜 雮橅儉雮╇媹雼."; + Text[ korean ] = "鞖旍暯鞐愳劀電 韽暔霅 臧滌殧 靾橃鞙茧攵韯 靹犿儩頃 雼澖鞚 靾橁皜 雮橅儉雮╇媹雼."; Text[ turkish ] = "謟et i鏸nde, dahil edilen b鰈黰 d鼁eylerinden se鏸len paragraflar bulunuyor."; - Text[ catalan ] = "En el extracto aparece la cantidad deseada de p醨rafos de los niveles de los cap韙ulos incluidos."; + Text[ catalan ] = "En l'estracte apareix la quantitat desitjada de par鄃rafs dels nivells dels cap韙ols inclosos."; Text[ finnish ] = "Tiivistelm鋝s on valittu m滗r kappaleita sis鋖lytetyist j鋝ennystasoista."; + Text[ thai ] = "喔氞笚喔勦副喔斷涪喙堗腑喔∴傅喔曕副喔о箑喔ム競喔椸傅喙堗箑喔ム阜喔竵喔傕腑喔囙涪喙堗腑喔笝喙夃覆喔堗覆喔佮福喔班笖喔编笟喙喔勦箟喔侧福喙堗覆喔囙笚喔掂箞喔｀抚喔∴箘喔о箟"; }; OKButton PB_OK { @@ -248,12 +252,12 @@ ModalDialog DLG_INSERT_ABSTRACT Text [ swedish ] = "Skapa AutoUtdrag" ; Text [ danish ] = "Opret AutoAbstract" ; Text [ italian ] = "Crea un sommario automatico" ; - Text [ spanish ] = "Crear AutoAbstracto" ; + Text [ spanish ] = "Crear Resumen autom醫ico" ; Text [ french ] = "Cr閍tion d'une AutoSynth鑣e" ; Text [ dutch ] = "AutoExtract maken" ; Text [ portuguese ] = "Criar AutoAbstracto" ; Text[ chinese_simplified ] = "鐢熸垚鑷姩鎽樿"; - Text[ russian ] = "杨玟囹 棱蝾疱翦疣"; + Text[ russian ] = "杨玟囹 噌耱疣牝眍 镳邃耱噔脲龛"; Text[ polish ] = "Utw髍z Autokonspekt"; Text[ japanese ] = "鑷嫊鎶藉嚭銇綔鎴"; Text[ chinese_traditional ] = "鐢㈢敓鑷嫊鎽樿"; @@ -261,13 +265,28 @@ ModalDialog DLG_INSERT_ABSTRACT Text[ dutch ] = "AutoExtract maken"; Text[ chinese_simplified ] = "鐢熸垚鑷姩鎽樿"; Text[ greek ] = "溺扉秕胥哚 AutoAbstract"; - Text[ korean ] = "鞛愲彊於旍儊 毵岆摛旮"; + Text[ korean ] = "鞛愲彊 鞖旍暯 毵岆摛旮"; Text[ turkish ] = "Otomatik 鰖et olu⺶ur"; - Text[ catalan ] = "Crear AutoAbstracto"; + Text[ catalan ] = "Crea AutoAbstracte"; Text[ finnish ] = "Luo automaattinen tiivistelm"; + Text[ thai ] = "喔福喙夃覆喔囙笟喔椸竸喔编笖喔⑧箞喔腑喔编笗喙傕笝喔∴副喔曕复"; }; + + + + + + + + + + + + + + diff --git a/sw/source/ui/dialog/ascfldlg.src b/sw/source/ui/dialog/ascfldlg.src index 428697e0feae..21b8be15cda2 100644 --- a/sw/source/ui/dialog/ascfldlg.src +++ b/sw/source/ui/dialog/ascfldlg.src @@ -2,9 +2,9 @@ * * $RCSfile: ascfldlg.src,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: jp $ $Date: 2002-01-21 14:14:36 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,8 +68,8 @@ ModalDialog DLG_ASCII_FILTER OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 239 , 80 ) ; - Text = "Encoded Text Filter Optionen" ; - Text [ English ] = "Encoded text filter options" ; + Text = "ASCII Filter Optionen" ; + Text [ English ] = "ASCII filter options" ; Moveable = TRUE ; FixedLine FL_1 { @@ -90,14 +90,15 @@ ModalDialog DLG_ASCII_FILTER Text[ swedish ] = "Egenskaper"; Text[ polish ] = "W砤渃iwo渃i"; Text[ portuguese_brazilian ] = "Properties"; - Text[ japanese ] = "懏惈"; - Text[ korean ] = "殿废沥焊"; - Text[ chinese_simplified ] = "属性"; - Text[ chinese_traditional ] = "妮┦"; + Text[ japanese ] = "灞炴"; + Text[ korean ] = "霌彪 鞝曤炒"; + Text[ chinese_simplified ] = "灞炴"; + Text[ chinese_traditional ] = "灞"; Text[ arabic ] = "握瞧"; Text[ turkish ] = "謟ellikler"; - Text[ catalan ] = "Propiedades"; + Text[ catalan ] = "Propietats"; Text[ finnish ] = "Ominaisuudet"; + Text[ thai ] = "喔勦父喔撪釜喔∴笟喔编笗喔"; }; FixedText FT_CHARSET { @@ -105,9 +106,9 @@ ModalDialog DLG_ASCII_FILTER Size = MAP_APPFONT ( 53 , 10 ) ; Text = "Z~eichensatz" ; Text [ English ] = "Character Set" ; - Text[ english_us ] = "~Font"; + Text[ english_us ] = "~Character set"; Text[ portuguese ] = "~Conjunto de caracteres"; - Text[ russian ] = "袜犷 珥嚓钼"; + Text[ russian ] = "暑滂痤怅"; Text[ greek ] = "觺弭 麽襻牯揆"; Text[ dutch ] = "~Tekenset"; Text[ french ] = "~Jeu de caract鑢es"; @@ -117,14 +118,15 @@ ModalDialog DLG_ASCII_FILTER Text[ swedish ] = "Teckenupps鋞tning"; Text[ polish ] = "Zbi髍 znak體"; Text[ portuguese_brazilian ] = "Charset"; - Text[ japanese ] = "暥帤楍(~F)"; - Text[ korean ] = "巩磊笼钦(~F)"; - Text[ chinese_simplified ] = "字符集(~F)"; - Text[ chinese_traditional ] = "(~F)"; + Text[ japanese ] = "鏂囧瓧鍒(~F)"; + Text[ korean ] = "氍胳瀽歆戫暕(~F)"; + Text[ chinese_simplified ] = "瀛楃闆(~F)"; + Text[ chinese_traditional ] = "瀛楀瀷(~F)"; Text[ turkish ] = "Karakter k黰esi"; Text[ arabic ] = "闾沔谏 猛演"; - Text[ catalan ] = "~Caracteres"; - Text[ finnish ] = "~Fontti"; + Text[ catalan ] = "~Lletra"; + Text[ finnish ] = "~Merkist"; + Text[ thai ] = "~喔曕副喔о腑喔编竵喔┼福"; }; ListBox LB_CHARSET { @@ -146,20 +148,21 @@ ModalDialog DLG_ASCII_FILTER Text[ greek ] = "箩箝贻 泷犰灬麸箦轳蒡"; Text[ dutch ] = "~Standaardlettertype"; Text[ french ] = "Police de base"; - Text[ spanish ] = "~Fuente est醤dar"; + Text[ spanish ] = "~Fuente predeterminada"; Text[ italian ] = "Carattere standard"; Text[ danish ] = "Standardskrifttyper"; Text[ swedish ] = "Standardteckensnitt"; Text[ polish ] = "Czcionka podstawowa"; Text[ portuguese_brazilian ] = "Standard fonts"; - Text[ japanese ] = "婛掕太菽"; - Text[ korean ] = "扁夯 臂裁"; - Text[ chinese_simplified ] = "标准字体"; - Text[ chinese_traditional ] = "夹非"; + Text[ japanese ] = "鏃㈠畾銉曘偐銉炽儓"; + Text[ korean ] = "旮半掣 旮昙"; + Text[ chinese_simplified ] = "鏍囧噯瀛椾綋"; + Text[ chinese_traditional ] = "妯欐簴瀛楀瀷"; Text[ turkish ] = "Standart yaz齮ipi"; Text[ arabic ] = "轻呜 轻揄怯"; - Text[ catalan ] = "~Fuente est醤dar"; + Text[ catalan ] = "Tipus de lletra per defecte"; Text[ finnish ] = "Oletusfontit"; + Text[ thai ] = "喔勦箞喔侧箑喔｀复喙堗浮喔曕箟喔權笗喔编抚喔副喔佮俯喔"; }; ListBox LB_FONT { @@ -187,15 +190,16 @@ ModalDialog DLG_ASCII_FILTER Text[ swedish ] = "Spr錵"; Text[ polish ] = "J陑yk"; Text[ portuguese_brazilian ] = "Language"; - Text[ japanese ] = "尵岅(~G)"; - Text[ korean ] = "攫绢(~G)"; - Text[ chinese_simplified ] = "语言(~G)"; - Text[ chinese_traditional ] = "粂ē(~G)"; + Text[ japanese ] = "瑷瑾(~G)"; + Text[ korean ] = "鞏胳柎(~G)"; + Text[ chinese_simplified ] = "璇█(~G)"; + Text[ chinese_traditional ] = "瑾炶█(~G)"; Text[ arabic ] = "轻巅"; Text[ turkish ] = "~Dil"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Idio~ma"; + Text[ catalan ] = "Llen~guatge"; Text[ finnish ] = "K~ieli"; + Text[ thai ] = "喔犩覆~喔┼覆"; }; ListBox LB_LANGUAGE { @@ -218,20 +222,21 @@ ModalDialog DLG_ASCII_FILTER Text[ dutch ] = "~Alinea-einde"; Text[ french ] = "Saut de ~paragraphe"; Text[ spanish ] = "Salt~o de p醨rafo"; - Text[ italian ] = "~Interruzione di paragrafo"; + Text[ italian ] = "~Interruzione paragrafo"; Text[ danish ] = "Afsnitsskift"; Text[ swedish ] = "Styckebrytning"; Text[ polish ] = "Podzia akapitu"; Text[ portuguese_brazilian ] = "Paragraphbreak"; - Text[ japanese ] = "抜棊嬫愗傝(~P)"; - Text[ korean ] = "窜遏 唱穿扁(~P)"; - Text[ chinese_simplified ] = "换段落(~P)"; - Text[ chinese_traditional ] = "传琿辅(~P)"; + Text[ japanese ] = "娈佃惤鍖哄垏銈(~P)"; + Text[ korean ] = "雼澖 雮橂垊旮(~P)"; + Text[ chinese_simplified ] = "鎹㈡钀(~P)"; + Text[ chinese_traditional ] = "鎻涙钀(~P)"; Text[ arabic ] = "萸蔗 蒉亚"; Text[ turkish ] = "Paragraf sonu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Salt~o de p醨rafo"; + Text[ catalan ] = "~Salt de par鄃af"; Text[ finnish ] = "~Kappalevaihto"; + Text[ thai ] = "喙佮笟喙堗竾~喔⑧箞喔斧喔權箟喔"; }; RadioButton RB_CRLF { @@ -255,13 +260,14 @@ ModalDialog DLG_ASCII_FILTER Text[ portuguese_brazilian ] = "CR & LF"; Text[ japanese ] = "~CR & LF"; Text[ korean ] = "~CR & LF"; - Text[ chinese_simplified ] = "回车并换行(~C)"; + Text[ chinese_simplified ] = "鍥炶溅骞舵崲琛(~C)"; Text[ chinese_traditional ] = "~CR & LF"; Text[ arabic ] = "CR & LF"; Text[ turkish ] = "~CR & LF"; Text[ language_user1 ] = " "; - Text[ catalan ] = "CR & LF"; + Text[ catalan ] = "~CR i LF"; Text[ finnish ] = "~CR & LF"; + Text[ thai ] = "~CR & LF"; }; RadioButton RB_CR { @@ -284,13 +290,14 @@ ModalDialog DLG_ASCII_FILTER Text[ portuguese_brazilian ] = "CR"; Text[ japanese ] = "C~R"; Text[ korean ] = "C~R"; - Text[ chinese_simplified ] = "回车(~R)"; + Text[ chinese_simplified ] = "鍥炶溅(~R)"; Text[ chinese_traditional ] = "C~R"; Text[ arabic ] = "CR"; Text[ turkish ] = "C~R"; Text[ language_user1 ] = " "; Text[ catalan ] = "C~R"; Text[ finnish ] = "C~R"; + Text[ thai ] = "C~R"; }; RadioButton RB_LF { @@ -313,13 +320,14 @@ ModalDialog DLG_ASCII_FILTER Text[ portuguese_brazilian ] = "LF"; Text[ japanese ] = "~LF"; Text[ korean ] = "~LF"; - Text[ chinese_simplified ] = "新行(~L)"; + Text[ chinese_simplified ] = "鏂拌(~L)"; Text[ chinese_traditional ] = "~LF"; Text[ arabic ] = "LF"; Text[ turkish ] = "~LF"; Text[ language_user1 ] = " "; Text[ catalan ] = "~LF"; Text[ finnish ] = "~LF"; + Text[ thai ] = "~LF"; }; OKButton PB_OK @@ -357,15 +365,16 @@ ModalDialog DLG_ASCII_FILTER Text[ swedish ] = "System"; Text[ polish ] = "System"; Text[ portuguese_brazilian ] = "System"; - Text[ japanese ] = "冀醚"; - Text[ korean ] = "矫胶袍"; - Text[ chinese_simplified ] = "系统"; - Text[ chinese_traditional ] = "╰参"; + Text[ japanese ] = "銈枫偣銉嗐儬"; + Text[ korean ] = "鞁滌姢韰"; + Text[ chinese_simplified ] = "绯荤粺"; + Text[ chinese_traditional ] = "绯荤当"; Text[ arabic ] = "轻滟倾"; Text[ turkish ] = "Sistem"; Text[ language_user1 ] = " "; Text[ catalan ] = "Sistema"; Text[ finnish ] = "J鋜jestelm"; + Text[ thai ] = "喔｀赴喔氞笟"; }; Text[ english_us ] = "ASCII Filter Options"; Text[ portuguese ] = "Op珲es de filtro ASCII"; @@ -379,15 +388,16 @@ ModalDialog DLG_ASCII_FILTER Text[ swedish ] = "ASCII filteralternativ"; Text[ polish ] = "Opcje filtra ASCII"; Text[ portuguese_brazilian ] = "ASCII filter options"; - Text[ japanese ] = "ASCII台倮堤呒"; - Text[ korean ] = "酒胶虐 鞘磐 可记"; - Text[ chinese_simplified ] = "ASCII 过滤器选项"; - Text[ chinese_traditional ] = "ASCII 锣传竟匡兜"; + Text[ japanese ] = "ASCII銉曘偅銉偪銈儣銈枫儳銉"; + Text[ korean ] = "鞎勳姢韨 頃勴劙 鞓奠厴"; + Text[ chinese_simplified ] = "ASCII 杞崲鍣ㄩ夐」"; + Text[ chinese_traditional ] = "ASCII 杞夋彌鍣ㄩ伕闋"; Text[ arabic ] = "握瞧 葆恃 ASCII"; Text[ turkish ] = "ASCII filtre se鏴nekleri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Opciones de filtro ASCII"; + Text[ catalan ] = "Opcions del filtre ASCII"; Text[ finnish ] = "ASCII-suodatusasetukset"; + Text[ thai ] = "喔曕副喔о箑喔ム阜喔竵喔曕副喔о竵喔｀腑喔 ASCII "; }; @@ -399,3 +409,15 @@ ModalDialog DLG_ASCII_FILTER + + + + + + + + + + + + diff --git a/sw/source/ui/dialog/dialog.src b/sw/source/ui/dialog/dialog.src index 15f2a13390d6..6eb861344a52 100644 --- a/sw/source/ui/dialog/dialog.src +++ b/sw/source/ui/dialog/dialog.src @@ -2,9 +2,9 @@ * * $RCSfile: dialog.src,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: kz $ $Date: 2001-11-16 23:02:02 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,14 +79,15 @@ CheckBox CB_USE_PASSWD Text[ chinese_simplified ] = "瀵嗙爜(~P)"; Text[ russian ] = "相痤朦"; Text[ polish ] = "Has硂"; - Text[ japanese ] = "锞婏緹锝斤緶锝帮緞锞(~P)"; + Text[ japanese ] = "銉戙偣銉兗銉(~P)"; Text[ chinese_traditional ] = "瀵嗙⒓(~P)"; Text[ arabic ] = "哚闵 轻友"; Text[ greek ] = "戍溟挈 瘃忉箸"; - Text[ korean ] = "韺姢鞗岆摐(~P)"; + Text[ korean ] = "鞎旐樃(~P)"; Text[ turkish ] = "辤fre"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Contrase馻"; + Text[ catalan ] = "~Contrasenya"; + Text[ thai ] = "~喔｀斧喔编釜喔溹箞喔侧笝"; }; CheckBox CB_READ_ONLY { @@ -96,11 +97,11 @@ CheckBox CB_READ_ONLY Text [ italian ] = "~Sola lettura" ; Text [ portuguese_brazilian ] = "~S?leitura" ; Text [ portuguese ] = "~S leitura" ; - Text [ finnish ] = "~Vain luku" ; + Text [ finnish ] = "Vain ~luku" ; Text [ danish ] = "Skrivebeskyttet" ; Text [ french ] = "En ~lecture seule" ; Text [ swedish ] = "Sk~rivskyddad" ; - Text [ dutch ] = "~Alleen lezen" ; + Text [ dutch ] = "~Alleen-lezen" ; Text [ spanish ] = "~S髄o lectura" ; Text [ english_us ] = "~Read-only" ; Text[ chinese_simplified ] = "鍙(~R)"; @@ -113,7 +114,8 @@ CheckBox CB_READ_ONLY Text[ korean ] = "鞚疥赴 鞝勳毄(~R)"; Text[ turkish ] = "~Salt okunur"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Solo lectura"; + Text[ catalan ] = "~Nom閟 lectura"; + Text[ thai ] = "~喔箞喔侧笝喔涪喙堗覆喔囙箑喔斷傅喔⑧抚"; }; String STR_LINKEDIT_TEXT { @@ -124,7 +126,7 @@ String STR_LINKEDIT_TEXT Text [ italian ] = "Modifica collegamenti" ; Text [ portuguese_brazilian ] = "Editar liga??s" ; Text [ portuguese ] = "Editar liga珲es" ; - Text [ finnish ] = "Muokkaa linkkej?" ; + Text [ finnish ] = "Muokkaa linkkej" ; Text [ danish ] = "Rediger k鎑er" ; Text [ french ] = "蒬ition de liens" ; Text [ swedish ] = "Redigera l鋘kar" ; @@ -134,14 +136,15 @@ String STR_LINKEDIT_TEXT Text[ chinese_simplified ] = "缂栬緫閾炬帴"; Text[ russian ] = "橡噔赅 耨铌"; Text[ polish ] = "Edytuj 彻cza"; - Text[ japanese ] = "锞橈緷锝搞伄绶ㄩ泦"; + Text[ japanese ] = "銉兂銈伄绶ㄩ泦"; Text[ chinese_traditional ] = "绶ㄨ集鎹峰緫"; Text[ arabic ] = "释秧 轻茄嗜秦鞘"; Text[ greek ] = "硼孱羼汜筮 篚礓蒹妁"; - Text[ korean ] = "鞐瓣舶 韼胳"; + Text[ korean ] = "毵來伂 韼胳"; Text[ turkish ] = "Ba餷ant齦ar d鼁enle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Modificar v韓culos"; + Text[ catalan ] = "Modifica els enlla鏾s"; + Text[ thai ] = "喙佮竵喙夃箘喔傕竵喔侧福喙喔娻阜喙堗腑喔∴箓喔⑧竾"; }; String STR_PATH_NOT_FOUND1 { @@ -152,7 +155,7 @@ String STR_PATH_NOT_FOUND1 Text [ italian ] = "La cartella" ; Text [ portuguese_brazilian ] = "O diret?io" ; Text [ portuguese ] = "O direct髍io '" ; - Text [ finnish ] = "Hakemistoa " ; + Text [ finnish ] = "Hakemistoa" ; Text [ danish ] = "Biblioteket '" ; Text [ french ] = "Le r閜ertoire'" ; Text [ swedish ] = "Katalogen '" ; @@ -160,16 +163,17 @@ String STR_PATH_NOT_FOUND1 Text [ spanish ] = "El directorio '" ; Text [ english_us ] = "The directory '" ; Text[ chinese_simplified ] = "杩欎釜鐩綍 '"; - Text[ russian ] = "蔫疱牝铕 '"; + Text[ russian ] = "枢蜞腩 '"; Text[ polish ] = "Katalog"; - Text[ japanese ] = "锞冿緸锝練锝革緞锞樸"; + Text[ japanese ] = "銉囥偅銉偗銉堛儶銆"; Text[ language_user1 ] = " "; Text[ chinese_traditional ] = "閫欏嬬洰閷<"; Text[ arabic ] = "轻厢磲 '"; Text[ greek ] = " 赆糗腼泔 '"; Text[ korean ] = "霐旊爥韱犽Μ'"; Text[ turkish ] = "Dizin '"; - Text[ catalan ] = "El directorio '"; + Text[ catalan ] = "El directori '"; + Text[ thai ] = "喙勦笖喙喔｀箛喔佮笚喔福喔掂箞 '"; }; String STR_PATH_NOT_FOUND2 { @@ -181,7 +185,7 @@ String STR_PATH_NOT_FOUND2 Text [ italian ] = "' non esiste." ; Text [ portuguese_brazilian ] = "' n?o existe." ; Text [ portuguese ] = "' n鉶 existe." ; - Text [ finnish ] = " ei ole" ; + Text [ finnish ] = "ei ole olemassa." ; Text [ danish ] = "' eksisterer ikke." ; Text [ french ] = "' n'existe pas." ; Text [ swedish ] = "' finns inte." ; @@ -191,14 +195,15 @@ String STR_PATH_NOT_FOUND2 Text[ chinese_simplified ] = "' 涓嶅瓨鍦ㄣ"; Text[ russian ] = "' 礤 耋耱怏弪."; Text[ polish ] = "nie istnieje."; - Text[ japanese ] = "銆嶃伅瀛樺湪銇椼仸銇勩伨銇涖倱銆"; + Text[ japanese ] = "銆嶃伅銇傘倞銇俱仜銈撱"; Text[ chinese_traditional ] = ">涓嶅瓨鍦ㄣ"; Text[ arabic ] = "' 垌 沔替."; Text[ greek ] = "' 溴 躔荞麇."; - Text[ korean ] = "' 鞚/臧 臁挫灛頃橃 鞎婌潓"; + Text[ korean ] = "' 鞚(臧) 鞐嗢姷雼堧嫟."; Text[ turkish ] = "' mevcut de餴l."; Text[ language_user1 ] = " "; - Text[ catalan ] = "' no existe."; + Text[ catalan ] = "' no existeix."; + Text[ thai ] = "' 喙勦浮喙堗浮喔掂腑喔⑧腹喙"; }; String STR_FLT_SGV { @@ -211,3 +216,8 @@ String STR_FLT_SGV + + + + + diff --git a/sw/source/ui/dialog/docstdlg.src b/sw/source/ui/dialog/docstdlg.src index b1cb48cc0ca5..33da30b9956b 100644 --- a/sw/source/ui/dialog/docstdlg.src +++ b/sw/source/ui/dialog/docstdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: docstdlg.src,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: fme $ $Date: 2002-08-13 07:15:16 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,7 +78,7 @@ TabPage TP_DOC_STAT Text [ italian ] = "Numero di pagine:" ; Text [ portuguese_brazilian ] = "N?ero de p?ginas:" ; Text [ portuguese ] = "N鷐ero de p醙inas:" ; - Text [ finnish ] = "Sivujen m??r?:" ; + Text [ finnish ] = "Sivujen m滗r:" ; Text [ danish ] = "Antal sider:" ; Text [ french ] = "Nombre de pages :" ; Text [ swedish ] = "Antal sidor:" ; @@ -89,14 +89,15 @@ TabPage TP_DOC_STAT Text[ chinese_simplified ] = "椤垫暟锛"; Text[ russian ] = "暑腓麇耱忸 耱疣龛:"; Text[ polish ] = "Liczba stron:"; - Text[ japanese ] = "锞嶏緹锝帮郊锞炵窂鏁:"; + Text[ japanese ] = "銉氥兗銈哥窂鏁:"; Text[ chinese_traditional ] = "闋佹暩锛"; Text[ arabic ] = "谙 轻蛰颓:"; Text[ greek ] = "榴殍禳 箦脒澌:"; - Text[ korean ] = "飒 靾:"; + Text[ korean ] = "韼橃澊歆 靾:"; Text[ turkish ] = "Sayfa:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "N鷐ero de p醙inas:"; + Text[ catalan ] = "Nombre de p鄃ines:"; + Text[ thai ] = "喔堗赋喔權抚喔權斧喔權箟喔:"; }; FixedText FT_TABLE { @@ -108,7 +109,7 @@ TabPage TP_DOC_STAT Text [ italian ] = "Numero di tabelle:" ; Text [ portuguese_brazilian ] = "N?ero de tabelas:" ; Text [ portuguese ] = "N鷐ero de tabelas:" ; - Text [ finnish ] = "Taulukoiden m??r?:" ; + Text [ finnish ] = "Taulukoiden m滗r:" ; Text [ danish ] = "Antal tabeller:" ; Text [ french ] = "Nombre de tableaux :" ; Text [ swedish ] = "Antal tabeller:" ; @@ -123,10 +124,11 @@ TabPage TP_DOC_STAT Text[ chinese_traditional ] = "琛ㄦ牸鏁哥洰锛"; Text[ arabic ] = "谙 轻滔擎:"; Text[ greek ] = "榴殍禳 痖碥犍:"; - Text[ korean ] = "響 臧滌垬:"; + Text[ korean ] = "響 靾:"; Text[ turkish ] = "Tablo:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "N鷐ero de tablas:"; + Text[ catalan ] = "Nombre de taules:"; + Text[ thai ] = "喔堗赋喔權抚喔權笗喔侧福喔侧竾:"; }; FixedText FT_GRF { @@ -138,7 +140,7 @@ TabPage TP_DOC_STAT Text [ italian ] = "Numero di immagini:" ; Text [ portuguese_brazilian ] = "N?ero de gr?ficos:" ; Text [ portuguese ] = "N鷐ero de imagens:" ; - Text [ finnish ] = "Kuvien m??r?:" ; + Text [ finnish ] = "Kuvien m滗r:" ; Text [ danish ] = "Antal billeder:" ; Text [ french ] = "Nombre d'images :" ; Text [ swedish ] = "Antal grafikobjekt:" ; @@ -147,16 +149,17 @@ TabPage TP_DOC_STAT Text [ english_us ] = "Number of Graphics:" ; Left = TRUE ; Text[ chinese_simplified ] = "鍥惧舰鏁扮洰锛"; - Text[ russian ] = "暑腓麇耱忸 痂耋黻钼:"; + Text[ russian ] = "暑腓麇耱忸 沭圄梓羼觇 钺牝钼:"; Text[ polish ] = "Liczba grafik:"; Text[ japanese ] = "鍥炽伄鏁:"; Text[ chinese_traditional ] = "鏁哥洰 鍦栧舰锛"; Text[ arabic ] = "谙 轻延驺鞘:"; Text[ greek ] = "榴殍禳 泷狯殛:"; - Text[ korean ] = "攴鸽灅頂 臧滌垬:"; + Text[ korean ] = "攴鸽 靾:"; Text[ turkish ] = "Grafik:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "N鷐ero de im醙enes:"; + Text[ catalan ] = "Nombre d'imatges:"; + Text[ thai ] = "喔堗赋喔權抚喔權竵喔｀覆喔熰复喔:"; }; FixedText FT_OLE { @@ -168,7 +171,7 @@ TabPage TP_DOC_STAT Text [ italian ] = "Numero di oggetti OLE:" ; Text [ portuguese_brazilian ] = "N?ero de objetos OLE:" ; Text [ portuguese ] = "N鷐ero de objectos OLE:" ; - Text [ finnish ] = "OLE-objektien m??r?:" ; + Text [ finnish ] = "OLE-objektien m滗r:" ; Text [ danish ] = "Antal OLE-objekter:" ; Text [ french ] = "Nombre d'objets OLE :" ; Text [ swedish ] = "Antal OLE-objekt:" ; @@ -179,14 +182,15 @@ TabPage TP_DOC_STAT Text[ chinese_simplified ] = "OLE 瀵硅薄鏁扮洰锛"; Text[ russian ] = "暑腓麇耱忸 钺牝钼 OL:"; Text[ polish ] = "Liczba obiekt體 OLE:"; - Text[ japanese ] = "OLE 锝碉緦锞烇郊锞烇姜锝革緞銇暟:"; + Text[ japanese ] = "OLE 銈儢銈搞偋銈儓銇暟:"; Text[ chinese_traditional ] = "鏁哥洰 OLE-鐗╀欢锛"; Text[ arabic ] = "谙 咔其鞘 OLE:"; Text[ greek ] = "榴殍禳 犴糸赍殪蓓 OLE:"; - Text[ korean ] = "OLE 臧滌泊 臧滌垬:"; + Text[ korean ] = "OLE 臧滌泊 靾:"; Text[ turkish ] = "OLE nesneleri:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "N鷐ero de objetos OLE:"; + Text[ catalan ] = "Nombre d'objectes OLE:"; + Text[ thai ] = "喔堗赋喔權抚喔權抚喔编笗喔栢父 OLE :"; }; FixedText FT_PARA { @@ -198,7 +202,7 @@ TabPage TP_DOC_STAT Text [ italian ] = "Numero di paragrafi:" ; Text [ portuguese_brazilian ] = "N?ero de par?grafos:" ; Text [ portuguese ] = "N鷐ero de par醙rafos:" ; - Text [ finnish ] = "Kappaleiden m??r?:" ; + Text [ finnish ] = "Kappaleiden m滗r:" ; Text [ danish ] = "Antal afsnit:" ; Text [ french ] = "Nombre de paragraphes :" ; Text [ swedish ] = "Antal stycken:" ; @@ -213,10 +217,11 @@ TabPage TP_DOC_STAT Text[ chinese_traditional ] = "鏁哥洰 娈佃惤锛"; Text[ arabic ] = "谙 轻蒉亚:"; Text[ greek ] = "榴殍禳 疳襻泷荟:"; - Text[ korean ] = "雼澖 臧滌垬:"; + Text[ korean ] = "雼澖 靾:"; Text[ turkish ] = "Paragraf:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "N鷐ero de p醨rafos:"; + Text[ catalan ] = "Nombre de par鄃rafs:"; + Text[ thai ] = "喔堗赋喔權抚喔權涪喙堗腑喔笝喙夃覆:"; }; FixedText FT_WORD { @@ -228,7 +233,7 @@ TabPage TP_DOC_STAT Text [ italian ] = "Numero di parole:" ; Text [ portuguese_brazilian ] = "N?ero de palavras:" ; Text [ portuguese ] = "N鷐ero de palavras:" ; - Text [ finnish ] = "Sanam??r?:" ; + Text [ finnish ] = "Sanam滗r:" ; Text [ danish ] = "Antal ord:" ; Text [ french ] = "Nombre de mots :" ; Text [ swedish ] = "Antal ord:" ; @@ -246,7 +251,8 @@ TabPage TP_DOC_STAT Text[ korean ] = "雼柎 靾:"; Text[ turkish ] = "S鰖c黭:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "N鷐ero de palabras:"; + Text[ catalan ] = "Nombre de paraules:"; + Text[ thai ] = "喔堗赋喔權抚喔權竸喔:"; }; FixedText FT_CHAR { @@ -258,7 +264,7 @@ TabPage TP_DOC_STAT Text [ italian ] = "Numero di caratteri:" ; Text [ portuguese_brazilian ] = "N?ero de caracteres:" ; Text [ portuguese ] = "N鷐ero de caracteres:" ; - Text [ finnish ] = "Merkkien m??r?:" ; + Text [ finnish ] = "Merkkien m滗r:" ; Text [ danish ] = "Antal tegn:" ; Text [ french ] = "Nombre de caract鑢es :" ; Text [ swedish ] = "Antal tecken:" ; @@ -267,7 +273,7 @@ TabPage TP_DOC_STAT Text [ english_us ] = "Number of Characters:" ; Left = TRUE ; Text[ chinese_simplified ] = "瀛楃鏁扮洰锛"; - Text[ russian ] = "暑腓麇耱忸 珥嚓钼:"; + Text[ russian ] = "暑腓麇耱忸 耔焘铍钼:"; Text[ polish ] = "Liczba znak體:"; Text[ japanese ] = "鏂囧瓧鏁:"; Text[ chinese_traditional ] = "鏁哥洰 瀛楀厓锛"; @@ -276,7 +282,8 @@ TabPage TP_DOC_STAT Text[ korean ] = "氍胳瀽 靾:"; Text[ turkish ] = "Karakter:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "N鷐ero de caracteres:"; + Text[ catalan ] = "Nombre de car郼ters:"; + Text[ thai ] = "喔堗赋喔權抚喔權笗喔编抚喔副喔佮競喔｀赴:"; }; FixedText FT_LINE { @@ -300,11 +307,12 @@ TabPage TP_DOC_STAT Text[ chinese_traditional ] = "鏁哥洰 琛岋細"; Text[ arabic ] = "谙 轻糜匮:"; Text[ greek ] = "榴殍禳 泷犰忐:"; - Text[ korean ] = "頄 臧滌垬:"; + Text[ korean ] = "欷 靾:"; Text[ turkish ] = "Sat齬:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "N鷐ero de l韓eas:"; - Text[ finnish ] = "Rivien m??r?:"; + Text[ catalan ] = "Nombre de l韓ies:"; + Text[ finnish ] = "Rivien m滗r:"; + Text[ thai ] = "喔堗赋喔權抚喔權笟喔｀福喔椸副喔:"; }; FixedText FT_PAGE_COUNT { @@ -367,9 +375,9 @@ TabPage TP_DOC_STAT Text [ swedish ] = "Uppd~atera" ; Text [ danish ] = "Opdater" ; Text [ italian ] = "Aggiorna" ; - Text [ spanish ] = "~Actualizar" ; + Text [ spanish ] = "Actualizar" ; Text [ french ] = "~Actualiser" ; - Text [ dutch ] = "~Actualiseren" ; + Text [ dutch ] = "~Bijwerken" ; Text[ chinese_simplified ] = "鏇存柊(~U)"; Text[ russian ] = "吾眍忤螯"; Text[ polish ] = "Aktualizuj"; @@ -380,8 +388,9 @@ TabPage TP_DOC_STAT Text[ korean ] = "鞐呺嵃鞚错姼(~U)"; Text[ turkish ] = "~G黱celle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Actualizar"; - Text[ finnish ] = "~P?ivit?"; + Text[ catalan ] = "~Actualitza"; + Text[ finnish ] = "~P鋓vit"; + Text[ thai ] = "~喔涏福喔编笟喔涏福喔膏竾"; }; }; @@ -395,3 +404,10 @@ TabPage TP_DOC_STAT + + + + + + + diff --git a/sw/source/ui/dialog/regionsw.cxx b/sw/source/ui/dialog/regionsw.cxx index 0825708f0c74..73881e89dcc9 100644 --- a/sw/source/ui/dialog/regionsw.cxx +++ b/sw/source/ui/dialog/regionsw.cxx @@ -2,9 +2,9 @@ * * $RCSfile: regionsw.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: os $ $Date: 2002-08-07 13:20:38 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1605,7 +1605,13 @@ void lcl_ReadSections( SwWrtShell& rSh, SfxMedium& rMedium, ComboBox& rBox ) case SOT_FORMATSTR_ID_STARWRITER_30: case SOT_FORMATSTR_ID_STARWRITERGLOB_50: case SOT_FORMATSTR_ID_STARWRITERGLOB_40: - ReadSw3->GetSectionList( rMedium, (SvStrings&) aArr ); + { + Sw3Reader* pRdr = (Sw3Reader*)ReadSw3; + Sw3Io* pOldIo = pRdr->GetSw3Io(); + pRdr->SetSw3Io( rSh.GetView().GetDocShell()->GetIoSystem() ); + pRdr->GetSectionList( rMedium, (SvStrings&) aArr ); + pRdr->SetSw3Io( pOldIo ); + } break; case SOT_FORMATSTR_ID_STARWRITER_60: case SOT_FORMATSTR_ID_STARWRITERGLOB_60: @@ -1710,7 +1716,6 @@ short SwInsertSectionTabDialog::Ok() aRequest.AppendItem(SfxStringItem( FN_PARAM_3, sLinkFileName.GetToken( 2, so3::cTokenSeperator ))); aRequest.Done(); } - return nRet; } diff --git a/sw/source/ui/dialog/regionsw.src b/sw/source/ui/dialog/regionsw.src index 4dda833d5d9b..def52c0971a9 100644 --- a/sw/source/ui/dialog/regionsw.src +++ b/sw/source/ui/dialog/regionsw.src @@ -2,9 +2,9 @@ * * $RCSfile: regionsw.src,v $ * - * $Revision: 1.38 $ + * $Revision: 1.39 $ * - * last change: $Author: os $ $Date: 2002-09-10 14:22:16 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,23 +74,23 @@ Text [ dutch ] = "~Bereik" ; \ Text [ english_us ] = "~Section" ; \ Text [ italian ] = "~Sezione" ; \ - Text [ spanish ] = "羠~ea" ; \ + Text [ spanish ] = "~Secci髇" ; \ Text [ french ] = "~Section" ; \ Text [ swedish ] = "~Omr錮e" ; \ Text [ danish ] = "Omr錮e" ; \ Text [ portuguese_brazilian ] = "Berei~ch" ; \ Text [ portuguese ] = "Sec玢o" ; \ Text[ chinese_simplified ] = "鍖哄煙(~S)"; \ - Text[ russian ] = "吾豚耱"; \ + Text[ russian ] = "朽玟咫"; \ Text[ polish ] = "Sekcja"; \ Text[ japanese ] = "绡勫洸(~S)"; \ - Text[ language_user1 ] = "桦: 朽玟咫 - -"; \ + Text[ language_user1 ] = "桦; 桦: 朽玟咫 - -"; \ Text[ chinese_traditional ] = "鍗鍩(~S)"; \ Text[ arabic ] = "轻湄寝"; \ Text[ greek ] = "舿睃翮翎"; \ - Text[ korean ] = "鞓侅棴(~S)"; \ + Text[ korean ] = "甑棴(~S)"; \ Text[ turkish ] = "B鰈黰"; \ - Text[ finnish ] = "~Osio"; \ + Text[ finnish ] = "Osa"; \ Text[ catalan ] = "~Secci"; \ Text[ thai ] = "~喔箞喔о笝"; @@ -101,7 +101,7 @@ Text [ italian ] = "Nascondi" ; \ Text [ portuguese_brazilian ] = "~Oculto" ; \ Text [ portuguese ] = "~Ocultar" ; \ - Text [ finnish ] = "~Piilotettu" ; \ + Text [ finnish ] = "Piilotettu" ; \ Text [ danish ] = "Skjul" ; \ Text [ french ] = "~Masquer" ; \ Text [ swedish ] = "~D鰈j" ; \ @@ -134,10 +134,10 @@ Text [ dutch ] = "Verbergen" ; \ Text [ spanish ] = "Ocultar" ; \ Text [ english_us ] = "Hide" ; \ - Text[ chinese_simplified ] = "闅愬叆"; \ + Text[ chinese_simplified ] = "闅愯棌"; \ Text[ russian ] = "殃瘥螯"; \ Text[ polish ] = "Ukryj"; \ - Text[ japanese ] = "闈炶〃绀"; \ + Text[ japanese ] = "琛ㄧず銇椼仾銇"; \ Text[ chinese_traditional ] = "闅卞叆"; \ Text[ arabic ] = "阄蓓"; \ Text[ greek ] = "琉聃"; \ @@ -149,8 +149,8 @@ #define CB_CONDITION_TEXT \ Text = "Mi~t Bedingung" ; \ Text [ English ] = "~With condition" ; \ - Text [ english_us ] = "~With condition" ; \ - Text [ italian ] = "Con condizione" ; \ + Text [ english_us ] = "~With Condition" ; \ + Text [ italian ] = "Con condi~zione" ; \ Text [ spanish ] = "Con condici髇" ; \ Text [ french ] = "Sous ~condition" ; \ Text [ dutch ] = "~Met conditie" ; \ @@ -158,16 +158,16 @@ Text [ danish ] = "Med betingelse" ; \ Text [ portuguese ] = "~Com condi玢o" ; \ Text [ portuguese_brazilian ] = "M~it Bedingung" ; \ - Text[ chinese_simplified ] = "甯︽潯浠(~W)"; \ + Text[ chinese_simplified ] = "闄勫姞鏉′欢(~W)"; \ Text[ russian ] = "橡 篑腩忤"; \ Text[ polish ] = "Uwzgl阣niaj筩 warunek"; \ Text[ japanese ] = "鏉′欢浠樸亶(~W)"; \ - Text[ chinese_traditional ] = "鏈夋浠(~W)"; \ + Text[ chinese_traditional ] = "闄勫姞姊濅欢(~W)"; \ Text[ arabic ] = "仍沿"; \ Text[ greek ] = "体 篚龛揸~"; \ - Text[ korean ] = "臁瓣贝瓿 頃粯(~W)"; \ + Text[ korean ] = "雼れ潓鞚 臁瓣贝鞚 韽暔(~W)"; \ Text[ turkish ] = "Ko⺷l"; \ - Text[ finnish ] = "~Ehdolla"; \ + Text[ finnish ] = "Ehdolla"; \ Text[ catalan ] = "Amb ~condici"; \ Text[ thai ] = "~喔斷箟喔о涪喙喔囙阜喙堗腑喔權箘喔"; @@ -206,7 +206,7 @@ Text[ dutch ] = "~Koppelen"; \ Text[ french ] = "~Lier"; \ Text[ spanish ] = "~V韓culo"; \ - Text[ finnish ] = "~Linkki"; \ + Text[ finnish ] = "Linkit"; \ Text[ italian ] = "~Collegamento"; \ Text[ danish ] = "~K鎑"; \ Text[ swedish ] = "~L鋘ka"; \ @@ -218,7 +218,7 @@ Text[ turkish ] = "Ba餷ant"; \ Text[ arabic ] = "茄嗜秦"; \ Text[ catalan ] = "En~lla"; \ - Text[ korean ] = "毵來伂(~L)"; \ + Text[ korean ] = "鞐瓣舶(~L)"; \ Text[ thai ] = "喙~喔娻阜喙堗腑喔∴箓喔⑧竾"; #define CB_DDE_TEXT \ @@ -242,7 +242,7 @@ Text[ greek ] = "~DDE"; \ Text[ korean ] = "DD~E"; \ Text[ turkish ] = "DDE"; \ - Text[ finnish ] = "DD~E"; \ + Text[ finnish ] = "DDE"; \ Text[ catalan ] = "DD~E"; \ Text[ thai ] = "DD~E"; @@ -251,7 +251,7 @@ Text [ English ] = "DDE command" ; \ Text [ english_us ] = "DDE ~command" ; \ Text [ italian ] = "Comando DDE" ; \ - Text [ spanish ] = "~Comando DDE" ; \ + Text [ spanish ] = "~Orden DDE" ; \ Text [ french ] = "Commande ~DDE" ; \ Text [ dutch ] = "~DDE-opdracht" ; \ Text [ swedish ] = "DDE-~kommando" ; \ @@ -265,9 +265,9 @@ Text[ chinese_traditional ] = "DDE - 鎸囦护(~C)"; \ Text[ arabic ] = "勉 DDE"; \ Text[ greek ] = "~彭麸朕 DDE"; \ - Text[ korean ] = "DDE锛嶋獏霠(~C)"; \ + Text[ korean ] = "DDE 氇呺牴(~C)"; \ Text[ turkish ] = "DDE komutu"; \ - Text[ finnish ] = "~DDE-komento"; \ + Text[ finnish ] = "DDE-komento"; \ Text[ catalan ] = "~Ordre DDE"; \ Text[ thai ] = "~喔勦赋喔副喙堗竾 DDE "; @@ -292,7 +292,7 @@ Text[ greek ] = "柬飤灬 狁麇唢"; \ Text[ korean ] = "韺岇澕 鞚措(~F)"; \ Text[ turkish ] = "D~osya ad"; \ - Text[ finnish ] = "~Tiedoston nimi"; \ + Text[ finnish ] = "Tiedoston nimi"; \ Text[ catalan ] = "Nom del ~fitxer"; \ Text[ thai ] = "喔娻阜喙堗腑喙亊喔熰箟喔"; @@ -381,16 +381,16 @@ Text[ russian ] = "相痤脲"; \ Text[ greek ] = "With password"; \ Text[ dutch ] = "~Met wachtwoord"; \ - Text[ french ] = "Avec mot de passe"; \ - Text[ spanish ] = "Con contrase馻"; \ - Text[ finnish ] = "~My鰏 salasana"; \ + Text[ french ] = "Avec mot de ~passe"; \ + Text[ spanish ] = "Con c~ontrase馻"; \ + Text[ finnish ] = "My鰏 salasana"; \ Text[ italian ] = "Con pass~word"; \ Text[ danish ] = "~Med adgangskode"; \ Text[ swedish ] = "~Med l鰏enord"; \ Text[ polish ] = "~Za pomoc has砤"; \ Text[ portuguese_brazilian ] = "With password"; \ Text[ japanese ] = "銉戙偣銉兗銉夈倰浣跨敤(~H)"; \ - Text[ korean ] = "韺姢鞗岆摐 靷毄(~H)"; \ + Text[ korean ] = "鞎旐樃 靷毄(~H)"; \ Text[ chinese_simplified ] = "浣跨敤瀵嗙爜(~H)"; \ Text[ chinese_traditional ] = "鎺＄敤瀵嗙⒓(~H)"; \ Text[ turkish ] = "With password"; \ @@ -415,12 +415,12 @@ ModalDialog MD_EDIT_REGION Text [ italian ] = "Modifica sezioni" ; Text [ portuguese_brazilian ] = "Editar Se??s" ; Text [ portuguese ] = "Editar sec珲es" ; - Text [ finnish ] = "Muokkaa osioita" ; + Text [ finnish ] = "Muokkaa osia" ; Text [ danish ] = "Rediger omr錮er" ; Text [ french ] = "蒬ition des sections" ; Text [ swedish ] = "Redigera omr錮en" ; Text [ dutch ] = "Bereiken bewerken" ; - Text [ spanish ] = "Modificar 醨eas" ; + Text [ spanish ] = "Editar secciones" ; Text [ english_us ] = "Edit Sections" ; Moveable = TRUE ; FixedLine FL_NAME @@ -434,22 +434,22 @@ ModalDialog MD_EDIT_REGION Text [ italian ] = "Sezione" ; Text [ portuguese_brazilian ] = "se??o" ; Text [ portuguese ] = "Sec玢o" ; - Text [ finnish ] = "Osio" ; + Text [ finnish ] = "Osa" ; Text [ danish ] = "Omr錮e" ; Text [ french ] = "Section" ; Text [ swedish ] = "Omr錮e" ; Text [ dutch ] = "Bereik" ; - Text [ spanish ] = "羠ea" ; + Text [ spanish ] = "Secci髇" ; Text [ english_us ] = "Section" ; Text[ chinese_simplified ] = "鍖哄煙"; - Text[ russian ] = "吾豚耱"; + Text[ russian ] = "朽玟咫"; Text[ polish ] = "Obszar"; Text[ japanese ] = "绡勫洸"; - Text[ language_user1 ] = "桦? 吾豚耱?- -"; + Text[ language_user1 ] = "桦; 桦? 吾豚耱?- -"; Text[ chinese_traditional ] = "鍗鍩"; Text[ arabic ] = "轻湄寝"; Text[ greek ] = "彭玺"; - Text[ korean ] = "氩旍渼"; + Text[ korean ] = "甑棴"; Text[ turkish ] = "B鰈黰"; Text[ catalan ] = "Secci"; Text[ thai ] = "喔箞喔о笝"; @@ -659,7 +659,7 @@ ModalDialog MD_EDIT_REGION Text[ chinese_traditional ] = "閬搁爡(~O)"; Text[ arabic ] = "雾茄鞘..."; Text[ turkish ] = "Se鏴nekler..."; - Text[ finnish ] = "~Asetukset"; + Text[ finnish ] = "~Asetukset..."; Text[ catalan ] = "~Opcions..."; Text[ thai ] = "~喔曕副喔о箑喔ム阜喔竵..."; }; @@ -675,21 +675,21 @@ ModalDialog MD_EDIT_REGION Text [ italian ] = "Ri~muovi" ; Text [ portuguese_brazilian ] = "~Dispensar" ; Text [ portuguese ] = "~Remover" ; - Text [ finnish ] = "~Peruuta" ; + Text [ finnish ] = "~Kumoa" ; Text [ danish ] = "Oph鎣" ; Text [ french ] = "~蒷iminer" ; Text [ swedish ] = "Upph鋠" ; Text [ dutch ] = "~Opheffen" ; - Text [ spanish ] = "An~ular" ; + Text [ spanish ] = "~Borrar" ; Text [ english_us ] = "Remove" ; Text[ chinese_simplified ] = "绉婚櫎(~U)"; - Text[ russian ] = "俞疣螯"; + Text[ russian ] = "愉嚯栩"; Text[ polish ] = "Usu"; Text[ japanese ] = "瑙ｉ櫎(~U)"; Text[ chinese_traditional ] = "绉婚櫎(~U)"; Text[ arabic ] = "乓轻"; Text[ greek ] = "梳糗胥珞"; - Text[ korean ] = "鞁ろ枆 旆唽(~U)"; + Text[ korean ] = "鞝滉卑(~U)"; Text[ turkish ] = "Kald齬"; Text[ catalan ] = "~Desf閟"; Text[ thai ] = "喙~喔ム复喔佮笚喔"; @@ -701,13 +701,13 @@ ModalDialog MD_EDIT_REGION TabStop = TRUE ; }; Text[ chinese_simplified ] = "缂栬緫鍖哄煙"; - Text[ russian ] = "橡噔赅 钺豚耱彘"; + Text[ russian ] = "绣溧牝桊钼囗桢 疣玟咫钼"; Text[ polish ] = "Edytuj sekcje"; Text[ japanese ] = "绡勫洸銇法闆"; Text[ chinese_traditional ] = "绶ㄨ集鍗鍩"; Text[ arabic ] = "释秧 湄寝鞘"; Text[ greek ] = "硼孱羼汜筮 麸燧"; - Text[ korean ] = "鞓侅棴 韼胳"; + Text[ korean ] = "甑棴 韼胳"; Text[ turkish ] = "B鰈黰leri d鼁enle"; Text[ catalan ] = "Edita les seccions"; Text[ thai ] = "喙佮竵喙夃箘喔傕釜喙堗抚喔"; @@ -743,12 +743,12 @@ String STR_REG_DUPLICATE Text [ italian ] = "Nome sezione modificato:" ; Text [ portuguese_brazilian ] = "Nome da se??o alterado:" ; Text [ portuguese ] = "Nome da sec玢o mudou:" ; - Text [ finnish ] = "Osion nimi muutettu:" ; + Text [ finnish ] = "Osan nimi muutettu:" ; Text [ danish ] = "Omr錮enavn 鎛dret:" ; Text [ french ] = "Nom de section modifi :" ; Text [ swedish ] = "Omr錮esnamn 鋘drat:" ; Text [ dutch ] = "Bereiknaam gewijzigd:" ; - Text [ spanish ] = "Nombre de 醨ea modificado:" ; + Text [ spanish ] = "Nombre de la secci髇 modificada:" ; Text [ english_us ] = "Section name changed:" ; Text[ chinese_simplified ] = "鍖哄煙鍚嶇О宸茬粡鏀瑰彉锛"; Text[ russian ] = "褥 疣玟咫 桤戾礤眍:"; @@ -757,7 +757,7 @@ String STR_REG_DUPLICATE Text[ chinese_traditional ] = "鍗鍩熷悕绋卞凡缍撹畩鏇达細"; Text[ arabic ] = "抒 售眄 怯 轻湄寝:"; Text[ greek ] = "岭脶戕 镯狒矧 麸 麸燧:"; - Text[ korean ] = "鞓侅棴 鞚措鞚 氤瓴诫悩鞐堨姷雼堧嫟:"; + Text[ korean ] = "甑棴 鞚措鞚 氤瓴诫悩鞐堨姷雼堧嫟:"; Text[ turkish ] = "B鰈黰 ad de餴⺶irildi:"; Text[ catalan ] = "El nom de la secci ha canviat:"; Text[ thai ] = "喙喔涏弗喔掂箞喔⑧笝喔娻阜喙堗腑喔箞喔о笝:"; @@ -770,21 +770,21 @@ String STR_INFO_DUPLICATE Text [ italian ] = "Nome area doppio" ; Text [ portuguese_brazilian ] = "Nome da se??o duplo" ; Text [ portuguese ] = "Nome de sec玢o duplo" ; - Text [ finnish ] = "Kopioi osion nimi" ; + Text [ finnish ] = "Kopioi osan nimi" ; Text [ danish ] = "Dobbelt omr錮enavn" ; Text [ french ] = "Dupliquer nom de la section" ; Text [ swedish ] = "Dubbelt omr錮esnamn" ; Text [ dutch ] = "Dubbele bereiknaam" ; - Text [ spanish ] = "Nombre doble de 醨ea" ; + Text [ spanish ] = "Nombre doble de la secci髇" ; Text [ english_us ] = "Duplicate section name" ; Text[ chinese_simplified ] = "鍙屽尯鍩熷悕绉"; - Text[ russian ] = "项怛铕 桁屙 钺豚耱"; + Text[ russian ] = "捏犭桊簋羼 桁 疣玟咫"; Text[ polish ] = "Zduplikowane nazwy sekcji"; Text[ japanese ] = "閲嶈銇椼仧绡勫洸鍚"; Text[ chinese_traditional ] = "闆欏崁鍩熷悕绋"; Text[ arabic ] = "怯 湄寝 阋湘"; Text[ greek ] = "拈痣 镯镬狍哚 麸燧"; - Text[ korean ] = "欷戨车霅 鞓侅棴鞚措"; + Text[ korean ] = "甑棴 鞚措 氤奠牅"; Text[ turkish ] = "B鰈黰 ad daha 鰊ce kullan齦d"; Text[ catalan ] = "Nom de secci duplicat"; Text[ thai ] = "喔椸赋喔娻阜喙堗腑喔箞喔о笝喔嬥箟喔"; @@ -795,25 +795,25 @@ QueryBox QB_CONNECT DefButton = WB_DEF_NO ; Message = "Eine Dateiverbindung l鰏cht den aktuellen Inhalt des Bereichs. Trotzdem verbinden ?" ; Message [ English ] = "A file connection will delete the content of the current section. Continue ?" ; - Message [ dutch ] = "Door een bestandsverbinding wordt de inhoud van het actuele bereik verwijderd. Toch verbinden?" ; + Message [ dutch ] = "Door een bestandsverbinding is de inhoud van het huidige bereik verwijderd. Toch verbinden?" ; Message [ english_us ] = "A file connection will delete the contents of the current section. Connect anyway?" ; Message [ italian ] = "Un collegamento di file cancella il contenuto dell'area. Volete collegare lo stesso?" ; - Message [ spanish ] = "Un enlace de archivos borra el contenido actual del 醨ea. 縀nlazar de todos modos?" ; + Message [ spanish ] = "Una conexi髇 de archivos borrar el contenido de la secci髇 actual. 緾onectar de todos modos?" ; Message [ french ] = "Une connexion supprime le contenu de la section courante. Connecter quand m阭e?" ; Message [ swedish ] = "En filf鰎bindelse raderar det aktuella inneh錶let i omr錮et. F鰎binda 鋘d?" ; Message [ danish ] = "En filforbindelse sletter omr錮ets aktuelle indhold. Vil du forbinde alligevel?" ; Message [ portuguese ] = "Uma liga玢o de ficheiros elimina o conte鷇o da actual sec玢o. Mesmo assim, ligar?" ; Message [ portuguese_brazilian ] = "Eine Dateiverbindung l?cht den aktuellen Inhalt des Bereichs. Trotzdem verbinden ?" ; Message[ chinese_simplified ] = "浣跨敤鏂囦欢杩炴帴浼氬垹闄ゅ綋鍓嶅尯鍩熷唴鐨勫唴瀹广傛偍杩樻槸瑕佹墽琛岃繛鎺ュ懡浠わ紵"; - Message[ russian ] = "砚琰 羿殡钼 箐嚯栩 蝈牦 耦溴疰桁铄 钺豚耱. 砚玎螯 礤耢铗 磬 ?"; + Message[ russian ] = "玉蜞眍怅 疋玷 箐嚯栩 蝈牦 耦溴疰桁铄 疣玟咫. 玉蜞眍忤螯, 礤耢铗 磬 ?"; Message[ polish ] = "Po彻czenie pliku usunie aktualn zawarto滄 obszaru. Mimo to po彻czy?"; Message[ japanese ] = "銉曘偂銈ゃ儷銇帴缍氥伅鐝惧湪銇瘎鍥插唴瀹广倰鍓婇櫎銇椼伨銇欍傛帴缍氥仐銇︺倐銇嬨伨銇勩伨銇涖倱銇嬨"; Message[ chinese_traditional ] = "浣跨敤妾旀閫ｇ祼鏈冨埅闄ゅ崁鍩熷収鐩墠鐨勫収瀹广傛偍閭勬槸瑕佸煼琛岄ｇ祼锛"; Message[ arabic ] = "禹南 鞘涨 轻汜 裴 托 轻阃舒砬 轻颓犴. 遽 恃硐 轻鞘涨 卺 轻眼 沅 嗅呖"; Message[ greek ] = "涕 簖礓弩 狁麇唢 溟徙褴鲥 麸 赳蓣镯 疱耖鬻屙 麸 綮揿狒矧. 歪 瘃徙灬麸痫殓桢 簖礓弩 疳翊 狨糗;"; - Message[ korean ] = "韺岇澕 鞐瓣舶鞚 順勳灛 鞓侅棴 雮挫毄鞚 靷牅頃橁矊 霅╇媹雼 . 攴鸽灅霃 鞐瓣舶頃橁矤鞀惦媹旯?"; + Message[ korean ] = "韺岇澕鞚 鞐瓣舶頃橂┐ 順勳灛 甑棴 雮挫毄鞚 靷牅霅╇媹雼. 攴鸽灅霃 鞐瓣舶頃橃嫓瓴犾姷雼堦箤?"; Message[ turkish ] = "Bir dosya ba餷ant齭, ⺷ anki b鰈黰 i鏴ri餴ni silecek? Ba餷ant yine de yap齦s齨 m?"; - Message[ finnish ] = "Tiedostojen yhdist鋗inen tuhoaa nykyisen valinnan sis鋖l鰊. Yhdistet滗nk kuitenkin?"; + Message[ finnish ] = "Tiedostojen yhdist鋗inen tuhoaa nykyisen osan sis鋖l鰊. Kytket滗nk kuitenkin?"; Message[ catalan ] = "Una connexi de fitxers suprimir el contingut de la secci actual. Voleu realitzar la connexi igualment?"; Message[ thai ] = "喔佮覆喔｀箑喔娻阜喙堗腑喔∴笗喙堗腑喙佮笩喙夃浮喔堗赴喔ム笟喙喔權阜喙夃腑喔覆喔傕腑喔囙釜喙堗抚喔權笡喔编笀喔堗父喔氞副喔 喙喔娻阜喙堗腑喔∴笗喙堗腑喔福喔粪腑喙勦浮喙?"; }; @@ -823,7 +823,7 @@ InfoBox REG_WRONG_PASSWORD DEFBUTTON = WB_DEF_OK ; Message = "Es wurde ein falsches Kennwort eingegeben." ; Message [ English ] = "A wrong password was specified." ; - Message [ dutch ] = "Er werd een verkeerd wachtwoord aangegeven" ; + Message [ dutch ] = "Er is een verkeerd wachtwoord opgegeven" ; Message [ english_us ] = "The password entered is invalid." ; Message [ italian ] = " stata impostata una password errata" ; Message [ spanish ] = "Se emple una contrase馻 falsa." ; @@ -839,7 +839,7 @@ InfoBox REG_WRONG_PASSWORD Message[ chinese_traditional ] = "杓稿叆鐨勫瘑纰肩劇鏁堛"; Message[ arabic ] = "抒 畔吻 哚闵 友 垌 胀硗."; Message[ greek ] = "砰筢泫戕 荜躐秕 犍溟觑 瘃忉箸."; - Message[ korean ] = "韹毽 旖旊摐 鞗岆摐臧 鞛呺牓霅橃棃鞀惦媹雼."; + Message[ korean ] = "鞛呺牓頃 鞎旐樃電 鞛橂霅橃棃鞀惦媹雼."; Message[ turkish ] = "Girilen 㱮fre yanl."; Message[ finnish ] = "Annettu salasana on virheellinen."; Message[ catalan ] = "S'ha introdu飔 una contrasenya incorrecta."; @@ -859,7 +859,7 @@ InfoBox REG_WRONG_PASSWD_REPEAT Message [ italian ] = "La password non stata impostata." ; Message [ spanish ] = "No se ha definido la contrase馻." ; Message [ french ] = "Vous n'avez pas saisi de mot de passe !" ; - Message [ dutch ] = "Er werd geen wachtwoord gedefinieerd." ; + Message [ dutch ] = "Er is geen wachtwoord gedefinieerd." ; Message[ chinese_simplified ] = "杩樻湭璁惧畾瀵嗙爜銆"; Message[ russian ] = "相痤朦 礤 篑蜞眍怆屙."; Message[ polish ] = "Brak has砤."; @@ -867,7 +867,7 @@ InfoBox REG_WRONG_PASSWD_REPEAT Message[ chinese_traditional ] = "閭勬湭瑷畾涓鍊嬪瘑纰笺"; Message[ arabic ] = "徙 硎 畔吻 哚闵 轻友."; Message[ greek ] = "腻 赆栾襁篝珀 犍溟挈 瘃忉箸."; - Message[ korean ] = "韺姢鞗岆摐臧 歆鞝曤悩歆 鞎婌晿鞀惦媹雼."; + Message[ korean ] = "鞎旐樃臧 靹れ爼霅橃 鞎婌晿鞀惦媹雼."; Message[ turkish ] = "辤fre belirlenmedi."; Message[ finnish ] = "Salasanaa ei ole m滗ritetty."; Message[ catalan ] = "No s'ha definit la contrasenya."; @@ -883,12 +883,12 @@ TabDialog DLG_INSERT_SECTION Text [ italian ] = "Inserisci sezioni" ; Text [ portuguese_brazilian ] = "Inserir Se??s" ; Text [ portuguese ] = "Inserir sec玢o" ; - Text [ finnish ] = "Lis滗 osio" ; + Text [ finnish ] = "Lis滗 osa" ; Text [ danish ] = "Inds鎡 omr錮e" ; Text [ french ] = "Insertion d'une section" ; Text [ swedish ] = "Infoga omr錮e" ; Text [ dutch ] = "Bereik invoegen" ; - Text [ spanish ] = "Insertar 醨ea" ; + Text [ spanish ] = "Insertar una secci髇" ; Text [ english_us ] = "Insert Section" ; OutputSize = TRUE ; SVLook = TRUE ; @@ -906,23 +906,23 @@ TabDialog DLG_INSERT_SECTION Text [ ENGLISH ] = "Section" ; Text[ english_us ] = "Section"; Text[ portuguese ] = "Sec玢o"; - Text[ russian ] = "吾豚耱"; + Text[ russian ] = "朽玟咫"; Text[ greek ] = "彭玺"; Text[ dutch ] = "Bereik"; Text[ french ] = "Section"; - Text[ spanish ] = "羠ea"; + Text[ spanish ] = "Secci髇"; Text[ italian ] = "Sezione"; Text[ danish ] = "Omr錮e"; Text[ swedish ] = "Omr錮e"; Text[ polish ] = "Obszar"; Text[ portuguese_brazilian ] = "Section"; Text[ japanese ] = "绡勫洸"; - Text[ korean ] = "鞓侅棴"; + Text[ korean ] = "甑棴"; Text[ chinese_simplified ] = "鍖哄煙"; Text[ chinese_traditional ] = "鍗鍩"; Text[ arabic ] = "轻湄寝"; Text[ turkish ] = "B鰈黰"; - Text[ finnish ] = "Osio"; + Text[ finnish ] = "Osa"; Text[ catalan ] = "Secci"; Text[ thai ] = "喔箞喔о笝"; }; @@ -936,7 +936,7 @@ TabDialog DLG_INSERT_SECTION Text [ italian ] = "Colonne" ; Text [ portuguese_brazilian ] = "Colunas" ; Text [ portuguese ] = "Colunas" ; - Text [ finnish ] = "Sarakkeet" ; + Text [ finnish ] = "Palstat" ; Text [ danish ] = "Kolonner" ; Text [ french ] = "Colonnes" ; Text [ swedish ] = "Kolumner" ; @@ -944,7 +944,7 @@ TabDialog DLG_INSERT_SECTION Text [ spanish ] = "Columnas" ; Text [ english_us ] = "Columns" ; Text[ chinese_simplified ] = "鏍"; - Text[ russian ] = "暑腩黻"; + Text[ russian ] = "羊铍狯"; Text[ polish ] = "Kolumny"; Text[ japanese ] = "娈电祫銇"; Text[ chinese_traditional ] = "娆"; @@ -992,11 +992,11 @@ TabDialog DLG_INSERT_SECTION Text [ ENGLISH ] = "Foot-/Endnotes" ; Text[ english_us ] = "Footnotes/Endnotes"; Text[ portuguese ] = "Notas de rodap/finais"; - Text[ russian ] = "吾睇/暑眦邂 耥铖觇"; + Text[ russian ] = "秧铖觇/暑眦邂 耥铖觇"; Text[ greek ] = "震矬珈彘彘/隅戾辋箦轵 糨腼躜"; Text[ dutch ] = "Voet-/eindnoten"; Text[ french ] = "Notes de bas de page / de fin"; - Text[ spanish ] = "Notas al pie/finales"; + Text[ spanish ] = "Notas al pie / notas finales"; Text[ italian ] = "Note a pi di pagina/di chiusura"; Text[ danish ] = "Fod-/slutnoter"; Text[ swedish ] = "Fot-/slutnoter"; @@ -1008,7 +1008,7 @@ TabDialog DLG_INSERT_SECTION Text[ chinese_traditional ] = "瑷昏叧鍜屽熬瑷"; Text[ arabic ] = "玩窃 虞犴/授犴耷 问倾砩"; Text[ turkish ] = "Dipnot/Sonnot"; - Text[ finnish ] = "Ala-/loppuviitteet"; + Text[ finnish ] = "Ala- ja loppuviitteet"; Text[ catalan ] = "Notes al peu/Notes finals"; Text[ thai ] = "喙喔娻复喔囙腑喔｀福喔/喔箟喔侧竾喔复喔囙笚喙夃覆喔⑧箑喔｀阜喙堗腑喔"; }; @@ -1041,11 +1041,11 @@ TabDialog DLG_INSERT_SECTION Text[ catalan ] = "Insereix"; Text[ thai ] = "喙佮笚喔｀竵"; }; - Text[ russian ] = "埋蜞忤螯 钺豚耱"; + Text[ russian ] = "埋蜞忤螯 疣玟咫"; Text[ greek ] = "旭矬柁赙 麸燧"; Text[ polish ] = "Wstaw obszar"; Text[ japanese ] = "绡勫洸銇尶鍏"; - Text[ korean ] = "鞓侅棴 靷届瀰"; + Text[ korean ] = "甑棴 靷届瀰"; Text[ chinese_simplified ] = "鎻掑叆鍖哄煙"; Text[ chinese_traditional ] = "鎻掑叆鍗鍩"; Text[ arabic ] = "畔亚 湄寝"; @@ -1070,7 +1070,7 @@ TabPage TP_INSERT_SECTION Text [ English ] = "New section" ; Text [ english_us ] = "New section" ; Text [ italian ] = "Nuova sezione" ; - Text [ spanish ] = "Nueva 醨ea" ; + Text [ spanish ] = "Secci髇 nueva" ; Text [ french ] = "Nouvelle section" ; Text [ dutch ] = "Nieuw bereik" ; Text [ swedish ] = "Nytt omr錮e" ; @@ -1078,15 +1078,15 @@ TabPage TP_INSERT_SECTION Text [ portuguese_brazilian ] = "Neuer Bereich" ; Text [ portuguese ] = "Nova sec玢o" ; Text[ chinese_simplified ] = "鏂板尯鍩"; - Text[ russian ] = "皖忄 钺豚耱"; + Text[ russian ] = "皖恹 疣玟咫"; Text[ polish ] = "Nowy obszar"; Text[ japanese ] = "鏂般仐銇勭瘎鍥"; Text[ chinese_traditional ] = "鏂板崁鍩"; Text[ arabic ] = "湄寝 滔硐"; Text[ greek ] = "洼矧 麸燧狎"; - Text[ korean ] = "靸 氩旍渼"; + Text[ korean ] = "靸 甑棴"; Text[ turkish ] = "Yeni b鰈黰"; - Text[ finnish ] = "Uusi osio"; + Text[ finnish ] = "Uusi osa"; Text[ catalan ] = "Nova secci"; Text[ thai ] = "喔箞喔о笝喙冟斧喔∴箞"; }; @@ -1179,10 +1179,10 @@ TabPage TP_INSERT_SECTION TabStop = TRUE ; Text = "~Sch黷zen" ; Text [ English ] = "Protect" ; - Text[ language_user1 ] = "(哪) 旭矬翎翦鮼E鸑; - - - -"; + Text[ language_user1 ] = "(?; (哪) 旭矬翎翦鮼E鸑; - - - -"; Text[ english_us ] = "~Protect"; Text[ portuguese ] = "Pro~teger"; - Text[ russian ] = "玉蜞眍忤螯 玎蝮"; + Text[ russian ] = "青眍"; Text[ greek ] = "旭矬翎翦觞戾盹"; Text[ dutch ] = "~Beveiligen"; Text[ french ] = "Prot間er"; @@ -1269,7 +1269,7 @@ TabDialog DLG_SECTION_PROPERTIES Text [ italian ] = "Colonne" ; Text [ portuguese_brazilian ] = "Colunas" ; Text [ portuguese ] = "Colunas" ; - Text [ finnish ] = "Sarakkeet" ; + Text [ finnish ] = "Palstat" ; Text [ danish ] = "Kolonner" ; Text [ french ] = "Colonnes" ; Text [ swedish ] = "Kolumner" ; @@ -1277,7 +1277,7 @@ TabDialog DLG_SECTION_PROPERTIES Text [ spanish ] = "Columnas" ; Text [ english_us ] = "Columns" ; Text[ chinese_simplified ] = "鏍"; - Text[ russian ] = "暑腩黻"; + Text[ russian ] = "羊铍狯"; Text[ polish ] = "Kolumny"; Text[ japanese ] = "娈电祫銇"; Text[ chinese_traditional ] = "娆"; @@ -1325,11 +1325,11 @@ TabDialog DLG_SECTION_PROPERTIES Text [ ENGLISH ] = "Foot-/Endnotes" ; Text[ english_us ] = "Footnotes/Endnotes"; Text[ portuguese ] = "Notas de rodap/finais"; - Text[ russian ] = "吾睇/暑眦邂 耥铖觇"; + Text[ russian ] = "秧铖觇/觐眦邂 耥铖觇"; Text[ greek ] = "震矬珈彘彘/隅戾辋箦轵 糨腼躜"; Text[ dutch ] = "Voet-/eindnoten"; Text[ french ] = "Notes de bas de page / de fin"; - Text[ spanish ] = "Notas al pie/finales"; + Text[ spanish ] = "Notas al pie / notas finales"; Text[ italian ] = "Note a pi di pagina/di chiusura"; Text[ danish ] = "Fod-/slutnoter"; Text[ swedish ] = "Fot-/slutnoter"; @@ -1341,7 +1341,7 @@ TabDialog DLG_SECTION_PROPERTIES Text[ chinese_traditional ] = "瑷昏叧鍜屽熬瑷"; Text[ arabic ] = "玩窃 虞犴/授犴耷 问倾砩"; Text[ turkish ] = "Dipnot/Sonnot"; - Text[ finnish ] = "Ala-/loppuviitteet"; + Text[ finnish ] = "Ala- ja loppuviitteet"; Text[ catalan ] = "Notes al peu/Notes finals"; Text[ thai ] = "喙喔娻复喔囙腑喔｀福喔/喔箟喔侧竾喔复喔囙笚喙夃覆喔⑧箑喔｀阜喙堗腑喔"; }; @@ -1398,7 +1398,7 @@ TabPage TP_SECTION_FTNENDNOTES Text[ polish ] = "Przypisy dolne"; Text[ portuguese_brazilian ] = "Footnotes"; Text[ japanese ] = "鑴氭敞"; - Text[ korean ] = "氚旊嫢旮"; + Text[ korean ] = "臧侅＜"; Text[ chinese_simplified ] = "娉ㄨ剼"; Text[ chinese_traditional ] = "瑷昏叧"; Text[ arabic ] = "玩窃 虞犴"; @@ -1427,13 +1427,13 @@ TabPage TP_SECTION_FTNENDNOTES Text[ polish ] = "zbierz na ko馽u tekstu"; Text[ portuguese_brazilian ] = "Collect at end of text"; Text[ japanese ] = "鏂囨浉鏈伀鎸垮叆(~T)"; - Text[ korean ] = "韰嶌姢韸 雭濎棎 靾橃(~T)"; + Text[ korean ] = "氍胳劀 雭濎溂搿 氇溂旮(~T)"; Text[ chinese_simplified ] = "鍦ㄦ鏂囩殑缁撴潫浣嶇疆鏀堕泦(~T)"; Text[ chinese_traditional ] = "鍦ㄥ収鏂囩殑绲愭潫浣嶇疆鏀堕泦(~T)"; Text[ arabic ] = "侍沩 阡 溴琼 轻湔"; Text[ turkish ] = "Metin sonunda topla"; - Text[ finnish ] = "Ke~r滗 tekstin lopussa"; + Text[ finnish ] = "Ke~r滗 tekstin loppuun"; Text[ catalan ] = "Recull al final del ~text"; Text[ thai ] = "喙喔佮箛喔氞福喔о笟喔｀抚~喔∴笚喔掂箞喔椸箟喔侧涪喔傕箟喔竸喔о覆喔"; }; @@ -1446,7 +1446,7 @@ TabPage TP_SECTION_FTNENDNOTES Text [ English ] = "Restart number" ; Text[ english_us ] = "~Restart numbering"; Text[ portuguese ] = "~Reiniciar numera玢o"; - Text[ russian ] = "袜鬣腩 眢戾疣鲨"; + Text[ russian ] = "腕戾痤忄螯 耥钼"; Text[ greek ] = "硼犴尻赀~礴箸 狁殍祜"; Text[ dutch ] = "~Nieuwe nummering"; Text[ french ] = "Nouvelle num閞otation"; @@ -1457,12 +1457,12 @@ TabPage TP_SECTION_FTNENDNOTES Text[ polish ] = "Uruchom ponownie numer"; Text[ portuguese_brazilian ] = "own number sequence"; Text[ japanese ] = "鐣彿銈掓柊銇椼亸濮嬨倎銈(~R)"; - Text[ korean ] = "氩堩樃 毵り赴旮 雼れ嫓 鞁滌瀾(~R)"; + Text[ korean ] = "雼れ嫓 氩堩樃 毵り赴旮(~R)"; Text[ chinese_simplified ] = "閲嶆柊寮濮嬬紪鍙(~R)"; Text[ chinese_traditional ] = "閲嶆柊绶ㄨ櫉(~R)"; Text[ arabic ] = "炮窍 认 轻恃揄"; Text[ turkish ] = "Num. yeniden baat"; - Text[ finnish ] = "~Aloita numerointi uudestaan"; + Text[ finnish ] = "Aloita numerointi ~uudestaan"; Text[ catalan ] = "~Reinicia la numeraci"; Text[ thai ] = "喙~喔｀复喙堗浮喔ム赋喔斷副喔氞笗喔编抚喙喔ム競喙冟斧喔∴箞"; }; @@ -1489,7 +1489,7 @@ TabPage TP_SECTION_FTNENDNOTES Text[ chinese_traditional ] = "闁嬪寰(~S)"; Text[ arabic ] = "轻认 溶"; Text[ greek ] = "容箸 尻赀礴箸"; - Text[ korean ] = "鞁滌瀾(~S)"; + Text[ korean ] = "鞁滌瀾 氩堩樃(~S)"; Text[ turkish ] = "Baang~"; Text[ finnish ] = "~Aloitus"; Text[ catalan ] = "~Inicia a"; @@ -1516,9 +1516,9 @@ TabPage TP_SECTION_FTNENDNOTES Text [ English ] = "Own format" ; Text[ english_us ] = "Custom ~format"; Text[ portuguese ] = "~Formato personalizado"; - Text[ russian ] = "耦狁蜮屙睇 纛痨囹"; + Text[ russian ] = "杨狁蜮屙睇 纛痨囹"; Text[ greek ] = "旭矬殛 祜駘鲛"; - Text[ dutch ] = "Eigen ~formaat"; + Text[ dutch ] = "Eigen ~indeling"; Text[ french ] = "Format personnalis"; Text[ spanish ] = "formato propio"; Text[ italian ] = "Formato proprio"; @@ -1527,7 +1527,7 @@ TabPage TP_SECTION_FTNENDNOTES Text[ polish ] = "Format w砤sny"; Text[ portuguese_brazilian ] = "Own format"; Text[ japanese ] = "浠绘剰銇浉寮(~F)"; - Text[ korean ] = "瓿犾湢 靹滌嫕(~F)"; + Text[ korean ] = "靷毄鞛 鞝曥潣 靹滌嫕(~F)"; Text[ chinese_simplified ] = "鑷畾鐨勬牸寮(~F)"; Text[ chinese_traditional ] = "鑷▊鏍煎紡(~F)"; Text[ arabic ] = "输禹 吻"; @@ -1561,7 +1561,7 @@ TabPage TP_SECTION_FTNENDNOTES Text[ chinese_traditional ] = "涔嬪墠(~F)"; Text[ arabic ] = "奕"; Text[ greek ] = "旭轫 狃"; - Text[ korean ] = "鞝勳棎(~F)"; + Text[ korean ] = "氩堩樃 鞎(~F)"; Text[ turkish ] = "謓黱de"; Text[ catalan ] = "Ab~ans"; Text[ thai ] = "喔佮箞喔瓇喔"; @@ -1595,7 +1595,7 @@ TabPage TP_SECTION_FTNENDNOTES Text [ portuguese_brazilian ] = "Atr?s" ; Text [ portuguese ] = "A~tr醩" ; Text [ finnish ] = "J鋖~keen" ; - Text [ danish ] = "Efter" ; + Text [ danish ] = "E~fter" ; Text [ french ] = "Apr鑣" ; Text [ swedish ] = "Ef~ter" ; Text [ dutch ] = "E~rachter" ; @@ -1609,7 +1609,7 @@ TabPage TP_SECTION_FTNENDNOTES Text[ chinese_traditional ] = "涔嬪緦(~E)"; Text[ arabic ] = "融"; Text[ greek ] = "体糗 狃"; - Text[ korean ] = "頉勳棎(~E)"; + Text[ korean ] = "氩堩樃 霋(~E)"; Text[ turkish ] = "謓黱de"; Text[ catalan ] = "D~espr閟"; Text[ thai ] = "喔弗喔编竾~喔堗覆喔"; @@ -1663,23 +1663,23 @@ TabPage TP_SECTION_FTNENDNOTES Text[ english ] = "Collect at end of section"; Text[ english_us ] = "C~ollect at end of section"; Text[ portuguese ] = "Agrupar no ~final da sec玢o"; - Text[ russian ] = "杨狃囹 觐眦 钺豚耱"; + Text[ russian ] = "杨狃囹 觐眦 疣玟咫"; Text[ greek ] = "吁汴蓓赳 篝 糨腼 麸 綮揿~狒矧"; - Text[ dutch ] = "aan ~bereikseinde verzamelen"; + Text[ dutch ] = "aan einde van ~bereik verzamelen"; Text[ french ] = "Regrouper en fin de ~section"; - Text[ spanish ] = "recoger al final del 醨ea"; + Text[ spanish ] = "~Reunir al final de la secci髇"; Text[ italian ] = "Raccogli a fine sezione"; Text[ danish ] = "saml ved omr錮ets slutning"; Text[ swedish ] = "s~amla vid omr錮ets slut"; Text[ polish ] = "zbierz na ko馽u obszaru"; Text[ portuguese_brazilian ] = "Collect at end of section"; Text[ japanese ] = "绡勫洸鏈伀鎸垮叆(~O)"; - Text[ korean ] = "鞓侅棴 雭濎棎 靾橃(~O)"; + Text[ korean ] = "甑棴 雭濎溂搿 氇潓(~O)"; Text[ chinese_simplified ] = "鍦ㄥ尯鍩熺殑缁撴潫浣嶇疆鏀堕泦(~O)"; Text[ chinese_traditional ] = "鍦ㄥ崁鍩熺殑绲愭潫浣嶇疆鏀堕泦(~O)"; Text[ arabic ] = "侍沩 阡 溴琼 轻湄寝"; Text[ turkish ] = "B鰈黰 sonunda topla"; - Text[ finnish ] = "Ke~r滗 osion lopussa"; + Text[ finnish ] = "Ke~r滗 osan loppuun"; Text[ catalan ] = "Recull al final de la secci"; Text[ thai ] = "喙喔佮箛喔氞福~喔о笟喔｀抚喔∴笚喔掂箞喔椸箟喔侧涪喔箞喔о笝"; }; @@ -1692,7 +1692,7 @@ TabPage TP_SECTION_FTNENDNOTES Text [ English ] = "Restart number" ; Text[ english_us ] = "~Restart numbering"; Text[ portuguese ] = "~Reiniciar numera玢o"; - Text[ russian ] = "袜鬣腩 眢戾疣鲨"; + Text[ russian ] = "腕戾痤忄螯 耥钼"; Text[ greek ] = "硼犴尻赀礴~箸 狁殍祜"; Text[ dutch ] = "Nieuwe n~ummering"; Text[ french ] = "Nouvelle num閞otation"; @@ -1703,12 +1703,12 @@ TabPage TP_SECTION_FTNENDNOTES Text[ polish ] = "Uruchom ponownie numer"; Text[ portuguese_brazilian ] = "own number sequence"; Text[ japanese ] = "鐣彿銈掓柊銇椼亸濮嬨倎銈(~R)"; - Text[ korean ] = "氩堩樃 毵り赴旮 雼れ嫓 鞁滌瀾(~R)"; + Text[ korean ] = "雼れ嫓 氩堩樃 毵り赴旮(~R)"; Text[ chinese_simplified ] = "閲嶆柊寮濮嬬紪鍙(~R)"; Text[ chinese_traditional ] = "閲嶆柊绶ㄨ櫉(~R)"; Text[ arabic ] = "炮窍 认 轻恃揄"; Text[ turkish ] = "Num. yeniden baat"; - Text[ finnish ] = "~Aloita numerointi uudestaan"; + Text[ finnish ] = "Aloita numerointi ~uudestaan"; Text[ catalan ] = "Rei~nicia la numeraci"; Text[ thai ] = "喙~喔｀复喙堗浮喔ム赋喔斷副喔氞笗喔编抚喙喔ム競喙冟斧喔∴箞"; }; @@ -1735,7 +1735,7 @@ TabPage TP_SECTION_FTNENDNOTES Text[ chinese_traditional ] = "闁嬪寰(~S)"; Text[ arabic ] = "轻认 溶"; Text[ greek ] = "容箸 尻赀礴箸"; - Text[ korean ] = "鞁滌瀾(~S)"; + Text[ korean ] = "鞁滌瀾 氩堩樃(~S)"; Text[ turkish ] = "Baang~"; Text[ finnish ] = "~Aloitus"; Text[ catalan ] = "~Inicia a"; @@ -1762,18 +1762,18 @@ TabPage TP_SECTION_FTNENDNOTES Text [ English ] = "Own format" ; Text[ english_us ] = "Custom format"; Text[ portuguese ] = "Formato ~personalizado"; - Text[ russian ] = "耦狁蜮屙睇 纛痨囹"; + Text[ russian ] = "杨狁蜮屙睇 纛痨囹"; Text[ greek ] = "旭矬殛 祜聆"; - Text[ dutch ] = "~Eigen formaat"; + Text[ dutch ] = "~Eigen indeling"; Text[ french ] = "Format personnalis"; Text[ spanish ] = "formato propio"; Text[ italian ] = "Formato proprio"; - Text[ danish ] = "eget format"; + Text[ danish ] = "e~get format"; Text[ swedish ] = "~eget format"; Text[ polish ] = "Format w砤sny"; Text[ portuguese_brazilian ] = "Own format"; Text[ japanese ] = "浠绘剰銇浉寮"; - Text[ korean ] = "靷毄鞛 靹滌嫕"; + Text[ korean ] = "靷毄鞛 鞝曥潣 靹滌嫕"; Text[ chinese_simplified ] = "鑷畾鐨勬牸寮"; Text[ chinese_traditional ] = "鑷▊鏍煎紡"; Text[ arabic ] = "输禹 吻"; @@ -1794,7 +1794,7 @@ TabPage TP_SECTION_FTNENDNOTES Text [ portuguese_brazilian ] = "Antes" ; Text [ portuguese ] = "An~tes" ; Text [ finnish ] = "En~nen" ; - Text [ danish ] = "F鴕" ; + Text [ danish ] = "F~鴕" ; Text [ french ] = "Avant" ; Text [ swedish ] = "~F鰎e" ; Text [ dutch ] = "~Ervoor" ; @@ -1808,7 +1808,7 @@ TabPage TP_SECTION_FTNENDNOTES Text[ chinese_traditional ] = "涔嬪墠(~F)"; Text[ arabic ] = "奕"; Text[ greek ] = "旭轫 狃"; - Text[ korean ] = "鞎烄棎(~F)"; + Text[ korean ] = "氩堩樃 鞎(~F)"; Text[ turkish ] = "謓黱de"; Text[ catalan ] = "Ab~ans"; Text[ thai ] = "喔佮箞喔瓇喔"; @@ -1853,7 +1853,7 @@ TabPage TP_SECTION_FTNENDNOTES Text [ portuguese_brazilian ] = "Atr?s" ; Text [ portuguese ] = "A~tr醩" ; Text [ finnish ] = "J鋖~keen" ; - Text [ danish ] = "Efter" ; + Text [ danish ] = "~Efter" ; Text [ french ] = "Apr鑣" ; Text [ swedish ] = "Efte~r" ; Text [ dutch ] = "E~rachter" ; @@ -1867,7 +1867,7 @@ TabPage TP_SECTION_FTNENDNOTES Text[ chinese_traditional ] = "涔嬪緦(~E)"; Text[ arabic ] = "融"; Text[ greek ] = "体糗 狃"; - Text[ korean ] = "頉勳棎(~E)"; + Text[ korean ] = "氩堩樃 霋(~E)"; Text[ turkish ] = "Arkas齨da"; Text[ catalan ] = "D~espr閟"; Text[ thai ] = "喔弗喔编竾~喔堗覆喔"; @@ -1884,3 +1884,25 @@ TabPage TP_SECTION_FTNENDNOTES }; + + + + + + + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/dochdl/dochdl.src b/sw/source/ui/dochdl/dochdl.src index 70a36d81f2ef..089a173f87c8 100644 --- a/sw/source/ui/dochdl/dochdl.src +++ b/sw/source/ui/dochdl/dochdl.src @@ -2,9 +2,9 @@ * * $RCSfile: dochdl.src,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: os $ $Date: 2002-11-11 10:56:02 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:42:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,12 +75,12 @@ String STR_NOGLOS1 TEXT [ italian ] = "Testo automatico per la sigla '" ; TEXT [ portuguese_brazilian ] = "Texto Autom?tico para Abrevia??o" ; TEXT [ portuguese ] = "AutoTexto para abreviatura '" ; - TEXT [ finnish ] = "Automaattinen teksti pikavalinnalle '" ; + TEXT [ finnish ] = "Automaattista teksti pikavalinnalle" ; TEXT [ danish ] = "AutoTekst til genvej '" ; TEXT [ french ] = "AutoTexte pour raccourci '" ; TEXT [ swedish ] = "AutoText till genv鋑en '" ; TEXT [ dutch ] = "AutoTekst voor afkortingen'" ; - TEXT [ spanish ] = "AutoTexto para la abreviatura '" ; + TEXT [ spanish ] = "Texto autom醫ico para la abreviatura '" ; TEXT [ english_us ] = "AutoText for Shortcut '" ; TEXT[ chinese_simplified ] = "鑷姩鍥炬枃闆嗙殑缂╁啓 '"; TEXT[ russian ] = "棱蝾蝈犟 耦牮帙屙棹 '"; @@ -91,7 +91,7 @@ String STR_NOGLOS1 TEXT[ dutch ] = "AutoTekst voor afkortingen'"; TEXT[ chinese_simplified ] = "鑷姩鍥炬枃闆嗙殑缂╁啓 '"; TEXT[ greek ] = "刘麸叔哽屙 汩 翎 狁鏖贶 '"; - TEXT[ korean ] = "鞛愲彊韰 鞀ろ姼 氚旊臧旮 '"; + TEXT[ korean ] = "鞛愲彊 韰嶌姢韸 氚旊 臧旮 '"; TEXT[ turkish ] = "Otomatik metin k齭altmas '"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "AutoText per al nom curt '"; @@ -109,7 +109,7 @@ String STR_NOGLOS2 TEXT [ italian ] = "' non trovato." ; TEXT [ portuguese_brazilian ] = "' n?o encontrado." ; TEXT [ portuguese ] = "' n鉶 localizado." ; - TEXT [ finnish ] = "Kohdetta ' ei l鰕dy." ; + TEXT [ finnish ] = "ei l鰕dy." ; TEXT [ danish ] = "' blev ikke fundet." ; TEXT [ french ] = "' introuvable." ; TEXT [ swedish ] = "' hittades inte." ; @@ -137,25 +137,25 @@ String STR_NO_TABLE Text = "Eine Tabelle kann nicht in eine andere Tabelle eingef黦t werden. Sie k鰊nen die Daten jedoch einf黦en, wenn sich der Cursor nicht in einer Tabelle befindet." ; Text [ english_us ] = "A table cannot be inserted into another table. However, you can paste the data into the document when the cursor is not in a table."; Text [ norwegian ] = "Inserting a table is impossible now." ; - Text [ italian ] = "Adesso impossibile inserire una tabella." ; + Text [ italian ] = "Impossibile inserire una tabella in un'altra tabella. Tuttavia potete inserire i dati nel documento quando il cursore non posizionato in una tabella." ; Text [ portuguese_brazilian ] = "Inserir a tabela ? agora imposs?vel." ; Text [ portuguese ] = "De momento n鉶 poss韛el inserir a tabela." ; Text [ finnish ] = "T鋖l hetkell taulukkoa ei voi lis鋞" ; Text [ danish ] = "Det er for tiden ikke muligt at inds鎡te en tabel" ; - Text [ french ] = "Impossible d'ins閞er un tableau maintenant." ; - Text [ swedish ] = "En tabell kan inte infogas vid denna tidpunkt." ; + Text [ french ] = "Impossible d'ins閞er un tableau dans un autre tableau ! Vous pouvez toutefois ins閞er les donn閑s tant que le curseur ne se trouve pas dans un tableau." ; + Text [ swedish ] = "En tabell kan inte infogas i en annan tabell. Men du kan klistra in data i dokumentet om mark鰎en inte 鋜 placerad i en tabell." ; Text [ dutch ] = "Tabel kan op dit ogenblik niet worden ingevoegd." ; - Text [ spanish ] = "Actualmente no se puede insertar ninguna tabla." ; - Text[ chinese_simplified ] = "褰撳墠鏃犳硶鎻掑叆浠讳綍琛ㄦ牸銆"; - Text[ russian ] = " 磬耱 怵屐 怦蜞忤螯 蜞犭桷 礤忸珈铈眍."; + Text [ spanish ] = "No se puede insertar una tabla dentro de otra. Sin embargo, puede pegar los datos en el documento cuando el cursor no est en la tabla." ; + Text[ chinese_simplified ] = "鍦ㄤ竴涓〃鏍间箣鍐呮棤娉曟彃鍏ヨ〃鏍笺傚鏋滈紶鏍囦笉鏄綅浜庝竴涓〃鏍间箣鍐咃紝鎮ㄤ篃杩樻槸鑳藉鎻掑叆鏁版嵁銆"; + Text[ russian ] = "彦轺囫 礤忸珈铈眍 怦蜞忤螯 蜞犭桷"; Text[ polish ] = "W tym momencie nie mo縠 by wstawiona tabela."; - Text[ japanese ] = "鐝惧湪銆佽〃銇尶鍏ャ伅銇с亶銇俱仜銈撱"; - Text[ chinese_traditional ] = "鐩墠鐒℃硶鎻掑叆浠讳綍琛ㄦ牸銆"; + Text[ japanese ] = "琛ㄣ倰鍒ャ伄琛ㄣ伀鎸垮叆銇欍倠銇撱仺銇仹銇嶃伨銇涖倱銆傘仧銇犮仐銆佽〃浠ュ銇牬鎵銇偒銉笺偨銉倰缃亼銇般併儔銈儱銉°兂銉堛伀琛ㄣ伄銉囥兗銈裤倰璨笺倞浠樸亼銈嬨亾銇ㄣ亴銇с亶銇俱仚銆"; + Text[ chinese_traditional ] = "琛ㄦ牸鐒℃硶鎻掑叆鍏朵粬琛ㄦ牸涓備絾鏄暥娓告涓嶅湪琛ㄦ牸涓檪锛屾偍鍙互灏囪硣鏂欒布鍒版枃浠朵腑銆"; Text[ arabic ] = "畔亚 滔驷 垌 沣咪 颓犴丘."; Text[ dutch ] = "Tabel kan op dit ogenblik niet worden ingevoegd."; - Text[ chinese_simplified ] = "褰撳墠鏃犳硶鎻掑叆浠讳綍琛ㄦ牸銆"; + Text[ chinese_simplified ] = "鍦ㄤ竴涓〃鏍间箣鍐呮棤娉曟彃鍏ヨ〃鏍笺傚鏋滈紶鏍囦笉鏄綅浜庝竴涓〃鏍间箣鍐咃紝鎮ㄤ篃杩樻槸鑳藉鎻掑叆鏁版嵁銆"; Text[ greek ] = "旭矧 麸 疳顸 暹磲 徜狒镯 磲 彘筢麒暹 疬磲赆."; - Text[ korean ] = "響滊ゼ 靷届瀰頃橂姅瓴冹澊 順勳灛 攵堦皜電ロ暕雼堧嫟."; + Text[ korean ] = "響 鞎堨棎 霕 雼るジ 響滊ゼ 靷届瀰頃 靾橂姅 鞐嗢溂雮 旎れ劀臧 響 鞎堨棎 雴撿棳鞛堨 鞎婌潃 頃 雿办澊韯半姅 響滊靹 鞎堨溂搿 靷届瀰頃 靾 鞛堨姷雼堧嫟."; Text[ turkish ] = "辵 an tablo eklenemiyor."; Text[ language_user1 ] = " "; Text[ catalan ] = "Ara no es pot inserir cap taula."; @@ -175,19 +175,19 @@ InfoBox MSG_ERR_INSERT_GLOS MESSAGE [ danish ] = "Det var ikke muligt at oprette AutoTeksten." ; MESSAGE [ french ] = "Impossible de cr閑r l'AutoTexte." ; MESSAGE [ swedish ] = "AutoText kunde inte skapas." ; - MESSAGE [ dutch ] = "AutoTekst kon niet worden gemaakt" ; - MESSAGE [ spanish ] = "No se pudo crear el AutoTexto." ; + MESSAGE [ dutch ] = "AutoTekst kan niet worden gemaakt" ; + MESSAGE [ spanish ] = "No se pudo crear el Texto autom醫ico." ; MESSAGE [ english_us ] = "AutoText could not be created." ; MESSAGE[ chinese_simplified ] = "鏃犳硶寤虹珛鑷姩鍥炬枃闆嗐"; - MESSAGE[ russian ] = "杨玟囹 噔蝾蝈犟 礤忸珈铈眍."; + MESSAGE[ russian ] = "湾忸珈铈眍 耦玟囹 噔蝾蝈犟."; MESSAGE[ polish ] = "Autotekst nie m骻 zosta utworzony."; MESSAGE[ japanese ] = "鍏ュ姏鏀彺銇с亶銇俱仜銈"; MESSAGE[ chinese_traditional ] = "鐒℃硶寤虹珛鑷嫊鍦栨枃闆嗐"; MESSAGE[ arabic ] = "授醒 阢 湔 梳耷祈."; - MESSAGE[ dutch ] = "AutoTekst kon niet worden gemaakt"; + MESSAGE[ dutch ] = "AutoTekst kan niet worden gemaakt"; MESSAGE[ chinese_simplified ] = "鏃犳硶寤虹珛鑷姩鍥炬枃闆嗐"; MESSAGE[ greek ] = "腻 摁犴 漉磲艮 彘筢泫戕 刘麸叔哽屙."; - MESSAGE[ korean ] = "鞛愲彊 韰嶌姢韸鸽ゼ 毵岆摛靾 鞐嗢姷雼堧嫟."; + MESSAGE[ korean ] = "鞛愲彊 韰嶌姢韸鸽ゼ 毵岆摛歆 氇豁枅鞀惦媹雼."; MESSAGE[ turkish ] = "Otomatik metin olu⺶urulamad."; MESSAGE[ language_user1 ] = " "; MESSAGE[ catalan ] = "No s'ha pogut crear l'autotext."; @@ -199,26 +199,26 @@ InfoBox MSG_CLPBRD_FORMAT_ERROR MESSAGE = "Gew黱schtes Zwischenablagen-Format steht nicht zur Verf黦ung." ; MESSAGE [ English ] = "Requested clipboard format is not available." ; MESSAGE [ norwegian ] = "Requested clipboard format is not available." ; - MESSAGE [ italian ] = "Il formato appunti richiesto non disponibile." ; + MESSAGE [ italian ] = "Il formato Appunti richiesto non disponibile." ; MESSAGE [ portuguese_brazilian ] = "Formato solicitado de clipboard n?o est? dispon?vel." ; MESSAGE [ portuguese ] = "Formato da 醨ea de transfer阯cia solicitado n鉶 se encontra dispon韛el." ; MESSAGE [ finnish ] = "Pyydetty leikep鰕d鋘 muoto ei ole k鋣tett鋠iss." ; MESSAGE [ danish ] = "Det anmodede udskriftsholderformat er ikke tilg鎛geligt." ; MESSAGE [ french ] = "Le format de presse-papiers souhait n'est pas disponible." ; MESSAGE [ swedish ] = "謓skat urklippsformat 鋜 inte tillg鋘gligt." ; - MESSAGE [ dutch ] = "Gevraagd clipboardformaat is niet beschikbaar." ; - MESSAGE [ spanish ] = "El formato deseado del portapapeles no est disponible." ; + MESSAGE [ dutch ] = "Gevraagde clipboardindeling is niet beschikbaar." ; + MESSAGE [ spanish ] = "El formato requerido, del portapapeles, no est disponible." ; MESSAGE [ english_us ] = "Requested clipboard format is not available." ; MESSAGE[ chinese_simplified ] = "鎵闇瑕佺殑瑁佸壀鏉挎牸寮忎笉瀛樺湪銆"; - MESSAGE[ russian ] = "棋豚屐 纛痨囹 狍翦疣 钺戾磬 礤漕耱箫屙."; + MESSAGE[ russian ] = "湾漕耱箫屙 驽豚屐 纛痨囹 狍翦疣 钺戾磬."; MESSAGE[ polish ] = "Szukany format schowka jest niedost阷ny."; MESSAGE[ japanese ] = "鎸囧畾銇偗銉儍銉椼儨銉笺儔鏇稿紡銇娇鐢ㄣ仹銇嶃伨銇涖倱銆"; - MESSAGE[ chinese_traditional ] = "鎵闇瑕佺殑瑁佸壀绨挎牸寮忎笉瀛樺湪銆"; + MESSAGE[ chinese_traditional ] = "璜嬫眰鐨勫壀璨肩翱鏍煎紡涓嶅瓨鍦ㄣ"; MESSAGE[ arabic ] = "输禹 轻颓葙 轻阖徭 垌 闶孑."; - MESSAGE[ dutch ] = "Gevraagd clipboardformaat is niet beschikbaar."; + MESSAGE[ dutch ] = "Gevraagde clipboardindeling is niet beschikbaar."; MESSAGE[ chinese_simplified ] = "鎵闇瑕佺殑瑁佸壀鏉挎牸寮忎笉瀛樺湪銆"; MESSAGE[ greek ] = " 骁麸屙 祜聆 麸 瘃彘耧 溴 暹磲 溟徼蒹殪."; - MESSAGE[ korean ] = "鞖旍箔霅 韥措氤措摐 靹滌嫕鞚 臧電ロ晿歆 鞎婌姷雼堧嫟."; + MESSAGE[ korean ] = "鞖旍箔頃 韥措氤措摐 靹滌嫕鞚 靷毄頃 靾 鞐嗢姷雼堧嫟."; MESSAGE[ turkish ] = "輘tenen pano format mevcut de餴l."; MESSAGE[ language_user1 ] = " "; MESSAGE[ catalan ] = "El format desitjat del porta-retalls no est disponible."; @@ -235,25 +235,25 @@ QueryBox MSG_UPDATE_NEW_GLOS_FMT MESSAGE [ italian ] = "Il formato dell'area vecchio.\n necessario convertirlo per poter\nsalvare le modifiche apportate\nVolete convertirlo?" ; MESSAGE [ portuguese_brazilian ] = "O formato de arquivo da regiao est? desatualizado.\nDeve ser convertido para que se possa gravar modifica??s.\nDeseja convert?-lo?" ; MESSAGE [ portuguese ] = "O formato do ficheiro est desactualizado.\nDeve ser convertido para que se possam\n guardar as respectivas altera珲es.\nDeseja convert-lo?" ; - MESSAGE [ finnish ] = "Osion muoto on vanhentunut.\nSe on muunnettava, jotta\nsit voisi muuttaa.\nMuunnetaanko osio nyt?" ; + MESSAGE [ finnish ] = "Osan muoto on vanhentunut.\nOsa on muunnettava, jotta\nmuutokset voisi tallentaa.\nMuunnetaanko osa nyt?" ; MESSAGE [ danish ] = "Omr錮ets filformat er for鎙det.\nDet skal konverteres, for at 鎛dringerne kan gemmes.\nVil du konvertere det?" ; MESSAGE [ french ] = "La section se trouve dans un format p閞im.\nVous ne pourrrez enregistrer aucune modification \n moins de le convertir.\nVoulez-vous proc閐er la conversion sans plus attendre ?" ; MESSAGE [ swedish ] = "Omr錮et har ett gammalt format.\nDet m錽te konverteras f鰎 att\n鋘dringar skall kunna sparas.\nVill du konvertera det?" ; - MESSAGE [ dutch ] = "Het bereik heeft een verouderd formaat.\nHet moet worden geconverteerd om de wijzigingen\nte kunnen opslaan.\nWilt u de conversie nu uitvoeren?" ; - MESSAGE [ spanish ] = "El formato del 醨ea no es actual.\nHay que convertirlo\npara poder guardar las modificaciones.\n緿esea usted convertirlo?" ; + MESSAGE [ dutch ] = "Het bereik heeft een verouderde indeling.\nHet moet worden geconverteerd om de wijzigingen\nte kunnen opslaan.\nWilt u de conversie nu uitvoeren?" ; + MESSAGE [ spanish ] = "El formato de la secci髇 no est actualizado.\nHay que convertirlo\npara poder guardar las modificaciones.\n緿esea convertirlo?" ; MESSAGE [ english_us ] = "The section format is outdated.\nIt needs to be converted so that changes\ncan be saved.\nShould it be converted now?" ; /* ### ACHTUNG: Neuer Text in Resource? Der Bereich liegt in einem alten Format vor.\nEr mu konvertiert werden, um 膎derungen\nspeichern zu k鰊nen.\nSoll er konvertiert werden? : Der Bereich liegt in einem alten Format vor.\nEr mu konvertiert werden, um 巒derungen\nspeichern zu k鱪nen.\nSoll er konvertiert werden? */ Message = "Der Bereich liegt in einem alten Format vor.\nEr muss konvertiert werden, um 膎derungen\nspeichern zu k鰊nen.\nSoll er konvertiert werden?" ; Message[ chinese_simplified ] = "杩欎釜鍖哄煙鍏锋湁鐨勬牸寮忔槸鏃х殑銆俓n瑕佸瓨鐩樻洿鏀瑰氨蹇呴』杩涜鏍煎紡杞崲銆俓n瑕佽浆鎹㈡牸寮忓悧锛"; - Message[ russian ] = "朽玟咫 镳邃耱噔脲 耱囵铎 纛痨囹.\n陪 礤钺躅滂祛 镳孱狃噻钼囹, 蝈 黩钺 祛骓 \n猁腩 耦躔囗栩 桤戾礤龛\n.橡孱狃噻钼囹?"; + Message[ russian ] = "朽玟咫 镳邃耱噔脲 耱囵铎 纛痨囹.\n陪 礤钺躅滂祛 镳孱狃噻钼囹, 黩钺 \n耦躔囗栩 桤戾礤龛\n.橡孱狃噻钼囹?"; Message[ polish ] = "Format obszaru nie jest aktualny.\nObszar musi by skonwertowany, by mo縩a by硂 zapisa zmiany\n. Skonwertowa go?"; Message[ japanese ] = "銇撱伄绡勫洸銇棫鏇稿紡銇亗銈娿伨銇欍俓n澶夋洿銈掍繚瀛樸仚銈嬨伀銇痋n鏇稿紡銈掑鎻涖仚銈嬪繀瑕併亴銇傘倞銇俱仚銆俓n鏇稿紡澶夋彌銇椼伨銇欍亱?"; Message[ chinese_traditional ] = "閫欏嬪崁鍩熺殑鏍煎紡鏄垔鐨勩俓n瑕佸劜瀛樿畩鏇村氨蹇呴爤杞夋彌瀹冩牸寮忋俓n鎮ㄨ杞夋彌瀹冪殑鏍煎紡锛"; Message[ arabic ] = "输禹 轻湄寝 尴磴.\n硖 释骓徨 褪 磴咪 \n洼 轻售眄亚.\n遽 恃硐 释骓徨"; - Message[ dutch ] = "Het bereik heeft een verouderd formaat.\nHet moet worden geconverteerd om de wijzigingen\nte kunnen opslaan.\nWilt u de conversie nu uitvoeren?"; + Message[ dutch ] = "Het bereik heeft een verouderde indeling.\nHet moet worden geconverteerd om de wijzigingen\nte kunnen opslaan.\nWilt u de conversie nu uitvoeren?"; Message[ chinese_simplified ] = "杩欎釜鍖哄煙鍏锋湁鐨勬牸寮忔槸鏃х殑銆俓n瑕佸瓨鐩樻洿鏀瑰氨蹇呴』杩涜鏍煎紡杞崲銆俓n瑕佽浆鎹㈡牸寮忓悧锛"; Message[ greek ] = " 疱耖秣 躔荞麇 箦 贶痫獒 瘃镢屙蒹翦耒 祜聆.\n旭蒺彘 磲 戾翎赳狃暹 汩 磲 暹磲 漉磲艮\n 狃镨揸艴箸 豉 犭脶泾.\n容脲翦 磲 氵礤 戾翎 "; - Message[ korean ] = "鞓侅棴 靹滌嫕鞚 鞓る灅霅 瓴冹瀰雼堧嫟.\n 鞚搓矁鞚 氤頇橅晿鞐暭 氤瓴 靷暛鞚刓n鞝鞛ロ暊 靾 鞛堨姷雼堧嫟.\n 歆旮 氤頇 頃橁矤鞀惦媹旯?"; + Message[ korean ] = "甑棴鞚 靹滌嫕鞚 鞓る灅霅橃棃鞀惦媹雼.\n 鞚搓矁鞚 氤頇橅晿鞐暭 氤瓴 靷暛鞚 鞝鞛ロ暊 靾 鞛堨姷雼堧嫟.\n 歆旮 氤頇橅晿鞁滉矤鞀惦媹旯?"; Message[ turkish ] = "B鰈黰黱 format eski.\nDe餴㱮kliklerin kaydedilebilmesi n\ni鏸n de餴⺶irilmesi gerekiyor.\nFormat de餴⺶irilsin mi?"; Message[ language_user1 ] = " "; Message[ catalan ] = "El format de l'鄏ea no 閟 actual.\nS'ha de convertir\nper poder desar les modificacions.\nVoleu convertir-lo?"; @@ -303,11 +303,11 @@ String STR_PRIVATEGRAPHIC Text [ spanish ] = "Imagen [%PRODUCTNAME Writer]" ; Text [ english_us ] = "Graphics [%PRODUCTNAME Writer]" ; Text[ chinese_simplified ] = "鍥惧舰 [%PRODUCTNAME Writer]"; - Text[ russian ] = "需耋眍 [%PRODUCTNAME Writer]"; + Text[ russian ] = "灭圄梓羼觇 钺牝 [%PRODUCTNAME Writer]"; Text[ polish ] = "Grafika [%PRODUCTNAME Writer]"; Text[ japanese ] = "鍥 [%PRODUCTNAME Writer]"; Text[ greek ] = "民狯殛 [%PRODUCTNAME Writer]"; - Text[ korean ] = "攴鸽灅頂 [%PRODUCTNAME Writer]"; + Text[ korean ] = "攴鸽 [%PRODUCTNAME Writer]"; Text[ chinese_traditional ] = "鍦栧舰 [%PRODUCTNAME Writer]"; Text[ arabic ] = "[%PRODUCTNAME Writer] 延驺鞘"; Text[ turkish ] = "Grafik [%PRODUCTNAME Writer]"; @@ -357,7 +357,7 @@ String STR_DDEFORMAT Text [ spanish ] = "V韓culo DDE" ; Text [ english_us ] = "DDE link" ; Text[ chinese_simplified ] = "DDE 閾炬帴"; - Text[ russian ] = "砚琰 DDE"; + Text[ russian ] = "砚琰 镱 DDE"; Text[ polish ] = "９cza DDE "; Text[ japanese ] = "DDE 銉兂銈"; Text[ chinese_traditional ] = "DDE 鎹峰緫"; @@ -384,3 +384,7 @@ String STR_SW_TEAM_NAMES + + + + diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx index 4ba383d3bc1e..4ae43b65146f 100644 --- a/sw/source/ui/dochdl/gloshdl.cxx +++ b/sw/source/ui/dochdl/gloshdl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: gloshdl.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: jp $ $Date: 2002-02-01 12:44:34 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -941,7 +941,8 @@ SwGlossaryHdl::SwGlossaryHdl(SfxViewFrame* pVwFrm, SwWrtShell *pSh) pWrtShell( pSh ), pCurGrp( 0 ), aCurGrp( rStatGlossaries.GetDefName() ) -{} +{ +} SwGlossaryHdl::~SwGlossaryHdl() @@ -988,13 +989,17 @@ BOOL SwGlossaryHdl::Rename(const String& rOldShort, const String& rNewShortName, BOOL SwGlossaryHdl::IsReadOnly( const String* pGrpNm ) const { - SwTextBlocks *pGlossary = pGrpNm ? rStatGlossaries.GetGroupDoc( *pGrpNm ) - : pCurGrp - ? pCurGrp - : rStatGlossaries.GetGroupDoc(aCurGrp); + SwTextBlocks *pGlossary = 0; + + if (pGrpNm) + pGlossary = rStatGlossaries.GetGroupDoc( *pGrpNm ); + else if (pCurGrp) + pGlossary = pCurGrp; + else + pGlossary = rStatGlossaries.GetGroupDoc(aCurGrp); BOOL bRet = pGlossary ? pGlossary->IsReadOnly() : TRUE; - if( !pCurGrp ) + if( pGrpNm || !pCurGrp ) delete pGlossary; return bRet; } diff --git a/sw/source/ui/dochdl/selglos.src b/sw/source/ui/dochdl/selglos.src index 5e45f1005731..9574782e2b0e 100644 --- a/sw/source/ui/dochdl/selglos.src +++ b/sw/source/ui/dochdl/selglos.src @@ -2,9 +2,9 @@ * * $RCSfile: selglos.src,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: kz $ $Date: 2001-08-29 09:24:50 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,12 +78,12 @@ ModalDialog DLG_SEL_GLOS Text [ italian ] = "Inserisci testo automatico" ; Text [ portuguese_brazilian ] = "Inserir Texto Autom?tico" ; Text [ portuguese ] = "Inserir AutoTexto" ; - Text [ finnish ] = "Lis?? automaattinen teksti" ; + Text [ finnish ] = "Lis滗 automaattinen teksti" ; Text [ danish ] = "Inds鎡 AutoTekst" ; - Text [ french ] = "Ins閞er AutoTexte" ; + Text [ french ] = "Ins閞er un AutoTexte" ; Text [ swedish ] = "Infoga AutoText" ; Text [ dutch ] = "AutoTekst invoegen" ; - Text [ spanish ] = "Insertar AutoTexto" ; + Text [ spanish ] = "Insertar Texto autom醫ico" ; Text [ english_us ] = "Insert AutoText" ; Moveable = TRUE ; OKButton BT_OK @@ -116,24 +116,25 @@ ModalDialog DLG_SEL_GLOS Text [ italian ] = "Testo automatico per la sigla " ; Text [ portuguese_brazilian ] = "Entadas para Abrevia??s " ; Text [ portuguese ] = "AutoTexto para abreviatura" ; - Text [ finnish ] = "Automaattiset tekstit pikavalinnalle " ; - Text [ danish ] = "AutoTekst til genvej " ; + Text [ finnish ] = "Pikavalikoiden automaattiset tekstit " ; + Text [ danish ] = "AutoTekst til forkortelse " ; Text [ french ] = "AutoTextes pour raccourci " ; Text [ swedish ] = "AutoText till genv鋑en " ; - Text [ dutch ] = "AutoTekst voor afkortingen " ; - Text [ spanish ] = "AutoTexto para abreviatura " ; + Text [ dutch ] = "AutoTekst voor afkortingen" ; + Text [ spanish ] = "Texto autom醫ico para la abreviatura " ; Text [ english_us ] = "AutoTexts for shortcut " ; Text[ chinese_simplified ] = "鑷姩鍥炬枃闆嗙殑缂╁啓 "; Text[ russian ] = "棱蝾蝈犟 潆 耦牮帙屙"; Text[ polish ] = "Autotekst skr髏u"; - Text[ japanese ] = "锝硷疆锝帮緞锝讹蒋锞勫叆鍔涙敮鎻 "; + Text[ japanese ] = "銈枫儳銉笺儓銈儍銉堝叆鍔涙敮鎻 "; Text[ chinese_traditional ] = "鑷嫊鍦栨枃闆嗙殑绺 "; Text[ arabic ] = "湔 梳耷祈 後俏收茄 "; Text[ greek ] = "刘麸叔哽屙 汩 狁鏖贶"; - Text[ korean ] = "鞛愲彊韰嶌姢韸 氚旊臧旮 "; + Text[ korean ] = "鞛愲彊 韰嶌姢韸 氚旊 臧旮 "; Text[ turkish ] = "Otomatik metin k齭altmas "; Text[ language_user1 ] = " "; - Text[ catalan ] = "AutoTexto para abreviatura "; + Text[ catalan ] = "AutoText per nom curt "; + Text[ thai ] = "喔傕箟喔竸喔о覆喔∴腑喔编笗喙傕笝喔∴副喔曕复喔赋喔福喔编笟喙喔涏箛喔權笚喔侧竾喔ム副喔 "; }; ListBox LB_GLOS { @@ -144,16 +145,17 @@ ModalDialog DLG_SEL_GLOS AutoHScroll = TRUE ; }; Text[ chinese_simplified ] = "鎻掑叆鑷姩鍥炬枃闆"; - Text[ russian ] = "埋蜞怅 噔蝾蝈犟蜞"; + Text[ russian ] = "埋蜞忤螯 噔蝾蝈犟"; Text[ polish ] = "Wstaw autotekst"; Text[ japanese ] = "鍏ュ姏鏀彺銇尶鍏"; Text[ chinese_traditional ] = "鎻掑叆鑷嫊鍦栨枃闆"; Text[ arabic ] = "畔亚 湔 梳耷祈"; Text[ greek ] = "旭矬柁赙 刘麸叔殪蓓秕"; - Text[ korean ] = "鞛愲彊韰嶌姢韸 靷届瀰"; + Text[ korean ] = "鞛愲彊 韰嶌姢韸 靷届瀰"; Text[ turkish ] = "Otomatik metin ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar AutoTexto"; + Text[ catalan ] = "Insereix AutoText"; + Text[ thai ] = "喙佮笚喔｀竵喔傕箟喔竸喔о覆喔∴腑喔编笗喙傕笝喔∴副喔曕复"; }; @@ -164,3 +166,13 @@ ModalDialog DLG_SEL_GLOS + + + + + + + + + + diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx index 5b07df8f3c26..900e1b5c7840 100644 --- a/sw/source/ui/dochdl/swdtflvr.cxx +++ b/sw/source/ui/dochdl/swdtflvr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: swdtflvr.cxx,v $ * - * $Revision: 1.63 $ + * $Revision: 1.64 $ * - * last change: $Author: dvo $ $Date: 2002-12-02 11:42:30 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -364,6 +364,7 @@ public: SwTransferable::SwTransferable( SwWrtShell& rSh ) : pWrtShell( &rSh ), + pCreatorView( 0 ), eBufferType( TRNSFR_NONE ), pClpDocFac( 0 ), pClpGraphic( 0 ), @@ -847,7 +848,9 @@ int SwTransferable::Copy( BOOL bIsCut ) pClpDocFac = new SwDocFac; pWrtShell->Copy( pClpDocFac->GetDoc() ); - AddFormat( SOT_FORMATSTR_ID_SVXB ); + if (! pOrigGrf->GetBitmap().IsEmpty()) + AddFormat( SOT_FORMATSTR_ID_SVXB ); + AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR ); const Graphic &rGrf = pWrtShell->GetGraphic(); if( rGrf.IsSupportedGraphic() ) @@ -1098,18 +1101,28 @@ static inline Reference < XTransferable > * lcl_getTransferPointer ( Reference < BOOL SwTransferable::IsPaste( const SwWrtShell& rSh, const TransferableDataHelper& rData ) { - ULONG nFormat; - Reference<XTransferable> xTransferable( rData.GetXTransferable() ); - USHORT nEventAction, - nDestination = SwTransferable::GetSotDestination( rSh ), - nSourceOptions = + // Check the common case first: We can always paste our own data! + // #106503#: If _only_ the internal format can be pasted, this check will + // yield 'true', while the one below would give a (wrong) result 'false'. + bool bIsPaste = ( SW_MOD()->pClipboard != NULL ); + + // if it's not our own data, we need to have a closer look: + if( ! bIsPaste ) + { + // determine the proper paste action, and return true if we find one + Reference<XTransferable> xTransferable( rData.GetXTransferable() ); + USHORT nDestination = SwTransferable::GetSotDestination( rSh ); + USHORT nSourceOptions = (( EXCHG_DEST_DOC_TEXTFRAME == nDestination || EXCHG_DEST_SWDOC_FREE_AREA == nDestination || EXCHG_DEST_DOC_TEXTFRAME_WEB == nDestination || EXCHG_DEST_SWDOC_FREE_AREA_WEB == nDestination ) ? EXCHG_IN_ACTION_COPY - : EXCHG_IN_ACTION_MOVE), - nAction = SotExchange::GetExchangeAction( + : EXCHG_IN_ACTION_MOVE); + + ULONG nFormat; // output param for GetExchangeAction + USHORT nEventAction; // output param for GetExchangeAction + USHORT nAction = SotExchange::GetExchangeAction( rData.GetDataFlavorExVector(), nDestination, nSourceOptions, /* ?? */ @@ -1117,7 +1130,11 @@ BOOL SwTransferable::IsPaste( const SwWrtShell& rSh, nFormat, nEventAction, 0, lcl_getTransferPointer ( xTransferable ) ); - return EXCHG_INOUT_ACTION_NONE != nAction; + // if we find a suitable action, we can paste! + bIsPaste = (EXCHG_INOUT_ACTION_NONE != nAction); + } + + return bIsPaste; } // ----------------------------------------------------------------------- @@ -2648,14 +2665,13 @@ ASSERT( !&rFileName, "how do we read today .URL - Files?" ); // ----------------------------------------------------------------------- -/* */ - BOOL SwTransferable::IsPasteSpecial( const SwWrtShell& rWrtShell, const TransferableDataHelper& rData ) { - return rData.GetXTransferable().is() && - 1 < rData.GetTransferable()->getTransferDataFlavors().getLength() && - IsPaste( rWrtShell, rData ); + // we can paste-special if there's an entry in the paste-special-format list + SvxClipboardFmtItem aClipboardFmtItem(0); + FillClipFmtItem( rWrtShell, rData, aClipboardFmtItem); + return aClipboardFmtItem.Count() > 0; } // ----------------------------------------------------------------------- @@ -2820,7 +2836,7 @@ int SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rData } -void SwTransferable::FillClipFmtItem( SwWrtShell& rSh, +void SwTransferable::FillClipFmtItem( const SwWrtShell& rSh, const TransferableDataHelper& rData, SvxClipboardFmtItem & rToFill ) { @@ -3373,20 +3389,28 @@ int SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt, } // Interfaces for Selection -void SwTransferable::CreateSelection( SwWrtShell& rSh ) +void SwTransferable::CreateSelection( SwWrtShell& rSh, + const ViewShell * _pCreatorView ) { SwModule *pMod = SW_MOD(); SwTransferable* pNew = new SwTransferable( rSh ); + + /* #96392#*/ + pNew->pCreatorView = _pCreatorView; + ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRef( pNew ); pMod->pXSelection = pNew; pNew->CopyToSelection( rSh.GetWin() ); } -void SwTransferable::ClearSelection( SwWrtShell& rSh ) +void SwTransferable::ClearSelection( SwWrtShell& rSh, + const ViewShell * _pCreatorView) { SwModule *pMod = SW_MOD(); - if( pMod->pXSelection && pMod->pXSelection->pWrtShell == &rSh ) + if( pMod->pXSelection && pMod->pXSelection->pWrtShell == &rSh && + /* #96392# */ + pMod->pXSelection->pCreatorView == _pCreatorView ) { TransferableHelper::ClearSelection( rSh.GetWin() ); } diff --git a/sw/source/ui/docvw/access.src b/sw/source/ui/docvw/access.src index e0848a87baaa..3d4f9f56f3a8 100644 --- a/sw/source/ui/docvw/access.src +++ b/sw/source/ui/docvw/access.src @@ -2,9 +2,9 @@ * * $RCSfile: access.src,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: obo $ $Date: 2002-09-19 08:44:17 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -183,7 +183,7 @@ String STR_ACCESS_HEADING_NAME Text[ polish ] = "Heading $(ARG1)"; Text[ portuguese_brazilian ] = "Heading $(ARG1)"; Text[ japanese ] = "瑕嬪嚭銇 $(ARG1)"; - Text[ korean ] = "響滌牅 $(ARG1)"; + Text[ korean ] = "鞝滊 $(ARG1)"; Text[ chinese_simplified ] = "澶ф爣棰 $(ARG1)"; Text[ chinese_traditional ] = "澶ф椤 $(ARG1)"; Text[ turkish ] = "Heading $(ARG1)"; @@ -209,7 +209,7 @@ String STR_ACCESS_HEADING_DESC Text[ polish ] = "Heading: $(ARG1)"; Text[ portuguese_brazilian ] = "Heading: $(ARG1)"; Text[ japanese ] = "瑕嬪嚭銇: $(ARG1)"; - Text[ korean ] = "響滌牅: $(ARG1)"; + Text[ korean ] = "鞝滊: $(ARG1)"; Text[ chinese_simplified ] = "澶ф爣棰橈細$(ARG1)"; Text[ chinese_traditional ] = "澶ф椤岋細$(ARG1)"; Text[ turkish ] = "Heading: $(ARG1)"; @@ -235,7 +235,7 @@ String STR_ACCESS_HEADING_WITH_NUM_DESC Text[ polish ] = "Heading number $(ARG2): $(ARG1)"; Text[ portuguese_brazilian ] = "Heading number $(ARG2): $(ARG1)"; Text[ japanese ] = "瑕嬪嚭銇楃暘鍙 $(ARG2): $(ARG1)"; - Text[ korean ] = "響滌牅 氩堩樃 $(ARG2): $(ARG1)"; + Text[ korean ] = "鞝滊 氩堩樃 $(ARG2): $(ARG1)"; Text[ chinese_simplified ] = "澶ф爣棰樼殑缂栧彿 $(ARG2): $(ARG1)"; Text[ chinese_traditional ] = "澶ф椤岀法铏 $(ARG2): $(ARG1)"; Text[ turkish ] = "Heading number $(ARG2): $(ARG1)"; @@ -409,7 +409,7 @@ String STR_ACCESS_ENDNOTE_NAME Text[ greek ] = "Endnote $(ARG1)"; Text[ dutch ] = "Endnote $(ARG1)"; Text[ french ] = "Note de fin $(ARG1)"; - Text[ spanish ] = "Nota al final $(ARG1)"; + Text[ spanish ] = "Nota final $(ARG1)"; Text[ finnish ] = "Endnote $(ARG1)"; Text[ italian ] = "Nota di chiusura $(ARG1)"; Text[ danish ] = "Endnote $(ARG1)"; @@ -435,7 +435,7 @@ String STR_ACCESS_ENDNOTE_DESC Text[ greek ] = "Endnote $(ARG1)"; Text[ dutch ] = "Endnote $(ARG1)"; Text[ french ] = "Note de fin $(ARG1)"; - Text[ spanish ] = "Nota al final $(ARG1)"; + Text[ spanish ] = "Nota final $(ARG1)"; Text[ finnish ] = "Endnote $(ARG1)"; Text[ italian ] = "Nota di chiusura $(ARG1)"; Text[ danish ] = "Endnote $(ARG1)"; @@ -451,84 +451,6 @@ String STR_ACCESS_ENDNOTE_DESC Text[ catalan ] = "Endnote $(ARG1)"; Text[ thai ] = "Endnote $(ARG1)"; }; -String STR_ACCESS_REPLACEMENT_POSTIT -{ - Text = "[Notiz: $(ARG1)]" ; - Text [ english ] = "[Note: $(ARG1)]" ; - Text[ english_us ] = "[Note: $(ARG1)]"; - Text[ portuguese ] = "[Annotation]"; - Text[ russian ] = "[Annotation]"; - Text[ greek ] = "[Annotation]"; - Text[ dutch ] = "[Annotation]"; - Text[ french ] = "[Note : $(ARG1)]"; - Text[ spanish ] = "[Nota: $(ARG1)]"; - Text[ finnish ] = "[Annotation]"; - Text[ italian ] = "[Nota: $(ARG1)]"; - Text[ danish ] = "[Annotation]"; - Text[ swedish ] = "[Anteckning: $(ARG1)]"; - Text[ polish ] = "[Annotation]"; - Text[ portuguese_brazilian ] = "[Annotation]"; - Text[ japanese ] = "[銈炽儭銉炽儓: $(ARG1)]"; - Text[ korean ] = "[欤检劃: $(ARG1)]"; - Text[ chinese_simplified ] = "[澶囨敞锛$(ARG1)]"; - Text[ chinese_traditional ] = "[鍌欒ɑ锛$(ARG1)]"; - Text[ turkish ] = "[Annotation]"; - Text[ arabic ] = "[Annotation]"; - Text[ catalan ] = "[Annotation]"; - Text[ thai ] = "[Annotation]"; -}; -String STR_ACCESS_REPLACEMENT_FRAME -{ - Text = "[Rahmen: $(ARG1)]" ; - Text [ english ] = "[Frame: $(ARG1)]" ; - Text[ english_us ] = "[Frame: $(ARG1)]"; - Text[ portuguese ] = "[Rahmen: $(ARG1)]"; - Text[ russian ] = "[Rahmen: $(ARG1)]"; - Text[ greek ] = "[Rahmen: $(ARG1)]"; - Text[ dutch ] = "[Rahmen: $(ARG1)]"; - Text[ french ] = "[Cadre : $(ARG1)]"; - Text[ spanish ] = "[Marcos: $(ARG1)]"; - Text[ finnish ] = "[Rahmen: $(ARG1)]"; - Text[ italian ] = "[Cornici: $(ARG1)]"; - Text[ danish ] = "[Rahmen: $(ARG1)]"; - Text[ swedish ] = "[Ram: $(ARG1)]"; - Text[ polish ] = "[Rahmen: $(ARG1)]"; - Text[ portuguese_brazilian ] = "[Rahmen: $(ARG1)]"; - Text[ japanese ] = "[鏋: $(ARG1)]"; - Text[ korean ] = "[頂勲爤鞛: $(ARG1)]"; - Text[ chinese_simplified ] = "[璁锛$(ARG1)]"; - Text[ chinese_traditional ] = "[瑷婃锛$(ARG1)]"; - Text[ turkish ] = "[Rahmen: $(ARG1)]"; - Text[ arabic ] = "[Rahmen: $(ARG1)]"; - Text[ catalan ] = "[Rahmen: $(ARG1)]"; - Text[ thai ] = "[Frame]"; -}; -String STR_ACCESS_REPLACEMENT_BULLET_GRAPHICS -{ - Text = "[Aufz鋒lungszeichen]" ; - Text [ english ] = "[Bullet]" ; - Text[ english_us ] = "[Bullets]"; - Text[ portuguese ] = "[Aufz鋒lungszeichen]"; - Text[ russian ] = "[Aufz?hlungszeichen]"; - Text[ greek ] = "[Aufz?hlungszeichen]"; - Text[ dutch ] = "[Aufz鋒lungszeichen]"; - Text[ french ] = "[Puces]"; - Text[ spanish ] = "[Caracteres de las numeraciones]"; - Text[ finnish ] = "[Aufz鋒lungszeichen]"; - Text[ italian ] = "[Carattere per elenchi puntati]"; - Text[ danish ] = "[Aufz鋒lungszeichen]"; - Text[ swedish ] = "[Punktuppst鋖lningstecken]"; - Text[ polish ] = "[Aufz鋒lungszeichen]"; - Text[ portuguese_brazilian ] = "[Aufz鋒lungszeichen]"; - Text[ japanese ] = "[绠囨潯鏇搞亶銈枫兂銉溿儷]"; - Text[ korean ] = "[旮毹鸽Μ旮绊樃]"; - Text[ chinese_simplified ] = "[椤圭洰绗﹀彿]"; - Text[ chinese_traditional ] = "[闋呯洰绗﹁櫉]"; - Text[ turkish ] = "[Aufz鋒lungszeichen]"; - Text[ arabic ] = "[Aufz?hlungszeichen]"; - Text[ catalan ] = "[Aufz鋒lungszeichen]"; - Text[ thai ] = "[Aufz盲hlungszeichen]"; -}; String STR_ACCESS_TABLE_DESC { Text = "$(ARG1) auf Seite $(ARG2)" ; @@ -547,7 +469,7 @@ String STR_ACCESS_TABLE_DESC Text[ polish ] = "$(ARG1) on page $(ARG2)"; Text[ portuguese_brazilian ] = "$(ARG1) on page $(ARG2)"; Text[ japanese ] = "$(ARG2) 銉氥兗銈哥洰銇 $(ARG1)"; - Text[ korean ] = "$(ARG1) 韼橃澊歆 靸侅棎靹 $(ARG2)"; + Text[ korean ] = "$(ARG2) 韼橃澊歆鞚 $(ARG1)"; Text[ chinese_simplified ] = "$(ARG1) 鍦ㄩ〉 $(ARG2) 涓"; Text[ chinese_traditional ] = "$(ARG1) 鍦ㄩ爜 $(ARG2) 涓"; Text[ turkish ] = "$(ARG1) on page $(ARG2)"; @@ -571,15 +493,12 @@ String STR_ACCESS_PAGE_NAME Text[ danish ] = "Page $(ARG1)"; Text[ swedish ] = "Sida $(ARG1)"; Text[ polish ] = "Page $(ARG1)"; - Text[ portuguese_brazilian ] = "Page $(ARG1)"; Text[ japanese ] = "$(ARG1) 銉氥兗銈"; - Text[ korean ] = "韼橃澊歆 $(ARG1)"; + Text[ korean ] = "$(ARG1) 韼橃澊歆"; Text[ chinese_simplified ] = "椤 $(ARG1)"; Text[ chinese_traditional ] = "闋 $(ARG1)"; Text[ turkish ] = "Page $(ARG1)"; Text[ arabic ] = "Page $(ARG1)"; - Text[ catalan ] = "Page $(ARG1)"; - Text[ thai ] = "Page $(ARG1)"; }; String STR_ACCESS_PAGE_DESC { @@ -597,13 +516,12 @@ String STR_ACCESS_PAGE_DESC Text[ danish ] = "Page: $(ARG1)"; Text[ swedish ] = "Sida: $(ARG1)"; Text[ polish ] = "Page: $(ARG1)"; - Text[ portuguese_brazilian ] = "Page: $(ARG1)"; Text[ japanese ] = "銉氥兗銈: $(ARG1)"; Text[ korean ] = "韼橃澊歆: $(ARG1)"; Text[ chinese_simplified ] = "椤碉細$(ARG1)"; Text[ chinese_traditional ] = "闋侊細$(ARG1)"; Text[ turkish ] = "Page: $(ARG1)"; Text[ arabic ] = "Page: $(ARG1)"; - Text[ catalan ] = "Page: $(ARG1)"; - Text[ thai ] = "Page: $(ARG1)"; }; + + diff --git a/sw/source/ui/docvw/docvw.src b/sw/source/ui/docvw/docvw.src index 18a284328352..af20ca144edf 100644 --- a/sw/source/ui/docvw/docvw.src +++ b/sw/source/ui/docvw/docvw.src @@ -2,9 +2,9 @@ * * $RCSfile: docvw.src,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: kz $ $Date: 2002-12-05 10:28:11 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -212,7 +212,7 @@ Menu MN_READONLY_POPUP Text[ dutch ] = "~Opnieuw laden"; Text[ chinese_simplified ] = "閲嶆柊瑁呭叆(~L)"; Text[ greek ] = "硼醻磲鳇耵"; - Text[ korean ] = "雼れ嫓 搿滊摐!(~L)"; + Text[ korean ] = "雼れ嫓 搿滊摐(~L)"; Text[ turkish ] = "Yeniden y黭le"; Text[ language_user1 ] = " "; Text[ catalan ] = "Torna a ~carregar"; @@ -232,10 +232,10 @@ Menu MN_READONLY_POPUP Text[ french ] = "~Recharger le frame"; Text[ swedish ] = "~Ladda ram p nytt"; Text[ dutch ] = "~Frame opnieuw laden"; - Text[ spanish ] = "~Recargar frame"; + Text[ spanish ] = "~Recargar marco"; Text[ english_us ] = "Reload Frame"; Text[ chinese_simplified ] = "閲嶆柊瑁呭叆妗嗗璞"; - Text[ russian ] = "襄疱玎沭箸栩 疣礻"; + Text[ russian ] = "襄疱玎沭箸栩 麴彘"; Text[ polish ] = "~Za砤duj ponownie ramk"; Text[ japanese ] = "銉曘儸銉笺儬銇啀瑾伩杈笺伩"; Text[ chinese_traditional ] = "閲嶆柊杓夊叆瑷婃"; @@ -274,7 +274,7 @@ Menu MN_READONLY_POPUP Text[ dutch ] = "~HTML-brontekst"; Text[ chinese_simplified ] = "HT~ML 婧愭枃鏈"; Text[ greek ] = "叔哽屙 瘃镙脲躞珧 HTM~L"; - Text[ korean ] = "HT~ML 靻岇姢韰嶌姢韸"; + Text[ korean ] = "HT~ML 鞗愲掣"; Text[ turkish ] = "HTM~L kaynak kodu"; Text[ language_user1 ] = " "; Text[ catalan ] = "Font HT~ML"; @@ -400,7 +400,7 @@ Menu MN_READONLY_POPUP Text[ dutch ] = "Afbeelding ops~laan..."; Text[ chinese_simplified ] = "瀛樼洏鍥惧舰..."; Text[ greek ] = "琉镨揸艴箸 ~泷狯殛稞..."; - Text[ korean ] = "攴鸽灅頂 鞝鞛..."; + Text[ korean ] = "攴鸽 鞝鞛..."; Text[ turkish ] = "Grafi餴 kaydet..."; Text[ language_user1 ] = " "; Text[ catalan ] = "Desa ~imatge..."; @@ -442,7 +442,7 @@ Menu MN_READONLY_POPUP Text[ dutch ] = "Als koppeling"; Text[ chinese_simplified ] = "褰撲綔閾炬帴"; Text[ greek ] = "衮 簖礓弩"; - Text[ korean ] = "毵來伂搿滌劀"; + Text[ korean ] = "毵來伂搿"; Text[ turkish ] = "Ba餷ant olarak"; Text[ catalan ] = "Com enlla"; Text[ finnish ] = "Linkkin"; @@ -500,7 +500,7 @@ Menu MN_READONLY_POPUP Text[ dutch ] = "Afbeelding t~oevoegen"; Text[ chinese_simplified ] = "鏂板鍥惧舰"; Text[ greek ] = "旭矬~柁赙 泷狯殛"; - Text[ korean ] = "攴鸽灅頂 於旉皜"; + Text[ korean ] = "攴鸽 於旉皜"; Text[ turkish ] = "Grafik ekle"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Afegeix imatge"; @@ -572,7 +572,7 @@ Menu MN_READONLY_POPUP Text[ dutch ] = "Als koppeling"; Text[ chinese_simplified ] = "褰撲綔閾炬帴"; Text[ greek ] = "衮 簖礓弩"; - Text[ korean ] = "毵來伂搿滌劀"; + Text[ korean ] = "毵來伂搿"; Text[ turkish ] = "Ba餷ant olarak"; Text[ language_user1 ] = " "; Text[ catalan ] = "Com enlla"; @@ -697,7 +697,7 @@ Menu MN_READONLY_POPUP Text[ dutch ] = "Afbeelding ko~pi雛en"; Text[ chinese_simplified ] = "澶嶅埗鍥惧舰(~G)"; Text[ greek ] = "另糸泷狯 泷狯閪掰"; - Text[ korean ] = "攴鸽灅頂 氤奠偓(~G)"; + Text[ korean ] = "攴鸽 氤奠偓(~G)"; Text[ turkish ] = "Grafi餴 kopyala"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Copia imatge"; @@ -729,7 +729,7 @@ Menu MN_READONLY_POPUP Text[ dutch ] = "A~fbeeldingen laden"; Text[ chinese_simplified ] = "瑁呭叆鍥惧舰"; Text[ greek ] = "贮~耵 泷狯殛"; - Text[ korean ] = "攴鸽灅頂 搿滊摐"; + Text[ korean ] = "攴鸽 搿滊摐"; Text[ turkish ] = "Grafikleri y黭le"; Text[ language_user1 ] = " "; Text[ catalan ] = "Carrega ~imatges"; @@ -760,7 +760,7 @@ Menu MN_READONLY_POPUP Text[ dutch ] = "~Afbeeldingen uitschakelen"; Text[ chinese_simplified ] = "闅愬叆鍥惧舰"; Text[ greek ] = "~琉屙羼泔痫哏箸 泷狯殛"; - Text[ korean ] = "攴鸽灅頂 鞝侅毄 頃挫牅"; + Text[ korean ] = "攴鸽 頃挫牅"; Text[ turkish ] = "Grafikleri kapat"; Text[ language_user1 ] = " "; Text[ catalan ] = "Desactiva ~imatges"; @@ -811,18 +811,18 @@ Menu MN_READONLY_POPUP Text[ russian ] = "Leave Full-Screen Mode"; Text[ greek ] = "Leave Full-Screen Mode"; Text[ dutch ] = "Leave Full-Screen Mode"; - Text[ french ] = "Leave Full-Screen Mode"; - Text[ spanish ] = "Leave Full-Screen Mode"; + Text[ french ] = "Quitter le mode Plein 閏ran"; + Text[ spanish ] = "Abandonar el modo Pantalla completa"; Text[ finnish ] = "Leave Full-Screen Mode"; - Text[ italian ] = "Leave Full-Screen Mode"; + Text[ italian ] = "Ripristina vista schermo standard"; Text[ danish ] = "Leave Full-Screen Mode"; - Text[ swedish ] = "Leave Full-Screen Mode"; + Text[ swedish ] = "L鋗na helsk鋜msl鋑e"; Text[ polish ] = "Leave Full-Screen Mode"; Text[ portuguese_brazilian ] = "Leave Full-Screen Mode"; - Text[ japanese ] = "Leave Full-Screen Mode"; + Text[ japanese ] = "鍏ㄧ敾闈€儮銉笺儔銈掍繚鎸"; Text[ korean ] = "鞝勳泊 頇旊┐ 氇摐 毵堨龚"; - Text[ chinese_simplified ] = "Leave Full-Screen Mode"; - Text[ chinese_traditional ] = "Leave Full-Screen Mode"; + Text[ chinese_simplified ] = "绂诲紑鍏ㄥ睆骞曟ā寮"; + Text[ chinese_traditional ] = "闆㈤枊鍏ㄨ灑骞曟ā寮"; Text[ turkish ] = "Leave Full-Screen Mode"; Text[ arabic ] = "Leave Full-Screen Mode"; Text[ catalan ] = "Leave Full-Screen Mode"; @@ -852,7 +852,7 @@ String STR_EXPORT_GRAFIK_TITLE Text[ dutch ] = "Afbeelding exporteren"; Text[ chinese_simplified ] = "杈撳嚭鍥惧舰"; Text[ greek ] = "蓬徙 泷狯殛"; - Text[ korean ] = "攴鸽灅頂 雮措炒雮搓赴"; + Text[ korean ] = "攴鸽 雮措炒雮搓赴"; Text[ turkish ] = "Grafik ver"; Text[ language_user1 ] = " "; Text[ catalan ] = "Exporta imatge"; @@ -902,7 +902,7 @@ String STR_CHAIN_NOT_EMPTY Text [ french ] = "Le cadre cible n'est pas vide." ; Text [ dutch ] = "Het doelkader is niet leeg." ; Text[ chinese_simplified ] = "鐩爣妗嗕笉鏄┖鐨勩"; - Text[ russian ] = "皱脲忄 疣礻 礤 怆弪 矬耱铋."; + Text[ russian ] = "朽礻 磬珥圜屙 礤 怆弪 矬耱铋."; Text[ polish ] = "Ramka docelowa nie jest pusta."; Text[ japanese ] = "鐩銇儐銈偣銉堟灎銇岀┖銇с伅銇傘倞銇俱仜銈撱"; Text[ chinese_traditional ] = "鐩鏂瑰涓嶆槸绌虹殑銆"; @@ -910,7 +910,7 @@ String STR_CHAIN_NOT_EMPTY Text[ dutch ] = "Het doelkader is niet leeg."; Text[ chinese_simplified ] = "鐩爣妗嗕笉鏄┖鐨勩"; Text[ greek ] = "燥 痣徇箝 瘃镲耖箪稞 溴 暹磲 赍睃."; - Text[ korean ] = "氇╉憸 頂勲爤鞛勳澊 牍勳柎鞛堨 鞎婌姷雼堧嫟."; + Text[ korean ] = "雽靸 頂勲爤鞛勳澊 牍勳柎鞛堨 鞎婌姷雼堧嫟."; Text[ turkish ] = "Hedef 鏴r鏴ve bo de餴l."; Text[ language_user1 ] = " "; Text[ catalan ] = "El marc de dest est buit."; @@ -931,7 +931,7 @@ String STR_CHAIN_IS_IN_CHAIN Text [ french ] = "Le cadre cible est d閖 li." ; Text [ dutch ] = "Het doelkader is reeds gekoppeld." ; Text[ chinese_simplified ] = "宸茬粡閾炬帴鐩爣妗嗐"; - Text[ russian ] = "皱脲忄 疣礻 箧 疋玎磬."; + Text[ russian ] = "朽礻 磬珥圜屙 箧 桁邋 疋琰."; Text[ polish ] = "Ramka docelowa jest ju po彻czona."; Text[ japanese ] = "鐩銇儐銈偣銉堟灎銇仚銇с伀閫ｇ祼銇曘倢銇︺亜銇俱仚銆"; Text[ chinese_traditional ] = "宸茬稉閫ｇ祼鐩鏂瑰銆"; @@ -939,7 +939,7 @@ String STR_CHAIN_IS_IN_CHAIN Text[ dutch ] = "Het doelkader is reeds gekoppeld."; Text[ chinese_simplified ] = "宸茬粡閾炬帴鐩爣妗嗐"; Text[ greek ] = "燥 痣徇箝 瘃镲耖箪稞 暹磲 掬 篚礓邃屐蓓."; - Text[ korean ] = "氇╉憸 頂勲爤鞛勳潃 鞚措 鞐瓣舶霅橃柎 鞛堨姷雼堧嫟."; + Text[ korean ] = "雽靸 頂勲爤鞛勳潃 鞚措 鞐瓣舶霅橃柎 鞛堨姷雼堧嫟."; Text[ turkish ] = "Hedef 鏴r鏴ve ba餷ant齭 olu⺶urulmu durumda."; Text[ language_user1 ] = " "; Text[ catalan ] = "El marc de dest ja est enlla鏰t."; @@ -960,7 +960,7 @@ String STR_CHAIN_WRONG_AREA Text [ french ] = "Le cadre-cible se trouve dans une section ne pouvant pas faire l'objet d'un lien." ; Text [ dutch ] = "Het bronkader staat in een bereik waarin geen koppeling mogelijk is." ; Text[ chinese_simplified ] = "鐩爣妗嗗浜庝竴涓棤娉曢摼鎺ョ殑鍖哄煙銆"; - Text[ russian ] = "皱脲忄 疣礻 磬躅滂蝰 钺豚耱, 疋琰 觐蝾痤 礤忸珈铈磬."; + Text[ russian ] = "朽礻 磬珥圜屙 磬躅滂蝰 钺豚耱, 疋琰 觐蝾痤 铐 礤 祛驽 磬躅滂螯."; Text[ polish ] = "Ramka docelowa znajduje si w obszarze, w kt髍ym niemo縧iwe jest po彻czenie."; Text[ japanese ] = "鐩銇儐銈偣銉堟灎銇ｇ祼銇с亶銇亜绡勫洸銇亗銈娿伨銇欍"; Text[ chinese_traditional ] = "鐩瑷婃铏曟柤涓鍊嬬劇娉曡▕妗嗙殑鍗鍩熴"; @@ -968,7 +968,7 @@ String STR_CHAIN_WRONG_AREA Text[ dutch ] = "Het bronkader staat in een bereik waarin geen koppeling mogelijk is."; Text[ chinese_simplified ] = "鐩爣妗嗗浜庝竴涓棤娉曢摼鎺ョ殑鍖哄煙銆"; Text[ greek ] = "燥 痣徇箝 瘃镲耖箪稞 怦唧赍翎 箦 扉 疱耖秣 篝珥 镳镞 暹磲 徜狒镯 磲 溏扉秕胥玷暹 爝 簖礓弩."; - Text[ korean ] = "氇╉憸 頂勲爤鞛勳潃銆鞐瓣舶鞚 攵堦皜電ロ暅銆鞓侅棴鞐 鞛堨姷雼堧嫟."; + Text[ korean ] = "雽靸 頂勲爤鞛勳潃 鞐瓣舶鞚 攵堦皜電ロ暅 鞓侅棴鞐 鞛堨姷雼堧嫟."; Text[ turkish ] = "Hedef 鏴r鏴ve ba餷ant olu⺶urulamayacak bir alanda bulunuyor."; Text[ language_user1 ] = " "; Text[ catalan ] = "El marc dest es troba en una 鄏ea on els enlla鏾s no s髇 possibles."; @@ -997,7 +997,7 @@ String STR_CHAIN_NOT_FOUND Text[ dutch ] = "Op de huidige positie kan geen doelkader worden gevonden."; Text[ chinese_simplified ] = "鍦ㄥ綋鍓嶇殑浣嶇疆娌℃湁鎵惧埌鐩爣妗嗐"; Text[ greek ] = "腻 暹磲 漉磲酎 磲 怦彖暹 痣徇箝 瘃镲耖箪稞 篝珥 赳蓣秕筢 栎箸."; - Text[ korean ] = "順勳灛鞚 鞙勳箻鞐愳劀 氇╉憸 頂勲爤鞛勳潉銆彀眷潉靾樸鞐嗢姷雼堧嫟."; + Text[ korean ] = "順勳灛鞚 鞙勳箻鞐愳劀 雽靸 頂勲爤鞛勳潉 彀眷潉 靾 鞐嗢姷雼堧嫟."; Text[ turkish ] = "Y黵黵l黭teki konumda hedef 鏴r鏴ve bulunam齳or."; Text[ language_user1 ] = " "; Text[ catalan ] = "A la posici actual no es pot trobar cap marc dest."; @@ -1026,7 +1026,7 @@ String STR_CHAIN_SOURCE_CHAINED Text[ dutch ] = "Het bronkader is reeds basis van een koppeling."; Text[ chinese_simplified ] = "杩欎釜鏉ユ簮妗嗗凡缁忔槸涓涓摼鎺ョ殑鏉ユ簮妗嗐"; Text[ greek ] = "燥 痣徇箝 瘃镙脲躞珧 暹磲 掬 瘃镙脲躞 扉狎 簖礓弩珧."; - Text[ korean ] = "靻岇姢 頂勲爤鞛勳潃 鞚措 鞐瓣舶鞚 靻岇姢鞛呺媹雼."; + Text[ korean ] = "鞚 鞗愲掣 頂勲爤鞛勳潃 鞚措 毵來伂鞚 鞗愲掣鞛呺媹雼."; Text[ turkish ] = "Kaynak 鏴r鏴ve zaten bir ba餷ant zincirinin kayna瘕."; Text[ language_user1 ] = " "; Text[ catalan ] = "El marc d'origen ja 閟 la font d'un enlla."; @@ -1044,10 +1044,10 @@ String STR_CHAIN_SELF Text [ danish ] = "En lukket k鎑e er ikke mulig." ; Text [ italian ] = "Un collegamento chiuso non possibile." ; Text [ spanish ] = "No es posible una secuencia cerrada." ; - Text [ french ] = "Une chaine ferm閑 n'est pas possible." ; + Text [ french ] = "Une cha頽e ferm閑 n'est pas possible." ; Text [ dutch ] = "Een gesloten koppeling is niet mogelijk." ; Text[ chinese_simplified ] = "涓涓皝闂紡鐨勯摼鎺ユ槸涓嶅彲鑳界殑銆"; - Text[ russian ] = "湾忸珈铈磬 玎礻眢蜞 鲥稂."; + Text[ russian ] = "砚琰 礤 祛驽 玎禧赅螯 磬 皴"; Text[ polish ] = "Zamkni阾e 彻cze nie jest mo縧iwe."; Text[ japanese ] = "寰挵銇欍倠閫ｇ祼銇仹銇嶃伨銇涖倱銆"; Text[ chinese_traditional ] = "涓鍊嬪皝闁夊紡鐨勯ｇ祼鏄笉鍙兘鐨勩"; @@ -1055,7 +1055,7 @@ String STR_CHAIN_SELF Text[ dutch ] = "Een gesloten koppeling is niet mogelijk."; Text[ chinese_simplified ] = "涓涓皝闂紡鐨勯摼鎺ユ槸涓嶅彲鑳界殑銆"; Text[ greek ] = "腻 暹磲 漉磲酎 磲 溏扉秕胥玷暹 犭躞咪 痫 觌暹礤."; - Text[ korean ] = "雼瀸 鞐瓣舶鞚 攵堦皜電ロ暕雼堧嫟."; + Text[ korean ] = "雼瀸 毵來伂電 攵堦皜電 頃╇媹雼."; Text[ turkish ] = "Kapal bir zincir olu⺶urulamaz."; Text[ language_user1 ] = " "; Text[ catalan ] = "No 閟 possible una seqncia tancada."; @@ -1101,7 +1101,7 @@ String STR_REDLINE_DELETE Text [ swedish ] = "Raderat" ; Text [ danish ] = "Slettet" ; Text [ italian ] = "Cancellato" ; - Text [ spanish ] = "Eliminado" ; + Text [ spanish ] = "Borrado" ; Text [ french ] = "Supprim" ; Text [ dutch ] = "Gewist" ; Text[ chinese_simplified ] = "宸茬粡鍒犻櫎"; @@ -1131,7 +1131,7 @@ String STR_REDLINE_FORMAT Text [ danish ] = "Formateret" ; Text [ italian ] = "Fomattato" ; Text [ spanish ] = "Formateado" ; - Text [ french ] = "Mis en forme" ; + Text [ french ] = "Format" ; Text [ dutch ] = "Opgemaakt" ; Text[ chinese_simplified ] = "宸茬粡鏍煎紡鍖"; Text[ russian ] = "悟纛痨囹桊钼囗"; @@ -1143,7 +1143,7 @@ String STR_REDLINE_FORMAT Text[ dutch ] = "Opgemaakt"; Text[ chinese_simplified ] = "宸茬粡鏍煎紡鍖"; Text[ greek ] = "田聆镳镩珈蓓"; - Text[ korean ] = "靹滌嫕 鞝侅毄"; + Text[ korean ] = "靻嶌劚"; Text[ turkish ] = "Faormatland"; Text[ catalan ] = "Formatat"; Text[ finnish ] = "Muotoiltu"; @@ -1171,7 +1171,7 @@ String STR_REDLINE_TABLE Text[ dutch ] = "Tabel gewijzigd"; Text[ chinese_simplified ] = "琛ㄦ牸宸茶鏇存敼"; Text[ greek ] = "各秕 氵礤 犭脶爿 篝镯 疬磲赆"; - Text[ korean ] = "響滉皜 氚旊岇棃鞀惦媹雼."; + Text[ korean ] = "響滉皜 氤瓴诫悩鞐堨姷雼堧嫟"; Text[ turkish ] = "Tablo de餴⺶irildi"; Text[ language_user1 ] = " "; Text[ catalan ] = "La taula ha canviat"; @@ -1288,7 +1288,7 @@ InfoBox MSG_READONLY_CONTENT MESSAGE[ dutch ] = "De cursor of de selectie bevindt zich op een schrijfbeveiligde positie.\nDe inhoud kan daarom niet worden gewijzigd."; MESSAGE[ chinese_simplified ] = "杈撳叆鍏夋爣鎴栭変腑鐨勫唴瀹规槸鍙椾繚鎶ょ殑銆俓n鍥犳鏃犳硶鏀瑰啓鍐呭銆"; MESSAGE[ greek ] = "燥 箸燔溟 翮 邈泷狯掾 屦殡镢 怦唧赍翎 箦 爝 瘃矬翎翦觞戾礴 栎箸.\n瞄 狨酎 麸 朦泔 溴 祓锺稞 磲 氵盹蹴 溴牯蒡 镳镩弩滢痫翦 赳镳镳? "; - MESSAGE[ korean ] = "鞊瓣赴 毵堩伂 霕愲姅 靹犿儩鞚 氤错樃霅 鞙勳箻鞐 鞛堨姷雼堧嫟.\n靾橃爼鞚 項堨毄霅橃 鞎婌姷雼堧嫟."; + MESSAGE[ korean ] = "鞊瓣赴 鞝勳毄 霕愲姅 靹犿儩鞚 氤错樃 鞙勳箻鞐 鞛堨溂氙搿 \n氤瓴届潃 項堨毄霅橃 鞎婌姷雼堧嫟."; MESSAGE[ turkish ] = "Salt okunur bir i鏴rik de餴⺶irilemez.\nYap齦an de餴㱮klikler nu nedenle kabul edilmeyecek."; MESSAGE[ language_user1 ] = " "; MESSAGE[ catalan ] = "La marca o selecci es troba en una posici protegida.\nPer aix no es pot acceptar una modificaci."; @@ -1299,3 +1299,8 @@ InfoBox MSG_READONLY_CONTENT + + + + + diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index ae28dff08d56..e666dd4f3cb1 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: edtwin.cxx,v $ * - * $Revision: 1.61 $ + * $Revision: 1.62 $ * - * last change: $Author: os $ $Date: 2002-11-27 09:12:37 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -561,6 +561,9 @@ void SwEditWin::UpdatePointer(const Point &rLPt, USHORT nModifier ) } else { + // dvo: IsObjSelectable() eventually calls SdrView::PickObj, so + // apparently this is used to determine whether this is a + // drawling layer object or not. if ( rSh.IsObjSelectable( rLPt ) ) { if (pSdrView->IsTextEdit()) @@ -580,16 +583,16 @@ void SwEditWin::UpdatePointer(const Point &rLPt, USHORT nModifier ) } else { - eStyle = POINTER_MOVE; - - if (!bNotInSelObj) - { - if (rSh.IsObjSelected() || rSh.IsFrmSelected()) - { - if (rSh.IsSelObjProtected(FLYPROTECT_POS)) - eStyle = POINTER_NOTALLOWED; - } - } + // if we're over a selected object, we show an + // ARROW by default. We only show a MOVE if 1) the + // object is selected, and 2) it may be moved + // (i.e., position is not protected). + bool bMovable = + (!bNotInSelObj) && + (rSh.IsObjSelected() || rSh.IsFrmSelected()) && + (!rSh.IsSelObjProtected(FLYPROTECT_POS)); + + eStyle = bMovable ? POINTER_MOVE : POINTER_ARROW; aActHitType = SDRHIT_OBJECT; } } @@ -598,6 +601,14 @@ void SwEditWin::UpdatePointer(const Point &rLPt, USHORT nModifier ) { if ( rSh.IsFrmSelected() && !bNotInSelObj ) { + // dvo: this branch appears to be dead and should be + // removed in a future version. Reason: The condition + // !bNotInSelObj means that this branch will only be + // executed in the cursor points inside a selected + // object. However, if this is the case, the previous + // if( rSh.IsObjSelectable(rLPt) ) must always be true: + // rLPt is inside a selected object, then obviously + // rLPt is over a selectable object. if (rSh.IsSelObjProtected(FLYPROTECT_SIZE)) eStyle = POINTER_NOTALLOWED; else @@ -1030,6 +1041,7 @@ void SwEditWin::ChangeDrawing( BYTE nDir ) SdrView *pSdrView = rSh.GetDrawView(); const SdrHdlList& rHdlList = pSdrView->GetHdlList(); SdrHdl* pHdl = rHdlList.GetFocusHdl(); + rSh.StartAllAction(); if(0L == pHdl) { // now move the selected draw objects @@ -1087,6 +1099,7 @@ void SwEditWin::ChangeDrawing( BYTE nDir ) } } } + rSh.EndAllAction(); } } @@ -1158,7 +1171,7 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt) else if( KEY_LEFT == nKey ) nKey = KEY_DOWN; else if( KEY_RIGHT == nKey ) nKey = KEY_UP; } - else if ( rSh.IsInRightToLeftText() ) + if ( rSh.IsInRightToLeftText() ) { if( KEY_LEFT == nKey ) nKey = KEY_RIGHT; else if( KEY_RIGHT == nKey ) nKey = KEY_LEFT; @@ -1287,7 +1300,7 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt) KS_TblColCellInsDel, KS_Fly_Change, KS_Draw_Change, - KS_AppendNodeInSection, + KS_SpecialInsert, KS_EnterCharCell, KS_Ende }; @@ -1575,8 +1588,8 @@ KEYINPUT_CHECKTABLE_INSDEL: case KEY_RETURN | KEY_MOD2: // ALT-Return if( !rSh.HasReadonlySel() && rSh.GetCurNumRule() ) eKeyState = KS_NoNum; - else if( rSh.CanInsertNodeAtEndOfSection() ) - eKeyState = KS_AppendNodeInSection; + else if( rSh.CanSpecialInsert() ) + eKeyState = KS_SpecialInsert; break; case KEY_BACKSPACE: @@ -1842,7 +1855,7 @@ KEYINPUT_CHECKTABLE_INSDEL: // Statusupdate enabled wurden, muss copy ggf. von uns // 'gewaltsam' gerufen werden. if( rKeyCode.GetFunction() == KEYFUNC_COPY ) - GetView().GetViewFrame()->GetDispatcher()->Execute(SID_COPY); + GetView().GetViewFrame()->GetBindings().Execute(SID_COPY); if( !bIsDocReadOnly && bNormalChar ) @@ -1984,8 +1997,8 @@ KEYINPUT_CHECKTABLE_INSDEL: //??? FlushInBuffer( &rSh ); switch( eKeyState ) { - case KS_AppendNodeInSection: - rSh.AppendNodeInSection(); + case KS_SpecialInsert: + rSh.DoSpecialInsert(); break; case KS_NoNum: @@ -2399,44 +2412,51 @@ void SwEditWin::MouseButtonDown(const MouseEvent& rMEvt) !SFX_APP()->IsDispatcherLocked() && !bExecDrawTextLink) { - rView.NoRotate(); - rSh.HideCrsr(); - - BOOL bUnLockView = !rSh.IsViewLocked(); - rSh.LockView( TRUE ); - BOOL bSelObj = rSh.SelectObj( aDocPos, - rMEvt.IsMod1() ? SW_ENTER_GROUP : 0); - if( bUnLockView ) - rSh.LockView( FALSE ); + // #107513# + // Test if there is a draw object at that position and if it should be selected. + sal_Bool bShould = rSh.ShouldObjectBeSelected(aDocPos); - if( bSelObj ) + if(bShould) { - // falls im Macro der Rahmen deselektiert - // wurde, muss nur noch der Cursor - // wieder angezeigt werden. - if( FRMTYPE_NONE == rSh.GetSelFrmType() ) - rSh.ShowCrsr(); - else + rView.NoRotate(); + rSh.HideCrsr(); + + BOOL bUnLockView = !rSh.IsViewLocked(); + rSh.LockView( TRUE ); + BOOL bSelObj = rSh.SelectObj( aDocPos, + rMEvt.IsMod1() ? SW_ENTER_GROUP : 0); + if( bUnLockView ) + rSh.LockView( FALSE ); + + if( bSelObj ) { - if (rSh.IsFrmSelected() && rView.GetDrawFuncPtr()) + // falls im Macro der Rahmen deselektiert + // wurde, muss nur noch der Cursor + // wieder angezeigt werden. + if( FRMTYPE_NONE == rSh.GetSelFrmType() ) + rSh.ShowCrsr(); + else { - rView.GetDrawFuncPtr()->Deactivate(); - rView.SetDrawFuncPtr(NULL); - rView.LeaveDrawCreate(); - rView.AttrChangedNotify( &rSh ); - } + if (rSh.IsFrmSelected() && rView.GetDrawFuncPtr()) + { + rView.GetDrawFuncPtr()->Deactivate(); + rView.SetDrawFuncPtr(NULL); + rView.LeaveDrawCreate(); + rView.AttrChangedNotify( &rSh ); + } - rSh.EnterSelFrmMode( &aDocPos ); - bFrmDrag = TRUE; - UpdatePointer( aDocPos, rMEvt.GetModifier() ); + rSh.EnterSelFrmMode( &aDocPos ); + bFrmDrag = TRUE; + UpdatePointer( aDocPos, rMEvt.GetModifier() ); + } + return; } - return; - } - else - bOnlyText = rSh.IsObjSelectable( aDocPos ); + else + bOnlyText = rSh.IsObjSelectable( aDocPos ); - if (!rView.GetDrawFuncPtr()) - rSh.ShowCrsr(); + if (!rView.GetDrawFuncPtr()) + rSh.ShowCrsr(); + } } else if ( rSh.IsSelFrmMode() && (aActHitType == SDRHIT_NONE || @@ -2460,6 +2480,14 @@ void SwEditWin::MouseButtonDown(const MouseEvent& rMEvt) BYTE nFlag = rMEvt.IsShift() ? SW_ADD_SELECT :0; if( rMEvt.IsMod1() ) nFlag = nFlag | SW_ENTER_GROUP; + + if ( rSh.IsSelFrmMode() ) + { + rSh.UnSelectFrm(); + rSh.LeaveSelFrmMode(); + rView.AttrChangedNotify(&rSh); + } + BOOL bSelObj = rSh.SelectObj( aDocPos, nFlag ); if( bUnLockView ) rSh.LockView( FALSE ); @@ -2505,8 +2533,9 @@ void SwEditWin::MouseButtonDown(const MouseEvent& rMEvt) { case SwWrtShell::SEL_GRF: RstMBDownFlags(); - GetView().GetViewFrame()->GetDispatcher()->Execute( - FN_FORMAT_GRAFIC_DLG, SFX_CALLMODE_RECORD|SFX_CALLMODE_SLOT); + GetView().GetViewFrame()->GetBindings().Execute( + FN_FORMAT_GRAFIC_DLG, 0, 0, + SFX_CALLMODE_RECORD|SFX_CALLMODE_SLOT); return; // Doppelklick auf OLE-Objekt --> OLE-InPlace @@ -2520,8 +2549,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent& rMEvt) case SwWrtShell::SEL_FRM: RstMBDownFlags(); - GetView().GetViewFrame()->GetDispatcher()->Execute( - FN_FORMAT_FRAME_DLG, SFX_CALLMODE_RECORD|SFX_CALLMODE_SLOT); + GetView().GetViewFrame()->GetBindings().Execute( + FN_FORMAT_FRAME_DLG, 0, 0, SFX_CALLMODE_RECORD|SFX_CALLMODE_SLOT); return; case SwWrtShell::SEL_DRW: @@ -2548,7 +2577,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& rMEvt) { RstMBDownFlags(); if( bFtn ) - GetView().GetViewFrame()->GetDispatcher()->Execute( FN_EDIT_FOOTNOTE ); + GetView().GetViewFrame()->GetBindings().Execute( FN_EDIT_FOOTNOTE ); else { USHORT nTypeId = pFld->GetTypeId(); @@ -2563,11 +2592,11 @@ void SwEditWin::MouseButtonDown(const MouseEvent& rMEvt) USHORT nSlot = TYP_POSTITFLD == nTypeId ? FN_POSTIT : FN_JAVAEDIT; SfxBoolItem aItem(nSlot, TRUE); pVFrame->GetBindings().SetState(aItem); - pVFrame->GetDispatcher()->Execute(nSlot); + pVFrame->GetBindings().Execute(nSlot); break; } case TYP_AUTHORITY : - pVFrame->GetDispatcher()->Execute(FN_EDIT_AUTH_ENTRY_DLG); + pVFrame->GetBindings().Execute(FN_EDIT_AUTH_ENTRY_DLG); break; default: pVFrame->GetBindings().Execute(FN_EDIT_FIELD); @@ -4095,12 +4124,15 @@ void SwEditWin::Command( const CommandEvent& rCEvt ) bCallBase = FALSE; if ( pItem ) { - //Eigentumsuebergang des Items - GetView().GetViewFrame()->GetDispatcher()->Execute( nSlotId, SFX_CALLMODE_STANDARD, - pItem, 0 ); + const SfxPoolItem* aArgs[2]; + aArgs[0] = pItem; + aArgs[1] = 0; + GetView().GetViewFrame()->GetBindings().Execute( + nSlotId, aArgs, 0, SFX_CALLMODE_STANDARD ); + delete pItem; } else - GetView().GetViewFrame()->GetDispatcher()->Execute( nSlotId ); + GetView().GetViewFrame()->GetBindings().Execute( nSlotId ); } } break; @@ -4292,6 +4324,15 @@ void SwEditWin::_FinitStaticData() { delete pQuickHlpData; } +/* -----------------23.01.2003 12:15----------------- + * #i3370# remove quick help to prevent saving + * of autocorrection suggestions + * --------------------------------------------------*/ +void SwEditWin::StopQuickHelp() +{ + if( HasFocus() && pQuickHlpData && pQuickHlpData->bClear ) + pQuickHlpData->Stop( rView.GetWrtShell() ); +} /*-----------------23.02.97 18:39------------------- diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx index ad901676b6f2..9e71ee86587c 100644 --- a/sw/source/ui/docvw/edtwin2.cxx +++ b/sw/source/ui/docvw/edtwin2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: edtwin2.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: os $ $Date: 2001-09-21 08:45:40 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -273,10 +273,10 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) #ifndef PRODUCT case SwContentAtPos::SW_TABLEBOXVALUE: { - ByteString sTmp; - sprintf( sTmp.AllocBuffer( 30 ), "%E", - ((SwTblBoxValue*)aCntntAtPos.aFnd.pAttr)->GetValue() ); - sTxt = UniString(sTmp.GetBuffer(), gsl_getSystemTextEncoding()); + sTxt = UniString( + ByteString::CreateFromDouble( + ((SwTblBoxValue*)aCntntAtPos.aFnd.pAttr)->GetValue() ) + , gsl_getSystemTextEncoding()); } break; case SwContentAtPos::SW_CURR_ATTRS: diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx index b3884beb5dc7..d91c9488ef3a 100644 --- a/sw/source/ui/docvw/srcedtw.cxx +++ b/sw/source/ui/docvw/srcedtw.cxx @@ -2,9 +2,9 @@ * * $RCSfile: srcedtw.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: os $ $Date: 2002-11-08 14:54:05 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -100,8 +100,8 @@ #ifndef _SVTOOLS_SOURCEVIEWCONFIG_HXX #include <svtools/sourceviewconfig.hxx> #endif -#ifndef _SVX_COLORCFG_HXX -#include <svx/colorcfg.hxx> +#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX +#include <svtools/colorcfg.hxx> #endif #ifndef _SVX_FLSTITEM_HXX #include <svx/flstitem.hxx> @@ -131,10 +131,10 @@ enum SwHtmlTextType { - TT_SGML = svx::HTMLSGML , - TT_COMMENT = svx::HTMLCOMMENT, - TT_KEYWORD = svx::HTMLKEYWORD, - TT_UNKNOWN = svx::HTMLUNKNOWN + TT_SGML = svtools::HTMLSGML , + TT_COMMENT = svtools::HTMLCOMMENT, + TT_KEYWORD = svtools::HTMLKEYWORD, + TT_UNKNOWN = svtools::HTMLUNKNOWN }; @@ -579,10 +579,12 @@ void SwSrcEditWindow::CreateTextEngine() //Scrollbars anlegen pHScrollbar = new ScrollBar(this, WB_3DLOOK |WB_HSCROLL|WB_DRAG); + pHScrollbar->EnableRTL( false ); // #107300# --- RTL --- no mirroring for scrollbars pHScrollbar->SetScrollHdl(LINK(this, SwSrcEditWindow, ScrollHdl)); pHScrollbar->Show(); pVScrollbar = new ScrollBar(this, WB_3DLOOK |WB_VSCROLL|WB_DRAG); + pVScrollbar->EnableRTL( false ); // #107300# --- RTL --- no mirroring for scrollbars pVScrollbar->SetScrollHdl(LINK(this, SwSrcEditWindow, ScrollHdl)); pHScrollbar->EnableDrag(); pVScrollbar->Show(); @@ -860,12 +862,12 @@ void SwSrcEditWindow::ImpDoHighlight( const String& rSource, USHORT nLineOff ) if ( r.nStart > r.nEnd ) // Nur bis Bug von MD behoeben continue; USHORT nCol = r.eType; - if(r.eType != svx::HTMLSGML && - r.eType != svx::HTMLCOMMENT && - r.eType != svx::HTMLKEYWORD && - r.eType != svx::HTMLUNKNOWN) - r.eType = (SwHtmlTextType)svx::HTMLUNKNOWN; - Color aColor((ColorData)SW_MOD()->GetColorConfig().GetColorValue((svx::ColorConfigEntry)r.eType).nColor); + if(r.eType != svtools::HTMLSGML && + r.eType != svtools::HTMLCOMMENT && + r.eType != svtools::HTMLKEYWORD && + r.eType != svtools::HTMLUNKNOWN) + r.eType = (SwHtmlTextType)svtools::HTMLUNKNOWN; + Color aColor((ColorData)SW_MOD()->GetColorConfig().GetColorValue((svtools::ColorConfigEntry)r.eType).nColor); USHORT nLine = nLineOff+r.nLine; // pTextEngine->SetAttrib( TextAttribFontColor( aColor ), nLine, r.nStart, r.nEnd+1 ); } @@ -1061,7 +1063,10 @@ BOOL lcl_GetLanguagesForEncoding(rtl_TextEncoding eEnc, LanguageType aLanguages aLanguages[0] = LANGUAGE_RUSSIAN; break; - case RTL_TEXTENCODING_APPLE_UKRAINIAN :aLanguages[0] = LANGUAGE_UKRAINIAN; break; + case RTL_TEXTENCODING_APPLE_UKRAINIAN: + case RTL_TEXTENCODING_KOI8_U: + aLanguages[0] = LANGUAGE_UKRAINIAN; + break; case RTL_TEXTENCODING_IBM_864 : case RTL_TEXTENCODING_MS_1256 : diff --git a/sw/source/ui/envelp/envelp.src b/sw/source/ui/envelp/envelp.src index e110bea07d88..2053fed7131c 100644 --- a/sw/source/ui/envelp/envelp.src +++ b/sw/source/ui/envelp/envelp.src @@ -2,9 +2,9 @@ * * $RCSfile: envelp.src,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: kz $ $Date: 2001-11-16 23:04:43 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,22 +76,23 @@ String STR_DATABASE_NOT_OPENED Text [ danish ] = "Det var ikke muligt at 錬ne databasen." ; Text [ french ] = "Impossible d'ouvrir la base de donn閑s." ; Text [ swedish ] = "Databas gick inte att 鰌pna." ; - Text [ dutch ] = "Database kon niet worden geopend." ; + Text [ dutch ] = "Database kan niet worden geopend." ; Text [ spanish ] = "No se pudo abrir la base de datos." ; Text [ english_us ] = "Database could not be opened." ; Text[ chinese_simplified ] = "鏃犳硶鎵撳紑鏁版嵁搴撱"; - Text[ russian ] = "悟牮 徉珞 溧眄 礤忸珈铈眍."; + Text[ russian ] = "湾忸珈铈眍 铗牮 徉珞 溧眄."; Text[ polish ] = "Baza danych nie mog砤 by otworzona."; - Text[ japanese ] = "锞冿緸锝帮線锞嶏緸锝帮浇銈掗枊銇忋亾銇ㄣ亴銇с亶銇俱仜銈撱仹銇椼仧"; + Text[ japanese ] = "銉囥兗銈裤儥銉笺偣銈掗枊銇忋亾銇ㄣ亴銇с亶銇俱仜銈撱仹銇椼仧"; Text[ chinese_traditional ] = "鐒℃硶闁嬪暉璩囨枡搴"; Text[ arabic ] = "授醒 菔 耷谙 轻软卿鞘."; - Text[ dutch ] = "Database kon niet worden geopend."; + Text[ dutch ] = "Database kan niet worden geopend."; Text[ chinese_simplified ] = "鏃犳硶鎵撳紑鏁版嵁搴撱"; Text[ greek ] = "腻 摁犴 漉磲酎 磲 犴镩黥暹 廛箸 溴滹燧睐."; Text[ korean ] = "雿办澊韯半矤鞚挫姢毳 鞐挫銆氇豁枅鞀惦媹雼."; Text[ turkish ] = "Veritaban a琮lamad."; Text[ language_user1 ] = " "; - Text[ catalan ] = "No se pudo abrir la base de datos."; + Text[ catalan ] = "No es pot obrir la base de dades."; + Text[ thai ] = "喙勦浮喙堗釜喔侧浮喔侧福喔栢箑喔涏复喔斷笎喔侧笝喔傕箟喔浮喔灌弗喙勦笖喙"; }; String STR_NO_DRIVERS { @@ -101,26 +102,27 @@ String STR_NO_DRIVERS Text [ italian ] = "Non sono installati driver di controllo database." ; Text [ portuguese_brazilian ] = "Nenhum driver de base de dados instalado." ; Text [ portuguese ] = "Controlador da base de dados n鉶 instalado." ; - Text [ finnish ] = "Tietokanta-ajureita ei ole asennettu." ; + Text [ finnish ] = "Tietokanta-ohjaimia ei ole asennettu." ; Text [ danish ] = "Ingen databasedriverere installeret." ; Text [ french ] = "Aucun gestionnaire de base de donn閑s install." ; Text [ swedish ] = "Inga databasdrivrutiner 鋜 installerade." ; - Text [ dutch ] = "Geen database-drivers ge飊stalleerd." ; + Text [ dutch ] = "Geen databasedrivers ge飊stalleerd." ; Text [ spanish ] = "No se han instalado controladores de bases de datos." ; Text [ english_us ] = "No database drivers installed." ; Text[ chinese_simplified ] = "娌℃湁瀹夎鏁版嵁搴撻┍鍔ㄧ▼搴忋"; - Text[ russian ] = "酿嚅忮 潆 徉琨 溧眄 礤 桧耱嚯腓痤忄."; + Text[ russian ] = "湾 篑蜞眍怆屙 漯嚅忮 徉琨 溧眄."; Text[ polish ] = "Nie zainstalowany sterownik bazy danych."; - Text[ japanese ] = "锞冿緸锝帮線锞嶏緸锝帮浇锞勶緸锞楋緤锞炪亴锝诧緷锝斤緞锝帮緳銇曘倢銇︺亜銇俱仜銈撱"; + Text[ japanese ] = "銉囥兗銈裤儥銉笺偣銉夈儵銉愩亴銈ゃ兂銈广儓銉笺儷銇曘倢銇︺亜銇俱仜銈撱"; Text[ chinese_traditional ] = "娌掓湁瀹夎璩囨枡搴﹨鍕曠▼寮忋"; Text[ arabic ] = "崆 礞滔 妊倾 试垌 捩勤 软卿鞘 闼仁."; - Text[ dutch ] = "Geen database-drivers ge飊stalleerd."; + Text[ dutch ] = "Geen databasedrivers ge飊stalleerd."; Text[ chinese_simplified ] = "娌℃湁瀹夎鏁版嵁搴撻┍鍔ㄧ▼搴忋"; Text[ greek ] = "腻 蓣彘 氵礤 邈赆糗篝狍 瘃镢褴祆狒矧 镤捭珞珧 廛箸 溴滹燧睐."; Text[ korean ] = "雿办澊韯半矤鞚挫姢 霌滊澕鞚措矂臧 靹れ箻霅橃 鞎婌晿鞀惦媹雼."; Text[ turkish ] = "Kurulmu veritaban s黵點黶 mevcut de餴l."; Text[ language_user1 ] = " "; - Text[ catalan ] = "No se han instalado controladores de bases de datos."; + Text[ catalan ] = "No s'han instal.lat els controladors de la base de dades."; + Text[ thai ] = "喙勦浮喙堗箘喔斷箟喔曕复喔斷笗喔编箟喔囙箘喔斷福喙夃笩喙屶箑喔о腑喔｀箤喔愢覆喔權競喙夃腑喔∴腹喔"; }; String STR_BTN_NEW_DOC { @@ -130,26 +132,27 @@ String STR_BTN_NEW_DOC Text [ italian ] = "Nuovo documento" ; Text [ portuguese_brazilian ] = "~Novo doc." ; Text [ portuguese ] = "~Novo documento" ; - Text [ finnish ] = "~Uusi asiakirja" ; + Text [ finnish ] = "Uusi asiakirja" ; Text [ danish ] = "Nyt dokument" ; Text [ french ] = "~Nouveau document" ; Text [ swedish ] = "~Nytt dokument" ; Text [ dutch ] = "~Nieuw document" ; - Text [ spanish ] = "~Nuevo documento" ; + Text [ spanish ] = "~Documento nuevo" ; Text [ english_us ] = "~New Document" ; Text[ chinese_simplified ] = "鏂板缓鏂囨。(~N)"; - Text[ russian ] = "皖恹 漕牦戾眚"; + Text[ russian ] = "杨玟囹 漕牦戾眚"; Text[ polish ] = "Nowy dok."; - Text[ japanese ] = "鏂帮緞锞烇椒锝緬锞濓緞(~N)"; + Text[ japanese ] = "鏂般儔銈儱銉°兂銉(~N)"; Text[ chinese_traditional ] = "闁嬪暉鏂版獢(~N)"; Text[ arabic ] = "阌输 滔硐"; Text[ dutch ] = "~Nieuw document"; Text[ chinese_simplified ] = "鏂板缓鏂囨。(~N)"; Text[ greek ] = "溺扉秕胥哚 邈泷荟秕"; - Text[ korean ] = "靸堧鞖 氍胳劀(~N)"; + Text[ korean ] = "靸 氍胳劀(~N)"; Text[ turkish ] = "~Yeni belge"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Nuevo documento"; + Text[ catalan ] = "Document ~nou"; + Text[ thai ] = "喙喔竵喔覆喔｀箖~喔浮喙"; }; String STR_BTN_NEWDOC @@ -158,27 +161,28 @@ String STR_BTN_NEWDOC Text [ English ] = "~New doc." ; Text[ english_us ] = "~New Doc."; Text[ portuguese ] = "~Novo doc."; - Text[ russian ] = "皖恹 漕牦戾眚"; + Text[ russian ] = "杨玟囹 漕牦戾眚"; Text[ dutch ] = "~Nieuw doc."; - Text[ french ] = "~Nouveau doc."; + Text[ french ] = "Nouveau doc."; Text[ spanish ] = "~Nuevo doc."; Text[ italian ] = "Nuovo doc."; Text[ danish ] = "Nyt dok."; Text[ swedish ] = "~Nytt dok."; Text[ polish ] = "Nowy dok."; Text[ portuguese_brazilian ] = "~New doc."; - Text[ japanese ] = "鏂帮緞锞烇椒锝緬锞濓緞(~N)"; + Text[ japanese ] = "鏂般儔銈儱銉°兂銉(~N)"; Text[ chinese_simplified ] = "鏂板缓鏂囨。(~N)"; Text[ chinese_traditional ] = "闁嬪暉鏂版獢(~N)"; Text[ arabic ] = "阌输 滔硐"; Text[ dutch ] = "~Nieuw doc."; Text[ chinese_simplified ] = "鏂板缓鏂囨。(~N)"; Text[ greek ] = "溺扉秕胥哚 邈泷荟秕"; - Text[ korean ] = "靸堧鞖 氍胳劀(~N)"; + Text[ korean ] = "靸 氍胳劀(~N)"; Text[ turkish ] = "~Yeni blg."; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Nuevo doc."; - Text[ finnish ] = "~Uusi as."; + Text[ catalan ] = "Doc. ~nou"; + Text[ finnish ] = "Uusi as."; + Text[ thai ] = "喙喔竵喔覆喔｀箖~喔浮喙"; }; String STR_SENDER_TOKENS @@ -194,7 +198,7 @@ String STR_SENDER_TOKENS Text[ spanish ] = "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;COUNTRY; ;POSTALCODE; ;CITY;CR;"; Text[ italian ] = "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;COUNTRY; ;POSTALCODE; ;CITY;CR;"; Text[ danish ] = "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;COUNTRY; ;POSTALCODE; :CITY;CR;"; - Text[ swedish ] = "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;COUNTRY; ;POSTALCODE; ;CITY;CR; "; + Text[ swedish ] = "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;COUNTRY; ;POSTALCODE; ;CITY;CR;"; Text[ polish ] = "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;CITY; ;STATEPROV; ;POSTALCODE;CR;COUNTRY;CR;"; Text[ portuguese_brazilian ] = "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;CITY; ;STATEPROV; ;POSTALCODE;CR;COUNTRY;CR;"; Text[ japanese ] = "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;CITY; ;STATEPROV; ;POSTALCODE;CR;COUNTRY;CR;"; @@ -203,8 +207,9 @@ String STR_SENDER_TOKENS Text[ chinese_traditional ] = "COMPANY;CR;FIRSTNAME;;LASTNAME;CR;ADDRESS;CR;CITY;;STATEPROV; ;POSTALCODE;CR;COUNTRY;CR;"; Text[ turkish ] = "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;CITY; ;STATEPROV; ;POSTALCODE;CR;COUNTRY;CR;"; Text[ arabic ] = "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;CITY; ;STATEPROV; ;POSTALCODE;CR;COUNTRY;CR;"; - Text[ catalan ] = "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;COUNTRY; ;POSTALCODE; ;CITY;CR;"; + Text[ catalan ] = "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;CITY; ;STATEPROV; ;POSTALCODE;CR;COUNTRY;CR;"; Text[ finnish ] = "YRITYS;CR;ETUNIMI; ;SUKUNIMI;CR;OSOITE;CR;POSTITOIMIPAIKKA; ;OSAVALTIO; ;POSTINUMERO;CR;MAA;CR;"; + Text[ thai ] = "COMPANY;CR;FIRSTNAME; ;LASTNAME;CR;ADDRESS;CR;CITY; ;STATEPROV; ;POSTALCODE;CR;COUNTRY;CR;"; }; @@ -220,3 +225,7 @@ String STR_SENDER_TOKENS + + + + diff --git a/sw/source/ui/envelp/envfmt.src b/sw/source/ui/envelp/envfmt.src index 7e20052910b1..58a7521151af 100644 --- a/sw/source/ui/envelp/envfmt.src +++ b/sw/source/ui/envelp/envfmt.src @@ -2,9 +2,9 @@ * * $RCSfile: envfmt.src,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: kz $ $Date: 2001-07-13 21:58:39 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,20 +83,21 @@ TabPage TP_ENV_FMT Text [ danish ] = "Modtager" ; Text [ french ] = "Destinataire" ; Text [ swedish ] = "Mottagare" ; - Text [ dutch ] = "Ontvanger" ; + Text [ dutch ] = "Geadresseerde" ; Text [ spanish ] = "Destinatario" ; Text [ english_us ] = "Addressee" ; - Text[ chinese_simplified ] = "收件人"; + Text[ chinese_simplified ] = "鏀朵欢浜"; Text[ russian ] = "项塍鬣蝈朦"; Text[ polish ] = "Odbiorca"; - Text[ japanese ] = "埗愭"; - Text[ chinese_traditional ] = "Μン"; + Text[ japanese ] = "瀹涘厛"; + Text[ chinese_traditional ] = "鏀朵欢鑰"; Text[ arabic ] = "轻阌梳"; Text[ greek ] = "嗅襻朕痿珧"; - Text[ korean ] = "罐绰荤恩"; + Text[ korean ] = "氚涬姅 靷瀸"; Text[ turkish ] = "Al齝"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Destinatario"; + Text[ catalan ] = "Destinatari"; + Text[ thai ] = "喔溹腹喙夃福喔编笟喔堗笖喔浮喔侧涪"; }; FixedText TXT_ADDR_POS { @@ -113,18 +114,19 @@ TabPage TP_ENV_FMT Text[ french ] = "Position"; Text[ spanish ] = "Posici髇"; Text[ italian ] = "Posizione"; - Text[ danish ] = "Start_ved"; + Text[ danish ] = "Placering"; Text[ swedish ] = "Placering"; Text[ polish ] = "Pozycja"; Text[ portuguese_brazilian ] = "Position"; - Text[ japanese ] = "埵抲"; - Text[ korean ] = "流困"; - Text[ chinese_simplified ] = "位置"; - Text[ chinese_traditional ] = "竚"; + Text[ japanese ] = "浣嶇疆"; + Text[ korean ] = "鞙勳箻"; + Text[ chinese_simplified ] = "浣嶇疆"; + Text[ chinese_traditional ] = "浣嶇疆"; Text[ turkish ] = "Pozisyon"; Text[ arabic ] = "轻沔众"; - Text[ catalan ] = "Posici髇"; + Text[ catalan ] = "Posici"; Text[ finnish ] = "Sijainti"; + Text[ thai ] = "喔曕赋喙佮斧喔權箞喔"; }; FixedText TXT_ADDR_LEFT { @@ -139,22 +141,23 @@ TabPage TP_ENV_FMT Text [ portuguese ] = "a partir da esquerda" ; Text [ finnish ] = "vasemmalta" ; Text [ danish ] = "fra venstre" ; - Text [ french ] = " ~gauche" ; + Text [ french ] = " gauche" ; Text [ swedish ] = "~fr錸 v鋘ster" ; Text [ dutch ] = "~vanaf links" ; Text [ spanish ] = "de izquierda" ; Text [ english_us ] = "from 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 ] = "Soldan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "de izquierda"; + Text[ catalan ] = "de l'esquerra"; + Text[ thai ] = "喔堗覆喔佮笅喙夃覆喔"; }; MetricField FLD_ADDR_LEFT { @@ -186,22 +189,23 @@ TabPage TP_ENV_FMT Text [ portuguese ] = "a partir do topo" ; Text [ finnish ] = "ylh滗lt" ; Text [ danish ] = "fra oven" ; - Text [ french ] = "en ~haut" ; + Text [ french ] = "En haut" ; Text [ swedish ] = "~uppifr錸" ; Text [ dutch ] = "v~anaf boven" ; Text [ spanish ] = "desde arriba" ; Text [ english_us ] = "from top" ; - Text[ chinese_simplified ] = "从上"; + Text[ chinese_simplified ] = "浠庝笂"; Text[ russian ] = "疋屦躞"; Text[ polish ] = "z g髍y"; - Text[ japanese ] = "忋偐傜"; - Text[ chinese_traditional ] = "眖"; + Text[ japanese ] = "涓娿亱銈"; + Text[ chinese_traditional ] = "寰炰笂"; Text[ arabic ] = "沅 泌犰"; Text[ greek ] = "狃 疖睐"; - Text[ korean ] = "困俊辑"; + Text[ korean ] = "鞙勳棎靹"; Text[ turkish ] = "Yukardan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "desde arriba"; + Text[ catalan ] = "des de d'alt"; + Text[ thai ] = "喔堗覆喔佮笖喙夃覆喔權笟喔"; }; MetricField FLD_ADDR_TOP { @@ -231,7 +235,7 @@ TabPage TP_ENV_FMT Text[ portuguese ] = "Formato"; Text[ russian ] = "灶痨囹"; Text[ greek ] = "梯沐栾"; - Text[ dutch ] = "Format"; + Text[ dutch ] = "Formaat"; Text[ french ] = "Format"; Text[ spanish ] = "Formato"; Text[ italian ] = "Formato"; @@ -239,14 +243,15 @@ TabPage TP_ENV_FMT Text[ swedish ] = "Format"; Text[ polish ] = "Format"; Text[ portuguese_brazilian ] = "Format"; - Text[ japanese ] = "彂幃"; - Text[ korean ] = "器杆"; - Text[ chinese_simplified ] = "格式"; - Text[ chinese_traditional ] = "Α"; + Text[ japanese ] = "鏇稿紡"; + Text[ korean ] = "靹滌嫕"; + Text[ chinese_simplified ] = "鏍煎紡"; + Text[ chinese_traditional ] = "鏍煎紡"; Text[ turkish ] = "Renk format"; Text[ arabic ] = "轻输禹"; - Text[ catalan ] = "Formato"; - Text[ finnish ] = "Muotoile"; + Text[ catalan ] = "Formata"; + Text[ finnish ] = "Muotoilu"; + Text[ thai ] = "喔堗副喔斷福喔灌笡喙佮笟喔"; }; MenuButton BTN_ADDR_EDIT { @@ -261,22 +266,23 @@ TabPage TP_ENV_FMT Text [ portuguese ] = "Editar" ; Text [ finnish ] = "Muokkaa" ; Text [ danish ] = "Rediger" ; - Text [ french ] = "Modifier" ; + Text [ french ] = "蒬iter" ; Text [ swedish ] = "Redigera" ; Text [ dutch ] = "Bewerk." ; Text [ spanish ] = "Editar" ; Text [ english_us ] = "Edit" ; - Text[ chinese_simplified ] = "编辑"; - Text[ russian ] = "橡噔赅"; + Text[ chinese_simplified ] = "缂栬緫"; + Text[ russian ] = "如戾龛螯"; Text[ polish ] = "E~dytuj"; - Text[ japanese ] = "曇廤"; - Text[ chinese_traditional ] = "絪胯"; + Text[ japanese ] = "绶ㄩ泦"; + Text[ chinese_traditional ] = "绶ㄨ集"; Text[ arabic ] = "释秧"; Text[ language_user1 ] = " "; Text[ greek ] = "硼孱羼."; - Text[ korean ] = "祈笼"; + Text[ korean ] = "韼胳"; Text[ turkish ] = "D鼁enle"; - Text[ catalan ] = "Editar"; + Text[ catalan ] = "Edita"; + Text[ thai ] = "喙佮竵喙夃箘喔"; }; FixedLine FL_SENDER { @@ -295,17 +301,18 @@ TabPage TP_ENV_FMT Text [ dutch ] = "Afzender" ; Text [ spanish ] = "Remitente" ; Text [ english_us ] = "Sender" ; - Text[ chinese_simplified ] = "发件人"; + Text[ chinese_simplified ] = "鍙戜欢浜"; Text[ russian ] = "悟镳噔栩咫"; Text[ polish ] = "Nadawca"; - Text[ japanese ] = "嵎弌恖廧強"; - Text[ chinese_traditional ] = "盚ン"; + Text[ japanese ] = "宸嚭浜轰綇鎵"; + Text[ chinese_traditional ] = "瀵勪欢鑰"; Text[ arabic ] = "轻阊俞"; Text[ greek ] = "琉矬麸胼狎"; - Text[ korean ] = "焊辰 荤恩"; + Text[ korean ] = "氤措偢 靷瀸"; Text[ turkish ] = "G鰊deren"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Remitente"; + Text[ catalan ] = "Remitent"; + Text[ thai ] = "喔溹腹喙夃釜喙堗竾"; }; FixedText TXT_SEND_POS { @@ -322,18 +329,19 @@ TabPage TP_ENV_FMT Text[ french ] = "Position"; Text[ spanish ] = "Posici髇"; Text[ italian ] = "Posizione"; - Text[ danish ] = "Stilling"; + Text[ danish ] = "Placering"; Text[ swedish ] = "Placering"; Text[ polish ] = "Pozycja"; Text[ portuguese_brazilian ] = "Position"; - Text[ japanese ] = "埵抲"; - Text[ korean ] = "流困"; - Text[ chinese_simplified ] = "位置"; - Text[ chinese_traditional ] = "竚"; + Text[ japanese ] = "浣嶇疆"; + Text[ korean ] = "鞙勳箻"; + Text[ chinese_simplified ] = "浣嶇疆"; + Text[ chinese_traditional ] = "浣嶇疆"; Text[ turkish ] = "蔺 unvan"; Text[ arabic ] = "轻沔众"; - Text[ catalan ] = "Posici髇"; + Text[ catalan ] = "Posici"; Text[ finnish ] = "Sijainti"; + Text[ thai ] = "喔曕赋喙佮斧喔權箞喔"; }; FixedText TXT_SEND_LEFT { @@ -348,22 +356,23 @@ TabPage TP_ENV_FMT Text [ portuguese ] = "a partir da esquerda" ; Text [ finnish ] = "vasemmalta" ; Text [ danish ] = "fra venstre" ; - Text [ french ] = " g~auche" ; + Text [ french ] = " gauche" ; Text [ swedish ] = "fr錸 ~v鋘ster" ; Text [ dutch ] = "vanaf ~links" ; Text [ spanish ] = "de izquierda" ; Text [ english_us ] = "from 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 ] = "Soldan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "de izquierda"; + Text[ catalan ] = "de l'esquerra"; + Text[ thai ] = "喔堗覆喔佮笖喙夃覆喔權笅喙夃覆喔"; }; MetricField FLD_SEND_LEFT { @@ -395,22 +404,23 @@ TabPage TP_ENV_FMT Text [ portuguese ] = "a partir do topo" ; Text [ finnish ] = "ylh滗lt" ; Text [ danish ] = "fra oven" ; - Text [ french ] = "en ha~ut" ; + Text [ french ] = "En haut" ; Text [ swedish ] = "u~ppifr錸" ; Text [ dutch ] = "vanaf ~boven" ; Text [ spanish ] = "desde arriba" ; Text [ english_us ] = "from top" ; - Text[ chinese_simplified ] = "从上"; + Text[ chinese_simplified ] = "浠庝笂"; Text[ russian ] = "疋屦躞"; Text[ polish ] = "z g髍y"; - Text[ japanese ] = "忋偐傜"; - Text[ chinese_traditional ] = "眖"; + Text[ japanese ] = "涓娿亱銈"; + Text[ chinese_traditional ] = "寰炰笂"; Text[ arabic ] = "沅 泌犰"; Text[ greek ] = "狃 疖~睐"; - Text[ korean ] = "困俊辑"; + Text[ korean ] = "鞙勳棎靹"; Text[ turkish ] = "Yukardan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "desde arriba"; + Text[ catalan ] = "des de d'alt"; + Text[ thai ] = "喔堗覆喔斷箟喔侧笝喔氞笝"; }; MetricField FLD_SEND_TOP { @@ -448,14 +458,15 @@ TabPage TP_ENV_FMT Text[ swedish ] = "Format"; Text[ polish ] = "Format"; Text[ portuguese_brazilian ] = "Format"; - Text[ japanese ] = "彂幃"; - Text[ korean ] = "器杆"; - Text[ chinese_simplified ] = "格式"; - Text[ chinese_traditional ] = "Α"; + Text[ japanese ] = "鏇稿紡"; + Text[ korean ] = "靹滌嫕"; + Text[ chinese_simplified ] = "鏍煎紡"; + Text[ chinese_traditional ] = "鏍煎紡"; Text[ turkish ] = "Renk format"; Text[ arabic ] = "轻输禹"; - Text[ catalan ] = "Formato"; - Text[ finnish ] = "Muotoile"; + Text[ catalan ] = "Formata"; + Text[ finnish ] = "Muotoilu"; + Text[ thai ] = "喔堗副喔斷福喔灌笡喙佮笟喔"; }; MenuButton BTN_SEND_EDIT { @@ -469,23 +480,24 @@ TabPage TP_ENV_FMT Text [ portuguese ] = "Editar" ; Text [ finnish ] = "Muokkaa" ; Text [ danish ] = "Rediger" ; - Text [ french ] = "Modifier" ; + Text [ french ] = "蒬iter" ; Text [ swedish ] = "Redigera" ; Text [ dutch ] = "Bewerk." ; Text [ spanish ] = "Editar" ; Text [ english_us ] = "Edit" ; TabStop = TRUE ; - Text[ chinese_simplified ] = "编辑"; - Text[ russian ] = "橡噔赅"; + Text[ chinese_simplified ] = "缂栬緫"; + Text[ russian ] = "如戾龛螯"; Text[ polish ] = "Edyt~uj"; - Text[ japanese ] = "曇廤"; - Text[ chinese_traditional ] = "絪胯"; + Text[ japanese ] = "绶ㄩ泦"; + Text[ chinese_traditional ] = "绶ㄨ集"; Text[ arabic ] = "释秧"; Text[ language_user1 ] = " "; Text[ greek ] = "硼孱羼."; - Text[ korean ] = "祈笼"; + Text[ korean ] = "韼胳"; Text[ turkish ] = "D鼁enle"; - Text[ catalan ] = "Editar"; + Text[ catalan ] = "Edita"; + Text[ thai ] = "喙佮竵喙夃箘喔"; }; FixedLine FL_SIZE { @@ -501,20 +513,21 @@ TabPage TP_ENV_FMT Text [ danish ] = "St鴕relse" ; Text [ french ] = "Taille" ; Text [ swedish ] = "Storlek" ; - Text [ dutch ] = "Grootte" ; + Text [ dutch ] = "Formaat" ; Text [ spanish ] = "Tama駉" ; Text [ english_us ] = "Size" ; - Text[ chinese_simplified ] = "大小"; + Text[ chinese_simplified ] = "澶у皬"; Text[ russian ] = "朽珈屦"; Text[ polish ] = "Rozmiar"; - Text[ japanese ] = "徊睫"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "銈点偆銈"; + Text[ chinese_traditional ] = "澶у皬"; Text[ arabic ] = "轻吞"; Text[ greek ] = "梯沐栾"; - Text[ korean ] = "农扁"; + Text[ korean ] = "韥赴"; Text[ turkish ] = "Boyut"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Tama駉"; + Text[ catalan ] = "Mida"; + Text[ thai ] = "喔傕笝喔侧笖"; }; FixedText TXT_SIZE_FORMAT { @@ -526,25 +539,26 @@ TabPage TP_ENV_FMT Text [ italian ] = "Formato" ; Text [ portuguese_brazilian ] = "Formato" ; Text [ portuguese ] = "Fo~rmato" ; - Text [ finnish ] = "~Muotoile" ; - Text [ danish ] = "Forma~ter" ; + Text [ finnish ] = "M~uotoilu" ; + Text [ danish ] = "~Format" ; Text [ french ] = "Forma~t" ; Text [ swedish ] = "~Format" ; Text [ dutch ] = "~Formaat" ; Text [ spanish ] = "~Formato" ; Text [ english_us ] = "F~ormat" ; Left = TRUE ; - Text[ chinese_simplified ] = "格式(~O)"; + Text[ chinese_simplified ] = "鏍煎紡(~O)"; Text[ russian ] = "灶饉爨"; Text[ polish ] = "Format"; - Text[ japanese ] = "晻摏徊睫(~O)"; - Text[ chinese_traditional ] = "Α(~O)"; + Text[ japanese ] = "灏佺瓛銈点偆銈(~O)"; + Text[ chinese_traditional ] = "鏍煎紡(~O)"; Text[ arabic ] = "轻输禹"; Text[ language_user1 ] = " "; Text[ greek ] = "硼殡镢蒡"; - Text[ korean ] = "器杆(~O)"; + Text[ korean ] = "鞖╈ 韥赴(~O)"; Text[ turkish ] = "Format"; - Text[ catalan ] = "~Formato"; + Text[ catalan ] = "F~ormata"; + Text[ thai ] = "喔堗副喔斷福喔箏喔涏箒喔氞笟"; }; ListBox BOX_SIZE_FORMAT { @@ -561,28 +575,29 @@ TabPage TP_ENV_FMT 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 ] = "~Largeur" ; + Text [ finnish ] = "~Leveys" ; + Text [ danish ] = "~Bredde" ; + Text [ french ] = "Largeur" ; Text [ swedish ] = "~Bredd" ; Text [ dutch ] = "B~reedte" ; - Text [ spanish ] = "A~ncho" ; + Text [ spanish ] = "Ancho" ; Text [ english_us ] = "~Width" ; Left = TRUE ; - Text[ chinese_simplified ] = "宽(~W)"; + Text[ chinese_simplified ] = "瀹藉害(~W)"; Text[ russian ] = "罔痂磬"; Text[ polish ] = "Szer."; - Text[ japanese ] = "暆(~W)"; - Text[ chinese_traditional ] = "糴(~W)"; + Text[ japanese ] = "骞(~W)"; + Text[ chinese_traditional ] = "瀵害(~W)"; Text[ arabic ] = "轻谘"; Text[ greek ] = "须荇矧"; - Text[ korean ] = "气(~W)"; + Text[ korean ] = "雱堧箘(~W)"; Text[ turkish ] = "Geniik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "A~ncho"; + Text[ catalan ] = "~Amplada"; + Text[ thai ] = "喔勦抚喔侧浮~喔佮抚喙夃覆喔"; }; MetricField FLD_SIZE_WIDTH { @@ -609,27 +624,28 @@ TabPage TP_ENV_FMT Text = "~H鰄e" ; Text [ ENGLISH ] = "Height" ; Text [ norwegian ] = "H鴜de " ; - Text [ italian ] = "~Altezza" ; + Text [ italian ] = "Altezza" ; Text [ portuguese_brazilian ] = "Altura" ; Text [ portuguese ] = "~Altura" ; - Text [ finnish ] = "K~orkeus" ; - Text [ danish ] = "H鴍de" ; - Text [ french ] = "~Hauteur" ; + Text [ finnish ] = "~Korkeus" ; + Text [ danish ] = "H~鴍de" ; + Text [ french ] = "Hauteur" ; Text [ swedish ] = "~H鰆d" ; Text [ dutch ] = "~Hoogte" ; Text [ spanish ] = "A~ltura" ; Text [ english_us ] = "~Height" ; - Text[ chinese_simplified ] = "高(~H)"; + Text[ chinese_simplified ] = "楂樺害(~H)"; Text[ russian ] = "蔓耦蜞"; Text[ polish ] = "Wys."; - Text[ japanese ] = "崅偝(~H)"; - Text[ chinese_traditional ] = "蔼(~H)"; + Text[ japanese ] = "楂樸仌(~H)"; + Text[ chinese_traditional ] = "楂樺害(~H)"; Text[ arabic ] = "轻茄瘦勤"; Text[ greek ] = "绝矧"; - Text[ korean ] = "臭捞(~H)"; + Text[ korean ] = "雴掛澊(~H)"; Text[ turkish ] = "Y黭seklik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "A~ltura"; + Text[ catalan ] = "A~l鏰da"; + Text[ thai ] = "喔勦抚喔侧浮~喔腹喔"; }; MetricField FLD_SIZE_HEIGHT { @@ -669,24 +685,25 @@ Menu MNU_EDIT TEXT [ italian ] = "~Carattere..." ; TEXT [ portuguese_brazilian ] = "~Caracter..." ; TEXT [ portuguese ] = "~Caracteres..." ; - TEXT [ finnish ] = "~Merkki" ; + TEXT [ finnish ] = "Fo~ntti..." ; TEXT [ danish ] = "Tegn..." ; - TEXT [ french ] = "~Caract鑢e..." ; + TEXT [ french ] = "~Caract鑢es..." ; TEXT [ swedish ] = "~Tecken..." ; TEXT [ dutch ] = "~Teken..." ; TEXT [ spanish ] = "~Caracteres..." ; TEXT [ english_us ] = "C~haracter..." ; - TEXT[ chinese_simplified ] = "字符(~H)..."; - TEXT[ russian ] = "琼嚓..."; + TEXT[ chinese_simplified ] = "瀛楃(~H)..."; + TEXT[ russian ] = "仞梏..."; TEXT[ polish ] = "Znak..."; - TEXT[ japanese ] = "暥帤(~H)..."; + TEXT[ japanese ] = "鏂囧瓧(~H)..."; TEXT[ language_user1 ] = " "; - TEXT[ chinese_traditional ] = "じ(~H)..."; + TEXT[ chinese_traditional ] = "瀛楀厓(~H)..."; TEXT[ arabic ] = "呜..."; TEXT[ greek ] = "~揍襻牯揆弪..."; - TEXT[ korean ] = "扁龋(~H)..."; + TEXT[ korean ] = "旮昙(~H)..."; TEXT[ turkish ] = "Karakter..."; - TEXT[ catalan ] = "~Caracteres..."; + TEXT[ catalan ] = "~Car郼ters..."; + TEXT[ thai ] = "喔曕副喔о腑喔编竵~喔傕福喔..."; }; MenuItem { @@ -697,26 +714,42 @@ Menu MNU_EDIT TEXT [ italian ] = "~Paragrafo..." ; TEXT [ portuguese_brazilian ] = "~Par?grafo..." ; TEXT [ portuguese ] = "~Par醙rafo..." ; - TEXT [ finnish ] = "~Kappale" ; + TEXT [ finnish ] = "Ka~ppale..." ; TEXT [ danish ] = "Afsnit..." ; TEXT [ french ] = "~Paragraphe..." ; TEXT [ swedish ] = "~Stycke..." ; TEXT [ dutch ] = "~Alinea..." ; TEXT [ spanish ] = "P醨rafo..." ; TEXT [ english_us ] = "P~aragraph..." ; - TEXT[ chinese_simplified ] = "段落(~A)..."; + TEXT[ chinese_simplified ] = "娈佃惤(~A)..."; TEXT[ russian ] = "泪玎..."; TEXT[ polish ] = "Akapit..."; - 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 ] = "Paragraf..."; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "P醨rafo..."; + TEXT[ catalan ] = "Par鄃raf..."; + TEXT[ thai ] = "喔⑧箞~喔斧喔權箟喔..."; }; }; }; + + + + + + + + + + + + + + + diff --git a/sw/source/ui/envelp/envlop.src b/sw/source/ui/envelp/envlop.src index 40db3024a27c..3c25295825b4 100644 --- a/sw/source/ui/envelp/envlop.src +++ b/sw/source/ui/envelp/envlop.src @@ -2,9 +2,9 @@ * * $RCSfile: envlop.src,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: kz $ $Date: 2002-11-27 16:50:25 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -231,7 +231,7 @@ TabDialog DLG_ENV Text[ dutch ] = "~Wijzigen"; Text[ chinese_simplified ] = "鏇存敼(~M)"; Text[ greek ] = "择镳镳镞珞"; - Text[ korean ] = "靾橃爼(~M)"; + Text[ korean ] = "氤瓴(~M)"; Text[ turkish ] = "D~e餴⺶ir"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Modifica"; @@ -244,7 +244,7 @@ TabDialog DLG_ENV Text[ chinese_traditional ] = "淇″皝"; Text[ arabic ] = "傺"; Text[ greek ] = "周赍腼"; - Text[ korean ] = "氪夗埇"; + Text[ korean ] = "韼胳氪夗埇"; Text[ turkish ] = "Zarf"; Text[ language_user1 ] = " "; Text[ catalan ] = "Sobre"; @@ -282,7 +282,7 @@ TabPage TP_ENV_ENV Text[ chinese_traditional ] = "鏀朵欢鑰(~E)"; Text[ arabic ] = "轻阌梳"; Text[ greek ] = "嗅襻朕痿珧"; - Text[ korean ] = "氚涬姅 靷瀸(~E)"; + Text[ korean ] = "靾橃嫚鞚(~E)"; Text[ turkish ] = "Al齝"; Text[ language_user1 ] = " "; Text[ catalan ] = "Destinat~ari"; @@ -359,7 +359,7 @@ TabPage TP_ENV_ENV Text[ chinese_traditional ] = "琛ㄦ牸"; Text[ arabic ] = "轻滔驷"; Text[ greek ] = "羞磲赆"; - Text[ korean ] = "鞁滍姼"; + Text[ korean ] = "韰岇澊敫"; Text[ turkish ] = "Tablo"; Text[ language_user1 ] = " "; Text[ catalan ] = "Taula"; @@ -444,7 +444,7 @@ TabPage TP_ENV_ENV Text[ chinese_traditional ] = "瀵勪欢鑰(~S)"; Text[ arabic ] = "轻阊俞"; Text[ greek ] = "琉矬麸胼狎"; - Text[ korean ] = "氤措偢 靷瀸(~S)"; + Text[ korean ] = "氚滌嫚鞚(~S)"; Text[ turkish ] = "G鰊deren"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Remitent"; @@ -491,7 +491,7 @@ String STR_DOC_TITLE Text[ chinese_traditional ] = "淇″皝"; Text[ arabic ] = "傺"; Text[ greek ] = "周赍腼"; - Text[ korean ] = "氪夗埇"; + Text[ korean ] = "韼胳氪夗埇"; Text[ turkish ] = "Zarf"; Text[ language_user1 ] = " "; Text[ catalan ] = "Sobre"; @@ -504,3 +504,8 @@ String STR_DOC_TITLE + + + + + diff --git a/sw/source/ui/envelp/envprt.src b/sw/source/ui/envelp/envprt.src index db1c526d8480..23b47f461957 100644 --- a/sw/source/ui/envelp/envprt.src +++ b/sw/source/ui/envelp/envprt.src @@ -2,9 +2,9 @@ * * $RCSfile: envprt.src,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: kz $ $Date: 2002-11-27 16:44:15 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -155,7 +155,7 @@ TabPage TP_ENV_PRT Group = TRUE ; Check = TRUE ; Text[ chinese_simplified ] = "浠庝笂鏂瑰紑濮嬫墦鍗(~P)"; - Text[ russian ] = "襄鬣蜞螯 疋屦躞"; + Text[ russian ] = "襄~鬣蜞螯 疋屦躞"; Text[ polish ] = "Drukuj od g髍y"; Text[ japanese ] = "灏佺瓛銇〃銈掍笂銇仚銈(~P)"; Text[ chinese_traditional ] = "寰炰笂鏂归枊濮嬪垪鍗(~P)"; @@ -217,7 +217,7 @@ TabPage TP_ENV_PRT Text [ PORTUGUESE ] = " direita" ; Left = TRUE ; Text[ chinese_simplified ] = "鍚戝彸(~S)"; - Text[ russian ] = "唁忤 怙疣忸"; + Text[ russian ] = "褈溻桡 怙疣忸"; Text[ polish ] = "Na prawo"; Text[ japanese ] = "鍙炽伀(~S)"; Text[ chinese_traditional ] = "鍚戝彸(~S)"; @@ -265,13 +265,13 @@ TabPage TP_ENV_PRT Text [ PORTUGUESE ] = "Para baixo" ; Left = TRUE ; Text[ chinese_simplified ] = "鍚戜笅(~D)"; - Text[ russian ] = "唁忤 忭桤"; + Text[ russian ] = "唁忤 忭鑯"; Text[ polish ] = "W d蟪"; Text[ japanese ] = "涓嬨伀(~D)"; Text[ chinese_traditional ] = "鍚戜笅(~D)"; Text[ arabic ] = "裴 糜葆"; Text[ greek ] = "旭矧 翎 贶豉"; - Text[ korean ] = "鞎勲灅搿 鞚措彊(~D)"; + Text[ korean ] = "鞎勲灅搿(~D)"; Text[ turkish ] = "~A瘕"; Text[ language_user1 ] = " "; Text[ catalan ] = "Cap a a~vall"; @@ -487,3 +487,8 @@ Bitmap BMP_VER_RGHT_UPPER_H + + + + + diff --git a/sw/source/ui/envelp/label.src b/sw/source/ui/envelp/label.src index 9c26b0ec3d0a..f31948df7f40 100644 --- a/sw/source/ui/envelp/label.src +++ b/sw/source/ui/envelp/label.src @@ -2,9 +2,9 @@ * * $RCSfile: label.src,v $ * - * $Revision: 1.47 $ + * $Revision: 1.48 $ * - * last change: $Author: kz $ $Date: 2002-09-05 19:46:17 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -72,7 +72,7 @@ Text [ italian ] = "Etichette" ; \ Text [ portuguese_brazilian ] = "Etiquetas" ; \ Text [ portuguese ] = "Etiquetas" ; \ - Text [ finnish ] = "Nimi鰐" ; \ + Text [ finnish ] = "Osoitetarrat" ; \ Text [ danish ] = "Etiketter" ; \ Text [ french ] = "蓆iquettes" ; \ Text [ swedish ] = "Etiketter" ; \ @@ -80,15 +80,16 @@ Text [ spanish ] = "Etiquetas" ; \ Text [ english_us ] = "Labels" ; \ Text[ chinese_simplified ] = "鏍囩"; \ - Text[ russian ] = "袜觌彘觇"; \ + Text[ russian ] = "蒡桕弪觇"; \ Text[ polish ] = "Etykiety"; \ Text[ japanese ] = "銉┿儥銉浉銇"; \ Text[ chinese_traditional ] = "璨兼"; \ Text[ arabic ] = "蓉寝鞘 阡驿"; \ Text[ greek ] = "鹏殛蒴弪"; \ - Text[ korean ] = "霛茧波"; \ + Text[ korean ] = "霠堨澊敫"; \ Text[ turkish ] = "Etiket"; \ - Text[ catalan ] = "Etiquetes"; + Text[ catalan ] = "Etiquetes"; \ + Text[ thai ] = "喔涏箟喔侧涪喔娻阜喙堗腑"; #define BUSINESS_CARD_STRING \ Text = "Visitenkarten" ; \ @@ -106,13 +107,14 @@ Text[ polish ] = "Wizyt體ki"; \ Text[ portuguese_brazilian ] = "Visiting cards"; \ Text[ japanese ] = "鍚嶅埡"; \ - Text[ korean ] = "齑堧寑鞛"; \ + Text[ korean ] = "氇呿暔"; \ Text[ chinese_simplified ] = "鍚嶇墖"; \ Text[ chinese_traditional ] = "鍚嶇墖"; \ Text[ arabic ] = "蓉寝鞘 轻翼茄"; \ - Text[ finnish ] = "Business cards"; \ + Text[ finnish ] = "K鋣ntikortit"; \ Text[ turkish ] = "Business cards"; \ - Text[ catalan ] = "Targetes de visita"; + Text[ catalan ] = "Targetes de visita"; \ + Text[ thai ] = "喔權覆喔∴笟喔编笗喔"; // DLG_LAB ------------------------------------------------------------------ TabDialog DLG_LAB @@ -157,8 +159,9 @@ TabDialog DLG_LAB Text[ arabic ] = "晕枕"; Text[ turkish ] = "謟el"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Privado"; + Text[ catalan ] = "Privat"; Text[ finnish ] = "Henkil鰇ohtainen"; + Text[ thai ] = "喔箞喔о笝喔曕副喔"; }; PageItem { @@ -168,7 +171,7 @@ TabDialog DLG_LAB Text [ ENGLISH ] = "Business" ; Text[ english_us ] = "Business"; Text[ portuguese ] = "Emprego"; - Text[ russian ] = "央箧遽睇"; + Text[ russian ] = "腻腩恹"; Text[ greek ] = "篷汜筮"; Text[ dutch ] = "Zaak"; Text[ french ] = "Bureau"; @@ -185,8 +188,9 @@ TabDialog DLG_LAB Text[ arabic ] = "阢"; Text[ turkish ] = "蔺"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Trabajo"; + Text[ catalan ] = "Negocis"; Text[ finnish ] = "Liiketoiminta"; + Text[ thai ] = "喔樴父喔｀竵喔脆笀"; }; PageItem { @@ -214,7 +218,8 @@ TabDialog DLG_LAB Text[ turkish ] = "Format"; Text[ language_user1 ] = " "; Text[ catalan ] = "Formata"; - Text[ finnish ] = "Muoto"; + Text[ finnish ] = "Muotoilu"; + Text[ thai ] = "喔｀腹喔涏箒喔氞笟"; }; PageItem { @@ -243,6 +248,7 @@ TabDialog DLG_LAB Text[ turkish ] = "Se鏴nekler"; Text[ catalan ] = "Opcions"; Text[ finnish ] = "Asetukset"; + Text[ thai ] = "喔曕副喔о箑喔ム阜喔竵"; }; }; }; @@ -277,8 +283,9 @@ TabDialog DLG_LAB Text[ arabic ] = "轻媲迂"; Text[ language_user1 ] = " "; Text[ turkish ] = "Ka瘕t"; - Text[ catalan ] = "Mitj"; + Text[ catalan ] = "Tipus"; Text[ finnish ] = "Normaali"; + Text[ thai ] = "喔涏覆喔權竵喔ム覆喔"; }; }; // TP_LAB_LAB --------------------------------------------------------------- @@ -299,7 +306,7 @@ TabPage TP_LAB_LAB Text [ italian ] = "~Testo etichetta" ; Text [ portuguese_brazilian ] = "Gravar" ; Text [ portuguese ] = "~Inscri玢o" ; - Text [ finnish ] = "Nimi鰐eksti" ; + Text [ finnish ] = "Tarran teksti" ; Text [ danish ] = "Etikettekst" ; Text [ french ] = "Inscription" ; Text [ swedish ] = "~P錽krift" ; @@ -307,16 +314,17 @@ TabPage TP_LAB_LAB Text [ spanish ] = "Te~xto de la etiqueta" ; Text [ english_us ] = "Label text" ; Text[ chinese_simplified ] = "鏍囩"; - Text[ russian ] = "袜滹桉"; + Text[ russian ] = "义犟 桕弪觇"; Text[ polish ] = "Napis"; Text[ japanese ] = "瀹涘厛"; Text[ chinese_traditional ] = "妯欑堡"; Text[ arabic ] = "湔 轻蓉寝"; Text[ greek ] = "硼殂襻鲛"; - Text[ korean ] = "霛茧波"; + Text[ korean ] = "霠堨澊敫 韰嶌姢韸"; Text[ turkish ] = "Etiket metni"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Te~xto"; + Text[ catalan ] = "Text de l'etiqueta"; + Text[ thai ] = "喔涏箟喔侧涪喔娻阜喙堗腑喔傕箟喔竸喔о覆喔"; }; CheckBox BOX_ADDR { @@ -346,7 +354,8 @@ TabPage TP_LAB_LAB Text[ korean ] = "欤检唽"; Text[ turkish ] = "Adres"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Direcci髇"; + Text[ catalan ] = "~Direcci"; + Text[ thai ] = "喔椸傅喙堗腑喔⑧腹喙"; }; MultiLineEdit EDT_WRITING { @@ -386,7 +395,8 @@ TabPage TP_LAB_LAB Text[ korean ] = "雿办澊韯半矤鞚挫姢"; Text[ turkish ] = "Veritaban"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Base de dades"; + Text[ catalan ] = "Base de dades"; + Text[ thai ] = "喔愢覆喔權競喙夃腑喔∴腹喔"; }; ListBox LB_DATABASE { @@ -418,11 +428,12 @@ TabPage TP_LAB_LAB Text[ chinese_traditional ] = "琛ㄦ牸"; Text[ arabic ] = "轻滔驷"; Text[ greek ] = "羞磲赆"; - Text[ korean ] = "鞁滍姼"; + Text[ korean ] = "韰岇澊敫"; Text[ language_user1 ] = " "; Text[ turkish ] = "Tablo"; - Text[ catalan ] = "Tabla"; + Text[ catalan ] = "Taula"; Text[ finnish ] = "Taulukko"; + Text[ thai ] = "喔曕覆喔｀覆喔"; }; ListBox LB_TABLE { @@ -449,7 +460,7 @@ TabPage TP_LAB_LAB Text [ italian ] = "Campo database" ; Text [ portuguese_brazilian ] = "Campo base de dados" ; Text [ portuguese ] = "Campo base de dados" ; - Text [ finnish ] = "Tietokantakentt" ; + Text [ finnish ] = "Tietokannan kentt" ; Text [ danish ] = "Databasefelt" ; Text [ french ] = "Champ de BD" ; Text [ swedish ] = "Databas~f鋖t" ; @@ -466,7 +477,8 @@ TabPage TP_LAB_LAB Text[ korean ] = "雿办澊韯半矤鞚挫姢 頃勲摐"; Text[ turkish ] = "Veritaban alan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Campo base de datos"; + Text[ catalan ] = "Camp de la base de dades"; + Text[ thai ] = "喙喔傕笗喔傕箟喔浮喔灌弗喔傕腑喔囙笎喔侧笝喔傕箟喔浮喔灌弗"; }; ListBox LB_DBFIELD { @@ -502,9 +514,10 @@ TabPage TP_LAB_LAB Text[ chinese_traditional ] = "妯欑堡"; Text[ arabic ] = "湔 轻蓉寝"; Text[ greek ] = "硼殂襻鲛"; - Text[ korean ] = "霛茧波"; + Text[ korean ] = "霠堨澊敫 韰嶌姢韸"; Text[ turkish ] = "Etiket metni"; Text[ catalan ] = "Etiqueta"; + Text[ thai ] = "喔堗覆喔｀付喔"; }; RadioButton BTN_CONT { @@ -535,7 +548,8 @@ TabPage TP_LAB_LAB Text[ korean ] = "瓿勳啀(~C)"; Text[ turkish ] = "Sonsuz form"; Text[ language_user1 ] = " "; - Text[ catalan ] = "S~ense fi"; + Text[ catalan ] = "~Continu"; + Text[ thai ] = "~喔曕箞喔箑喔權阜喙堗腑喔"; }; RadioButton BTN_SHEET { @@ -547,7 +561,7 @@ TabPage TP_LAB_LAB Text [ italian ] = "Foglio" ; Text [ portuguese_brazilian ] = "Folha" ; Text [ portuguese ] = "~Folha" ; - Text [ finnish ] = "~Lomake" ; + Text [ finnish ] = "Taulukko" ; Text [ danish ] = "Ark" ; Text [ french ] = "~Feuille" ; Text [ swedish ] = "~Ark" ; @@ -555,7 +569,7 @@ TabPage TP_LAB_LAB Text [ spanish ] = "~Hoja" ; Text [ english_us ] = "~Sheet" ; Text[ chinese_simplified ] = "绾稿紶(~S)"; - Text[ russian ] = "悟溴朦眍"; + Text[ russian ] = "髓耱"; Text[ polish ] = "Arkusz"; Text[ japanese ] = "銈枫兗銉(~S)"; Text[ chinese_traditional ] = "绱欏嫉(~S)"; @@ -564,7 +578,8 @@ TabPage TP_LAB_LAB Text[ korean ] = "鞁滍姼(~S)"; Text[ turkish ] = "F鰕"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Hoja"; + Text[ catalan ] = "~Full"; + Text[ thai ] = "喙亊喔溹箞喔權竾喔侧笝"; }; FixedText TXT_MAKE { @@ -594,7 +609,8 @@ TabPage TP_LAB_LAB Text[ greek ] = "~誊耜"; Text[ korean ] = "靸來憸"; Text[ turkish ] = "Markas"; - Text[ catalan ] = "~Marca"; + Text[ catalan ] = "Marca"; + Text[ thai ] = "喔⑧傅喙堗斧喙夃腑"; }; ListBox BOX_MAKE { @@ -633,6 +649,7 @@ TabPage TP_LAB_LAB Text[ turkish ] = "Tipi"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Tipus"; + Text[ thai ] = "~喔娻笝喔脆笖"; }; ListBox BOX_TYPE { @@ -659,7 +676,7 @@ TabPage TP_LAB_LAB Text [ italian ] = "Formato" ; Text [ portuguese_brazilian ] = "Formato" ; Text [ portuguese ] = "Formato" ; - Text [ finnish ] = "Muoto" ; + Text [ finnish ] = "Muotoilu" ; Text [ danish ] = "Format" ; Text [ french ] = "Format" ; Text [ swedish ] = "Format" ; @@ -676,7 +693,8 @@ TabPage TP_LAB_LAB Text[ korean ] = "靹滌嫕"; Text[ turkish ] = "Format"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Formata"; + Text[ catalan ] = "Format"; + Text[ thai ] = "喔｀腹喔涏箒喔氞笟"; }; }; #define WIDTH 100 @@ -708,17 +726,18 @@ FloatingWindow DLG_SYNC_BTN Text [ dutch ] = "Etiketten synchroniseren" ; Text [ portuguese ] = "Sincronizar etiquetas" ; Text[ chinese_simplified ] = "鏍囩鍚屾鍖"; - Text[ russian ] = "谚眭痤龛玷痤忄螯 磬觌彘觇"; + Text[ russian ] = "谚眭痤龛玷痤忄螯 镱滹桉"; Text[ polish ] = "Synchronizacja etykiet"; Text[ japanese ] = "銉┿儥銉浉銇嶃倰鍚屾湡銇曘仜銈"; Text[ chinese_traditional ] = "璨兼鍚屾鍖"; Text[ arabic ] = "室倾 蓉寝鞘 轻阡驿"; Text[ greek ] = "吁泖耧黹箪 弭殛弭"; - Text[ korean ] = "霛茧波 霃欔赴頇"; + Text[ korean ] = "霠堨澊敫 霃欔赴頇"; Text[ turkish ] = "Etiket i鏴ri餴ni 鏾餫lt"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sincronizar etiquetas"; - Text[ finnish ] = "Synkronoi nimi鰐"; + Text[ catalan ] = "Sincronitza les etiquetes"; + Text[ finnish ] = "Synkronoi osoitetarrat"; + Text[ thai ] = "喔涏箟喔侧涪喔娻阜喙堗腑喔椸傅喙堗笗喔｀竾喔佮副喔"; }; }; // String ******************************************************************* @@ -730,7 +749,7 @@ String STR_DOC_TITLE Text [ italian ] = "Busta" ; Text [ portuguese_brazilian ] = "Etiquetas" ; Text [ portuguese ] = "Etiquetas" ; - Text [ finnish ] = "Nimi鰐" ; + Text [ finnish ] = "Osoitetarrat" ; Text [ danish ] = "Etiketter" ; Text [ french ] = "蓆iquettes" ; Text [ swedish ] = "Etiketter" ; @@ -738,16 +757,17 @@ String STR_DOC_TITLE Text [ spanish ] = "Etiquetas" ; Text [ english_us ] = "Labels" ; Text[ chinese_simplified ] = "鏍囩"; - Text[ russian ] = "袜觌彘觇"; + Text[ russian ] = "项滹桉"; Text[ polish ] = "Etykiety"; Text[ japanese ] = "銉┿儥銉浉銇"; Text[ chinese_traditional ] = "璨兼"; Text[ arabic ] = "蓉寝鞘 阡驿"; Text[ greek ] = "鹏殛蒴弪"; - Text[ korean ] = "霛茧波"; + Text[ korean ] = "霠堨澊敫"; Text[ turkish ] = "Etiket"; Text[ language_user1 ] = " "; Text[ catalan ] = "Etiquetes"; + Text[ thai ] = "喔涏箟喔侧涪喔娻阜喙堗腑"; }; String STR_CUSTOM { @@ -757,7 +777,7 @@ String STR_CUSTOM Text[ portuguese ] = "[Utilizador]"; Text[ russian ] = "[项朦珙忄蝈朦]"; Text[ greek ] = "[遵摅翮騗"; - Text[ dutch ] = "[Gebruiker] "; + Text[ dutch ] = "[Aangepast]"; Text[ french ] = "[Utilisateur]"; Text[ spanish ] = "[Usuario]"; Text[ finnish ] = "[K鋣tt鋔鋘 m滗ritt鋗鋆"; @@ -772,7 +792,8 @@ String STR_CUSTOM Text[ chinese_traditional ] = "[浣跨敤鑰匽"; Text[ turkish ] = "[Kullan齝 tan齧l齗"; Text[ arabic ] = "[阌饰香]"; - Text[ catalan ] = "[Usuario]"; + Text[ catalan ] = "[Usuari-definit]"; + Text[ thai ] = "[喔｀赴喔氞父喔溹腹喙夃箖喔娻箟]"; }; /********************************************************************/ TabPage TP_VISITING_CARDS @@ -796,25 +817,26 @@ TabPage TP_VISITING_CARDS Text [ English ] = "AutoText group" ; Text[ english_us ] = "AutoText - Section"; Text[ portuguese ] = "AutoTexto - ~sec玢o"; - Text[ russian ] = "吾豚耱 噔蝾蝈犟蜞"; + Text[ russian ] = "棱蝾蝈犟 - 朽玟咫"; Text[ greek ] = "绣耖秣 刘麸叔殪蓓秕"; Text[ dutch ] = "AutoTekst - ~bereik"; Text[ french ] = "AutoTexte - ~Section"; - Text[ spanish ] = "羠ea AutoT~exto"; + Text[ spanish ] = "Texto autom醫ico - ~Secci髇"; Text[ italian ] = "Testo automatico - Sezione"; Text[ danish ] = "AutoTekst - omr錮e"; Text[ swedish ] = "AutoText - omr錮e"; Text[ polish ] = "Obszar Autotekstu"; Text[ portuguese_brazilian ] = "AutoText group"; Text[ japanese ] = "鍏ュ姏鏀彺銈般儷銉笺儣"; - Text[ korean ] = "鞛愲彊 韰嶌姢韸- 鞓侅棴"; + Text[ korean ] = "鞛愲彊 韰嶌姢韸 甑棴"; Text[ chinese_simplified ] = "鑷姩鍥炬枃闆嗗垎绫"; Text[ chinese_traditional ] = "鑷嫊鍦栨枃闆嗗垎椤"; Text[ arabic ] = "湄寝 轻湔 轻梳耷祈"; Text[ turkish ] = "Otomatik metin - alan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "羠ea AutoT~exto"; - Text[ finnish ] = "Automaattinen teksti - osio"; + Text[ catalan ] = "纑ea AutoT~ext"; + Text[ finnish ] = "Automaattinen teksti - osa"; + Text[ thai ] = "喔傕箟喔竸喔о覆喔∴腑喔编笗喙傕笝喔∴副喔曕复 - 喔箞喔о笝"; }; ListBox LB_AUTO_TEXT_GROUP { @@ -851,6 +873,7 @@ TabPage TP_VISITING_CARDS Text[ language_user1 ] = " "; Text[ catalan ] = "Contingut"; Text[ finnish ] = "Sis鋖t"; + Text[ thai ] = "喙喔權阜喙夃腑喔覆"; }; Window WIN_EXAMPLE { @@ -877,7 +900,7 @@ TabPage TP_PRIVATE_DATA Text[ portuguese ] = "Dados pessoais"; Text[ russian ] = "髓黜 溧眄"; Text[ greek ] = "旭矬殛 篝镩麇哚"; - Text[ dutch ] = "Priv間egevens"; + Text[ dutch ] = "Persoonlijke gegevens"; Text[ french ] = "Coordonn閑s priv閑s"; Text[ spanish ] = "Datos privados"; Text[ italian ] = "Dati privati"; @@ -886,14 +909,15 @@ TabPage TP_PRIVATE_DATA Text[ polish ] = "Dane prywatne"; Text[ portuguese_brazilian ] = "Private data"; Text[ japanese ] = "鍊嬩汉銉囥兗銈"; - Text[ korean ] = "臧滌澑 雿办澊韯"; + Text[ korean ] = "臧滌澑 鞝曤炒"; Text[ chinese_simplified ] = "绉佷汉璧勬枡"; Text[ chinese_traditional ] = "绉佷汉璩囨枡"; Text[ arabic ] = "软卿鞘 晕枕"; Text[ turkish ] = "謟el bilgiler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Datos privados"; + Text[ catalan ] = "Dades privades"; Text[ finnish ] = "Omat tiedot"; + Text[ thai ] = "喔傕箟喔浮喔灌弗喔箞喔о笝喔曕副喔"; }; FixedText FT_NAME { @@ -903,7 +927,7 @@ TabPage TP_PRIVATE_DATA Text [ English ] = "First/Last ~name" ; Text[ english_us ] = "First/Last ~name/Initials"; Text[ portuguese ] = "~Nome pr髉rio/Apelido/Iniciais"; - Text[ russian ] = "脏扈腓/桁/桧桷栲臌"; + Text[ russian ] = "褥/脏扈腓/软桷栲臌"; Text[ greek ] = "柬镬/硼蹯/榴~鏖贶"; Text[ dutch ] = "~Voor-/achternaam/Initialen"; Text[ french ] = "Pr閚om/Nom/Initiales"; @@ -914,14 +938,15 @@ TabPage TP_PRIVATE_DATA Text[ polish ] = "Imi/Nazwisko/Inicja硑"; Text[ portuguese_brazilian ] = "First/Last ~name"; Text[ japanese ] = "鍚/濮/銈ゃ儖銈枫儯銉(~N)"; - Text[ korean ] = "靹/鞚措/毹鸽Μ旮鞛(~N)"; + Text[ korean ] = "靹/鞚措/鞚措媹靺(~N)"; Text[ chinese_simplified ] = "鍚嶅瓧/濮撴皬/缂╁啓(~N)"; Text[ chinese_traditional ] = "鍚嶅瓧/濮撴皬/绺(~N)"; Text[ arabic ] = "轻怯/怯 轻谇漆/轻俏收茄"; Text[ turkish ] = "Ad/Soyad/Ba㭎arfler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "No~mbre/Apellidos/Iniciales"; + Text[ catalan ] = "~Nom/Cog~noms/Inicials"; Text[ finnish ] = "Etu-/suku~nimi/nimikirjaimet"; + Text[ thai ] = "~喔娻阜喙堗腑/喔權覆喔∴釜喔佮父喔/喔娻阜喙堗腑喔⑧箞喔"; }; Edit ED_FIRSTNAME { @@ -949,9 +974,9 @@ TabPage TP_PRIVATE_DATA Text [ English ] = "First/Last ~name 2" ; Text[ english_us ] = "First / Last ~Name / Initials 2"; Text[ portuguese ] = "~Nome pr髉rio/Apelido/Iniciais 2"; - Text[ russian ] = "脏扈腓/桁/耦牮帙屙桢 2"; + Text[ russian ] = "褥 / 脏扈腓 / 软桷栲臌 2"; Text[ greek ] = "柬镬/硼哞弭/榴~鏖贶 2"; - Text[ dutch ] = "Voor/achter ~naam 2"; + Text[ dutch ] = "Voor-/Achternaam/Initialen 2"; Text[ french ] = "Pr閚om/Nom/Initiales 2"; Text[ spanish ] = "Nombre/Apellidos/Iniciales 2"; Text[ italian ] = "Nome/Cognome/Iniziali 2"; @@ -960,13 +985,14 @@ TabPage TP_PRIVATE_DATA Text[ polish ] = "Imi/Nazwisko/Inicja硑"; Text[ portuguese_brazilian ] = "First/Last ~name 2"; Text[ japanese ] = "濮/鍚/銈ゃ儖銈枫儯銉 2 (~N)"; - Text[ korean ] = "靹/鞚措/毹鸽Μ旮鞛 2(~N)"; + Text[ korean ] = "靹/鞚措/鞚措媹靺 2(~N)"; Text[ chinese_simplified ] = "鍚嶅瓧/濮撴皬/缂╁啓 2(~N)"; Text[ chinese_traditional ] = "鍚嶅瓧/濮撴皬/绺 2(~N)"; Text[ arabic ] = "轻怯/怯 轻谇漆/轻俏收茄 2"; Text[ turkish ] = "Ad/Soyad/Ba㭎arfler 2"; - Text[ catalan ] = "Nombre/Apellidos/Iniciales 2"; + Text[ catalan ] = "~Nom / Cog~noms / Inicials 2"; Text[ finnish ] = "Etu-/suku~nimi/nimikirjaimet 2"; + Text[ thai ] = "~喔娻阜喙堗腑/喔權覆喔∴釜喔佮父喔/喔娻阜喙堗腑喔⑧箞喔 2"; }; Edit ED_FIRSTNAME_2 { @@ -1011,8 +1037,9 @@ TabPage TP_PRIVATE_DATA Text[ arabic ] = "轻郧掩"; Text[ turkish ] = "Sokak"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Calle"; + Text[ catalan ] = "C~arrer"; Text[ finnish ] = "Ka~tuosoite"; + Text[ thai ] = "喔杶喔權笝"; }; Edit ED_STREET { @@ -1028,25 +1055,26 @@ TabPage TP_PRIVATE_DATA Text [ English ] = "Zip/City" ; Text[ english_us ] = "Zip/Cit~y"; Text[ portuguese ] = "CP/~Localidade"; - Text[ russian ] = "项黩.桧溴犟/泐痤"; + Text[ russian ] = "项黩钼 桧溴犟/妙痤"; Text[ greek ] = "../悬腌"; Text[ dutch ] = "~Postcode/Plaats"; Text[ french ] = "C.P./~Ville"; - Text[ spanish ] = "CP/Ciuda~d"; + Text[ spanish ] = "C.P./Ciuda~d"; Text[ italian ] = "C.A.P./Localit"; Text[ danish ] = "Postnr./By"; Text[ swedish ] = "~Postnr/Ort"; Text[ polish ] = "Kod pocztowy/Miejscowo滄"; Text[ portuguese_brazilian ] = "Zip/City"; Text[ japanese ] = "閮典究鐣彿/閮介亾搴滅湆鍚(~Y)"; - Text[ korean ] = "鞖绊幐氩堩樃/霃勳嫓(~Y)"; + Text[ korean ] = "鞖绊幐氩堩樃/甑/甑/鞁(~Y)"; Text[ chinese_simplified ] = "閭紪/鍩庡競(~Y)"; Text[ chinese_traditional ] = "閮甸仦鍗铏/鍩庡競(~Y)"; Text[ arabic ] = "轻雁 轻妊硐/轻阆礓"; Text[ turkish ] = "Posta kodu/辝hir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "CP/Ciuda~d"; + Text[ catalan ] = "Codi postal/Ciuta~t"; Text[ finnish ] = "Postinumero/Posti~toimipaikka"; + Text[ thai ] = "喔｀斧喔编釜喙勦笡喔｀俯喔撪傅喔⑧箤/喙喔∴阜喔瓇喔"; }; Edit ED_ZIP { @@ -1068,7 +1096,7 @@ TabPage TP_PRIVATE_DATA Text [ English ] = "Country/State" ; Text[ english_us ] = "Co~untry/State"; Text[ portuguese ] = "~Pa韘"; - Text[ russian ] = "羊疣磬/钺豚耱"; + Text[ russian ] = "羊疣磬/吾豚耱"; Text[ greek ] = "襻"; Text[ dutch ] = "~Land"; Text[ french ] = "~Pays/蓆at"; @@ -1086,7 +1114,8 @@ TabPage TP_PRIVATE_DATA Text[ turkish ] = "躭ke/輑"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Pa韘/Provincia"; - Text[ finnish ] = "Val~tio/osavaltio"; + Text[ finnish ] = "Maa/osaval~tio"; + Text[ thai ] = "喔涏福喔班箑~喔椸辅/喔｀副喔"; }; Edit ED_COUNTRY { @@ -1108,7 +1137,7 @@ TabPage TP_PRIVATE_DATA Text [ English ] = "Title/Profession" ; Text[ english_us ] = "Title/~Profession"; Text[ portuguese ] = "~T韙ulo/Profiss鉶"; - Text[ russian ] = "诣蝮/镳铘羼耔"; + Text[ russian ] = "氢囗桢/漕腈眍耱"; Text[ greek ] = "~赃綦矧/硼茔沐腱"; Text[ dutch ] = "Titel/Beroep"; Text[ french ] = "~Titre/Profession"; @@ -1125,8 +1154,9 @@ TabPage TP_PRIVATE_DATA Text[ arabic ] = "轻徂 轻沐漤/轻尜磔"; Text[ turkish ] = "Unvan/Meslek"; Text[ language_user1 ] = " "; - Text[ catalan ] = "T韙ulo/Pro~fesi髇"; - Text[ finnish ] = "Asema/~ammatti"; + Text[ catalan ] = "T韙ol/Pro~fessi"; + Text[ finnish ] = "Teht鋠/~ammatti"; + Text[ thai ] = "喔曕赋喙佮斧喔權箞喔/~喔覆喔娻傅喔"; }; Edit ED_TITLE { @@ -1150,7 +1180,7 @@ TabPage TP_PRIVATE_DATA Text[ portuguese ] = "Telefone/Telem髒el"; Text[ russian ] = "义脲纛/祛徼朦睇"; Text[ greek ] = "早胼鳄盹/书礴酎"; - Text[ dutch ] = "Telefoon/mobile"; + Text[ dutch ] = "Telefoon/mobiele tel."; Text[ french ] = "T閘閜hone/Portable"; Text[ spanish ] = "Tel閒ono/M髒il"; Text[ italian ] = "Tel./Cell."; @@ -1159,13 +1189,14 @@ TabPage TP_PRIVATE_DATA Text[ polish ] = "Telefon/Kom髍ka"; Text[ portuguese_brazilian ] = "Phone/Mobile"; Text[ japanese ] = "鑷畢闆昏┍/鎼哄腐闆昏┍"; - Text[ korean ] = "鞝勴檾/頃鸽摐韽"; + Text[ korean ] = "鞝勴檾/頊措寑韽"; Text[ chinese_simplified ] = "鐢佃瘽/鎵嬫満"; Text[ chinese_traditional ] = "闆昏┍/绉诲嫊闆昏┍"; Text[ turkish ] = "Phone/Mobile"; Text[ arabic ] = "轻迩瘦/轻阃沔"; - Text[ catalan ] = "Tel閒ono/M髒il"; + Text[ catalan ] = "Tel鑖ono/M骲il"; Text[ finnish ] = "Puhelin/Matkapuhelin"; + Text[ thai ] = "喙傕笚喔｀辅喔编笧喔椸箤/喔∴阜喔笘喔粪腑"; }; Edit ED_PHONE { @@ -1206,6 +1237,7 @@ TabPage TP_PRIVATE_DATA Text[ language_user1 ] = " "; Text[ catalan ] = "Fa~x"; Text[ finnish ] = "Fak~si"; + Text[ thai ] = "喙傕笚喔喔覆喔"; }; Edit ED_FAX { @@ -1221,25 +1253,26 @@ TabPage TP_PRIVATE_DATA Text [ English ] = "Homepage / eMail" ; Text[ english_us ] = "Homepage / e-mail"; Text[ portuguese ] = "Homepage / e-mail"; - Text[ russian ] = "念.耱疣龛鲟 / .镱黩"; + Text[ russian ] = "羊疣龛鲟 / . 镱黩"; Text[ greek ] = "榴鏖贽 箦脒溽 / E-Mail"; Text[ dutch ] = "Homepage / e-mail"; Text[ french ] = "Homepage / E-mail"; - Text[ spanish ] = "P醙ina principal / e-mail"; + Text[ spanish ] = "P醙ina principal / Correo-e"; Text[ italian ] = "Homepage/eMail"; Text[ danish ] = "Hjemmeside/E-mail"; Text[ swedish ] = "Hemsida / e-post"; Text[ polish ] = "Strona macierzysta/e-mail"; Text[ portuguese_brazilian ] = "Homepage / eMail"; Text[ japanese ] = "銉涖兗銉犮儦銉笺偢/E-mail"; - Text[ korean ] = "頇堩帢鞚挫/鞝勳瀽 氅旍澕"; + Text[ korean ] = "頇堩帢鞚挫/鞝勳瀽氅旍澕"; Text[ chinese_simplified ] = "涓婚〉/鐢靛瓙閭欢"; Text[ chinese_traditional ] = "棣栭爜/闆诲瓙閮典欢"; Text[ arabic ] = "沔挹 轻配恃涫 / 轻妊硐 轻裴呤焰漤"; Text[ turkish ] = "Web sayfas / E-posta"; Text[ language_user1 ] = " "; - Text[ catalan ] = "P醙ina principal / e-mail"; + Text[ catalan ] = "P鄃ina principal / e-mail"; Text[ finnish ] = "Kotisivu/s鋒k鰌osti"; + Text[ thai ] = "喙傕府喔∴箑喔炧笀 / 喔傅喙喔∴弗喙"; }; Edit ED_WWW { @@ -1284,8 +1317,9 @@ TabPage TP_BUSINESS_DATA Text[ arabic ] = "软卿鞘 轻阢"; Text[ turkish ] = "蔺 Bilgileri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Datos del trabajo"; + Text[ catalan ] = "Dades professionals"; Text[ finnish ] = "Liiketiedot"; + Text[ thai ] = "喔傕箟喔浮喔灌弗喔椸覆喔囙笜喔膏福喔佮复喔"; }; FixedText FT_COMP { @@ -1295,9 +1329,9 @@ TabPage TP_BUSINESS_DATA Text [ English ] = "Company" ; Text[ english_us ] = "Company"; Text[ portuguese ] = "~Firma"; - Text[ russian ] = "橡邃镳蜩"; + Text[ russian ] = "勿汔龛玎鲨"; Text[ greek ] = "舿翎轳哚"; - Text[ dutch ] = "~Firma"; + Text[ dutch ] = "~Bedrijf"; Text[ french ] = "~Soci閠"; Text[ spanish ] = "E~mpresa"; Text[ italian ] = "Azienda"; @@ -1312,8 +1346,9 @@ TabPage TP_BUSINESS_DATA Text[ arabic ] = "轻匝呱"; Text[ turkish ] = "~辤rket ad"; Text[ language_user1 ] = " "; - Text[ catalan ] = "E~mpresa"; + Text[ catalan ] = "Empresa"; Text[ finnish ] = "Yritys"; + Text[ thai ] = "喔氞福喔脆俯喔编笚"; }; Edit ED_COMP { @@ -1329,9 +1364,9 @@ TabPage TP_BUSINESS_DATA Text [ English ] = "Company 2nd line" ; Text[ english_us ] = "Company 2nd line"; Text[ portuguese ] = "Firma: ~2 linha"; - Text[ russian ] = "橡邃镳蜩 2- 耱痤赅"; + Text[ russian ] = "勿汔龛玎鲨 2- 耱痤赅"; Text[ greek ] = "鹏衢襁 2 泷犰燹"; - Text[ dutch ] = "Firma ~2e regel"; + Text[ dutch ] = "Bedrijf ~2e regel"; Text[ french ] = "Soci閠 : ~2e ligne"; Text[ spanish ] = "Empresa (~2 l韓ea)"; Text[ italian ] = "Azienda (2 riga)"; @@ -1340,14 +1375,15 @@ TabPage TP_BUSINESS_DATA Text[ polish ] = "Firma 2 wiersz"; Text[ portuguese_brazilian ] = "Company 2nd line"; Text[ japanese ] = "浼氱ぞ鍚 2琛岀洰"; - Text[ korean ] = "須岇偓 2氩堨Ц 欷"; + Text[ korean ] = "須岇偓 欷2"; Text[ chinese_simplified ] = "鍏徃(绗簩琛)"; Text[ chinese_traditional ] = "鍏徃(绗簩琛)"; Text[ arabic ] = "轻匝呱 轻迂 轻饲漤"; Text[ turkish ] = "辤rket ad ( 2'nci sat齬)"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Empresa ~2da l韓ea"; + Text[ catalan ] = "Empresa ~2a l韓ia"; Text[ finnish ] = "Yritys2"; + Text[ thai ] = "喔氞福喔脆俯喔编笚喔氞福喔｀笚喔编笖喔椸傅喙堗釜喔竾"; }; Edit ED_COMP_EXT { @@ -1382,6 +1418,7 @@ TabPage TP_BUSINESS_DATA Text[ language_user1 ] = " "; Text[ catalan ] = "Esl~ogan"; Text[ finnish ] = "Iskulause"; + Text[ thai ] = "喔箓喔ム箒喔佮笝"; }; Edit ED_SLOGAN { @@ -1408,14 +1445,15 @@ TabPage TP_BUSINESS_DATA Text[ polish ] = "Ulica"; Text[ portuguese_brazilian ] = "Street"; Text[ japanese ] = "甯傜敽鏉戝悕鐣湴"; - Text[ korean ] = "瓯半Μ氩堨"; + Text[ korean ] = "欤检唽"; Text[ chinese_simplified ] = "琛楅亾"; Text[ chinese_traditional ] = "琛楅亾"; Text[ arabic ] = "轻郧掩"; Text[ turkish ] = "Sokak"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Calle"; + Text[ catalan ] = "Carrer"; Text[ finnish ] = "Katuosoite"; + Text[ thai ] = "喔栢笝喔"; }; Edit ED_STREET { @@ -1431,25 +1469,26 @@ TabPage TP_BUSINESS_DATA Text [ English ] = "ZIP/City" ; Text[ english_us ] = "ZIP/City"; Text[ portuguese ] = "CP/~Localidade"; - Text[ russian ] = "项黩.桧溴犟/泐痤"; + Text[ russian ] = "项黩钼 桧溴犟/妙痤"; Text[ greek ] = "../悬腌"; Text[ dutch ] = "Pos~tcode/Plaats"; Text[ french ] = "C.P/~Ville"; - Text[ spanish ] = "CP/Ciu~dad"; + Text[ spanish ] = "C.P./Ciuda~d"; Text[ italian ] = "C.A.P./Localit"; Text[ danish ] = "Postnr./By"; Text[ swedish ] = "Postnr/Or~t"; Text[ polish ] = "Kod pocztowy/Miejscowo滄"; Text[ portuguese_brazilian ] = "ZIP/City"; Text[ japanese ] = "閮典究鐣彿/閮介亾搴滅湆鍚"; - Text[ korean ] = "鞖绊幐氩堩樃/霃勳嫓"; + Text[ korean ] = "鞖绊幐氩堩樃/甑/甑/鞁"; Text[ chinese_simplified ] = "閭紪/鍩庡競"; Text[ chinese_traditional ] = "閮甸仦鍗铏/鍩庡競"; Text[ arabic ] = "轻雁 轻妊硐/轻阆礓"; Text[ turkish ] = "Posta kodu/辝hir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "CP/Ciu~dad"; + Text[ catalan ] = "Codi postal/Ciutat"; Text[ finnish ] = "Postinumero/postitoimipaikka"; + Text[ thai ] = "喔｀斧喔编釜喙勦笡喔｀俯喔撪傅喔⑧箤/喙喔∴阜喔竾"; }; Edit ED_ZIP { @@ -1471,7 +1510,7 @@ TabPage TP_BUSINESS_DATA Text [ English ] = "Country/State" ; Text[ english_us ] = "Country/State"; Text[ portuguese ] = "~Pa韘"; - Text[ russian ] = "羊疣磬/钺豚耱"; + Text[ russian ] = "羊疣磬/吾豚耱"; Text[ greek ] = "襻"; Text[ dutch ] = "~Land"; Text[ french ] = "~Pays/蓆at"; @@ -1489,7 +1528,8 @@ TabPage TP_BUSINESS_DATA Text[ turkish ] = "躭ke/輑"; Text[ language_user1 ] = " "; Text[ catalan ] = "Pa韘/Pro~vincia"; - Text[ finnish ] = "Valtio/osavaltio"; + Text[ finnish ] = "Maa/osavaltio"; + Text[ thai ] = "喔涏福喔班箑喔椸辅/喔｀副喔"; }; Edit ED_COUNTRY { @@ -1522,14 +1562,15 @@ TabPage TP_BUSINESS_DATA Text[ polish ] = "Pozycja"; Text[ portuguese_brazilian ] = "Position"; Text[ japanese ] = "閮ㄧ讲"; - Text[ korean ] = "歆侅渼"; + Text[ korean ] = "攵靹"; Text[ chinese_simplified ] = "浣嶇疆"; Text[ chinese_traditional ] = "浣嶇疆"; Text[ arabic ] = "轻沅杖 轻尜磔"; Text[ turkish ] = "Pozisyon"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Posici髇"; + Text[ catalan ] = "~Posici"; Text[ finnish ] = "Sijainti"; + Text[ thai ] = "喔曕赋喙佮斧喔權箞喔"; }; Edit ED_POSITION { @@ -1547,7 +1588,7 @@ TabPage TP_BUSINESS_DATA Text[ portuguese ] = "Telefone/Telem髒el"; Text[ russian ] = "义脲纛/祛徼朦睇"; Text[ greek ] = "早胼鳄盹/书礴酎"; - Text[ dutch ] = "Telefoon/mobile"; + Text[ dutch ] = "Telefoon/mobiel"; Text[ french ] = "T閘閜hone/Portable"; Text[ spanish ] = "Tel閒ono/M髒il"; Text[ italian ] = "Tel./Cell."; @@ -1556,13 +1597,14 @@ TabPage TP_BUSINESS_DATA Text[ polish ] = "Telefon/Kom髍ka"; Text[ portuguese_brazilian ] = "Phone/Mobile"; Text[ japanese ] = "浼氱ぞ闆昏┍/鎼哄腐闆昏┍"; - Text[ korean ] = "鞝勴檾/頃鸽摐韽"; + Text[ korean ] = "鞝勴檾/頊措寑韽"; Text[ chinese_simplified ] = "鐢佃瘽/鎵嬫満"; Text[ chinese_traditional ] = "闆昏┍/绉诲嫊闆昏┍"; Text[ turkish ] = "Phone/Mobile"; Text[ arabic ] = "轻迩瘦/轻阃沔"; - Text[ catalan ] = "Tel閒ono/M髒il"; + Text[ catalan ] = "Tel鑖ono/M騜il"; Text[ finnish ] = "Puhelin/Matkapuhelin"; + Text[ thai ] = "喙傕笚喔｀辅喔编笧喔椸箤/喔∴阜喔笘喔粪腑"; }; Edit ED_PHONE { @@ -1602,6 +1644,7 @@ TabPage TP_BUSINESS_DATA Text[ arabic ] = "轻萸哂"; Text[ catalan ] = "Fax"; Text[ finnish ] = "Faksi"; + Text[ thai ] = "喙傕笚喔｀釜喔侧福"; }; Edit ED_FAX { @@ -1617,25 +1660,26 @@ TabPage TP_BUSINESS_DATA Text [ English ] = "Homepage / eMail" ; Text[ english_us ] = "Ho~mepage / e-mail"; Text[ portuguese ] = "Ho~mepage / e-mail"; - Text[ russian ] = "念.耱疣龛鲟 /.镱黩"; + Text[ russian ] = "C蝠囗鑯鲟 /. 镱黩"; Text[ greek ] = "榴鏖贽 箦脒溽 / E-Mail"; Text[ dutch ] = "Ho~mepage / e-mail"; Text[ french ] = "~Homepage / E-mail"; - Text[ spanish ] = "P醙ina principal / ~e-mail"; + Text[ spanish ] = "P醙ina principal / ~Correo-e"; Text[ italian ] = "Ho~mepage/eMail"; Text[ danish ] = "Hjemmeside/E-mail"; Text[ swedish ] = "He~msida / e-post"; Text[ polish ] = "Strona macierzysta/e-mail"; Text[ portuguese_brazilian ] = "Homepage / eMail"; Text[ japanese ] = "銉涖兗銉犮儦銉笺偢/E-~mail"; - Text[ korean ] = "頇堩帢鞚挫/鞝勳瀽 氅旍澕(~M)"; + Text[ korean ] = "頇堩帢鞚挫/鞝勳瀽氅旍澕(~M)"; Text[ chinese_simplified ] = "涓婚〉/鐢靛瓙閭欢(~M)"; Text[ chinese_traditional ] = "棣栭爜/闆诲瓙閮典欢(~M)"; Text[ arabic ] = "沔挹 轻配恃涫 / 轻妊硐 轻裴呤焰漤"; Text[ turkish ] = "Web sayfas / E-posta"; Text[ language_user1 ] = " "; - Text[ catalan ] = "P醙ina principal / ~e-mail"; + Text[ catalan ] = "P鄃ina principal / ~e-mail"; Text[ finnish ] = "Ko~tisivu/s鋒k鰌osti"; + Text[ thai ] = "喙傕府喔∴箑~喔炧笀 / 喔傅喙喔∴弗喙"; }; Edit ED_WWW { @@ -1665,3 +1709,8 @@ TabPage TP_BUSINESS_DATA + + + + + diff --git a/sw/source/ui/envelp/labfmt.src b/sw/source/ui/envelp/labfmt.src index 9d2c711b279d..8e9415a47544 100644 --- a/sw/source/ui/envelp/labfmt.src +++ b/sw/source/ui/envelp/labfmt.src @@ -2,9 +2,9 @@ * * $RCSfile: labfmt.src,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:20:41 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -97,24 +97,25 @@ TabPage TP_LAB_FMT Text [ portuguese ] = "Espa鏰mento ~horiz." ; Text [ finnish ] = "~Vaakaet鋓syys" ; Text [ danish ] = "Vandret afstand" ; - Text [ french ] = "蒫art ~horizontal" ; + Text [ french ] = "蒫art horizontal" ; Text [ swedish ] = "~Horis. avst錸d" ; Text [ dutch ] = "~Horiz. afstand" ; Text [ spanish ] = "Distancia ~horiz." ; Text [ english_us ] = "Hori~zontal pitch" ; Group = TRUE ; Left = TRUE ; - Text[ chinese_simplified ] = "水平间隔(~Z)"; + Text[ chinese_simplified ] = "姘村钩闂撮殧(~Z)"; Text[ russian ] = "剜 镱 泐痂珙眚."; Text[ polish ] = "Odst阷 poziomy"; - Text[ japanese ] = "墶偺娫妘(~Z)"; - Text[ chinese_traditional ] = "キ丁筳(~Z)"; + Text[ japanese ] = "妯伄闁撻殧(~Z)"; + Text[ chinese_traditional ] = "姘村钩闁撻殧(~Z)"; Text[ arabic ] = "轻呜嫔 轻幂揄"; Text[ greek ] = "像殒糸 狃翎箸"; - Text[ korean ] = "啊肺 埃拜(~Z)"; + Text[ korean ] = "靾橅弶 臧勱博(~Z)"; Text[ turkish ] = "~Yatay bouk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Distancia ~horiz."; + Text[ catalan ] = "Dist鄋cia ~horit."; + Text[ thai ] = "喔｀赴喔⑧赴喔箞喔侧竾喙佮笝喔о笝~喔笝"; }; MetricField FLD_HDIST { @@ -144,20 +145,21 @@ TabPage TP_LAB_FMT Text [ french ] = "蒫art ~vertical" ; Text [ swedish ] = "~Vert. avst錸d" ; Text [ dutch ] = "V~ert. afstand" ; - Text [ spanish ] = "Distancia ~vert." ; + Text [ spanish ] = "Distancia ~vertical" ; Text [ english_us ] = "~Vertical pitch" ; Left = TRUE ; - Text[ chinese_simplified ] = "垂直间隔(~V)"; + Text[ chinese_simplified ] = "鍨傜洿闂撮殧(~V)"; Text[ russian ] = "剜 镱 忮痱桕."; Text[ polish ] = "Odst阷 pionowy"; - Text[ japanese ] = "廲偺娫妘(~V)"; - Text[ chinese_traditional ] = "丁筳(~V)"; + Text[ japanese ] = "绺︺伄闁撻殧(~V)"; + Text[ chinese_traditional ] = "鍨傜洿闁撻殧(~V)"; Text[ arabic ] = "轻呜嫔 轻衙禹"; Text[ greek ] = "梳翎挈聃鲧 狃翎箸"; - Text[ korean ] = "技肺 埃拜(~V)"; + Text[ korean ] = "靾橃 臧勱博(~V)"; Text[ turkish ] = "Dikey bouk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Distancia ~vert."; + Text[ catalan ] = "Dist鄋cia ~vert."; + Text[ thai ] = "喔｀赴喔⑧赴喔箞喔侧竾喙佮笝喔喔曕副喙夃竾"; }; MetricField FLD_VDIST { @@ -179,28 +181,29 @@ TabPage TP_LAB_FMT 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 ] = "~Largeur" ; + Text [ french ] = "Largeur" ; Text [ swedish ] = "~Bredd" ; Text [ dutch ] = "B~reedte" ; - Text [ spanish ] = "A~ncho" ; + Text [ spanish ] = "Ancho" ; Text [ english_us ] = "~Width" ; Left = TRUE ; - Text[ chinese_simplified ] = "宽(~W)"; + Text[ chinese_simplified ] = "瀹藉害(~W)"; Text[ russian ] = "罔痂磬"; Text[ polish ] = "Szer."; - Text[ japanese ] = "暆(~W)"; - Text[ chinese_traditional ] = "糴(~W)"; + Text[ japanese ] = "骞(~W)"; + Text[ chinese_traditional ] = "瀵害(~W)"; Text[ arabic ] = "轻谘"; Text[ greek ] = "须荇矧"; - Text[ korean ] = "呈厚(~W)"; + Text[ korean ] = "雱堧箘(~W)"; Text[ turkish ] = "Ge~niik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "A~ncho"; + Text[ catalan ] = "~Amplada"; + Text[ thai ] = "喔勦抚喔侧浮~喔佮抚喙夃覆喔"; }; MetricField FLD_WIDTH { @@ -227,23 +230,24 @@ TabPage TP_LAB_FMT Text [ portuguese ] = "Altura" ; Text [ finnish ] = "~Korkeus" ; Text [ danish ] = "H鴍de" ; - Text [ french ] = "~Hauteur" ; + Text [ french ] = "Hauteur" ; Text [ swedish ] = "H鰆~d" ; Text [ dutch ] = "H~oogte" ; Text [ spanish ] = "A~ltura" ; Text [ english_us ] = "~Height" ; Left = TRUE ; - Text[ chinese_simplified ] = "高(~H)"; - Text[ russian ] = "蔓耦蜞"; + Text[ chinese_simplified ] = "楂樺害(~H)"; + Text[ russian ] = "聗铗"; Text[ polish ] = "Wys."; - Text[ japanese ] = "崅偝(~H)"; - Text[ chinese_traditional ] = "蔼(~H)"; + Text[ japanese ] = "楂樸仌(~H)"; + Text[ chinese_traditional ] = "楂樺害(~H)"; Text[ arabic ] = "轻茄瘦勤"; Text[ greek ] = "绝矧"; - Text[ korean ] = "臭捞(~H)"; + Text[ korean ] = "雴掛澊(~H)"; Text[ turkish ] = "~Y黭seklik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "A~ltura"; + Text[ catalan ] = "A~l鏰da"; + Text[ thai ] = "喔勦抚喔侧浮~喔腹喔"; }; MetricField FLD_HEIGHT { @@ -268,25 +272,26 @@ TabPage TP_LAB_FMT Text [ italian ] = "Margine sinistro" ; Text [ portuguese_brazilian ] = "Margem esquerda" ; Text [ portuguese ] = "Margem esquerda" ; - Text [ finnish ] = "~Vasen marginaali" ; + Text [ finnish ] = "~Vasen reunus" ; Text [ danish ] = "Margen venstre" ; - Text [ french ] = "~Marge gauche" ; + Text [ french ] = "Marge gauche" ; Text [ swedish ] = "V鋘ster margina~l" ; - Text [ dutch ] = "~Marge links" ; + Text [ dutch ] = "Linker~marge" ; Text [ spanish ] = "Margen i~zquierdo" ; Text [ english_us ] = "~Left margin" ; Left = TRUE ; - Text[ chinese_simplified ] = "左方页边距(~L)"; + Text[ chinese_simplified ] = "宸︽柟椤佃竟璺(~L)"; Text[ russian ] = "隋恹 牮嚅"; Text[ polish ] = "Lewy margines"; - 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 ] = "S~ol kenar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Margen i~zquierdo"; + Text[ catalan ] = "~Marge esquerre"; + Text[ thai ] = "喔｀赴喔⑧赴喔傕腑喔殈喔嬥箟喔侧涪"; }; MetricField FLD_LEFT { @@ -318,20 +323,21 @@ TabPage TP_LAB_FMT Text [ french ] = "Marge ~sup閞ieure" ; Text [ swedish ] = "~講re marginal" ; Text [ dutch ] = "~Bovenmarge" ; - Text [ spanish ] = "M~argen superior" ; + Text [ spanish ] = "Margen superior" ; Text [ english_us ] = "~Top margin" ; Left = TRUE ; - Text[ chinese_simplified ] = "上方页边距(~T)"; + Text[ chinese_simplified ] = "涓婃柟椤佃竟璺(~T)"; Text[ russian ] = "洛瘐龛 牮嚅"; Text[ polish ] = "Margines g髍ny"; - Text[ japanese ] = "忋梋敀(~T)"; - Text[ chinese_traditional ] = "娩(~T)"; + Text[ japanese ] = "涓婁綑鐧(~T)"; + Text[ chinese_traditional ] = "涓婇倞妗(~T)"; Text[ arabic ] = "轻迩阍 轻卺骓"; Text[ greek ] = "㈨ 疱耖棹耖"; - Text[ korean ] = "困 咯归(~T)"; + Text[ korean ] = "鞙 鞐氨(~T)"; Text[ turkish ] = "躶t kenar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "M~argen superior"; + Text[ catalan ] = "~Marge superior"; + Text[ thai ] = "喔｀赴喔⑧赴喔傕腑喔殈喔氞笝"; }; MetricField FLD_UPPER { @@ -358,7 +364,7 @@ TabPage TP_LAB_FMT Text [ italian ] = "~Colonne" ; Text [ portuguese_brazilian ] = "Colunas" ; Text [ portuguese ] = "~Colunas" ; - Text [ finnish ] = "~Sarakkeet" ; + Text [ finnish ] = "Pal~stat" ; Text [ danish ] = "Kolonner" ; Text [ french ] = "~Colonnes" ; Text [ swedish ] = "Kolumner" ; @@ -366,17 +372,18 @@ TabPage TP_LAB_FMT Text [ spanish ] = "Column~as" ; Text [ english_us ] = "~Columns" ; Left = TRUE ; - Text[ chinese_simplified ] = "列(~C)"; - Text[ russian ] = "暑腩黻"; + Text[ chinese_simplified ] = "鍒(~C)"; + Text[ russian ] = "羊铍狯"; Text[ polish ] = "Kolumny"; - Text[ japanese ] = "楍(~C)"; - Text[ chinese_traditional ] = "逆(~C)"; + Text[ japanese ] = "鍒(~C)"; + Text[ chinese_traditional ] = "娆(~C)"; Text[ arabic ] = "轻泌阆"; Text[ greek ] = "郁揠弪"; - Text[ korean ] = "凯(~C)"; + Text[ korean ] = "鞐(~C)"; Text[ turkish ] = "~S黷un"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Column~as"; + Text[ catalan ] = "~Columnes"; + Text[ thai ] = "~喔勦腑喔ム副喔∴笝喙"; }; NumericField FLD_COLUMNS { @@ -402,23 +409,24 @@ TabPage TP_LAB_FMT Text [ portuguese ] = "Linhas" ; Text [ finnish ] = "~Rivit" ; Text [ danish ] = "R鎘ker" ; - Text [ french ] = "~Lignes" ; + Text [ french ] = "Lignes" ; Text [ swedish ] = "~Rader" ; Text [ dutch ] = "~Rijen" ; Text [ spanish ] = "~Filas" ; Text [ english_us ] = "R~ows" ; Left = TRUE ; - Text[ chinese_simplified ] = "行(~O)"; + Text[ chinese_simplified ] = "琛(~O)"; Text[ russian ] = "羊痤觇"; Text[ polish ] = "Wiersze"; - Text[ japanese ] = "峴(~O)"; - Text[ chinese_traditional ] = "︽(~O)"; + Text[ japanese ] = "琛(~O)"; + Text[ chinese_traditional ] = "琛(~O)"; Text[ arabic ] = "轻蛰孑"; Text[ greek ] = "民犰燧"; - Text[ korean ] = "青(~O)"; + Text[ korean ] = "頄(~O)"; Text[ turkish ] = "~Sat齬"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Filas"; + Text[ catalan ] = "F~iles"; + Text[ thai ] = "喙佮笘~喔"; }; NumericField FLD_ROWS { @@ -446,18 +454,19 @@ TabPage TP_LAB_FMT Text[ french ] = "~Enregistrer..."; Text[ spanish ] = "~Guardar..."; Text[ italian ] = "~Salva..."; - Text[ danish ] = "Save..."; + Text[ danish ] = "~Gem..."; Text[ swedish ] = "~Spara..."; Text[ polish ] = "Zapisz..."; Text[ portuguese_brazilian ] = "Save..."; - Text[ japanese ] = "曐懚(~S)..."; - Text[ korean ] = "历厘(~S)..."; - Text[ chinese_simplified ] = "存盘(~S)..."; - Text[ chinese_traditional ] = "纗(~S)..."; + Text[ japanese ] = "淇濆瓨(~S)..."; + Text[ korean ] = "鞝鞛(~S)..."; + Text[ chinese_simplified ] = "瀛樼洏(~S)..."; + Text[ chinese_traditional ] = "鍎插瓨(~S)..."; Text[ turkish ] = "Save..."; Text[ arabic ] = "洼..."; - Text[ catalan ] = "~Guardar..."; - Text[ finnish ] = "~Tallenna"; + Text[ catalan ] = "~Desa..."; + Text[ finnish ] = "~Tallenna..."; + Text[ thai ] = "~喔氞副喔權笚喔多竵..."; }; }; // String ******************************************************************* @@ -476,17 +485,18 @@ String STR_HDIST Text [ dutch ] = "H. afstand" ; Text [ spanish ] = "Distancia h." ; Text [ english_us ] = "H. Pitch" ; - Text[ chinese_simplified ] = "水平间隔"; + Text[ chinese_simplified ] = "姘村钩闂撮殧"; Text[ russian ] = "剜 镱 泐痂珙眚."; Text[ polish ] = "Odst阷 poziomy"; - Text[ japanese ] = "墶偺娫妘"; - Text[ chinese_traditional ] = "キ丁筳"; + Text[ japanese ] = "妯伄闁撻殧"; + Text[ chinese_traditional ] = "姘村钩闁撻殧"; Text[ arabic ] = "轻呜嫔 轻幂揄"; Text[ greek ] = "像殒糸 狃翎箸"; - Text[ korean ] = "啊肺 埃拜"; + Text[ korean ] = "靾橅弶 臧勱博"; Text[ turkish ] = "Y. bouk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Distancia h."; + Text[ catalan ] = "Dist鄋cia h."; + Text[ thai ] = "喔｀赴喔⑧赴喔箞喔侧竾喙佮笝喔о笝喔笝"; }; String STR_VDIST { @@ -503,17 +513,18 @@ String STR_VDIST Text [ dutch ] = "V. afstand" ; Text [ spanish ] = "Distancia v." ; Text [ english_us ] = "V. Pitch" ; - Text[ chinese_simplified ] = "垂直间隔"; + Text[ chinese_simplified ] = "鍨傜洿闂撮殧"; Text[ russian ] = "剜 镱 忮痱桕."; Text[ polish ] = "Odst阷 pionowy"; - Text[ japanese ] = "廲偺娫妘"; - Text[ chinese_traditional ] = "丁筳"; + Text[ japanese ] = "绺︺伄闁撻殧"; + Text[ chinese_traditional ] = "鍨傜洿闁撻殧"; Text[ arabic ] = "轻呜嫔 轻衙禹"; Text[ greek ] = "梳翎. 狃翎箸"; - Text[ korean ] = "技肺 埃拜"; + Text[ korean ] = "靾橃 臧勱博"; Text[ turkish ] = "D. bouk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Distancia v."; + Text[ catalan ] = "Dist鄋cia v."; + Text[ thai ] = "喔｀赴喔⑧赴喔箞喔侧竾喙佮笝喔о笗喔编箟喔"; }; String STR_WIDTH { @@ -530,17 +541,18 @@ String STR_WIDTH Text [ dutch ] = "Breedte" ; Text [ spanish ] = "Ancho" ; Text [ english_us ] = "Width" ; - Text[ chinese_simplified ] = "宽"; + Text[ chinese_simplified ] = "瀹藉害"; Text[ russian ] = "罔痂磬"; Text[ polish ] = "Szeroko滄"; - Text[ japanese ] = "暆"; - Text[ chinese_traditional ] = "糴"; + Text[ japanese ] = "骞"; + Text[ chinese_traditional ] = "瀵害"; Text[ arabic ] = "轻谘"; Text[ greek ] = "须荇矧"; - Text[ korean ] = "呈厚"; + Text[ korean ] = "雱堧箘"; Text[ turkish ] = "Geniik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ancho"; + Text[ catalan ] = "Amplada"; + Text[ thai ] = "喔勦抚喔侧浮喔佮抚喙夃覆喔"; }; String STR_HEIGHT { @@ -551,23 +563,24 @@ String STR_HEIGHT Text [ portuguese_brazilian ] = "Altura" ; Text [ portuguese ] = "Altura" ; Text [ finnish ] = "Korkeus" ; - Text [ danish ] = "H鴍de" ; + Text [ danish ] = "H鴡jde" ; Text [ french ] = "Hauteur" ; Text [ swedish ] = "H鰆d" ; Text [ dutch ] = "Hoogte" ; Text [ spanish ] = "Altura" ; Text [ english_us ] = "Height" ; - Text[ chinese_simplified ] = "高"; + Text[ chinese_simplified ] = "楂樺害"; Text[ russian ] = "蔓耦蜞"; Text[ polish ] = "Wysoko滄"; - Text[ japanese ] = "崅偝"; - Text[ chinese_traditional ] = "蔼"; + Text[ japanese ] = "楂樸仌"; + Text[ chinese_traditional ] = "楂樺害"; Text[ arabic ] = "轻茄瘦勤"; Text[ greek ] = "绝矧"; - Text[ korean ] = "臭捞"; + Text[ korean ] = "雴掛澊"; Text[ turkish ] = "Y黭seklik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Altura"; + Text[ catalan ] = "Al鏰da"; + Text[ thai ] = "喔勦抚喔侧浮喔腹喔"; }; String STR_LEFT { @@ -577,24 +590,25 @@ String STR_LEFT Text [ italian ] = "Margine sinistro" ; Text [ portuguese_brazilian ] = "Margem esquerda" ; Text [ portuguese ] = "Margem esquerda" ; - Text [ finnish ] = "Vasen marginaali" ; + Text [ finnish ] = "Vasen reunus" ; Text [ danish ] = "Margen venstre" ; Text [ french ] = "Marge gauche" ; Text [ swedish ] = "V鋘ster marginal" ; - Text [ dutch ] = "Linker marge" ; + Text [ dutch ] = "Linkermarge" ; Text [ spanish ] = "Margen izquierdo" ; Text [ english_us ] = "Left margin" ; - Text[ chinese_simplified ] = "左方页边距"; + Text[ chinese_simplified ] = "宸︽柟椤佃竟璺"; Text[ russian ] = "隋恹 牮嚅"; Text[ polish ] = "Lewy margines"; - Text[ japanese ] = "嵍梋敀"; - Text[ chinese_traditional ] = "オ娩"; + Text[ japanese ] = "宸︿綑鐧"; + Text[ chinese_traditional ] = "宸﹂倞妗"; Text[ arabic ] = "轻迩阍 轻庙友"; Text[ greek ] = "榴轶翦顸 疱耖棹耖"; - Text[ korean ] = "哭率 咯归"; + Text[ korean ] = "鞕检 鞐氨"; Text[ turkish ] = "Sol kenar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Margen izquierdo"; + Text[ catalan ] = "Marge esquerre"; + Text[ thai ] = "喔｀赴喔⑧赴喔傕腑喔氞笅喙夃覆喔"; }; String STR_UPPER { @@ -604,24 +618,25 @@ String STR_UPPER Text [ italian ] = "Margine superiore" ; Text [ portuguese_brazilian ] = "Margem superior" ; Text [ portuguese ] = "Margem superior" ; - Text [ finnish ] = "Yl鋗arginaali" ; + Text [ finnish ] = "Yl鋜eunus" ; Text [ danish ] = "Margen foroven" ; Text [ french ] = "Marge sup閞ieure" ; Text [ swedish ] = "講re marginal" ; Text [ dutch ] = "Bovenmarge" ; Text [ spanish ] = "Margen superior" ; Text [ english_us ] = "Top margin" ; - Text[ chinese_simplified ] = "上方页边距"; + Text[ chinese_simplified ] = "涓婃柟椤佃竟璺"; Text[ russian ] = "洛瘐龛 牮嚅"; Text[ polish ] = "G髍ny margines"; - Text[ japanese ] = "忋梋敀"; - Text[ chinese_traditional ] = "娩"; + Text[ japanese ] = "涓婁綑鐧"; + Text[ chinese_traditional ] = "涓婇倞妗"; Text[ arabic ] = "轻迩阍 轻卺骓"; Text[ greek ] = "㈨ 疱耖棹耖"; - Text[ korean ] = "困 咯归"; + Text[ korean ] = "鞙 鞐氨"; Text[ turkish ] = "躶t kenar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Margen superior"; + Text[ catalan ] = "Marge superior"; + Text[ thai ] = "喔｀赴喔⑧赴喔傕腑喔氞笟喔"; }; String STR_COLS { @@ -631,24 +646,25 @@ String STR_COLS Text [ italian ] = "Colonne" ; Text [ portuguese_brazilian ] = "Colunas" ; Text [ portuguese ] = "Colunas" ; - Text [ finnish ] = "Sarakkeet" ; + Text [ finnish ] = "Palstat" ; Text [ danish ] = "Kolonner" ; Text [ french ] = "Colonnes" ; Text [ swedish ] = "Kolumner" ; Text [ dutch ] = "Kolommen" ; Text [ spanish ] = "Columnas" ; Text [ english_us ] = "Columns" ; - Text[ chinese_simplified ] = "栏"; - Text[ russian ] = "暑腩黻"; + Text[ chinese_simplified ] = "鏍"; + Text[ russian ] = "羊铍狯"; Text[ polish ] = "Kolumny"; - Text[ japanese ] = "楍"; - Text[ chinese_traditional ] = "逆"; + Text[ japanese ] = "鍒"; + Text[ chinese_traditional ] = "娆"; Text[ arabic ] = "轻泌阆"; Text[ greek ] = "郁揠弪"; - Text[ korean ] = "凯"; + Text[ korean ] = "雼"; Text[ turkish ] = "S黷un"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Columnas"; + Text[ catalan ] = "Columnes"; + Text[ thai ] = "喔勦腑喔ム副喔∴笝喙"; }; String STR_ROWS { @@ -665,17 +681,18 @@ String STR_ROWS Text [ dutch ] = "Rijen" ; Text [ spanish ] = "Filas" ; Text [ english_us ] = "Rows" ; - Text[ chinese_simplified ] = "行"; + Text[ chinese_simplified ] = "琛"; Text[ russian ] = "羊痤觇"; Text[ polish ] = "Wiersze"; - Text[ japanese ] = "峴"; - Text[ chinese_traditional ] = "︽"; + Text[ japanese ] = "琛"; + Text[ chinese_traditional ] = "琛"; Text[ arabic ] = "轻蛰孑"; Text[ greek ] = "民犰燧"; - Text[ korean ] = "青"; + Text[ korean ] = "頄"; Text[ turkish ] = "Sat齬"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Filas"; + Text[ catalan ] = "Files"; + Text[ thai ] = "喙佮笘喔"; }; ModalDialog DLG_SAVE_LABEL { @@ -695,24 +712,25 @@ ModalDialog DLG_SAVE_LABEL Text [ portuguese_brazilian ] = "Fazer" ; Text [ portuguese ] = "~Marca" ; Text [ finnish ] = "Tuotemerkki" ; - Text [ danish ] = "M鎟ke" ; + Text [ danish ] = "~M鎟ke" ; Text [ french ] = "~Marque" ; Text [ swedish ] = "~M鋜ke" ; Text [ dutch ] = "~Merk" ; Text [ spanish ] = "~Marca" ; Text [ english_us ] = "Brand" ; Left = TRUE ; - Text[ chinese_simplified ] = "商标"; + Text[ chinese_simplified ] = "鍟嗘爣"; Text[ russian ] = "锑痍"; Text[ polish ] = "Marka"; - Text[ japanese ] = "惢憿尦"; + Text[ japanese ] = "瑁介犲厓"; Text[ language_user1 ] = " "; - Text[ chinese_traditional ] = "坝夹"; + Text[ chinese_traditional ] = "鍟嗘"; Text[ arabic ] = "轻闱堰"; Text[ greek ] = "~誊耜"; - Text[ korean ] = "惑钎"; + Text[ korean ] = "靸來憸"; Text[ turkish ] = "Markas"; - Text[ catalan ] = "~Marca"; + Text[ catalan ] = "Marca"; + Text[ thai ] = "喔⑧傅喙堗斧喙夃腑"; }; ComboBox CB_MAKE { @@ -732,24 +750,25 @@ ModalDialog DLG_SAVE_LABEL Text [ portuguese_brazilian ] = "Tipo" ; Text [ portuguese ] = "~Tipo" ; Text [ finnish ] = "~Tyyppi" ; - Text [ danish ] = "Type" ; - Text [ french ] = "~Type" ; + Text [ danish ] = "Typ~e" ; + Text [ french ] = "Type" ; Text [ swedish ] = "~Typ" ; Text [ dutch ] = "~Type" ; Text [ spanish ] = "~Tipo" ; Text [ english_us ] = "T~ype" ; Left = TRUE ; - Text[ chinese_simplified ] = "类型(~Y)"; + Text[ chinese_simplified ] = "绫诲瀷(~Y)"; Text[ russian ] = "诣"; Text[ polish ] = "Typ"; - Text[ japanese ] = "庬椶(~Y)"; - Text[ chinese_traditional ] = "摸(~Y)"; + Text[ japanese ] = "绋(~Y)"; + Text[ chinese_traditional ] = "椤炲瀷(~Y)"; Text[ arabic ] = "轻滏"; Text[ greek ] = "~札痫"; - Text[ korean ] = "蜡屈(~Y)"; + Text[ korean ] = "鞙犿槙(~Y)"; Text[ turkish ] = "Tipi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Tipo"; + Text[ catalan ] = "T~ipus"; + Text[ thai ] = "喔妦喔權复喔"; }; Edit ED_TYPE { @@ -771,18 +790,19 @@ ModalDialog DLG_SAVE_LABEL Text[ french ] = "Options"; Text[ spanish ] = "Opciones"; Text[ italian ] = "Opzioni"; - Text[ danish ] = "Options"; + Text[ danish ] = "Indstillinger"; Text[ swedish ] = "Alternativ"; Text[ polish ] = "Opcje"; Text[ portuguese_brazilian ] = "Options"; - Text[ japanese ] = "堤呒"; - Text[ korean ] = "可记"; - Text[ chinese_simplified ] = "选项"; - Text[ chinese_traditional ] = "匡兜"; + Text[ japanese ] = "銈儣銈枫儳銉"; + Text[ korean ] = "鞓奠厴"; + Text[ chinese_simplified ] = "閫夐」"; + Text[ chinese_traditional ] = "閬搁爡"; Text[ turkish ] = "Options"; Text[ arabic ] = "轻雾茄鞘"; - Text[ catalan ] = "Opciones"; - Text[ finnish ] = "Mukauta"; + Text[ catalan ] = "Opcions"; + Text[ finnish ] = "Asetukset"; + Text[ thai ] = "喔曕副喔о箑喔ム阜喔竵"; }; OKButton PB_OK { @@ -814,47 +834,63 @@ ModalDialog DLG_SAVE_LABEL Message [ English ] = "The label \"%1 / %2\" already exists.\nDo you want to overwrite it?" ; Message[ english_us ] = "The label \"%1 / %2\" already exists.\nDo you want to overwrite it?"; Message[ portuguese ] = "A etiqueta \"%1 / %2\" j existe.\nSubstitui-la?"; - Message[ russian ] = "袜觌彘赅 \"%1 / %2\" 箧 耋耱怏弪.\n青戾龛螯 溧眄?"; + Message[ russian ] = "项滹桉 \"%1 / %2\" 箧 耋耱怏弪.\n襄疱玎镨襦螯?"; Message[ greek ] = " 弭殛蒴 \"%1 / %2\" 躔荞麇 掬.\n容脲翦 磲 犴糸赆翎篝徼暹;"; Message[ dutch ] = "Etiket \"%1 / %2\" bestaat reeds.\nOverschrijven?"; Message[ french ] = "L'閠iquette \"%1 / %2\" existe d閖.\nVoulez-vous 閏raser les donn閑s ?"; Message[ spanish ] = "La etiqueta \"%1 / %2\" existe ya.\n緿esea sobrescribila?"; Message[ italian ] = "L'etichetta \"%1 / %2\" esiste gi.\nVolete sovrascriverla?"; - Message[ danish ] = "The label \"%1 / %2\" already exists.\nDo you want to overwrite it?"; + Message[ danish ] = "Etiketten \"%1 / %2\" findes allerede.\nVil du overskrive dataene?"; Message[ swedish ] = "Etiketten \"%1 / %2\" finns redan.\nVill du skriva 鰒er den?"; Message[ polish ] = "Etykieta \"%1 / %2\" ju istnieje.\nSkasowa dane przez zapisanie?"; Message[ portuguese_brazilian ] = "The label \"%1 / %2\" already exists.\nDo you want to overwrite it?"; - Message[ japanese ] = "淄拶乽%1 / %2乿偼偡偱偵偁傝傑偡丅\n忋彂偒偟傑偡偐丅"; - Message[ korean ] = "\"%1 / %2\"扼骇篮 捞固 粮犁钦聪促.\n单捞磐甫 丹绢竞快矫摆嚼聪鳖?"; - Message[ chinese_simplified ] = "这个贴标 \"%1 / %2\" 已经存在。\n要覆写？"; - Message[ chinese_traditional ] = "硂禟夹%1 / %2竒\n璶滦糶"; + Message[ japanese ] = "銉┿儥銉浉銇嶃%1 / %2銆嶃伅銇欍仹銇亗銈娿伨銇欍俓n涓婃浉銇嶃仐銇俱仚銇嬨"; + Message[ korean ] = "\"%1 / %2\" 霠堨澊敫旍潃 鞚措 鞛堨姷雼堧嫟.\n雿办澊韯半ゼ 雿柎鞊办嫓瓴犾姷雼堦箤?"; + Message[ chinese_simplified ] = "杩欎釜璐存爣 \"%1 / %2\" 宸茬粡瀛樺湪銆俓n瑕佹敼鍐欙紵"; + Message[ chinese_traditional ] = "閫欏嬭布妯<%1 / %2>宸茬稉瀛樺湪銆俓n瑕佽瀵紵"; Message[ turkish ] = "The label \"%1 / %2\" already exists.\nDo you want to overwrite it?"; Message[ arabic ] = "蓉寝 轻阡驿 \"%1 / %2\" 沔替仙 惹彷卺.\n遽 恃硐 轻呤侨 萱 轻软卿鞘"; - Message[ catalan ] = "La etiqueta \"%1 / %2\" existe ya.\n緿esea sobrescribila?"; - Message[ finnish ] = "Das Etikett \"%1 / %2\" ist bereits vorhanden.\nM鯿hten Sie die Daten 黚erschreiben?"; + Message[ catalan ] = "L'etiqueta \"%1 / %2\" ja existeix.\nLa voleu sobreescriure?"; + Message[ finnish ] = "Selite \"%1 / %2\" on jo k鋣t鰏s.\nHaluatko korvata sen?"; + Message[ thai ] = "喔涏箟喔侧涪喔娻阜喙堗腑 \"%1 / %2\" 喔∴傅喔涪喔灌箞喙佮弗喙夃抚\n喔勦父喔撪笗喙夃腑喔囙竵喔侧福喙喔傕傅喔⑧笝喔椸副喔氞浮喔编笝喔福喔粪腑喙勦浮喙?"; }; Text[ english_us ] = "Save Label Format"; Text[ portuguese ] = "Guardar formato de etiqueta"; - Text[ russian ] = "杨躔囗栩 纛痨囹 磬觌彘觇"; + Text[ russian ] = "杨躔囗栩 纛痨囹 镱滹桉"; Text[ greek ] = "琉镨揸艴箸 麸 戾爿栾躜 翮 弭殛蒴狎"; Text[ dutch ] = "Etiketformaat opslaan"; - Text[ french ] = "Enregistrer le format d'閠iquette"; + Text[ french ] = "Enregistrement du format d'閠iquette"; Text[ spanish ] = "Guardar formato de etiqueta"; Text[ italian ] = "Salva il formato etichetta"; - Text[ danish ] = "Save label format"; + Text[ danish ] = "Gem etiketformat"; Text[ swedish ] = "Spara etikettformat"; Text[ polish ] = "Zapisz format etykiety"; Text[ portuguese_brazilian ] = "Save label format"; - Text[ japanese ] = "淄拶偺彂幃傪曐懚偡傞"; - Text[ korean ] = "扼骇 器杆 历厘"; - Text[ chinese_simplified ] = "存盘贴标格式"; - Text[ chinese_traditional ] = "纗禟夹Α"; + Text[ japanese ] = "銉┿儥銉浉銇嶃伄鏇稿紡銈掍繚瀛"; + Text[ korean ] = "霠堨澊敫 靹滌嫕 鞝鞛"; + Text[ chinese_simplified ] = "瀛樼洏璐存爣鏍煎紡"; + Text[ chinese_traditional ] = "鍎插瓨璨兼鏍煎紡"; Text[ turkish ] = "Save label format"; Text[ arabic ] = "洼 输禹 蓉寝鞘 轻阡驿"; - Text[ catalan ] = "Guardar formato de etiqueta"; - Text[ finnish ] = "Etikettenformat speichern"; + Text[ catalan ] = "Desa el format de l'etiqueta"; + Text[ finnish ] = "Tallenna tarramuoto"; + Text[ thai ] = "喔氞副喔權笚喔多竵喔｀腹喔涏箒喔氞笟喔涏箟喔侧涪喔娻阜喙堗腑"; }; + + + + + + + + + + + + + + diff --git a/sw/source/ui/envelp/labprt.src b/sw/source/ui/envelp/labprt.src index f5579ad698aa..3a6688d1d643 100644 --- a/sw/source/ui/envelp/labprt.src +++ b/sw/source/ui/envelp/labprt.src @@ -2,9 +2,9 @@ * * $RCSfile: labprt.src,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: kz $ $Date: 2002-11-27 16:48:23 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -89,7 +89,7 @@ TabPage TP_LAB_PRT Text [ SWEDISH ] = "H~ela sidan" ; Text [ PORTUGUESE ] = "P醙ina ~inteira" ; Text[ chinese_simplified ] = "鏁撮〉(~E)"; - Text[ russian ] = "埋 耱疣龛鲟"; + Text[ russian ] = "埋~ 耱疣龛鲟"; Text[ polish ] = "Ca砤 strona"; Text[ japanese ] = "銉氥兗銈稿叏浣(~E)"; Text[ chinese_traditional ] = "鏁撮爜(~E)"; @@ -124,7 +124,7 @@ TabPage TP_LAB_PRT Text[ chinese_traditional ] = "鍠嬭布妯(~S)"; Text[ arabic ] = "蓉寝 阡驿 爿严"; Text[ greek ] = "体祜睐燧礴 弭殛蒴"; - Text[ korean ] = "臧 霛茧波(~S)"; + Text[ korean ] = "臧滊硠 霠堨澊敫(~S)"; Text[ turkish ] = "Tek Eti~ket"; Text[ catalan ] = "~Una etiqueta"; Text[ thai ] = "喔涏箟喔侧涪喔娻阜喙堗腑喙~喔斷傅喔⑧抚"; @@ -262,7 +262,7 @@ TabPage TP_LAB_PRT Text[ polish ] = "Dystrybuj"; Text[ portuguese_brazilian ] = "Divide"; Text[ japanese ] = "鍓层倞褰撱仸"; - Text[ korean ] = "攵勴暊"; + Text[ korean ] = "攵勲鞍"; Text[ chinese_simplified ] = "鍒嗗竷"; Text[ chinese_traditional ] = "鍒嗗竷"; Text[ turkish ] = "Divide"; @@ -365,3 +365,8 @@ TabPage TP_LAB_PRT + + + + + diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index ea362b42c4af..e95c6cd512e0 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -2,9 +2,9 @@ * * $RCSfile: mailmrge.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: os $ $Date: 2002-11-29 12:32:28 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -804,3 +804,26 @@ SwMailMergeCreateFromDlg::SwMailMergeCreateFromDlg(Window* pParent) : SwMailMergeCreateFromDlg::~SwMailMergeCreateFromDlg() { } +/* -----------------04.02.2003 13:45----------------- + * + * --------------------------------------------------*/ +SwMailMergeFieldConnectionsDlg::SwMailMergeFieldConnectionsDlg(Window* pParent) : + ModalDialog(pParent, SW_RES(DLG_MERGE_FIELD_CONNECTIONS)), + aConnectionsFL( this, ResId( FL_CONNECTIONS )), + aUseExistingRB( this, ResId( RB_USEEXISTING )), + aCreateNewRB( this, ResId( RB_CREATENEW )), + aInfoFI( this, ResId( FT_INFO )), + aOK( this, ResId( BT_OK )), + aCancel( this, ResId( BT_CANCEL )), + aHelp( this, ResId( BT_HELP )) +{ + FreeResource(); +} +/* -----------------04.02.2003 13:45----------------- + * + * --------------------------------------------------*/ +SwMailMergeFieldConnectionsDlg::~SwMailMergeFieldConnectionsDlg() +{ +} + + diff --git a/sw/source/ui/envelp/mailmrge.hrc b/sw/source/ui/envelp/mailmrge.hrc index 483be9e5e4d3..9eb6f0b83a40 100644 --- a/sw/source/ui/envelp/mailmrge.hrc +++ b/sw/source/ui/envelp/mailmrge.hrc @@ -2,9 +2,9 @@ * * $RCSfile: mailmrge.hrc,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: os $ $Date: 2002-11-29 12:14:10 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -111,8 +111,10 @@ #define BT_OK 4 #define BT_CANCEL 5 #define BT_HELP 6 - - +#define FL_CONNECTIONS 7 +#define RB_USEEXISTING 8 +#define RB_CREATENEW 9 +#define FT_INFO 10 #endif diff --git a/sw/source/ui/envelp/mailmrge.src b/sw/source/ui/envelp/mailmrge.src index 4845888e2b2f..422be1b92a0d 100644 --- a/sw/source/ui/envelp/mailmrge.src +++ b/sw/source/ui/envelp/mailmrge.src @@ -2,9 +2,9 @@ * * $RCSfile: mailmrge.src,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: os $ $Date: 2002-09-18 14:48:16 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,24 +63,38 @@ // #include ***************************************************************** #include "mailmrge.hrc" #include "cmdid.h" +#include "helpid.h" + +#define _MAIL_MERGE_STRING_ \ + Text = "Seriendruck" ;\ + Text [ english_us ] = "Mail Merge" ; \ + Text[ portuguese ] = "Mail Merge"; \ + Text[ russian ] = "Mail Merge"; \ + Text[ spanish ] = "Impresi髇 en serie"; \ + Text[ italian ] = "Stampa in serie"; \ + Text[ swedish ] = "Kopplad utskrift"; \ + Text[ polish ] = "Mail Merge"; \ + Text[ portuguese_brazilian ] = "Mail Merge"; \ + Text[ japanese ] = "宸仐杈笺伩鍗板埛"; \ + Text[ korean ] = "韼胳 氤戫暕"; \ + Text[ turkish ] = "Mail Merge"; \ + Text[ thai ] = "Mail Merge"; \ + Text[ greek ] = "Mail Merge"; \ + Text[ dutch ] = "Mail Merge"; \ + Text[ french ] = "Mailing"; \ + Text[ finnish ] = "Mail Merge"; \ + Text[ danish ] = "Mail Merge"; \ + Text[ chinese_simplified ] = "閭欢鍚堝苟"; \ + Text[ chinese_traditional ] = "鍚堜降鍒楀嵃"; \ + Text[ arabic ] = "Mail Merge"; \ + Text[ catalan ] = "Mail Merge"; + ModalDialog DLG_MAILMERGE { OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 374 , 185 ) ; - Text = "Serienbrief" ; - Text [ ENGLISH ] = "Print merge" ; - Text [ norwegian ] = "Print merge" ; - Text [ italian ] = "Stampa in serie" ; - Text [ portuguese_brazilian ] = "Imprimir Intercala??o" ; - Text [ portuguese ] = "Carta em s閞ie" ; - Text [ finnish ] = "Lomakekirje" ; - Text [ danish ] = "Brevfletning" ; - Text [ french ] = "Mailing" ; - Text [ swedish ] = "Kopplad utskrift" ; - Text [ dutch ] = "Standaardbrief" ; - Text [ spanish ] = "Carta en serie" ; - Text [ english_us ] = "Form Letter" ; + _MAIL_MERGE_STRING_ Moveable = TRUE ; HelpID = FN_QRY_MERGE ; Window WIN_BEAMER @@ -113,7 +127,7 @@ ModalDialog DLG_MAILMERGE Text[ chinese_traditional ] = "鍏ㄩ儴(~A)"; Text[ arabic ] = "轻哚"; Text[ greek ] = "茧"; - Text[ korean ] = "鞝勳泊(~A)"; + Text[ korean ] = "氇憪(~A)"; Text[ turkish ] = "T黰"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Tot"; @@ -144,7 +158,7 @@ ModalDialog DLG_MAILMERGE Text[ chinese_traditional ] = "閬稿彇鐨勮硣鏂欐鐩(~S)"; Text[ arabic ] = "轻犹崆 轻阃舷"; Text[ greek ] = "硼殡邈燧礤 邈泷狯蒡"; - Text[ korean ] = "靹犿儩 響滌嫓霅 雿办澊韯 霠堨綌霌(~S)"; + Text[ korean ] = "靹犿儩霅 霠堨綌霌(~S)"; Text[ turkish ] = "Se鏸li veri k黰eleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Registres seleccionats"; @@ -160,7 +174,7 @@ ModalDialog DLG_MAILMERGE Text [ italian ] = "Da:" ; Text [ portuguese_brazilian ] = "~De:" ; Text [ portuguese ] = "~De:" ; - Text [ finnish ] = "~Kohde:" ; + Text [ finnish ] = "~L鋒de:" ; Text [ danish ] = "Fra:" ; Text [ french ] = "~De :" ; Text [ swedish ] = "~Fr錸:" ; @@ -175,7 +189,7 @@ ModalDialog DLG_MAILMERGE Text[ chinese_traditional ] = "寰(~F)锛"; Text[ arabic ] = "沅:"; Text[ greek ] = "琉:"; - Text[ korean ] = "搿 攵韯(~F):"; + Text[ korean ] = "鞁滌瀾(~F):"; Text[ turkish ] = "輑k:"; Text[ language_user1 ] = " "; Text[ catalan ] = "~De:"; @@ -218,7 +232,7 @@ ModalDialog DLG_MAILMERGE Text[ greek ] = "旭矧:"; Text[ korean ] = "雭(~T):"; Text[ turkish ] = "Son:"; - Text[ language_user1 ] = "RB: SW Datei - Serienbrief"; + Text[ language_user1 ] = "RB: ; RB: SW Datei - Serienbrief"; Text[ catalan ] = "~A:"; Text[ thai ] = "~喔栢付喔:"; }; @@ -250,13 +264,13 @@ ModalDialog DLG_MAILMERGE Text [ spanish ] = "Registros" ; Text [ english_us ] = "Records" ; Text[ chinese_simplified ] = "鏁版嵁鏉＄洰"; - Text[ russian ] = "青镨耔 溧眄"; + Text[ russian ] = "青镨耔"; Text[ polish ] = "Rekordy"; Text[ japanese ] = "銉偝銉笺儔"; Text[ chinese_traditional ] = "璩囨枡姊濈洰"; Text[ arabic ] = "轻犹崆"; Text[ greek ] = "陪泷狯蒡"; - Text[ korean ] = "雿办澊韯 霠堨綌霌"; + Text[ korean ] = "霠堨綌霌"; Text[ turkish ] = "Veri k黰eleri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Registres"; @@ -271,7 +285,7 @@ ModalDialog DLG_MAILMERGE Check = TRUE ; TabStop = TRUE ; Text [ dutch ] = "~Printer" ; - Text [ english_us ] = "P~rinter" ; + Text [ english_us ] = "~Printer" ; Text [ italian ] = "Stampante" ; Text [ spanish ] = "Impresora" ; Text [ french ] = "Imprimante" ; @@ -280,7 +294,7 @@ ModalDialog DLG_MAILMERGE Text [ portuguese ] = "~Impressora" ; Text [ portuguese_brazilian ] = "~Drucker" ; Text[ chinese_simplified ] = "鎵撳嵃鏈(~P)"; - Text[ russian ] = "橡桧蝈"; + Text[ russian ] = "襄鬣螯"; Text[ polish ] = "Drukarka"; Text[ japanese ] = "銉椼儶銉炽偪銇(~P)"; Text[ chinese_traditional ] = "鍗拌〃姗(~P)"; @@ -310,7 +324,7 @@ ModalDialog DLG_MAILMERGE Text [ portuguese ] = "~Correio-e" ; Text [ portuguese_brazilian ] = "~Mailing" ; Text[ chinese_simplified ] = "鐢靛瓙閭欢(~E)"; - Text[ russian ] = "项黩"; + Text[ russian ] = "蓦. 镱黩"; Text[ polish ] = "Po~czta"; Text[ japanese ] = "銉°兗銉仺銇椼仸(~E)"; Text[ chinese_traditional ] = "闆诲瓙閮典欢(~E)"; @@ -318,7 +332,7 @@ ModalDialog DLG_MAILMERGE Text[ greek ] = "岭腌腼泷狯哚"; Text[ korean ] = "氅旍澕(~E)"; Text[ turkish ] = "E-posta"; - Text[ language_user1 ] = "ENG:the anglicism \"Mailing\" as used in German cannot be used in Eng. because the real meaning has nothing to do with e-mail.EM17.5.00"; + Text[ language_user1 ] = "ENG:; ENG:the anglicism \"Mailing\" as used in German cannot be used in Eng. because the real meaning has nothing to do with e-mail.EM17.5.00"; Text[ catalan ] = "~Envia correu"; Text[ finnish ] = "~S鋒k鰅nen"; Text[ thai ] = "~喔复喙喔ム箛喔勦箓喔椸福喔權复喔"; @@ -410,7 +424,7 @@ ModalDialog DLG_MAILMERGE Text [ italian ] = "Nome di file generato da " ; Text [ spanish ] = "Nombre de archivo a partir de" ; Text [ french ] = "G閚閞ation du nom de fichier :" ; - Text [ dutch ] = "Bestandsnaam ontnemen aan" ; + Text [ dutch ] = "Bestandsnaam op basis van" ; Text [ portuguese ] = "Gerar nome do ficheiro a partir de" ; Text[ chinese_simplified ] = "鏂囦欢鍚嶇殑鐢熸垚鏂瑰紡"; Text[ russian ] = "杨玟囹 桁 羿殡 桤:"; @@ -419,7 +433,7 @@ ModalDialog DLG_MAILMERGE Text[ chinese_traditional ] = "妾旀鍚嶇敘鐢熷緸"; Text[ arabic ] = "配郧 怯 轻汜 沅"; Text[ greek ] = "溺扉秕胥哚 镯狒矧 狁麇唢 狃"; - Text[ korean ] = "搿滊秬韯 韺岇澕 鞚措 靸濎劚"; + Text[ korean ] = "韺岇澕 鞚措 靸濎劚"; Text[ turkish ] = "Dosya ad kayna瘕"; Text[ language_user1 ] = " "; Text[ catalan ] = "Genera el nom del arxiu des de"; @@ -441,7 +455,7 @@ ModalDialog DLG_MAILMERGE Text [ italian ] = "Campo database" ; Text [ spanish ] = "Campo de base de datos" ; Text [ french ] = "Champ de BD" ; - Text [ dutch ] = "Database-veld" ; + Text [ dutch ] = "Databaseveld" ; Text[ chinese_simplified ] = "鏁版嵁搴撳瓧娈"; Text[ russian ] = "项脲 徉琨 溧眄"; Text[ polish ] = "Pole bazy danych"; @@ -449,7 +463,7 @@ ModalDialog DLG_MAILMERGE Text[ chinese_traditional ] = "璩囨枡搴瑒浣"; Text[ arabic ] = "娃 耷谙 轻软卿鞘"; Text[ greek ] = "绣溥 廛箸 溴滹燧睐"; - Text[ korean ] = "韰岇澊韯半矤鞚挫姢 頃勲摐"; + Text[ korean ] = "雿办澊韯半矤鞚挫姢 頃勲摐"; Text[ turkish ] = "Veritaban alan"; Text[ language_user1 ] = " "; Text[ catalan ] = "Camp de la base de dades"; @@ -470,11 +484,11 @@ ModalDialog DLG_MAILMERGE Text [ swedish ] = "Manuell inst鋖lning" ; Text [ danish ] = "Manuel forudindstilling" ; Text [ italian ] = "Preimpostazione manuale" ; - Text [ spanish ] = "Manualmente" ; + Text [ spanish ] = "Configuraci髇 manual" ; Text [ french ] = "Saisie manuelle" ; - Text [ dutch ] = "Handmatige voorgift" ; + Text [ dutch ] = "Handmatige standaardinstelling" ; Text[ chinese_simplified ] = "鎵嬪伐棰勭疆"; - Text[ russian ] = "玉蜞眍怅 怵篦眢"; + Text[ russian ] = "青溧螯 怵篦眢"; Text[ polish ] = "Ustawienie r阠zne"; Text[ japanese ] = "浠绘剰瑷畾"; Text[ chinese_traditional ] = "鎵嬪嫊闋愯ō"; @@ -509,14 +523,14 @@ ModalDialog DLG_MAILMERGE Text = "~Einzelne Druckjobs erzeugen" ; Text [ ENGLISH ] = "Si~ngle print jobs" ; TabStop = TRUE ; - Text [ english_us ] = "Single print ~jobs" ; + Text [ english_us ] = "~Single print jobs" ; Text [ portuguese_brazilian ] = "Einzelne Druckjobs erzeugen" ; Text [ swedish ] = "Skapa ~enstaka utskriftsjobb" ; Text [ danish ] = "Opret enkelte printerjob" ; Text [ italian ] = "Crea singoli ordini di stampa" ; Text [ spanish ] = "Crear tareas individuales de impresi髇" ; Text [ french ] = "Travaux d'impression individuels" ; - Text [ dutch ] = "Af~zonderlijke afdrukjobs" ; + Text [ dutch ] = "Af~zonderlijke afdruktaken" ; Text [ portuguese ] = "C~riar tarefas de impress鉶 individuais" ; Text[ chinese_simplified ] = "鐢熸垚鍗曚釜鎵撳嵃浠诲姟(~S)"; Text[ russian ] = "杨玟囹 铗溴朦眍 玎溧龛 镥鬣蜩"; @@ -525,11 +539,11 @@ ModalDialog DLG_MAILMERGE Text[ chinese_traditional ] = "鐢㈢敓鍠爡鍒楀嵃浣滄キ(~S)"; Text[ arabic ] = "配郧 尜瞧 厝勤 菅享"; Text[ greek ] = "溺扉秕胥哚 戾祜睐燧睐 羼汜箝 尻酏瘗箸"; - Text[ korean ] = "臧 鞚胳噭 鞛戩梾銆毵岆摛旮(~S)"; + Text[ korean ] = "臧滊硠 鞚胳噭 鞛戩梾銆毵岆摛旮(~S)"; Text[ turkish ] = "Bireysel yazd齬ma ieri olu⺶ur"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Crea tasques individuals d'impressi"; - Text[ finnish ] = "~Yksitt鋓set tulostusty鰐"; + Text[ finnish ] = "Yksitt鋓set tulostusty~鰐"; Text[ thai ] = "喔囙覆喔權笧喔脆浮喔炧箤喙~喔斷傅喔⑧抚"; }; FixedText FT_ADDRESS @@ -550,7 +564,7 @@ ModalDialog DLG_MAILMERGE Text [ portuguese_brazilian ] = "Adressfeld" ; Text [ portuguese ] = "~Campo de endere鏾" ; Text[ chinese_simplified ] = "鍦板潃鏍(~F)"; - Text[ russian ] = "冷疱耥铄 镱脲"; + Text[ russian ] = "项脲 噤疱襦"; Text[ polish ] = "Pole adresowe"; Text[ japanese ] = "浣忔墍銉曘偅銉笺儷銉(~F)"; Text[ chinese_traditional ] = "鍦板潃娆(~F)"; @@ -600,7 +614,7 @@ ModalDialog DLG_MAILMERGE Text[ turkish ] = "Konu"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Assumpte"; - Text[ finnish ] = "~Aihe"; + Text[ finnish ] = "A~ihe"; Text[ thai ] = "~喔娻阜喙堗腑喙喔｀阜喙堗腑喔"; }; Edit ED_SUBJECT @@ -623,12 +637,12 @@ ModalDialog DLG_MAILMERGE Text [ swedish ] = "Bilagor" ; Text [ danish ] = "Vedh鎓tede filer" ; Text [ italian ] = "Allegati" ; - Text [ spanish ] = "Anexos" ; + Text [ spanish ] = "Documentos adjuntos" ; Text [ french ] = "Fichiers joints" ; - Text [ dutch ] = "Aanhangsels" ; + Text [ dutch ] = "Bijlagen" ; Text [ portuguese ] = "Anexos" ; Text[ chinese_simplified ] = "闄勫姞鏂囦欢"; - Text[ russian ] = "码铈屙"; + Text[ russian ] = "码铈栩"; Text[ polish ] = "Za彻czniki"; Text[ japanese ] = "娣讳粯銉曘偂銈ゃ儷"; Text[ chinese_traditional ] = "闄勫姞妾旀"; @@ -673,16 +687,16 @@ ModalDialog DLG_MAILMERGE Text [ italian ] = "Formato mail" ; Text [ spanish ] = "Formato de correo" ; Text [ french ] = "Format de courrier" ; - Text [ dutch ] = "Mail-formaat" ; + Text [ dutch ] = "Mail-indeling" ; Text [ portuguese ] = "Formato da mensagem" ; Text[ chinese_simplified ] = "鐢靛瓙閭欢鏍煎紡"; - Text[ russian ] = "灶痨囹 Mail"; + Text[ russian ] = "灶痨囹 镨顸爨"; Text[ polish ] = "Format wiadomo渃i"; Text[ japanese ] = "銉°兗銉浉寮"; Text[ chinese_traditional ] = "閮典欢鏍煎紡"; Text[ arabic ] = "输禹 轻妊硐"; Text[ greek ] = "田聆 扃睚灬麸"; - Text[ korean ] = "鞖绊幐 靹滌嫕"; + Text[ korean ] = "氅旍澕 靹滌嫕"; Text[ turkish ] = "E-posta format"; Text[ language_user1 ] = " "; Text[ catalan ] = "Format de correu"; @@ -700,7 +714,7 @@ ModalDialog DLG_MAILMERGE Text [ english_us ] = "HTM~L" ; Text [ portuguese_brazilian ] = "HTML" ; Text [ swedish ] = "HTM~L" ; - Text [ danish ] = "HTML" ; + Text [ danish ] = "HTM~L" ; Text [ italian ] = "HTML" ; Text [ spanish ] = "HTM~L" ; Text [ french ] = "HTM~L" ; @@ -832,18 +846,236 @@ ModalDialog DLG_MAILMERGE Size = MAP_APPFONT ( 50 , 14 ) ; }; Text[ chinese_simplified ] = "閭欢鍚堝苟"; - Text[ russian ] = "骤痍箅痦铄 镨顸祛"; + Text[ russian ] = "朽耨赅 镨皴..."; Text[ polish ] = "List seryjny"; Text[ japanese ] = "宸仐杈笺伩鍗板埛"; Text[ chinese_traditional ] = "鍚堜降鍒楀嵃"; Text[ arabic ] = "呜侨 阌嵊"; Text[ greek ] = "陪挲觌轱 屦轶麸朕"; - Text[ korean ] = "韼胳歆 鞏戩嫕"; + Text[ korean ] = "韼胳 鞏戩嫕"; Text[ turkish ] = "Standart mektup"; Text[ language_user1 ] = " "; Text[ catalan ] = "Carta formulari"; Text[ thai ] = "喙佮笟喔氞笀喔斷斧喔∴覆喔"; + Text[ english_us ] = "Form Letter"; + Text[ portuguese ] = "Carta em s閞ie"; + Text[ dutch ] = "Standaardbrief"; + Text[ french ] = "Lettre type"; + Text[ spanish ] = "Carta en serie"; + Text[ finnish ] = "Joukkokirje"; + Text[ italian ] = "Stampa in serie"; + Text[ danish ] = "Brevfletning"; + Text[ swedish ] = "Kopplad utskrift"; }; +ModalDialog DLG_MERGE_CREATE +{ + OutputSize = TRUE ; + SVLook = TRUE ; + Size = MAP_APPFONT ( 145 , 63 ) ; + Moveable = TRUE ; + HelpID = HID_MAIL_MERGE_CREATE_FROM; + _MAIL_MERGE_STRING_ + FixedLine FL_CREATEFROM + { + Pos = MAP_APPFONT ( 6 , 3 ) ; + Size = MAP_APPFONT ( 80 , 8 ) ; + Text = "Erstellen aus" ; + Text [ english_us ] = "Create" ; + Text[ portuguese ] = "Create from"; + Text[ russian ] = "Create from"; + Text[ spanish ] = "Crear "; + Text[ italian ] = "Crea da"; + Text[ swedish ] = "Skapa av"; + Text[ polish ] = "Create from"; + Text[ portuguese_brazilian ] = "Create from"; + Text[ japanese ] = "浣滄垚"; + Text[ korean ] = "毵岆摛旮"; + Text[ turkish ] = "Create from"; + Text[ thai ] = "Create from"; + Text[ greek ] = "Create from"; + Text[ dutch ] = "Create from"; + Text[ french ] = "Cr閑r"; + Text[ finnish ] = "Create from"; + Text[ danish ] = "Create from"; + Text[ chinese_simplified ] = "寤虹珛"; + Text[ chinese_traditional ] = "瑁戒綔渚嗘簮"; + Text[ arabic ] = "Create from"; + Text[ catalan ] = "Create from"; + }; + RadioButton RB_THISDOC + { + Pos = MAP_APPFONT ( 12 , 14 ) ; + Size = MAP_APPFONT ( 70 , 10 ) ; + Check = TRUE; + TabStop = TRUE ; + Text = "~Diesem Dokument" ; + Text [ english_us ] = "From this ~document" ; + Text[ portuguese ] = "~This document"; + Text[ russian ] = "~This document"; + Text[ spanish ] = "~De este documento"; + Text[ italian ] = "Da questo documento"; + Text[ swedish ] = "Fr錸 det h鋜 ~dokumentet"; + Text[ polish ] = "~This document"; + Text[ portuguese_brazilian ] = "~This document"; + Text[ japanese ] = "銇撱伄銉夈偔銉ャ儭銉炽儓銇嬨倝(~D)"; + Text[ korean ] = "鞚 氍胳劀搿滊秬韯"; + Text[ turkish ] = "~This document"; + Text[ thai ] = "~This document"; + Text[ greek ] = "~This document"; + Text[ dutch ] = "~This document"; + Text[ french ] = " partir de ce document"; + Text[ finnish ] = "~This document"; + Text[ danish ] = "~This document"; + Text[ chinese_simplified ] = "浠庤繖涓枃妗(~D)"; + Text[ chinese_traditional ] = "姝ゆ枃浠(~T)"; + Text[ arabic ] = "~This document"; + Text[ catalan ] = "~This document"; + }; + RadioButton RB_TEMPLATE + { + Pos = MAP_APPFONT ( 12 , 27 ) ; + Size = MAP_APPFONT ( 70 , 10 ) ; + TabStop = TRUE ; + Text = "~Vorlage" ; + Text [ english_us ] = "From a ~template" ; + Text[ language_user1 ] = "chg German to \"aus einer ~Dokumentvorlage\""; + Text[ portuguese ] = "~Use template"; + Text[ russian ] = "~Use template"; + Text[ spanish ] = "~De esta plantilla"; + Text[ italian ] = "Da ~modello"; + Text[ swedish ] = "Fr錸 en ~mall"; + Text[ polish ] = "~Use template"; + Text[ portuguese_brazilian ] = "~Use template"; + Text[ japanese ] = "銉嗐兂銉椼儸銉笺儓銇嬨倝(~T)"; + Text[ korean ] = "靹滌嫕 韺岇澕搿滊秬韯"; + Text[ turkish ] = "~Use template"; + Text[ thai ] = "~Use template"; + Text[ greek ] = "~Use template"; + Text[ dutch ] = "~Use template"; + Text[ french ] = " partir d'un mod鑜e"; + Text[ finnish ] = "~Use template"; + Text[ danish ] = "~Use template"; + Text[ chinese_simplified ] = "鏍峰紡(~S)"; + Text[ chinese_traditional ] = "鎺＄敤妯ｅ紡(~T)"; + Text[ arabic ] = "~Use template"; + Text[ catalan ] = "~Use template"; + }; + OKButton BT_OK + { + Pos = MAP_APPFONT ( 89 , 6 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + DefButton = TRUE ; + }; + CancelButton BT_CANCEL + { + Pos = MAP_APPFONT ( 89 , 23 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + }; + HelpButton BT_HELP + { + Pos = MAP_APPFONT ( 89 , 43 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + }; +}; +ModalDialog DLG_MERGE_FIELD_CONNECTIONS +{ + OutputSize = TRUE ; + SVLook = TRUE ; + Size = MAP_APPFONT ( 205 , 97 ) ; + Moveable = TRUE ; + HelpID = HID_MAIL_MERGE_CREATE_FROM; + Text = "Datenquellen-Verbindung" ; + Text [ english_us ] = "Data Source Connection" ; + FixedLine FL_CONNECTIONS + { + Pos = MAP_APPFONT ( 6 , 3 ) ; + Size = MAP_APPFONT ( 140 , 8 ) ; + Text = "Verbinden" ; + Text [ english_us ] = "Connect" ; + Text[ french ] = "Connect"; + Text[ spanish ] = "Connect"; + Text[ italian ] = "Connect"; + Text[ swedish ] = "Connect"; + Text[ japanese ] = "Connect"; + Text[ korean ] = "Connect"; + Text[ chinese_simplified ] = "Connect"; + Text[ chinese_traditional ] = "Connect"; + }; + RadioButton RB_USEEXISTING + { + Pos = MAP_APPFONT ( 12 , 14 ) ; + Size = MAP_APPFONT ( 130 , 10 ) ; + Check = TRUE; + TabStop = TRUE ; + Text = "~Mit vorhandener Datenquelle" ; + Text [ english_us ] = "~Use existing" ; + Text[ french ] = "~Use existing"; + Text[ spanish ] = "~Use existing"; + Text[ italian ] = "~Use existing"; + Text[ swedish ] = "~Use existing"; + Text[ japanese ] = "~Use existing"; + Text[ korean ] = "~Use existing"; + Text[ chinese_simplified ] = "~Use existing"; + Text[ chinese_traditional ] = "~Use existing"; + }; + RadioButton RB_CREATENEW + { + Pos = MAP_APPFONT ( 12 , 27 ) ; + Size = MAP_APPFONT ( 130 , 10 ) ; + TabStop = TRUE ; + Text = "Mit ~anderer Datenquelle" ; + Text [ english_us ] = "~Create new connection" ; + Text[ french ] = "~Create new connection"; + Text[ spanish ] = "~Create new connection"; + Text[ italian ] = "~Create new connection"; + Text[ swedish ] = "~Create new connection"; + Text[ japanese ] = "~Create new connection"; + Text[ korean ] = "~Create new connection"; + Text[ chinese_simplified ] = "~Create new connection"; + Text[ chinese_traditional ] = "~Create new connection"; + }; + FixedText FT_INFO + { + Pos = MAP_APPFONT ( 6 , 41 ) ; + Size = MAP_APPFONT ( 141 , 50 ) ; + WordBreak = TRUE; + Text = "Serienbriefe ben鰐igen f黵 eine Personalisierung Felder. Felder sind in diesem Falle Platzhalter f黵 Daten, die aus einer Datenquelle stammen, z.B. aus einer Datenbank. Die Felder in dem Serienbrief m黶sen mit der Datenquelle verbunden sein. " ; + Text [ english_us ] = "Fields are used to personlaize form letters. The fields are placeholders for data from a data source, such as a database. The fields in the form letter must be connected to the data source." ; + Text[ french ] = "Fields are used to personlaize form letters. The fields are placeholders for data from a data source, such as a database. The fields in the form letter must be connected to the data source."; + Text[ spanish ] = "Fields are used to personlaize form letters. The fields are placeholders for data from a data source, such as a database. The fields in the form letter must be connected to the data source."; + Text[ italian ] = "Fields are used to personlaize form letters. The fields are placeholders for data from a data source, such as a database. The fields in the form letter must be connected to the data source."; + Text[ swedish ] = "Fields are used to personlaize form letters. The fields are placeholders for data from a data source, such as a database. The fields in the form letter must be connected to the data source."; + Text[ japanese ] = "Fields are used to personlaize form letters. The fields are placeholders for data from a data source, such as a database. The fields in the form letter must be connected to the data source."; + Text[ korean ] = "Fields are used to personlaize form letters. The fields are placeholders for data from a data source, such as a database. The fields in the form letter must be connected to the data source."; + Text[ chinese_simplified ] = "Fields are used to personlaize form letters. The fields are placeholders for data from a data source, such as a database. The fields in the form letter must be connected to the data source."; + Text[ chinese_traditional ] = "Fields are used to personlaize form letters. The fields are placeholders for data from a data source, such as a database. The fields in the form letter must be connected to the data source."; + }; + OKButton BT_OK + { + Pos = MAP_APPFONT ( 149 , 6 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + DefButton = TRUE ; + }; + CancelButton BT_CANCEL + { + Pos = MAP_APPFONT ( 149 , 23 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + }; + HelpButton BT_HELP + { + Pos = MAP_APPFONT ( 149 , 43 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + }; + + Text[ french ] = "Data Source Connection"; + Text[ spanish ] = "Data Source Connection"; + Text[ italian ] = "Data Source Connection"; + Text[ swedish ] = "Data Source Connection"; + Text[ japanese ] = "Data Source Connection"; + Text[ korean ] = "Data Source Connection"; + Text[ chinese_simplified ] = "Data Source Connection"; + Text[ chinese_traditional ] = "Data Source Connection"; +}; diff --git a/sw/source/ui/fldui/changedb.src b/sw/source/ui/fldui/changedb.src index e2f597ca2386..f30fce5f7305 100644 --- a/sw/source/ui/fldui/changedb.src +++ b/sw/source/ui/fldui/changedb.src @@ -2,9 +2,9 @@ * * $RCSfile: changedb.src,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: os $ $Date: 2002-08-29 07:06:47 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -98,7 +98,7 @@ ModalDialog DLG_CHANGE_DB Text [ portuguese_brazilian ] = "Datenbank austauschen" ; Text [ portuguese ] = "Substituir base de dados" ; Text[ chinese_simplified ] = "鏇存崲鏁版嵁搴"; - Text[ russian ] = "青戾龛螯 徉珞 溧眄"; + Text[ russian ] = "锐蝾黜桕 溧眄"; Text[ polish ] = "Wymie baz danych"; Text[ japanese ] = "銉囥兗銈裤儥銉笺偣銇氦鎻"; Text[ chinese_traditional ] = "鏇挎彌璩囨枡搴"; @@ -130,7 +130,7 @@ ModalDialog DLG_CHANGE_DB Text [ portuguese_brazilian ] = "Verwendete Datenbanken" ; Text [ portuguese ] = "Bases de dados utilizadas" ; Text[ chinese_simplified ] = "浣跨敤鐨勬暟鎹簱"; - Text[ russian ] = "锐镱朦珞屐 徉琨 溧眄"; + Text[ russian ] = "锐镱朦珞屐 桉蝾黜. 溧眄"; Text[ polish ] = "U縴te bazy danych"; Text[ japanese ] = "浣跨敤銇曘倢銇︺亜銈嬨儑銉笺偪銉欍兗銈"; Text[ chinese_traditional ] = "鎵浣跨敤鐨勮硣鏂欏韩"; @@ -138,7 +138,7 @@ ModalDialog DLG_CHANGE_DB Text[ dutch ] = "Gebruikte databases"; Text[ chinese_simplified ] = "浣跨敤鐨勬暟鎹簱"; Text[ greek ] = "遵珞殪镳镩稞戾礤 廛箦轵 溴滹燧睐"; - Text[ korean ] = "雿办澊韯半矤鞚挫姢臧 靷毄欷 鞛呺媹雼."; + Text[ korean ] = "雿办澊韯半矤鞚挫姢臧 靷毄 欷戩瀰雼堧嫟."; Text[ turkish ] = "Kullan齦an veritabanlar"; Text[ language_user1 ] = " "; Text[ catalan ] = "Bases de dades utilitzades"; @@ -163,7 +163,7 @@ ModalDialog DLG_CHANGE_DB Text [ portuguese_brazilian ] = "Verf?bare Datenbanken" ; Text [ portuguese ] = "Bases de dados dispon韛eis" ; Text[ chinese_simplified ] = "鍙娇鐢ㄧ殑鏁版嵁搴"; - Text[ russian ] = "念耱箫睇 徉琨 溧眄"; + Text[ russian ] = "念耱箫睇 桉蝾黜桕 溧眄"; Text[ polish ] = "Dost阷ne bazy danych"; Text[ japanese ] = "浣跨敤銇с亶銈嬨儑銉笺偪銉欍兗銈"; Text[ chinese_traditional ] = "鐝惧瓨鐨勮硣鏂欏韩"; @@ -205,21 +205,21 @@ ModalDialog DLG_CHANGE_DB Text [ italian ] = "In questo dialogo si possono scambiare database ai quali si accede tramite campi di database. Si pu effettuare una modifica per volta. Nell'elenco di sinistra possibile una selezione multipla." ; Text [ spanish ] = "En este di醠ogo puede intercambiar por otras las bases de datos a las que acceda a trav閟 de los campos. Se puede realizar solo un cambio por fase de trabajo. En la lista izquierda es posible hacer una selecci髇 m鷏tiple." ; Text [ french ] = "Utilisez cette bo顃e de dialogue pour 閏hanger les bases de donn閑s auxquelles vous acc閐ez dans vos documents via des champs de formulaire. Vous ne pouvez ex閏uter qu'une seule modification la fois. La liste de gauche permet une s閘ection multiple." ; - Text [ dutch ] = "In deze dialoog kunt u een database waarop de databasevelden in uw document betrekking hebben vervangen door een andere database. U kunt slechts 殚n wijziging tegelijk aanbrengen. In de linker lijst is ook een meervoudige keuze mogelijk." ; + Text [ dutch ] = "In dit dialoogvenster kunt u een database waarop de databasevelden in uw document betrekking hebben, vervangen door een andere database. U kunt slechts 殚n wijziging tegelijk aanbrengen. In de linkerlijst is ook een meervoudige keuze mogelijk." ; Text [ swedish ] = "I den h鋜 dialogrutan kan du byta ut databaser, som du kan n via databasf鋖t i ditt dokument, mot andra databaser. Du kan bara g鰎a en 鋘dring 錿 g錸gen. I den v鋘stra listan g錼 det att g鰎a multimarkering." ; Text [ danish ] = "I denne dialog kan du udskifte databaser, som du har adgang til i et dokument via databasefelter, med andre databaser. Du kan kun foretage 閚 鎛dring pr. arbejdsdag. P venstre liste er det muligt at foretage multimarkeringer." ; Text [ portuguese_brazilian ] = "In diesem Dialog k?nen Sie Datenbanken, auf die Sie in Ihrem Dokument ?er Datenbankfelder zugreifen, durch andere Datenbanken austauschen. Sie k?nen nur eine ?nderung pro Arbeitsgang durchf?ren. In der linken Liste ist Mehrfachselektion m?lich." ; Text [ portuguese ] = "Nesta caixa de di醠ogo poder substituir bases de dados por outras, tendo acesso a elas no seu documento atrav閟 dos campos da base de dados. apenas poss韛el uma altera玢o por cada opera玢o. Na lista da esquerda poder seleccionar v醨ias op珲es." ; Text[ chinese_simplified ] = "鍦ㄨ繖涓璇濇鍐呮偍鑳藉浣跨敤鍙︿竴涓暟鎹簱鏉ヤ唬鏇垮綋鍓嶇紪杈戠殑鏂囨。璇诲彇鐨勬暟鎹簱銆傛瘡娆＄紪杈戞枃妗ｆ椂鍙兘涓娆℃浛鎹㈡暟鎹簱銆傚湪宸︽柟鐨勫垪鍗曞唴鍙互鎵ц澶氶噸閫夋嫨鐨勫姛鑳姐"; - Text[ russian ] = " 铎 滂嚯钽 蔓 祛驽蝈 玎戾龛螯 徉琨 溧眄, 漕耱箫 觐蝾瘥 忸珈铈屙 镳 镱祛 镱脲 徉琨 溧眄, 漯筱桁 徉玎扈 溧眄. 青 钿眢 铒屦圉棹 祛骓 镳铊玮羼蜩 钿眍 桤戾礤龛. 耧桉赍 耠邂 漕耱箫眍 沭箫镱忸 恹溴脲龛."; + Text[ russian ] = " 铎 滂嚯钽 恹 祛驽蝈 恹狃囹 桉蝾黜桕 溧眄, 漕耱箫 觐蝾瘥 忸珈铈屙 镳 镱祛 疣珈妁屙睇 磬 纛痨 屐屙蝾 箫疣怆屙. 青 钿眢 铒屦圉棹 祛骓 镳铊玮羼蜩 钿眍 桤戾礤龛. 耧桉赍 耠邂 漕耱箫眍 沭箫镱忸 恹溴脲龛."; Text[ polish ] = "Tutaj mo縩a zamieni bazy danych, dost阷ne w dokumencie poprzez pola baz danych, na inne. Zmieni mo縩a tylko jedn baz danych na raz. Wielokrotnej selekcji dokona mo縩a na li渃ie po lewej."; Text[ japanese ] = "銇撱伄銉銈ゃ偄銉偘銇с伅銆併儔銈儱銉°兂銉堛伄銉囥兗銈裤儥銉笺偣銉曘偅銉笺儷銉夈亱銈夈偄銈偦銈广仚銈嬨儑銉笺偪銉欍兗銈广亴浜ゆ彌銇с亶銇俱仚銆備竴搴︺伄鎿嶄綔銇с伈銇ㄣ仱銇鏇淬伄銇裤亴瀹熻銇曘倢銇俱仚銆傚乏銇儶銈广儓銇с伅瑜囨暟閬告姙銇屽彲鑳姐仹銇欍"; Text[ chinese_traditional ] = "鍦ㄩ欏嬪皪瑭辨柟濉婂収鎮ㄥ彲浠ヤ娇鐢ㄥ彟涓鍊嬭硣鏂欏韩渚嗕唬鏇垮凡缍撻枊鍟撶殑鏂囦欢鎵浣跨敤鐨勮硣鏂欏韩銆傛瘡娆＄法杓枃浠舵檪鍙兘鍋氫竴娆¤畩鏇淬傚湪宸︽瑒鍏у彲浠ュ煼琛屽閲嶉伕鍙栫殑鍔熻兘銆"; Text[ arabic ] = "蓓 阊融 轻玩茄 逍恰 磴咪 怯嗜锨 捩勤 轻软卿鞘 轻薯 收 裴礤 蓓 阌输线 孺怯厣 娃驷 捩勤 轻软卿鞘 让窝. 崆唾 娩 磴咪 阢 售眄 媲拖"; - Text[ dutch ] = "In deze dialoog kunt u een database waarop de databasevelden in uw document betrekking hebben vervangen door een andere database. U kunt slechts 殚n wijziging tegelijk aanbrengen. In de linker lijst is ook een meervoudige keuze mogelijk."; + Text[ dutch ] = "In dit dialoogvenster kunt u een database waarop de databasevelden in uw document betrekking hebben, vervangen door een andere database. U kunt slechts 殚n wijziging tegelijk aanbrengen. In de linkerlijst is ook een meervoudige keuze mogelijk."; Text[ chinese_simplified ] = "鍦ㄨ繖涓璇濇鍐呮偍鑳藉浣跨敤鍙︿竴涓暟鎹簱鏉ヤ唬鏇垮綋鍓嶇紪杈戠殑鏂囨。璇诲彇鐨勬暟鎹簱銆傛瘡娆＄紪杈戞枃妗ｆ椂鍙兘涓娆℃浛鎹㈡暟鎹簱銆傚湪宸︽柟鐨勫垪鍗曞唴鍙互鎵ц澶氶噸閫夋嫨鐨勫姛鑳姐"; Text[ greek ] = "渝 狨酎 麸 溟茈镢 祓锺暹翦 磲 犭胲铄翦 糸 廛箦轵 溴滹燧睐, 糸 镳镞弪 黢珞殪镳镩暹翦 篝 葶泷狯 筢 燧簌 豉 疱溥 廛箦 溴滹燧睐. 硼轸褫疱翎 禳盹 扉 犭脶戕 贶桢 鲲褴. 郁 狁轶翦顸 綮揿 祓锺稞 磲 氵盹蹴 痫腚犭蒡 屦殡镢蒡."; - Text[ korean ] = "鞚 雽頇旍儊鞛愳棎靹滊姅 氍胳劀鞐愳劀 雿办澊韯半矤鞚挫姢 頃勲摐毳 韱淀暣 雿办澊韯半矤鞚挫姢毳 鞎§劯鞀ろ晿瓯半倶 甑愴櫂頃橂姅 雿办澊韯半矤鞚挫姢 頃勲摐毳 靷毄頃 靾 鞛堨姷雼堧嫟.頃橂倶鞚 鞛戩梾 瓿检爼鞐愳劀 氤瓴 鞛戩梾鞚 頃 氩 靾橅枆霅╇媹雼. 鞕检鞚 氇╇鞐愳劀電 鞐煬 頃鞚 靹犿儩頃 靾 鞛堨姷雼堧嫟."; + Text[ korean ] = "鞚 雽頇旍儊鞛愳棎靹滊姅 氍胳劀鞐愳劀 雿办澊韯半矤鞚挫姢 頃勲摐毳 韱淀暣 雿办澊韯半矤鞚挫姢毳 鞎§劯鞀ろ晿瓯半倶 氚旉靖電 雿办澊韯半矤鞚挫姢 頃勲摐毳 靷毄頃 靾 鞛堨姷雼堧嫟.頃橂倶鞚 鞛戩梾 瓿检爼鞐愳劀 氤瓴 鞛戩梾鞚 頃 氩 靾橅枆霅╇媹雼. 鞕检鞚 氇╇鞐愳劀電 鞐煬 頃鞚 靹犿儩頃 靾 鞛堨姷雼堧嫟."; Text[ turkish ] = "Bu pencerede, belgenizdeki veritaban alanlar yoluyla eri⺶i餴niz veritabanlar齨 ba⺧alar ile de餴⺶irebilirsiniz. Her iemde yaln齴ca tek bir de餴㱮klik yap齦abilir. Soldaki listede birden fazla se鏸m yap齦abilir."; Text[ language_user1 ] = " "; Text[ catalan ] = "En aquest quadre de di鄉eg podeu intercanviar per altres bases de dades a les que accediu a trav閟 de camps. Es pot realitzar nom閟 un canvi per fase de treball. A la llista de l'esquerra 閟 possible fer una selecci m鷏tiple."; @@ -258,7 +258,7 @@ ModalDialog DLG_CHANGE_DB Text [ portuguese_brazilian ] = "Am Dokument gesetzte Datenbank:" ; Text [ portuguese ] = "Base de dados aplicada ao documento:" ; Text[ chinese_simplified ] = "鏂囨。浣跨敤鐨勬暟鎹簱锛"; - Text[ russian ] = "拎玎 溧眄, 篑蜞眍怆屙磬 漕牦戾眚:"; + Text[ russian ] = "锐镱朦珞屐 桉蝾黜桕 溧眄:"; Text[ polish ] = "Baza danych ustawiona przy dok.:"; Text[ japanese ] = "銉夈偔銉ャ儭銉炽儓銇仼鐢ㄣ仌銈屻仧銉囥兗銈裤儥銉笺偣:"; Text[ chinese_traditional ] = "鏂囦欢浣跨敤鐨勮硣鏂欏韩锛"; @@ -352,7 +352,7 @@ ModalDialog DLG_CHANGE_DB Text [ portuguese ] = "Definir" ; Text [ portuguese_brazilian ] = "Festlegen" ; Text[ chinese_simplified ] = "瀹氫箟"; - Text[ russian ] = "青溧螯"; + Text[ russian ] = "泥"; Text[ polish ] = "Zdefiniuj"; Text[ japanese ] = "鎸囧畾"; Text[ chinese_traditional ] = "瀹氱京"; @@ -360,7 +360,7 @@ ModalDialog DLG_CHANGE_DB Text[ dutch ] = "Defini雛en"; Text[ chinese_simplified ] = "瀹氫箟"; Text[ greek ] = "梳栾耖箪"; - Text[ korean ] = "鞝曥潣"; + Text[ korean ] = "歆鞝"; Text[ turkish ] = "Tan齧la"; Text[ catalan ] = "Defineix"; Text[ finnish ] = "M滗rit"; @@ -403,7 +403,7 @@ ModalDialog DLG_CHANGE_DB TabStop = TRUE ; }; Text[ chinese_simplified ] = "鏇存崲鏁版嵁搴"; - Text[ russian ] = "青戾龛螯 徉珞 溧眄"; + Text[ russian ] = "蔓犷 嚓蜩忭钽 桉蝾黜桕 溧眄"; Text[ polish ] = "Wymie baz danych"; Text[ japanese ] = "銉囥兗銈裤儥銉笺偣銇氦鎻"; Text[ chinese_traditional ] = "鏇挎彌璩囨枡搴"; @@ -419,3 +419,20 @@ ModalDialog DLG_CHANGE_DB Text[ thai ] = "喙佮弗喔佮箑喔涏弗喔掂箞喔⑧笝喔愢覆喔權競喙夃腑喔∴腹喔"; }; + + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/fldui/flddb.src b/sw/source/ui/fldui/flddb.src index fc356742c308..aab79feda895 100644 --- a/sw/source/ui/fldui/flddb.src +++ b/sw/source/ui/fldui/flddb.src @@ -2,9 +2,9 @@ * * $RCSfile: flddb.src,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: iha $ $Date: 2002-08-09 10:05:44 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -95,7 +95,7 @@ TabPage TP_FLD_DB Text[ chinese_traditional ] = "娆勪綅椤炲瀷(~T)"; Text[ arabic ] = "滏 轻娃"; Text[ greek ] = "~札痫 疱溥秕"; - Text[ korean ] = "頃勲摐鞙犿槙(~T)"; + Text[ korean ] = "鞙犿槙(~T)"; Text[ turkish ] = "Alan tipi"; Text[ catalan ] = "~Tipus"; Text[ thai ] = "~喔娻笝喔脆笖"; @@ -169,7 +169,7 @@ TabPage TP_FLD_DB TEXT [ danish ] = "Datapostnummer" ; TEXT [ french ] = "~Num閞o de l'enregistrement" ; TEXT [ swedish ] = "~Datapostnummer" ; - TEXT [ dutch ] = "~Record-nummer" ; + TEXT [ dutch ] = "~Recordnummer" ; TEXT [ spanish ] = "N鷐ero de registro" ; TEXT [ english_us ] = "Record number" ; Left = TRUE ; @@ -180,7 +180,7 @@ TabPage TP_FLD_DB TEXT[ chinese_traditional ] = "姊濈洰铏熺⒓"; TEXT[ arabic ] = "艳 轻犹"; TEXT[ greek ] = "榴殍禳 邈泷狯掾"; - TEXT[ korean ] = "雿办澊韯 霠堨綌霌 氩堩樃"; + TEXT[ korean ] = "霠堨綌霌 氩堩樃"; TEXT[ turkish ] = "Veri k黰esi numaras"; TEXT[ catalan ] = "N鷐ero de registre"; TEXT[ thai ] = "喙喔ム競喔｀赴喙喔氞傅喔⑧笝"; @@ -267,14 +267,14 @@ TabPage TP_FLD_DB Text [ english_us ] = "User-defined" ; Text [ portuguese_brazilian ] = "Selbstdefiniert" ; Text [ swedish ] = "An~v鋘dardefinierat" ; - Text [ danish ] = "Brugerdefineret" ; + Text [ danish ] = "~Brugerdefineret" ; Text [ italian ] = "Personalizzato" ; Text [ spanish ] = "Definido por el usuario" ; Text [ french ] = "D閒ini par l'utilisateur" ; Text [ dutch ] = "~Zelf gedefinieerd" ; Text [ portuguese ] = "D~efinido pelo utilizador" ; Text[ chinese_simplified ] = "浣跨敤鑰呰嚜瀹"; - Text[ russian ] = "袜耱痤殛 镱朦珙忄蝈"; + Text[ russian ] = "项朦珙忄蝈朦耜栝"; Text[ polish ] = "Zdefiniowane przez u縴tkownika"; Text[ japanese ] = "銉︺兗銈躲兗瀹氱京"; Text[ chinese_traditional ] = "鑷▊"; @@ -331,7 +331,7 @@ TabPage TP_FLD_DB Text[ korean ] = "靹滌嫕"; Text[ turkish ] = "Format"; Text[ catalan ] = "Format"; - Text[ finnish ] = "Muoto"; + Text[ finnish ] = "Muotoilu"; Text[ thai ] = "喔｀腹喔涏箒喔氞笟"; }; FixedLine FL_DBFORMAT_VERT @@ -375,3 +375,5 @@ TabPage TP_FLD_DB + + diff --git a/sw/source/ui/fldui/flddinf.src b/sw/source/ui/fldui/flddinf.src index f36393b2c009..d98269192d4e 100644 --- a/sw/source/ui/fldui/flddinf.src +++ b/sw/source/ui/fldui/flddinf.src @@ -2,9 +2,9 @@ * * $RCSfile: flddinf.src,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:18:28 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,17 +88,18 @@ TabPage TP_FLD_DOKINF Text [ spanish ] = "~Tipo de campo" ; Text [ english_us ] = "~Type" ; Left = TRUE ; - Text[ chinese_simplified ] = "字段类型(~T)"; + Text[ chinese_simplified ] = "瀛楁绫诲瀷(~T)"; Text[ russian ] = "诣 镱"; Text[ polish ] = "Typ pola"; - Text[ japanese ] = "台百霓啦踢(~T)"; - Text[ chinese_traditional ] = "逆摸(~T)"; + Text[ japanese ] = "銉曘偅銉笺儷銉夈偪銈ゃ儣(~T)"; + Text[ chinese_traditional ] = "娆勪綅椤炲瀷(~T)"; Text[ arabic ] = "滏 轻娃"; Text[ greek ] = "~札痫 疱溥秕"; - Text[ korean ] = "鞘靛蜡屈(~T)"; + Text[ korean ] = "鞙犿槙(~T)"; Text[ turkish ] = "A~lan tipi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Tipo de campo"; + Text[ catalan ] = "~Tipus"; + Text[ thai ] = "~喔娻笝喔脆笖"; }; Control TLB_DOKINFTYPE { @@ -125,17 +126,18 @@ TabPage TP_FLD_DOKINF Text [ spanish ] = "Se~lecci髇" ; Text [ english_us ] = "S~elect" ; Left = TRUE ; - Text[ chinese_simplified ] = "选择(~E)"; - Text[ russian ] = "蔓犷"; + Text[ chinese_simplified ] = "閫夋嫨(~E)"; + Text[ russian ] = "蔓狃囹"; Text[ polish ] = "Wyb髍"; - 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 ] = "S~e鏸m"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Se~lecci髇"; + Text[ catalan ] = "S~elecciona"; + Text[ thai ] = "喙喔ム阜~喔竵"; }; ListBox LB_DOKINFSELECTION { @@ -190,7 +192,7 @@ TabPage TP_FLD_DOKINF < "Autor" ; > ; < "Hora" ; > ; < "Fecha" ; > ; - < "Fecha Hora Autor" ; > ; + < "Hora Fecha Autor" ; > ; }; stringlist [ french ] = { @@ -215,10 +217,10 @@ TabPage TP_FLD_DOKINF }; StringList [ chinese_simplified ] = { - < "作者" ; > ; - < "时间" ; > ; - < "日期" ; > ; - < "日期 时间 作者" ; > ; + < "浣滆" ; > ; + < "鏃堕棿" ; > ; + < "鏃ユ湡" ; > ; + < "鏃ユ湡 鏃堕棿 浣滆" ; > ; }; StringList [ russian ] = { @@ -236,17 +238,17 @@ TabPage TP_FLD_DOKINF }; StringList [ japanese ] = { - < "嶌惉幰" ; > ; - < "帪崗" ; > ; - < "擔晅" ; > ; - < "擔晅丂帪崗丂嶌惉幰" ; > ; + < "浣滄垚鑰" ; > ; + < "鏅傚埢" ; > ; + < "鏃ヤ粯" ; > ; + < "鏃ヤ粯銆鏅傚埢銆浣滄垚鑰" ; > ; }; StringList [ chinese_traditional ] = { - < "" ; > ; - < "丁" ; > ; - < "ら戳" ; > ; - < "ら戳 丁 " ; > ; + < "浣滆" ; > ; + < "鏅傞枔" ; > ; + < "鏃ユ湡" ; > ; + < "鏃ユ湡 鏅傞枔 浣滆" ; > ; }; StringList [ arabic ] = { @@ -264,10 +266,10 @@ TabPage TP_FLD_DOKINF }; StringList [ korean ] = { - < "累己磊" ; > ; - < "矫埃" ; > ; - < "老磊" ; > ; - < "老磊, 矫埃, 累己磊" ; > ; + < "鞛戩劚鞛" ; > ; + < "鞁滉皠" ; > ; + < "雮犾" ; > ; + < "雮犾 鞁滉皠 鞛戩劚鞛" ; > ; }; StringList [ turkish ] = { @@ -287,15 +289,22 @@ TabPage TP_FLD_DOKINF { < "Autor" ; > ; < "Hora" ; > ; - < "Fecha" ; > ; - < "Fecha Hora Autor" ; > ; + < "Data" ; > ; + < "Data hora autor" ; > ; }; StringList [ finnish ] = { - < "Laatija" ; > ; + < "Tekij" ; > ; < "Aika" ; > ; < "P鋓v鋗滗r" ; > ; - < "P鋓v鋗滗r Aika Laatija" ; > ; + < "P鋓v鋗滗r Aika Tekij" ; > ; + }; + StringList [ thai ] = + { + < "喔溹腹喙夃箑喔傕傅喔⑧笝" ; > ; + < "喙喔о弗喔" ; > ; + < "喔о副喔" ; > ; + < "喔о副喔 喙喔о弗喔 喙佮弗喔班笢喔灌箟喙喔傕傅喔⑧笝" ; > ; }; }; FixedText FT_DOKINFFORMAT @@ -314,18 +323,19 @@ TabPage TP_FLD_DOKINF Text [ french ] = "F~ormat" ; Text [ dutch ] = "F~ormaat" ; Text [ portuguese ] = "F~ormato" ; - Text[ chinese_simplified ] = "格式(~O)"; + Text[ chinese_simplified ] = "鏍煎紡(~O)"; Text[ russian ] = "灶痨囹"; Text[ polish ] = "Format"; - Text[ japanese ] = "彂幃(~O)"; - Text[ chinese_traditional ] = "Α(~O)"; + Text[ japanese ] = "鏇稿紡(~O)"; + Text[ chinese_traditional ] = "鏍煎紡(~O)"; Text[ arabic ] = "轻输禹"; Text[ greek ] = "虀锺鲛"; - Text[ korean ] = "辑侥(~O)"; + Text[ korean ] = "靹滌嫕(~O)"; Text[ turkish ] = "F~ormat"; Text[ language_user1 ] = " "; - Text[ catalan ] = "F~ormato"; - Text[ finnish ] = "~Muotoile"; + Text[ catalan ] = "F~ormata"; + Text[ finnish ] = "M~uotoilu"; + Text[ thai ] = "喔｀腹~喔涏箒喔氞笟"; }; ListBox LB_DOKINFFORMAT { @@ -344,25 +354,26 @@ TabPage TP_FLD_DOKINF TabStop = TRUE ; Text [ english_us ] = "~Fixed content" ; Text [ portuguese_brazilian ] = "~Inhalt fixieren" ; - Text [ swedish ] = "Fixera ~inneh錶l" ; - Text [ danish ] = "Fast indhold" ; + Text [ swedish ] = "Fi~xera inneh錶l" ; + Text [ danish ] = "Fast in~dhold" ; Text [ italian ] = "~Fissa il contenuto" ; - Text [ spanish ] = "~Fijar contenido" ; - Text [ french ] = "Contenu f~ixe" ; + Text [ spanish ] = "~Contenido fijo" ; + Text [ french ] = "Contenu fixe" ; Text [ dutch ] = "~Inhoud fixeren" ; Text [ portuguese ] = "~Cont閡do fixo" ; - Text[ chinese_simplified ] = "固定内容(~F)"; + Text[ chinese_simplified ] = "鍥哄畾鍐呭(~F)"; Text[ russian ] = "澡犟. 耦溴疰桁铄"; Text[ polish ] = "Sta砤 tre滄"; - Text[ japanese ] = "撪梕偺屌掕(~F)"; - Text[ chinese_traditional ] = "㏕﹚ず甧(~F)"; + Text[ japanese ] = "鍐呭銇浐瀹(~F)"; + Text[ chinese_traditional ] = "鍥哄畾鍏у(~F)"; Text[ arabic ] = "仕软 轻阃舒砬"; Text[ greek ] = "嗅氵 疱駘殄黠燧睐"; - Text[ korean ] = "郴侩 绊沥(~F)"; + Text[ korean ] = "雮挫毄 瓿犾爼(~F)"; Text[ turkish ] = "葭eri餴 sabitle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Fijar contenido"; + Text[ catalan ] = "Contingut fi~x"; Text[ finnish ] = "~Kiinte sis鋖t"; + Text[ thai ] = "喙喔權阜喙夃腑喔覆~喔勦竾喔椸傅喙"; }; Bitmap BMP_DOKINFROOT_OPENED { @@ -385,18 +396,19 @@ TabPage TP_FLD_DOKINF Text [ french ] = "Info" ; Text [ dutch ] = "Info" ; Text [ portuguese ] = "Info" ; - Text[ chinese_simplified ] = "有关"; + Text[ chinese_simplified ] = "鏈夊叧"; Text[ russian ] = "软纛痨圉"; Text[ polish ] = "Informacja"; - Text[ japanese ] = "忣曬"; - Text[ chinese_traditional ] = "戈癟"; + Text[ japanese ] = "鎯呭牨"; + Text[ chinese_traditional ] = "璩囪▕"; Text[ arabic ] = "阙徭闱"; Text[ greek ] = "须珩秭锺咤"; - Text[ korean ] = "沥焊"; + Text[ korean ] = "鞝曤炒"; Text[ turkish ] = "Bilgi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Informaci髇"; + Text[ catalan ] = "Informaci"; Text[ finnish ] = "Tietoja"; + Text[ thai ] = "喔傕箟喔浮喔灌弗"; }; Text [ english_us ] = "DocInformation" ; Text [ portuguese_brazilian ] = "Dokumentinfo" ; @@ -407,20 +419,33 @@ TabPage TP_FLD_DOKINF Text [ french ] = "Info document" ; Text [ dutch ] = "Documentinfo" ; Text [ portuguese ] = "Info. sobre documento" ; - Text[ chinese_simplified ] = "文档信息"; + Text[ chinese_simplified ] = "鏂囨。淇℃伅"; Text[ russian ] = "砚邃屙 漕牦戾眚"; Text[ polish ] = "Informacje o dokumencie"; - Text[ japanese ] = "霓翻逸膹顣"; - Text[ chinese_traditional ] = "ゅン戈癟"; + Text[ japanese ] = "銉夈偔銉ャ儭銉炽儓鎯呭牨"; + Text[ chinese_traditional ] = "鏂囦欢璩囪▕"; Text[ arabic ] = "阙徭闱 轻阌输"; Text[ greek ] = "须珩秭锺咤 邈泷荟秕"; - Text[ korean ] = "殿废沥焊"; + Text[ korean ] = "氍胳劀 鞝曤炒"; Text[ turkish ] = "Belge bilgileri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Informaci髇 del documento"; + Text[ catalan ] = "Informaci del document"; Text[ finnish ] = "Asiakirjatiedot"; + Text[ thai ] = "喔傕箟喔浮喔灌弗喙喔竵喔覆喔"; }; + + + + + + + + + + + + diff --git a/sw/source/ui/fldui/flddok.src b/sw/source/ui/fldui/flddok.src index 0adc4e530a2b..38fd0e0528ec 100644 --- a/sw/source/ui/fldui/flddok.src +++ b/sw/source/ui/fldui/flddok.src @@ -2,9 +2,9 @@ * * $RCSfile: flddok.src,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:19:39 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,17 +88,18 @@ TabPage TP_FLD_DOK Text [ spanish ] = "~Tipo de campo" ; Text [ english_us ] = "~Type" ; Left = TRUE ; - Text[ chinese_simplified ] = "字段类型(~T)"; - Text[ russian ] = "诣 镱"; + Text[ chinese_simplified ] = "瀛楁绫诲瀷(~T)"; + Text[ russian ] = "诣"; Text[ polish ] = "Typ pola"; - Text[ japanese ] = "台百霓啦踢(~T)"; - Text[ chinese_traditional ] = "逆摸(~T)"; + Text[ japanese ] = "銉曘偅銉笺儷銉夈偪銈ゃ儣(~T)"; + Text[ chinese_traditional ] = "娆勪綅椤炲瀷(~T)"; Text[ arabic ] = "滏 轻娃"; Text[ greek ] = "~札痫 疱溥秕"; - Text[ korean ] = "鞘靛蜡屈(~T)"; + Text[ korean ] = "鞙犿槙(~T)"; Text[ turkish ] = "~Alan tipi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Tipo de campo"; + Text[ catalan ] = "~Tipus"; + Text[ thai ] = "~喔娻笝喔脆笖"; }; ListBox LB_DOKTYPE { @@ -127,17 +128,18 @@ TabPage TP_FLD_DOK Text [ spanish ] = "Se~lecci髇" ; Text [ english_us ] = "S~elect" ; Left = TRUE ; - Text[ chinese_simplified ] = "选择(~E)"; - Text[ russian ] = "蔓犷"; + Text[ chinese_simplified ] = "閫夋嫨(~E)"; + Text[ russian ] = "蔓狃囹"; Text[ polish ] = "Wyb髍"; - 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 ] = "~Se鏸m"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Se~lecci髇"; + Text[ catalan ] = "S~elecciona"; + Text[ thai ] = "喙喔ム阜~喔竵"; }; ListBox LB_DOKSELECTION { @@ -162,18 +164,19 @@ TabPage TP_FLD_DOK Text [ french ] = "F~ormat" ; Text [ dutch ] = "~Notatie" ; Text [ portuguese ] = "F~ormato" ; - Text[ chinese_simplified ] = "格式(~O)"; + Text[ chinese_simplified ] = "鏍煎紡(~O)"; Text[ russian ] = "灶痨囹"; Text[ polish ] = "Format"; - Text[ japanese ] = "彂幃(~O)"; - Text[ chinese_traditional ] = "Α(~O)"; + Text[ japanese ] = "鏇稿紡(~O)"; + Text[ chinese_traditional ] = "鏍煎紡(~O)"; Text[ arabic ] = "轻输禹"; Text[ greek ] = "虀锺鲛"; - Text[ korean ] = "辑侥(~O)"; + Text[ korean ] = "靹滌嫕(~O)"; Text[ turkish ] = "F~ormat"; Text[ language_user1 ] = " "; - Text[ catalan ] = "F~ormato"; - Text[ finnish ] = "~Muotoile"; + Text[ catalan ] = "F~ormata"; + Text[ finnish ] = "M~uotoilu"; + Text[ thai ] = "喔｀腹~喔涏箒喔氞笟"; }; ListBox LB_DOKFORMAT { @@ -206,24 +209,25 @@ TabPage TP_FLD_DOK TEXT [ portuguese ] = "~Correc玢o" ; TEXT [ finnish ] = "~Siirtym" ; TEXT [ danish ] = "Korrektion" ; - TEXT [ french ] = "C~orrecture" ; + TEXT [ french ] = "C~orrection" ; TEXT [ swedish ] = "Ko~rrigering" ; TEXT [ dutch ] = "~Correctie" ; TEXT [ spanish ] = "~Correcci髇" ; TEXT [ english_us ] = "O~ffset" ; Left = TRUE ; Hide = TRUE ; - TEXT[ chinese_simplified ] = "修改(~F)"; - TEXT[ russian ] = "暑痧尻蜩痤怅"; + TEXT[ chinese_simplified ] = "淇敼(~F)"; + TEXT[ russian ] = "鸯妁屙桢"; TEXT[ polish ] = "Korekta"; - TEXT[ japanese ] = "廋惓(~F)"; - TEXT[ chinese_traditional ] = "э(~F)"; + TEXT[ japanese ] = "淇(~F)"; + TEXT[ chinese_traditional ] = "淇敼(~F)"; TEXT[ arabic ] = "轻收晚"; TEXT[ greek ] = "拈棂箸"; - TEXT[ korean ] = "荐沥(~F)"; + TEXT[ korean ] = "靾橃爼(~F)"; TEXT[ turkish ] = "D鼁eltme"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "~Correcci髇"; + TEXT[ catalan ] = "~Correcci"; + TEXT[ thai ] = "喔腑~喔熰箑喔嬥笗"; }; Edit ED_DOKVALUE { @@ -272,25 +276,26 @@ TabPage TP_FLD_DOK TabStop = TRUE ; Text [ english_us ] = "~Fixed content" ; Text [ portuguese_brazilian ] = "~Inhalt fixieren" ; - Text [ swedish ] = "Fixera ~inneh錶l" ; - Text [ danish ] = "Fast indhold" ; + Text [ swedish ] = "Fi~xera inneh錶l" ; + Text [ danish ] = "Fast in~dhold" ; Text [ italian ] = "~Fissa il contenuto" ; - Text [ spanish ] = "~Fijar contenido" ; - Text [ french ] = "Contenu f~ixe" ; + Text [ spanish ] = "~Contenido fijo" ; + Text [ french ] = "Contenu fixe" ; Text [ dutch ] = "~Inhoud fixeren" ; Text [ portuguese ] = "Conte鷇o ~fixo" ; - Text[ chinese_simplified ] = "固定内容(~F)"; + Text[ chinese_simplified ] = "鍥哄畾鍐呭(~F)"; Text[ russian ] = "澡犟. 耦溴疰桁铄"; Text[ polish ] = "Sta砤 tre滄"; - Text[ japanese ] = "撪梕偺屌掕(~F)"; - Text[ chinese_traditional ] = "㏕﹚ず甧(~F)"; + Text[ japanese ] = "鍐呭銇浐瀹(~F)"; + Text[ chinese_traditional ] = "鍥哄畾鍏у(~F)"; Text[ arabic ] = "仕软 轻阃舒砬"; Text[ greek ] = "嗅氵 疱駘殄黠燧睐"; - Text[ korean ] = "郴侩 绊沥(~F)"; + Text[ korean ] = "雮挫毄 瓿犾爼(~F)"; Text[ turkish ] = "葭eri餴 sabitle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Fijar contenido"; + Text[ catalan ] = "Contingut ~fix"; Text[ finnish ] = "~Kiinte sis鋖t"; + Text[ thai ] = "喙喔權阜喙夃腑喔覆~喔勦竾喔椸傅喙"; }; Bitmap BMP_DOKROOT_OPENED { @@ -313,18 +318,19 @@ TabPage TP_FLD_DOK Text [ french ] = "Co~rrection en jours" ; Text [ dutch ] = "Co~rrectie in dagen" ; Text [ portuguese ] = "Co~rrec玢o em dias" ; - Text[ chinese_simplified ] = "修改天数(~E)"; - Text[ russian ] = "暑痧尻蜩痤怅 漤彘"; + Text[ chinese_simplified ] = "淇敼澶╂暟(~E)"; + Text[ russian ] = "鸯妁屙桢 漤"; Text[ polish ] = "Korekta dni"; - 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 ] = "D鼁eltme (g黱)"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Correcci髇 en d韆s"; + Text[ catalan ] = "~Correcci en dies"; Text[ finnish ] = "~Siirtym p鋓vin"; + Text[ thai ] = "喔腑喔熰箑~喔嬥笗喙冟笝喔о副喔"; }; String STR_DOKTIMEOFF { @@ -339,18 +345,19 @@ TabPage TP_FLD_DOK Text [ french ] = "Co~rrection en minutes" ; Text [ dutch ] = "Co~rrectie in minuten" ; Text [ portuguese ] = "Co~rrec玢o em minutos" ; - Text[ chinese_simplified ] = "修改分钟设定(~E)"; - Text[ russian ] = "暑痧尻蜩痤怅 扈眢"; + Text[ chinese_simplified ] = "淇敼鍒嗛挓璁惧畾(~E)"; + Text[ russian ] = "鸯妁屙桢 扈眢蜞"; Text[ polish ] = "Korekta minut"; - 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 ] = "D鼁eltme (dakika)"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Correcci髇 en minutos"; + Text[ catalan ] = "~Correcci en minuts"; Text[ finnish ] = "~Siirtym minuutteina"; + Text[ thai ] = "喔腑喔熰箑~喔嬥笗喙冟笝喔權覆喔椸傅"; }; Text [ english_us ] = "Document" ; Text [ portuguese_brazilian ] = "Dokument" ; @@ -361,20 +368,34 @@ TabPage TP_FLD_DOK Text [ french ] = "Document" ; Text [ dutch ] = "Document" ; Text [ portuguese ] = "Documento" ; - Text[ chinese_simplified ] = "文档"; + Text[ chinese_simplified ] = "鏂囨。"; Text[ russian ] = "念牦戾眚"; Text[ polish ] = "Dokument"; - Text[ japanese ] = "霓翻逸"; - Text[ chinese_traditional ] = "ゅン"; + Text[ japanese ] = "銉夈偔銉ャ儭銉炽儓"; + Text[ chinese_traditional ] = "鏂囦欢"; Text[ arabic ] = "轻阌输"; Text[ greek ] = "搞泷狯"; - Text[ korean ] = "巩辑"; + Text[ korean ] = "氍胳劀"; Text[ turkish ] = "Belge"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Documento"; + Text[ catalan ] = "Document"; Text[ finnish ] = "Asiakirja"; + Text[ thai ] = "喙喔竵喔覆喔"; }; + + + + + + + + + + + + + diff --git a/sw/source/ui/fldui/fldfunc.src b/sw/source/ui/fldui/fldfunc.src index b92ce9bfe42f..4d9ea2fef358 100644 --- a/sw/source/ui/fldui/fldfunc.src +++ b/sw/source/ui/fldui/fldfunc.src @@ -2,9 +2,9 @@ * * $RCSfile: fldfunc.src,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:20:47 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,17 +88,18 @@ TabPage TP_FLD_FUNC Text [ spanish ] = "~Tipo de campo" ; Text [ english_us ] = "~Type" ; Left = TRUE ; - Text[ chinese_simplified ] = "字段类型(~T)"; + Text[ chinese_simplified ] = "瀛楁绫诲瀷(~T)"; Text[ russian ] = "诣 镱"; Text[ polish ] = "Typ pola"; - Text[ japanese ] = "台百霓啦踢(~T)"; - Text[ chinese_traditional ] = "逆摸(~T)"; + Text[ japanese ] = "銉曘偅銉笺儷銉夈偪銈ゃ儣(~T)"; + Text[ chinese_traditional ] = "娆勪綅椤炲瀷(~T)"; Text[ arabic ] = "滏 轻娃"; Text[ greek ] = "~札痫 疱溥秕"; - Text[ korean ] = "蜡屈(~T)"; + Text[ korean ] = "鞙犿槙(~T)"; Text[ turkish ] = "~Alan tipi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Tipo de campo"; + Text[ catalan ] = "~Tipus"; + Text[ thai ] = "~喔娻笝喔脆笖"; }; ListBox LB_FUNCTYPE { @@ -128,17 +129,18 @@ TabPage TP_FLD_FUNC Text [ english_us ] = "S~elect" ; Hide = TRUE ; Left = TRUE ; - Text[ chinese_simplified ] = "选择(~E)"; + Text[ chinese_simplified ] = "閫夋嫨(~E)"; Text[ russian ] = "蔓犷"; Text[ polish ] = "Wyb髍"; - 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 ] = "~Se鏸m"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Se~lecci髇"; + Text[ catalan ] = "S~elecciona"; + Text[ thai ] = "喙喔ム阜~喔竵"; }; ListBox LB_FUNCSELECTION { @@ -166,18 +168,19 @@ TabPage TP_FLD_FUNC Text [ french ] = "F~ormat" ; Text [ dutch ] = "F~ormaat" ; Text [ portuguese ] = "F~ormato" ; - Text[ chinese_simplified ] = "格式(~O)"; + Text[ chinese_simplified ] = "鏍煎紡(~O)"; Text[ russian ] = "灶痨囹"; Text[ polish ] = "Format"; - Text[ japanese ] = "彂幃(~O)"; - Text[ chinese_traditional ] = "Α(~O)"; + Text[ japanese ] = "鏇稿紡(~O)"; + Text[ chinese_traditional ] = "鏍煎紡(~O)"; Text[ arabic ] = "轻输禹"; Text[ greek ] = "虀锺鲛"; - Text[ korean ] = "辑侥(~O)"; + Text[ korean ] = "靹滌嫕(~O)"; Text[ turkish ] = "F~ormat"; Text[ language_user1 ] = " "; - Text[ catalan ] = "F~ormato"; - Text[ finnish ] = "~Muotoile"; + Text[ catalan ] = "F~ormata"; + Text[ finnish ] = "M~uotoilu"; + Text[ thai ] = "喔｀腹~喔涏箒喔氞笟"; }; ListBox LB_FUNCFORMAT { @@ -199,21 +202,22 @@ TabPage TP_FLD_FUNC Text [ danish ] = "Navn" ; Text [ italian ] = "No~me" ; Text [ spanish ] = "No~mbre" ; - Text [ french ] = "~Nom" ; + Text [ french ] = "Nom" ; Text [ dutch ] = "Naa~m" ; Text [ portuguese ] = "No~me" ; - Text[ chinese_simplified ] = "名称(~M)"; + Text[ chinese_simplified ] = "鍚嶇О(~M)"; Text[ russian ] = "褥"; Text[ polish ] = "Nazwa"; - Text[ japanese ] = "柤慜(~M)"; - Text[ chinese_traditional ] = "嘿(~M)"; + Text[ japanese ] = "鍚嶅墠(~M)"; + Text[ chinese_traditional ] = "鍚嶇ū(~M)"; Text[ arabic ] = "轻怯"; Text[ greek ] = "柬镬"; - Text[ korean ] = "捞抚(~M)"; + Text[ korean ] = "鞚措(~M)"; Text[ turkish ] = "~Ad"; Text[ language_user1 ] = " "; - Text[ catalan ] = "No~mbre"; + Text[ catalan ] = "No~m"; Text[ finnish ] = "~Nimi"; + Text[ thai ] = "喔娻阜喙垀喔"; }; Edit ED_FUNCNAME { @@ -241,17 +245,18 @@ TabPage TP_FLD_FUNC Text [ spanish ] = "~Valor" ; Text [ english_us ] = "~Value" ; Left = TRUE ; - Text[ chinese_simplified ] = "数值(~V)"; + Text[ chinese_simplified ] = "鏁板(~V)"; Text[ russian ] = "琼圜屙桢"; Text[ polish ] = "Warto滄"; - Text[ japanese ] = "抣(~V)"; - Text[ chinese_traditional ] = "计(~V)"; + Text[ japanese ] = "鍊(~V)"; + Text[ chinese_traditional ] = "鏁稿(~V)"; Text[ arabic ] = "轻揄闵"; Text[ greek ] = "蚤燹"; - Text[ korean ] = "蔼(~V)"; + Text[ korean ] = "臧(~V)"; Text[ turkish ] = "D~e餰r"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Valor"; + Text[ thai ] = "~喔勦箞喔"; }; Edit ED_FUNCVALUE { @@ -278,18 +283,19 @@ TabPage TP_FLD_FUNC Text [ french ] = "~Alors" ; Text [ dutch ] = "~Dan" ; Text [ portuguese ] = "~Ent鉶" ; - Text[ chinese_simplified ] = "就"; + Text[ chinese_simplified ] = "灏"; Text[ russian ] = "翌沅"; Text[ polish ] = "Wtedy"; - Text[ japanese ] = "忦審傪枮偨偡偲偒"; - Text[ chinese_traditional ] = "碞"; + Text[ japanese ] = "鏉′欢銈掓簚銇熴仚銇ㄣ亶"; + Text[ chinese_traditional ] = "灏"; Text[ arabic ] = "蓓 逍 轻颓嵘"; Text[ greek ] = "渣翦"; - Text[ korean ] = "弊 促澜"; + Text[ korean ] = "臁瓣贝鞚 於╈”頃 瓴届毎"; Text[ turkish ] = "O halde"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Entonces"; + Text[ catalan ] = "Aleshores"; Text[ finnish ] = "Sitten"; + Text[ thai ] = "喔堗覆喔佮笝喔编箟喔"; }; Edit ED_FUNCCOND1 { @@ -317,18 +323,19 @@ TabPage TP_FLD_FUNC Text [ french ] = "~Sinon" ; Text [ dutch ] = "~Anders" ; Text [ portuguese ] = "~Sen鉶" ; - Text[ chinese_simplified ] = "其它"; + Text[ chinese_simplified ] = "鍏跺畠"; Text[ russian ] = "软圜"; Text[ polish ] = "W przeciwnym wypadku"; - Text[ japanese ] = "忦審傪枮偨偝側偄偲偒"; - Text[ chinese_traditional ] = "玥"; + Text[ japanese ] = "鏉′欢銈掓簚銇熴仌銇亜銇ㄣ亶"; + Text[ chinese_traditional ] = "鍚﹀墖"; Text[ arabic ] = "蓓闱 谙 嗅"; Text[ greek ] = "岭腴"; - Text[ korean ] = "扁鸥"; + Text[ korean ] = "旮绊儉"; Text[ turkish ] = "Yoksa"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Si no"; + Text[ catalan ] = "Sin"; Text[ finnish ] = "Muutoin"; + Text[ thai ] = "喔涪喙堗覆喔囙腑喔粪箞喔"; }; Edit ED_FUNCCOND2 { @@ -354,21 +361,22 @@ TabPage TP_FLD_FUNC Text [ spanish ] = "M~acro..." ; Text [ danish ] = "Makro..." ; Text [ swedish ] = "M~akro..." ; - Text [ finnish ] = "~Makro" ; + Text [ finnish ] = "~Makro..." ; Text [ english_us ] = "~Macro..." ; Disable = TRUE ; TabStop = TRUE ; - Text[ chinese_simplified ] = "宏(~M)..."; + Text[ chinese_simplified ] = "瀹(~M)..."; Text[ russian ] = "锑牮铖..."; Text[ polish ] = "Makro..."; - Text[ japanese ] = "细(~M)..."; - Text[ chinese_traditional ] = "エ栋(~M)..."; + Text[ japanese ] = "銉炪偗銉(~M)..."; + Text[ chinese_traditional ] = "宸ㄩ泦(~M)..."; Text[ arabic ] = "闱哐..."; Text[ greek ] = "提犟镥眙镫..."; - Text[ korean ] = "概农肺(~M)..."; + Text[ korean ] = "毵ろ伂搿(~M)..."; Text[ turkish ] = "M~akro..."; Text[ language_user1 ] = " "; - Text[ catalan ] = "M~acro..."; + Text[ catalan ] = "~Macro..."; + Text[ thai ] = "~喔∴覆喙傕竸喔..."; }; Text [ english_us ] = "Functions" ; Text [ portuguese_brazilian ] = "Funktionen" ; @@ -379,17 +387,30 @@ TabPage TP_FLD_FUNC Text [ french ] = "Fonctions" ; Text [ dutch ] = "Functies" ; Text [ portuguese ] = "Fun珲es" ; - Text[ chinese_simplified ] = "功能"; + Text[ chinese_simplified ] = "鍔熻兘"; Text[ russian ] = "泽黻鲨"; Text[ polish ] = "Funkcje"; - Text[ japanese ] = "婡擻\"; - Text[ chinese_traditional ] = "\"; + Text[ japanese ] = "姗熻兘"; + Text[ chinese_traditional ] = "鍔熻兘"; Text[ arabic ] = "沐倾"; Text[ greek ] = "隋轸秕胥咤"; - Text[ korean ] = "窃荐"; + Text[ korean ] = "旮半姤"; Text[ turkish ] = "Fonksiyon"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Funciones"; + Text[ catalan ] = "Funcions"; Text[ finnish ] = "Toiminnot"; + Text[ thai ] = "喔熰副喔囙竵喙屶笂喔编箞喔"; }; + + + + + + + + + + + + diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx index b7fdebbaf3fc..84579412fd6a 100644 --- a/sw/source/ui/fldui/fldpage.cxx +++ b/sw/source/ui/fldui/fldpage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fldpage.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: os $ $Date: 2002-11-15 11:12:16 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -288,22 +288,12 @@ BOOL SwFldPage::InsertFld(USHORT nTypeId, USHORT nSubType, const String& rPar1, case TYP_DBNUMSETFLD: case TYP_DBSETNUMBERFLD: { - USHORT nPos, nTablePos, nExpPos; + xub_StrLen nPos = 0; SwDBData aData; - // DBName aus rPar1 extrahieren. Format: DBName.TableName.ExpStrg - if ((nTablePos = rPar1.Search(DB_DELIM)) != STRING_NOTFOUND) - aData.sDataSource = rPar1.Copy(0, nTablePos++); - if ((nExpPos = rPar1.Search(DB_DELIM, nTablePos)) != STRING_NOTFOUND) - { - aData.sCommand = rPar1.Copy(nTablePos, nExpPos++ - nTablePos); - } - if (nExpPos != STRING_NOTFOUND) - nPos = nExpPos; - else if (nTablePos != STRING_NOTFOUND) - nPos = nTablePos; - else - nPos = 0; + aData.sDataSource = rPar1.GetToken(0, DB_DELIM, nPos); + aData.sCommand = rPar1.GetToken(0, DB_DELIM, nPos); + aData.nCommandType = rPar1.GetToken(0, DB_DELIM, nPos).ToInt32(); sPar1 = rPar1.Copy(nPos); ((SwDBNameInfField*)pCurFld)->SetDBData(aData); diff --git a/sw/source/ui/fldui/fldref.src b/sw/source/ui/fldui/fldref.src index 755220681610..bb441aeb35e4 100644 --- a/sw/source/ui/fldui/fldref.src +++ b/sw/source/ui/fldui/fldref.src @@ -2,9 +2,9 @@ * * $RCSfile: fldref.src,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: kz $ $Date: 2001-07-14 03:06:41 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,17 +88,18 @@ TabPage TP_FLD_REF Text [ spanish ] = "~Tipo de campo" ; Text [ english_us ] = "~Type" ; Left = TRUE ; - Text[ chinese_simplified ] = "字段类型(~T)"; + Text[ chinese_simplified ] = "瀛楁绫诲瀷(~T)"; Text[ russian ] = "诣 镱"; Text[ polish ] = "Typ pola"; - Text[ japanese ] = "台百霓啦踢(~T)"; - Text[ chinese_traditional ] = "摸(~T)"; + Text[ japanese ] = "銉曘偅銉笺儷銉夈偪銈ゃ儣(~T)"; + Text[ chinese_traditional ] = "娆勪綅椤炲瀷(~T)"; Text[ arabic ] = "滏 轻娃"; Text[ greek ] = "~札痫 疱溥秕"; - Text[ korean ] = "蜡屈(~T)"; + Text[ korean ] = "鞙犿槙(~T)"; Text[ turkish ] = "~Alan tipi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Tipo de campo"; + Text[ catalan ] = "~Tipus"; + Text[ thai ] = "~喔娻笝喔脆笖"; }; ListBox LB_REFTYPE { @@ -126,17 +127,18 @@ TabPage TP_FLD_REF Text [ spanish ] = "Se~lecci髇" ; Text [ english_us ] = "S~election" ; Left = TRUE ; - Text[ chinese_simplified ] = "选择(~E)"; + Text[ chinese_simplified ] = "閫夋嫨(~E)"; Text[ russian ] = "蔓犷"; Text[ polish ] = "Wyb髍"; - 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 ] = "S~e鏸m"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Se~lecci髇"; + Text[ catalan ] = "Se~lecci"; + Text[ thai ] = "喙喔ム阜~喔竵"; }; ListBox LB_REFSELECTION { @@ -162,18 +164,19 @@ TabPage TP_FLD_REF Text [ french ] = "F~ormat" ; Text [ dutch ] = "F~ormaat" ; Text [ portuguese ] = "F~ormato" ; - Text[ chinese_simplified ] = "格式(~O)"; + Text[ chinese_simplified ] = "鏍煎紡(~O)"; Text[ russian ] = "灶痨囹"; Text[ polish ] = "Format"; - Text[ japanese ] = "彂幃(~O)"; - Text[ chinese_traditional ] = "Α(~O)"; + Text[ japanese ] = "鏇稿紡(~O)"; + Text[ chinese_traditional ] = "鏍煎紡(~O)"; Text[ arabic ] = "轻输禹"; Text[ greek ] = "虀锺鲛"; - Text[ korean ] = "辑侥(~O)"; + Text[ korean ] = "靹滌嫕(~O)"; Text[ turkish ] = "F~ormat"; Text[ language_user1 ] = " "; - Text[ catalan ] = "F~ormato"; - Text[ finnish ] = "~Muotoile"; + Text[ catalan ] = "F~ormata"; + Text[ finnish ] = "M~uotoilu"; + Text[ thai ] = "喔｀腹~喔涏箒喔氞笟"; }; ListBox LB_REFFORMAT { @@ -197,21 +200,22 @@ TabPage TP_FLD_REF Text [ danish ] = "Navn" ; Text [ italian ] = "No~me" ; Text [ spanish ] = "No~mbre" ; - Text [ french ] = "~Nom" ; + Text [ french ] = "Nom" ; Text [ dutch ] = "Naa~m" ; Text [ portuguese ] = "No~me" ; - Text[ chinese_simplified ] = "名称(~M)"; + Text[ chinese_simplified ] = "鍚嶇О(~M)"; Text[ russian ] = "褥"; Text[ polish ] = "Nazwa"; - Text[ japanese ] = "柤慜(~M)"; - Text[ chinese_traditional ] = "嘿(~M)"; + Text[ japanese ] = "鍚嶅墠(~M)"; + Text[ chinese_traditional ] = "鍚嶇ū(~M)"; Text[ arabic ] = "轻怯"; Text[ greek ] = "柬镬"; - Text[ korean ] = "捞抚(~M)"; + Text[ korean ] = "鞚措(~M)"; Text[ turkish ] = "~Ad"; Text[ language_user1 ] = " "; - Text[ catalan ] = "No~mbre"; + Text[ catalan ] = "No~m"; Text[ finnish ] = "~Nimi"; + Text[ thai ] = "喔娻阜喙垀喔"; }; Edit ED_REFNAME { @@ -240,17 +244,18 @@ TabPage TP_FLD_REF Text [ english_us ] = "~Value" ; Disable = TRUE ; Left = TRUE ; - Text[ chinese_simplified ] = "数值(~V)"; + Text[ chinese_simplified ] = "鏁板(~V)"; Text[ russian ] = "琼圜屙桢"; Text[ polish ] = "Warto滄"; - Text[ japanese ] = "抣(~V)"; - Text[ chinese_traditional ] = "计(~V)"; + Text[ japanese ] = "鍊(~V)"; + Text[ chinese_traditional ] = "鏁稿(~V)"; Text[ arabic ] = "轻揄闵"; Text[ greek ] = "蚤燹"; - Text[ korean ] = "蔼(V)(~V)"; + Text[ korean ] = "臧(~V)"; Text[ turkish ] = "~De餰r"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Valor"; + Text[ thai ] = "~喔勦箞喔"; }; Edit ED_REFVALUE { @@ -274,18 +279,19 @@ TabPage TP_FLD_REF Text [ danish ] = "Tekstmarkeringer" ; Text [ portuguese ] = "Marcadores de texto" ; Text [ portuguese_brazilian ] = "Textmarken" ; - Text[ chinese_simplified ] = "书签"; - Text[ russian ] = "义犟蝾恹 镱戾蜿"; + Text[ chinese_simplified ] = "涔︾"; + Text[ russian ] = "青觌噤觇"; Text[ polish ] = "Zak砤dki"; - Text[ japanese ] = "梅侥习"; - Text[ chinese_traditional ] = "ずゅ夹乓"; + Text[ japanese ] = "銉嗐偔銈广儓銉炪兗銈"; + Text[ chinese_traditional ] = "鍏ф枃妯欑堡"; Text[ arabic ] = "旁茄鞘 阊腾砩"; Text[ greek ] = "隅燔溟 赍殪蓓秕"; - Text[ korean ] = "氓哎乔"; + Text[ korean ] = "毂呹皥頂"; Text[ turkish ] = "Metin ireti"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Marcas de texto"; + Text[ catalan ] = "Marques de text"; Text[ finnish ] = "Kirjanmerkit"; + Text[ thai ] = "喔椸傅喙堗竸喔编箞喔"; }; String STR_REFFOOTNOTE { @@ -302,17 +308,18 @@ TabPage TP_FLD_REF Text [ dutch ] = "Voetnoten" ; Text [ spanish ] = "Notas al pie" ; Text [ english_us ] = "Footnotes" ; - Text[ chinese_simplified ] = "注脚"; + Text[ chinese_simplified ] = "娉ㄨ剼"; Text[ russian ] = "秧铖觇"; Text[ polish ] = "Przypisy dolne"; - Text[ japanese ] = "媟拲"; - Text[ chinese_traditional ] = "爹竲"; + Text[ japanese ] = "鑴氭敞"; + Text[ chinese_traditional ] = "瑷昏叧"; Text[ arabic ] = "玩窃 虞犴"; Text[ greek ] = "震矬珈彘彘"; - Text[ korean ] = "阿林"; + Text[ korean ] = "臧侅＜"; Text[ turkish ] = "Dipnotlar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Notas al pie"; + Text[ catalan ] = "Notes al peu"; + Text[ thai ] = "喙喔娻复喔囙腑喔｀福喔"; }; String STR_REFENDNOTE { @@ -327,18 +334,19 @@ TabPage TP_FLD_REF Text [ french ] = "Notes de fin" ; Text [ dutch ] = "Eindnoten" ; Text [ portuguese ] = "Notas finais" ; - Text[ chinese_simplified ] = "尾注"; + Text[ chinese_simplified ] = "灏炬敞"; Text[ russian ] = "暑眦邂 耥铖赅"; Text[ polish ] = "Przypisy ko馽owe"; - Text[ japanese ] = "暥枛媟拲"; - Text[ chinese_traditional ] = "Ю爹"; + Text[ japanese ] = "鏂囨湯鑴氭敞"; + Text[ chinese_traditional ] = "灏捐ɑ"; Text[ arabic ] = "授犴耷 问倾砩"; Text[ greek ] = "隅戾辋箦轵 糨腼躜"; - Text[ korean ] = "固林"; + Text[ korean ] = "氙胳＜"; Text[ turkish ] = "Son notlar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Notas finales"; - Text[ finnish ] = "Loppuhuomautukset"; + Text[ catalan ] = "Notes finals"; + Text[ finnish ] = "Loppuviitteet"; + Text[ thai ] = "喔箟喔侧竾喔复喔囙笚喙夃覆喔⑧箑喔｀阜喙堗腑喔"; }; Text [ english_us ] = "References" ; Text [ portuguese_brazilian ] = "Referenzen" ; @@ -349,20 +357,30 @@ TabPage TP_FLD_REF Text [ french ] = "R閒閞ences" ; Text [ dutch ] = "Verwijzingen" ; Text [ portuguese ] = "Refer阯cias" ; - Text[ chinese_simplified ] = "说明文"; + Text[ chinese_simplified ] = "璇存槑鏂"; Text[ russian ] = "疡觇"; Text[ polish ] = "Odwo砤nia"; - Text[ japanese ] = "嶲徠"; - Text[ chinese_traditional ] = "把酚"; + Text[ japanese ] = "鍙傜収"; + Text[ chinese_traditional ] = "鍙冪収"; Text[ arabic ] = "轻阊翘"; Text[ greek ] = "另狯锺蒡"; - Text[ korean ] = "曼炼"; + Text[ korean ] = "彀胳“"; Text[ turkish ] = "Referans"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Referencias"; + Text[ catalan ] = "Refer鑞cies"; Text[ finnish ] = "Viitteet"; + Text[ thai ] = "喔箟喔侧竾喔复喔"; }; + + + + + + + + + diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index fdae7950a210..10f501963fe8 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fldtdlg.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: os $ $Date: 2002-12-12 16:10:53 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -233,6 +233,46 @@ void SwFldDlgWrapper::ShowPage(USHORT nPage) ((SwFldDlg*)GetWindow())->ShowPage(nPage ? nPage : TP_FLD_REF); } +SFX_IMPL_CHILDWINDOW(SwFldDataOnlyDlgWrapper, FN_INSERT_FIELD_DATA_ONLY) + +/* -----------------04.02.2003 14:17----------------- + * + * --------------------------------------------------*/ +SfxChildWinInfo SwFldDataOnlyDlgWrapper::GetInfo() const +{ + SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); +// prevent instatiation of dialog other than by calling +// the mail merge dialog + aInfo.bVisible = FALSE; + return aInfo; +} +/* -----------------04.02.2003 14:17----------------- + * + * --------------------------------------------------*/ +SwFldDataOnlyDlgWrapper::SwFldDataOnlyDlgWrapper( Window* pParent, USHORT nId, + SfxBindings* pB, + SfxChildWinInfo* pInfo ) + : SwChildWinWrapper( pParent, nId ) +{ + SwFldDlg *pDlg = new SwFldDlg( pB, this, pParent ); + pWindow = pDlg; + pDlg->ActivateDatabasePage(); + pDlg->Start(); + pDlg->Initialize( pInfo ); + eChildAlignment = SFX_ALIGN_NOALIGNMENT; +} +/* -----------------04.02.2003 14:17----------------- + * re-init after doc activation + * --------------------------------------------------*/ +BOOL SwFldDataOnlyDlgWrapper::ReInitDlg(SwDocShell *pDocSh) +{ + BOOL bRet; + if ((bRet = SwChildWinWrapper::ReInitDlg(pDocSh)) == TRUE) // Sofort aktualisieren, Dok-Wechsel + ((SwFldDlg*)GetWindow())->ReInitDlg(); + + return bRet; +} + /*-------------------------------------------------------------------- Beschreibung: Der Traeger des Dialoges --------------------------------------------------------------------*/ @@ -240,7 +280,8 @@ void SwFldDlgWrapper::ShowPage(USHORT nPage) SwFldDlg::SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent) : SfxTabDialog( pParent, SW_RES( DLG_FLD_INSERT )), - pChildWin(pCW) + pChildWin(pCW), + bDataBaseMode(FALSE) { SetStyle(GetStyle()|WB_STDMODELESS); bHtmlMode = (::GetHtmlMode((SwDocShell*)SfxObjectShell::Current()) & HTMLMODE_ON) != 0; @@ -292,7 +333,8 @@ SwFldDlg::~SwFldDlg() BOOL SwFldDlg::Close() { SfxViewFrame::Current()->GetDispatcher()-> - Execute(FN_INSERT_FIELD, SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD); + Execute(bDataBaseMode ? FN_INSERT_FIELD_DATA_ONLY : FN_INSERT_FIELD, + SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD); return TRUE; } @@ -473,10 +515,17 @@ void SwFldDlg::InsertHdl() * --------------------------------------------------*/ void SwFldDlg::ActivateDatabasePage() { + bDataBaseMode = TRUE; ShowPage( TP_FLD_DB ); SfxTabPage* pDBPage = GetTabPage( TP_FLD_DB ); if( pDBPage ) { ((SwFldDBPage*)pDBPage)->ActivateMailMergeAddress(); } + //remove all other pages + RemoveTabPage(TP_FLD_DOK); + RemoveTabPage(TP_FLD_VAR); + RemoveTabPage(TP_FLD_DOKINF); + RemoveTabPage(TP_FLD_REF); + RemoveTabPage(TP_FLD_FUNC); } diff --git a/sw/source/ui/fldui/fldtdlg.src b/sw/source/ui/fldui/fldtdlg.src index 0b3d5dd9f1a7..a2dd4add6e74 100644 --- a/sw/source/ui/fldui/fldtdlg.src +++ b/sw/source/ui/fldui/fldtdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: fldtdlg.src,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:23:14 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -91,18 +91,19 @@ TabDialog DLG_FLD_INSERT Text [ french ] = "Document" ; Text [ dutch ] = "Document" ; Text [ portuguese ] = "Documento" ; - Text[ chinese_simplified ] = "文档"; + Text[ chinese_simplified ] = "鏂囨。"; Text[ russian ] = "念牦戾眚"; Text[ polish ] = "Dokument"; - Text[ japanese ] = "霓翻逸"; - Text[ chinese_traditional ] = "ゅン"; + Text[ japanese ] = "銉夈偔銉ャ儭銉炽儓"; + Text[ chinese_traditional ] = "鏂囦欢"; Text[ arabic ] = "轻阌输"; Text[ greek ] = "搞泷狯"; - Text[ korean ] = "巩辑"; + Text[ korean ] = "氍胳劀"; Text[ turkish ] = "Belge"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Documento"; + Text[ catalan ] = "Document"; Text[ finnish ] = "Asiakirja"; + Text[ thai ] = "喙喔竵喔覆喔"; }; PageItem { @@ -119,18 +120,19 @@ TabDialog DLG_FLD_INSERT Text [ french ] = "R閒閞ences" ; Text [ dutch ] = "Verwijzingen" ; Text [ portuguese ] = "Refer阯cias" ; - Text[ chinese_simplified ] = "引用"; + Text[ chinese_simplified ] = "寮曠敤"; Text[ russian ] = "疡觇"; Text[ polish ] = "Odwo砤nia"; - Text[ japanese ] = "嶲徠"; - Text[ chinese_traditional ] = "把酚"; + Text[ japanese ] = "鍙傜収"; + Text[ chinese_traditional ] = "鍙冪収"; Text[ arabic ] = "阊翘"; Text[ greek ] = "另狯锺蒡"; - Text[ korean ] = "曼炼"; + Text[ korean ] = "彀胳“"; Text[ turkish ] = "Referanslar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Referencias"; + Text[ catalan ] = "Refer鑞cies"; Text[ finnish ] = "Viitteet"; + Text[ thai ] = "喔箟喔侧竾喔复喔"; }; PageItem { @@ -147,18 +149,19 @@ TabDialog DLG_FLD_INSERT Text [ french ] = "Fonctions" ; Text [ dutch ] = "Functies" ; Text [ portuguese ] = "Fun珲es" ; - Text[ chinese_simplified ] = "功能"; + Text[ chinese_simplified ] = "鍔熻兘"; Text[ russian ] = "泽黻鲨"; Text[ polish ] = "Funkcje"; - Text[ japanese ] = "婡擻\"; - Text[ chinese_traditional ] = "\"; + Text[ japanese ] = "姗熻兘"; + Text[ chinese_traditional ] = "鍔熻兘"; Text[ arabic ] = "沐倾"; Text[ greek ] = "隋轸秕胥咤"; - Text[ korean ] = "扁瓷"; + Text[ korean ] = "旮半姤"; Text[ turkish ] = "蔺levler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Funciones"; + Text[ catalan ] = "Funcions"; Text[ finnish ] = "Toiminnot"; + Text[ thai ] = "喔熰副喔囙竵喙屶笂喔编箞喔"; }; PageItem { @@ -175,18 +178,19 @@ TabDialog DLG_FLD_INSERT Text [ french ] = "Info document" ; Text [ dutch ] = "Documentinfo" ; Text [ portuguese ] = "Info. sobre documento" ; - Text[ chinese_simplified ] = "文档信息"; + Text[ chinese_simplified ] = "鏂囨。淇℃伅"; Text[ russian ] = "砚邃屙 漕牦戾眚"; Text[ polish ] = "Informacje o dokumencie"; - Text[ japanese ] = "霓翻逸膹顣"; - Text[ chinese_traditional ] = "ゅン戈癟"; + Text[ japanese ] = "銉夈偔銉ャ儭銉炽儓鎯呭牨"; + Text[ chinese_traditional ] = "鏂囦欢璩囪▕"; Text[ arabic ] = "阙徭闱 轻阌输"; Text[ greek ] = "须珩秭锺咤 邈泷荟秕"; - Text[ korean ] = "巩辑沥焊"; + Text[ korean ] = "氍胳劀 鞝曤炒"; Text[ turkish ] = "Belge bilgileri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Informaci髇 del documento"; + Text[ catalan ] = "Informaci del document"; Text[ finnish ] = "Asiakirjatiedot"; + Text[ thai ] = "喔傕箟喔浮喔灌弗喙喔竵喔覆喔"; }; PageItem { @@ -203,18 +207,19 @@ TabDialog DLG_FLD_INSERT Text [ french ] = "Variables" ; Text [ dutch ] = "Variabelen" ; Text [ portuguese ] = "Vari醰eis" ; - Text[ chinese_simplified ] = "变量"; + Text[ chinese_simplified ] = "鍙橀噺"; Text[ russian ] = "襄疱戾眄"; Text[ polish ] = "Zmienne"; - Text[ japanese ] = "曄悢"; - Text[ chinese_traditional ] = "跑秖"; + Text[ japanese ] = "澶夋暟"; + Text[ chinese_traditional ] = "璁婇噺"; Text[ arabic ] = "闶垌亚"; Text[ greek ] = "体翎怆玺蒡"; - Text[ korean ] = "函荐"; + Text[ korean ] = "氤靾"; Text[ turkish ] = "De餴⺧enler"; Text[ language_user1 ] = " "; Text[ catalan ] = "Variables"; Text[ finnish ] = "Muuttujat"; + Text[ thai ] = "喔曕副喔о箒喔涏福"; }; PageItem { @@ -231,18 +236,19 @@ TabDialog DLG_FLD_INSERT Text [ french ] = "Base de donn閑s" ; Text [ dutch ] = "Database" ; Text [ portuguese ] = "Base de dados" ; - Text[ chinese_simplified ] = "数据库"; + Text[ chinese_simplified ] = "鏁版嵁搴"; Text[ russian ] = "拎玎 溧眄"; Text[ polish ] = "Baza danych"; - Text[ japanese ] = "棉袄娃敖"; - Text[ chinese_traditional ] = "戈畐"; + Text[ japanese ] = "銉囥兗銈裤儥銉笺偣"; + Text[ chinese_traditional ] = "璩囨枡搴"; Text[ arabic ] = "耷谙 轻软卿鞘"; Text[ greek ] = "萝箸 溴滹燧睐"; - Text[ korean ] = "单捞磐海捞胶"; + Text[ korean ] = "雿办澊韯半矤鞚挫姢"; Text[ turkish ] = "Veritaban"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Base de datos"; + Text[ catalan ] = "Base de dades"; Text[ finnish ] = "Tietokanta"; + Text[ thai ] = "喔愢覆喔權競喙夃腑喔∴腹喔"; }; }; }; @@ -251,27 +257,28 @@ TabDialog DLG_FLD_INSERT Text = "~Einf黦en" ; Text [ ENGLISH ] = "~Insert" ; Text [ norwegian ] = "~Insert" ; - Text [ italian ] = "~Inserisci" ; + Text [ italian ] = "Inserisci" ; Text [ portuguese_brazilian ] = "~Inserir" ; Text [ portuguese ] = "~Inserir" ; Text [ finnish ] = "~Lis滗" ; Text [ danish ] = "~Inds鎡" ; - Text [ french ] = "~Ins閞er" ; + Text [ french ] = "Ins閞er" ; Text [ swedish ] = "~Infoga" ; Text [ dutch ] = "~Invoegen" ; Text [ spanish ] = "~Insertar" ; Text [ english_us ] = "~Insert" ; - Text[ chinese_simplified ] = "插入(~I)"; - Text[ russian ] = "埋蜞怅"; + Text[ chinese_simplified ] = "鎻掑叆(~I)"; + Text[ russian ] = "埋蜞忤螯"; Text[ polish ] = "Wstaw"; - Text[ japanese ] = "憓擖(~I)"; - Text[ chinese_traditional ] = "础(~I)"; + Text[ japanese ] = "鎸垮叆(~I)"; + Text[ chinese_traditional ] = "鎻掑叆(~I)"; Text[ arabic ] = "畔亚"; Text[ greek ] = "~砰筢泫戕"; - Text[ korean ] = "火涝(~I)"; + Text[ korean ] = "靷届瀰(~I)"; Text[ turkish ] = "~Ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Insertar"; + Text[ catalan ] = "~Insereix"; + Text[ thai ] = "喙亊喔椸福喔"; }; String STR_FLD_CLOSE { @@ -280,24 +287,25 @@ TabDialog DLG_FLD_INSERT Text [ english_us ] = "~Close" ; Text [ italian ] = "~Chiudi" ; Text [ spanish ] = "~Cerrar" ; - Text [ french ] = "~Fermer" ; + Text [ french ] = "Fermer" ; Text [ dutch ] = "~Sluiten" ; Text [ swedish ] = "~St鋘g" ; Text [ danish ] = "Luk" ; Text [ portuguese_brazilian ] = "~Schlie?en" ; Text [ portuguese ] = "~Fechar" ; - Text[ chinese_simplified ] = "关闭(~C)"; + Text[ chinese_simplified ] = "鍏抽棴(~C)"; Text[ russian ] = "青牮"; Text[ polish ] = "Zamknij"; - Text[ japanese ] = "暵偠傞(~C)"; - Text[ chinese_traditional ] = "闽超(~C)"; + Text[ japanese ] = "闁夈仒銈(~C)"; + Text[ chinese_traditional ] = "闂滈枆(~C)"; Text[ arabic ] = "袍崆"; Text[ greek ] = "孰暹箝祜"; - Text[ korean ] = "摧扁(~C)"; + Text[ korean ] = "雼赴(~C)"; Text[ turkish ] = "~驱k"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Cerrar"; + Text[ catalan ] = "~Tanca"; Text[ finnish ] = "~Sulje"; + Text[ thai ] = "~喔涏复喔"; }; Text [ english_us ] = "Fields" ; Text [ portuguese_brazilian ] = "Feldbefehle" ; @@ -308,20 +316,30 @@ TabDialog DLG_FLD_INSERT Text [ french ] = "Champs" ; Text [ dutch ] = "Veldopdracht" ; Text [ portuguese ] = "Campos" ; - Text[ chinese_simplified ] = "字段指令"; - Text[ russian ] = "项脲"; + Text[ chinese_simplified ] = "瀛楁鎸囦护"; + Text[ russian ] = "项"; Text[ polish ] = "Pola"; - Text[ japanese ] = "台百霓"; - Text[ chinese_traditional ] = "逆"; + Text[ japanese ] = "銉曘偅銉笺儷銉"; + Text[ chinese_traditional ] = "娆勪綅鎸囦护"; Text[ arabic ] = "娃驷"; Text[ greek ] = "彭麸胼 疱溥"; - Text[ korean ] = "鞘靛"; + Text[ korean ] = "頃勲摐"; Text[ turkish ] = "Alan 鲳eleri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Campos"; - Text[ finnish ] = "Kent鋞"; + Text[ catalan ] = "Camps"; + Text[ finnish ] = "Kentt"; + Text[ thai ] = "喙喔傕笗喔傕箟喔浮喔灌弗"; }; + + + + + + + + + diff --git a/sw/source/ui/fldui/fldui.src b/sw/source/ui/fldui/fldui.src index 13925b9c9803..19780a5ab43d 100644 --- a/sw/source/ui/fldui/fldui.src +++ b/sw/source/ui/fldui/fldui.src @@ -2,9 +2,9 @@ * * $RCSfile: fldui.src,v $ * - * $Revision: 1.38 $ + * $Revision: 1.39 $ * - * last change: $Author: kz $ $Date: 2002-12-09 09:57:58 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,7 +87,7 @@ String STR_FLD_EDIT_DLG Text[ chinese_traditional ] = "绶ㄨ集娆勪綅鎸囦护"; Text[ arabic ] = "释秧 轻娃"; Text[ greek ] = "硼孱羼汜筮 屙麸朕 疱溥秕"; - Text[ korean ] = "韺岇澕 韼胳"; + Text[ korean ] = "頃勲摐 韼胳"; Text[ turkish ] = "Alan 鲳esi d鼁enle"; Text[ language_user1 ] = " "; Text[ catalan ] = "Edita els camps"; @@ -277,7 +277,7 @@ String STR_DOCSTATFLD TEXT [ portuguese ] = "Estat韘tica" ; TEXT [ finnish ] = "Tilastotiedot" ; TEXT [ danish ] = "Statistik" ; - TEXT [ french ] = "Statistique" ; + TEXT [ french ] = "Statistiques" ; TEXT [ swedish ] = "Statistik" ; TEXT [ dutch ] = "Statistiek" ; TEXT [ spanish ] = "Estad韘tica" ; @@ -305,7 +305,7 @@ String STR_AUTHORFLD Text [ swedish ] = "Anv鋘dare" ; Text [ danish ] = "Bruger" ; Text [ italian ] = "Autore" ; - Text [ spanish ] = "Usuario" ; + Text [ spanish ] = "Autor" ; Text [ french ] = "Utilisateur" ; Text [ dutch ] = "Gebruiker" ; Text[ chinese_simplified ] = "浣跨敤鑰"; @@ -335,7 +335,7 @@ String STR_TEMPLNAMEFLD TEXT [ french ] = "Mod鑜e de document" ; TEXT [ swedish ] = "Dokumentmall" ; TEXT [ dutch ] = "Sjabloon" ; - TEXT [ spanish ] = "Plantilla" ; + TEXT [ spanish ] = "Plantillas" ; TEXT [ english_us ] = "Templates" ; TEXT[ chinese_simplified ] = "鏂囨。鏍峰紡"; TEXT[ russian ] = "剜犭铐"; @@ -344,7 +344,7 @@ String STR_TEMPLNAMEFLD TEXT[ chinese_traditional ] = "鏂囦欢妯ｅ紡"; TEXT[ arabic ] = "耷崛 阌输"; TEXT[ greek ] = "旭躔 邈泷荟秕"; - TEXT[ korean ] = "氍胳劀 靹滌嫕 韺岇澕"; + TEXT[ korean ] = "靹滌嫕 韺岇澕"; TEXT[ turkish ] = "Belge blonu"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Plantilles"; @@ -539,13 +539,13 @@ String STR_USRINPUTFLD Text [ portuguese ] = "Campo de entrada (utilizador)" ; Text [ portuguese_brazilian ] = "Eingabefeld (Benutzer)" ; Text[ chinese_simplified ] = "杈撳叆瀛楁(浣跨敤鑰)"; - Text[ russian ] = "项脲 忖钿 (镱朦珙忄蝈朦)"; + Text[ russian ] = "项脲 忖钿 (镱朦珙忄蝈朦耜铄)"; Text[ polish ] = "Pole wprowadzania (U縴tkownik)"; Text[ japanese ] = "鍏ュ姏銉曘偅銉笺儷銉 (銉︺兗銈躲兗)"; Text[ chinese_traditional ] = "杓稿叆娆勪綅(浣跨敤鑰)"; Text[ arabic ] = "娃 畔吻 (轻阌饰香)"; Text[ greek ] = "绣溥 彘筢泫戕 (遵摅翮)"; - Text[ korean ] = "鞛呺牓 頃勲摐 (靷毄鞛)"; + Text[ korean ] = "鞛呺牓 頃勲摐(靷毄鞛)"; Text[ turkish ] = "Giri alan (Kullan齝)"; Text[ language_user1 ] = " "; Text[ catalan ] = "Camp d'entrada (usuari)"; @@ -565,7 +565,7 @@ String STR_CONDTXTFLD TEXT [ french ] = "Texte conditionnel" ; TEXT [ swedish ] = "Villkorlig text" ; TEXT [ dutch ] = "Conditionele tekst" ; - TEXT [ spanish ] = "Texto condicionado" ; + TEXT [ spanish ] = "Texto condicional" ; TEXT [ english_us ] = "Conditional text" ; TEXT[ chinese_simplified ] = "鏈夋潯浠剁殑鏂囧瓧"; TEXT[ russian ] = "义犟 篑腩忤屐"; @@ -574,7 +574,7 @@ String STR_CONDTXTFLD TEXT[ chinese_traditional ] = "鏈夋浠剁殑鏂囧瓧"; TEXT[ arabic ] = "湔 阍焰"; TEXT[ greek ] = "叔哽屙 躔 篚龛揸弪"; - TEXT[ korean ] = "臁瓣贝鞝 韰嶌姢韸"; + TEXT[ korean ] = "臁瓣贝攵 韰嶌姢韸"; TEXT[ turkish ] = "Ko⺷llu metin"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Text condicional"; @@ -658,7 +658,7 @@ String STR_SEQFLD TEXT[ chinese_traditional ] = "绶ㄨ櫉闋嗗簭"; TEXT[ arabic ] = "恃揄 闶俞俞"; TEXT[ greek ] = "硼唣邃 狁哞扃箸"; - TEXT[ korean ] = "靾瀽 氩旍渼"; + TEXT[ korean ] = "氩堩樃 氩旍渼"; TEXT[ turkish ] = "Numara aral"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Seqncia"; @@ -870,10 +870,10 @@ String STR_DBFLD TEXT [ portuguese ] = "Campo para cartas em s閞ie" ; TEXT [ finnish ] = "Joukkokirjeen kentt" ; TEXT [ danish ] = "Brevfletningsfelt" ; - TEXT [ french ] = "Champ de mailing" ; + TEXT [ french ] = "Champs de mailing" ; TEXT [ swedish ] = "Standardbrevf鋖t" ; TEXT [ dutch ] = "Standaardbriefveld" ; - TEXT [ spanish ] = "Campo de carta en serie" ; + TEXT [ spanish ] = "Campos de la impresi髇 en serie" ; TEXT [ english_us ] = "Mail merge fields" ; TEXT[ chinese_simplified ] = "閭欢鍚堝苟瀛楁"; TEXT[ russian ] = "项 徉 溧眄"; @@ -882,7 +882,7 @@ String STR_DBFLD TEXT[ chinese_traditional ] = "鍚堜降鍒楀嵃娆勪綅"; TEXT[ arabic ] = "娃 呜侨 阌嵊"; TEXT[ greek ] = "绣溥 邈牾觌唢 屦轶麸朕"; - TEXT[ korean ] = "韼胳歆 鞏戩嫕 頃勲摐"; + TEXT[ korean ] = "韼胳 氤戫暕 頃勲摐"; TEXT[ turkish ] = "Standart mektup"; TEXT[ language_user1 ] = "German should be Seriendruck-Felder"; TEXT[ catalan ] = "Camp de carta formulari"; @@ -1280,7 +1280,7 @@ String FLD_DATE_FIX TEXT[ chinese_traditional ] = "鏃ユ湡(鍥哄畾)"; TEXT[ arabic ] = "是秧 (饲仁)"; TEXT[ greek ] = "庆羼镬珥哚 (郁徼羼)"; - TEXT[ korean ] = "雮犾(瓿犾爼霅)"; + TEXT[ korean ] = "雮犾(瓿犾爼鞝)"; TEXT[ turkish ] = "Tarih (sabit)"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Data (fixa)"; @@ -1478,7 +1478,7 @@ String FLD_STAT_GRF TEXT[ chinese_traditional ] = "鍦栧舰"; TEXT[ arabic ] = "真"; TEXT[ greek ] = "民狯殛"; - TEXT[ korean ] = "攴鸽灅頂"; + TEXT[ korean ] = "攴鸽"; TEXT[ turkish ] = "Grafik"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Imatges"; @@ -1681,7 +1681,7 @@ String FLD_EU_NAME Text[ chinese_traditional ] = "濮撴皬"; Text[ arabic ] = "怯 轻谇漆"; Text[ greek ] = "硼蹯"; - Text[ korean ] = "鞚措"; + Text[ korean ] = "靹"; Text[ turkish ] = "Soyad"; Text[ language_user1 ] = " "; Text[ catalan ] = "Cognom"; @@ -1710,7 +1710,7 @@ String FLD_EU_ABK TEXT[ chinese_traditional ] = "绺"; TEXT[ arabic ] = "轻俏收茄"; TEXT[ greek ] = "榴鏖贶"; - TEXT[ korean ] = "毹鸽Μ旮鞛"; + TEXT[ korean ] = "鞚措媹靺"; TEXT[ turkish ] = "Ba㭎arfler"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Inicials"; @@ -1738,7 +1738,7 @@ String FLD_EU_STRASSE TEXT[ chinese_traditional ] = "琛楅亾"; TEXT[ arabic ] = "轻郧掩"; TEXT[ greek ] = "箱"; - TEXT[ korean ] = "欤检唽氩堨"; + TEXT[ korean ] = "欤检唽"; TEXT[ turkish ] = "Sokak"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Carrer"; @@ -1766,7 +1766,7 @@ String FLD_EU_LAND TEXT[ chinese_traditional ] = "鍦嬪"; TEXT[ arabic ] = "轻柔"; TEXT[ greek ] = "襻"; - TEXT[ korean ] = "甑皜"; + TEXT[ korean ] = "甑獏"; TEXT[ turkish ] = "躭ke"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Pa韘"; @@ -1785,7 +1785,7 @@ String FLD_EU_PLZ TEXT [ french ] = "C.P." ; TEXT [ swedish ] = "Postnummer" ; TEXT [ dutch ] = "Postcode" ; - TEXT [ spanish ] = "CP" ; + TEXT [ spanish ] = "C.P." ; TEXT [ english_us ] = "Zip code" ; TEXT[ chinese_simplified ] = "閭紪"; TEXT[ russian ] = "项黩钼 桧溴犟"; @@ -1822,7 +1822,7 @@ String FLD_EU_ORT TEXT[ chinese_traditional ] = "浣嶇疆"; TEXT[ arabic ] = "轻阆礓"; TEXT[ greek ] = "悬腌"; - TEXT[ korean ] = "鞁"; + TEXT[ korean ] = "甑/甑/鞁"; TEXT[ turkish ] = "辝hir"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Ciutat"; @@ -1850,7 +1850,7 @@ String FLD_EU_TITEL TEXT[ chinese_traditional ] = "闋姕"; TEXT[ arabic ] = "轻阌沆 轻尜磔"; TEXT[ greek ] = "赃綦矧"; - TEXT[ korean ] = "歆來暔"; + TEXT[ korean ] = "攵靹"; TEXT[ turkish ] = "Unvan"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "T韙ol"; @@ -1878,7 +1878,7 @@ String FLD_EU_POS TEXT[ chinese_traditional ] = "浣嶇疆"; TEXT[ arabic ] = "轻阊咭"; TEXT[ greek ] = "容箸"; - TEXT[ korean ] = "歆侅渼"; + TEXT[ korean ] = "攵靹"; TEXT[ turkish ] = "Pozisyon"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Posici"; @@ -1897,10 +1897,10 @@ String FLD_EU_TELPRIV TEXT [ french ] = "T閘. (domicile)" ; TEXT [ swedish ] = "Tfn (privat)" ; TEXT [ dutch ] = "Tel. (priv)" ; - TEXT [ spanish ] = "Tel. (Priv.)" ; + TEXT [ spanish ] = "Tfno. (particular)" ; TEXT [ english_us ] = "Tel. (Home)" ; TEXT[ chinese_simplified ] = "鐢佃瘽(绉佷汉)"; - TEXT[ russian ] = "义. (漕爨栝)"; + TEXT[ russian ] = "义. 漕爨栝"; TEXT[ polish ] = "Tel. (prywatny)"; TEXT[ japanese ] = "Tel.(鑷畢)"; TEXT[ chinese_traditional ] = "闆昏┍(绉佷汉)"; @@ -1925,10 +1925,10 @@ String FLD_EU_TELFIRMA TEXT [ french ] = "T閘. (bureau)" ; TEXT [ swedish ] = "Tfn (arbete)" ; TEXT [ dutch ] = "Tel. (Bedrijf)" ; - TEXT [ spanish ] = "Tel. (Emp.)" ; + TEXT [ spanish ] = "Tfno. (trabajo)" ; TEXT [ english_us ] = "Tel. (Work)" ; TEXT[ chinese_simplified ] = "鐢佃瘽(鍔炲叕瀹)"; - TEXT[ russian ] = "义. (疣犷麒)"; + TEXT[ russian ] = "义. 疣犷麒"; TEXT[ polish ] = "Tel. (firmowy)"; TEXT[ japanese ] = "Tel.(鍕ゅ嫏鍏)"; TEXT[ chinese_traditional ] = "闆昏┍(杈﹀叕瀹)"; @@ -1954,17 +1954,17 @@ String FLD_EU_EMAIL Text [ swedish ] = "E-post" ; Text [ danish ] = "E-mail" ; Text [ italian ] = "eMail" ; - Text [ spanish ] = "E-mail" ; + Text [ spanish ] = "Correo-e" ; Text [ french ] = "E-Mail" ; Text [ dutch ] = "E-mail" ; Text[ chinese_simplified ] = "鐢靛瓙閭欢"; - Text[ russian ] = "蓦. 项黩"; + Text[ russian ] = "蓦. 镱黩"; Text[ polish ] = "e-mail"; Text[ japanese ] = "E-mail"; Text[ chinese_traditional ] = "闆诲瓙閮典欢"; Text[ arabic ] = "妊硐 裴呤焰漤"; Text[ greek ] = "E-mail"; - Text[ korean ] = "e-mail"; + Text[ korean ] = "鞝勳瀽 氅旍澕"; Text[ turkish ] = "E-posta"; Text[ language_user1 ] = " "; Text[ catalan ] = "correu electr騨ic"; @@ -1977,7 +1977,7 @@ String FLD_EU_STATE Text [ English ] = "State" ; Text [ english_us ] = "State" ; Text [ italian ] = "Stato" ; - Text [ spanish ] = "Estado" ; + Text [ spanish ] = "Provincia" ; Text [ french ] = "R間ion" ; Text [ dutch ] = "Land" ; Text [ danish ] = "Stat" ; @@ -1991,7 +1991,7 @@ String FLD_EU_STATE Text[ chinese_traditional ] = "鐪佸競"; Text[ arabic ] = "轻驷琼"; Text[ greek ] = "襻"; - Text[ korean ] = "欤"; + Text[ korean ] = "欤/霃勲獏"; Text[ turkish ] = "輑"; Text[ language_user1 ] = " "; Text[ catalan ] = "Comarca"; @@ -2045,7 +2045,7 @@ String FLD_PAGEREF_ON Text[ chinese_traditional ] = "鏀朵欢鑰"; Text[ arabic ] = "试垌"; Text[ greek ] = "屙羼泔痫哏箸"; - Text[ korean ] = "鞛戨彊"; + Text[ korean ] = "鞝侅毄"; Text[ turkish ] = "A琮k"; Text[ language_user1 ] = " "; Text[ catalan ] = "on"; @@ -2176,7 +2176,7 @@ String FMT_FF_UI_NAME Text [ swedish ] = "Mall" ; Text [ danish ] = "Skabelon" ; Text [ italian ] = "Modello" ; - Text [ spanish ] = "Plantilla" ; + Text [ spanish ] = "Estilo" ; Text [ french ] = "Mod鑜e" ; Text [ dutch ] = "Sjabloon" ; Text[ chinese_simplified ] = "鏍峰紡"; @@ -2186,7 +2186,7 @@ String FMT_FF_UI_NAME Text[ chinese_traditional ] = "妯ｅ紡"; Text[ arabic ] = "耷崛"; Text[ greek ] = "旭躔"; - Text[ korean ] = "靹滌嫕"; + Text[ korean ] = "鞀ろ儉鞚"; Text[ turkish ] = "轪blon"; Text[ language_user1 ] = " "; Text[ catalan ] = "Estil"; @@ -2203,7 +2203,7 @@ String FMT_FF_UI_RANGE Text [ swedish ] = "Omr錮e" ; Text [ danish ] = "Omr錮e" ; Text [ italian ] = "Sezione" ; - Text [ spanish ] = "羠ea" ; + Text [ spanish ] = "Categor韆" ; Text [ french ] = "Cat間orie" ; Text [ dutch ] = "Bereik" ; Text[ chinese_simplified ] = "鍖哄煙"; @@ -2261,7 +2261,7 @@ String FMT_CHAPTER_NO Text [ swedish ] = "Kapitelnummer" ; Text [ danish ] = "Kapitelnummer" ; Text [ italian ] = "Numero capitolo" ; - Text [ spanish ] = "N鷐ero del cap韙ulo" ; + Text [ spanish ] = "N鷐ero de cap韙ulo" ; Text [ french ] = "Num閞o de chapitre" ; Text [ dutch ] = "Hoofdstuknummer" ; Text[ chinese_simplified ] = "绔犺妭缂栧彿"; @@ -2298,7 +2298,7 @@ String FMT_CHAPTER_NO_NOSEPARATOR Text[ chinese_traditional ] = "绔犵瘈绶ㄨ櫉涓嶅付鍒嗛殧绗"; Text[ arabic ] = "艳 轻菡 认驿 萸蔗"; Text[ greek ] = "榴殍禳 赍鲠脶唢 鼯襁 屙殛"; - Text[ korean ] = "甑秳 旮绊樃 鞐嗠姅 鞛 氩堩樃"; + Text[ korean ] = "甑秳 旮绊樃鞐嗠姅 鞛 氩堩樃"; Text[ turkish ] = "Ay齬ma ireti i鏴rmeyen b鰈黰 numaras"; Text[ language_user1 ] = " "; Text[ catalan ] = "N鷐ero de cap韙ol sense separador"; @@ -2326,7 +2326,7 @@ String FMT_CHAPTER_NAMENO Text[ chinese_traditional ] = "绔犵瘈绶ㄨ櫉鍜屽悕绋"; Text[ arabic ] = "艳 媲鱼 轻菡"; Text[ greek ] = "榴殍禳 赍鲠脶唢 赆 镬"; - Text[ korean ] = "鞛 氩堩樃鞕 鞚措"; + Text[ korean ] = "鞛 氩堩樃 氚 鞚措"; Text[ turkish ] = "B鰈黰 numaras ve ad"; Text[ language_user1 ] = " "; Text[ catalan ] = "N鷐ero i nom"; @@ -2458,7 +2458,7 @@ String FMT_NUM_PAGEDESC TEXT[ chinese_traditional ] = "鍜岄爜闈㈡ǎ寮忕浉鍚"; TEXT[ arabic ] = "闼 溷 轻蛰蜕"; TEXT[ greek ] = "拣 麸 瘃躔 箦脒溽"; - TEXT[ korean ] = "韼橃澊歆 鞀ろ儉鞚茧 靹れ爼"; + TEXT[ korean ] = "韼橃澊歆 鞀ろ儉鞚 靹れ爼"; TEXT[ turkish ] = "Sayfa bi鏸mi gibi"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Com estil de p鄃ina"; @@ -2544,7 +2544,7 @@ String FMT_AUTHOR_SCUT TEXT[ chinese_traditional ] = "绺"; TEXT[ arabic ] = "轻俏收茄"; TEXT[ greek ] = "榴鏖贶"; - TEXT[ korean ] = "毹鸽Μ旮鞛"; + TEXT[ korean ] = "鞚措媹靺"; TEXT[ turkish ] = "Ba㭎arfler"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Inicials"; @@ -2850,7 +2850,7 @@ String FMT_REG_DATE TEXT[ chinese_traditional ] = "鏃ユ湡"; TEXT[ arabic ] = "轻是秧"; TEXT[ greek ] = "庆羼镬珥哚"; - TEXT[ korean ] = "鞚检瀽"; + TEXT[ korean ] = "雮犾"; TEXT[ turkish ] = "Tarih"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Data"; @@ -2992,7 +2992,7 @@ String FMT_REF_PAGE_PGDSC TEXT[ chinese_traditional ] = "鍜岄爜闈㈡ǎ寮忕浉鍚"; TEXT[ arabic ] = "闼 溷 轻蛰蜕"; TEXT[ greek ] = "拣 麸 瘃躔 箦脒溽"; - TEXT[ korean ] = "韼橃澊歆 鞀ろ儉鞚茧 靹れ爼"; + TEXT[ korean ] = "韼橃澊歆 鞀ろ儉鞚 靹れ爼"; TEXT[ turkish ] = "Sayfa bi鏸mi gibi"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Com estil de p鄃ina"; @@ -3131,7 +3131,7 @@ String FMT_MARK_TABLE Text[ chinese_traditional ] = "琛ㄦ牸"; Text[ arabic ] = "滔驷"; Text[ greek ] = "羞磲赆"; - Text[ korean ] = "鞁滍姼"; + Text[ korean ] = "響"; Text[ turkish ] = "Tablo"; Text[ language_user1 ] = " "; Text[ catalan ] = "Taula"; @@ -3159,7 +3159,7 @@ String FMT_MARK_FRAME Text[ chinese_traditional ] = "鏂囧瓧鏂瑰"; Text[ arabic ] = "咔涎"; Text[ greek ] = "绣襁泷犰灬"; - Text[ korean ] = "韰嶌姢韸 靸侅瀽"; + Text[ korean ] = "頂勲爤鞛"; Text[ turkish ] = "莈r鏴ve"; Text[ language_user1 ] = " "; Text[ catalan ] = "Marc"; @@ -3187,7 +3187,7 @@ String FMT_MARK_GRAFIC Text[ chinese_traditional ] = "鍦栧舰"; Text[ arabic ] = "真焉"; Text[ greek ] = "民狯殛"; - Text[ korean ] = "攴鸽灅頂"; + Text[ korean ] = "攴鸽"; Text[ turkish ] = "Grafik"; Text[ language_user1 ] = " "; Text[ catalan ] = "Imatge"; @@ -3253,7 +3253,7 @@ String STR_ALL Text[ chinese_traditional ] = "鍏ㄩ儴"; Text[ arabic ] = "轻哚"; Text[ greek ] = "茧"; - Text[ korean ] = "鞝勳泊"; + Text[ korean ] = "氇憪"; Text[ turkish ] = "T黰"; Text[ language_user1 ] = " "; Text[ catalan ] = "Tot"; @@ -3340,7 +3340,7 @@ String STR_TEXT TEXT[ chinese_traditional ] = "閭ｉ杭灏憋紝鍚﹀墖"; TEXT[ arabic ] = "算 垌 嗅"; TEXT[ greek ] = "渣翦, 岭腴"; - TEXT[ korean ] = "雼れ潓, 旮绊儉"; + TEXT[ korean ] = "臁瓣贝鞚 於╈”頃 瓴届毎, 攴鸽爣歆 鞎婌潉 瓴届毎"; TEXT[ turkish ] = "O halde, Yoksa"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Aleshores, si no"; @@ -3362,7 +3362,7 @@ String STR_DDE_CMD TEXT [ spanish ] = "Instrucci髇 DDE" ; TEXT [ english_us ] = "DDE Statement" ; TEXT[ chinese_simplified ] = "DDE 鎸囦护"; - TEXT[ russian ] = "雨噻囗桢 DDE"; + TEXT[ russian ] = "吾怆屙桢 DDE"; TEXT[ polish ] = "Instrukcja DDE"; TEXT[ japanese ] = "DDE鎸囩ず"; TEXT[ chinese_traditional ] = "DDE 鎸囦护"; @@ -3444,7 +3444,7 @@ String STR_PROMPT TEXT [ spanish ] = "I~ndicaci髇" ; TEXT [ english_us ] = "~Reference" ; TEXT[ chinese_simplified ] = "鎻愮ず(~R)"; - TEXT[ russian ] = "疡赅"; + TEXT[ russian ] = "项漶赅珀"; TEXT[ polish ] = "Wskaz體ka"; TEXT[ japanese ] = "銉掋兂銉(~R)"; TEXT[ chinese_traditional ] = "鎻愮ず(~R)"; @@ -3615,7 +3615,7 @@ String STR_LEVEL TEXT[ chinese_traditional ] = "绱"; TEXT[ arabic ] = "轻阌舒 "; TEXT[ greek ] = "硼唣邃"; - TEXT[ korean ] = "瓿勳傅"; + TEXT[ korean ] = "瓿勳傅 "; TEXT[ turkish ] = "D鼁ey"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Capa"; @@ -3726,3 +3726,8 @@ PushButton PB_FLDEDT_ADDRESS + + + + + diff --git a/sw/source/ui/fldui/fldvar.src b/sw/source/ui/fldui/fldvar.src index d4ae2d606390..7c7970c56824 100644 --- a/sw/source/ui/fldui/fldvar.src +++ b/sw/source/ui/fldui/fldvar.src @@ -2,9 +2,9 @@ * * $RCSfile: fldvar.src,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: os $ $Date: 2002-09-06 13:59:25 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -96,7 +96,7 @@ TabPage TP_FLD_VAR Text[ chinese_traditional ] = "娆勪綅椤炲瀷(~T)"; Text[ arabic ] = "滏 轻娃"; Text[ greek ] = "~札痫 疱溥秕"; - Text[ korean ] = "頃勲摐 鞙犿槙(~T)"; + Text[ korean ] = "鞙犿槙(~T)"; Text[ turkish ] = "A~lan tipi"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Tipus"; @@ -176,7 +176,7 @@ TabPage TP_FLD_VAR Text[ turkish ] = "F~ormat"; Text[ language_user1 ] = " "; Text[ catalan ] = "Formata"; - Text[ finnish ] = "Muoto"; + Text[ finnish ] = "Muotoilu"; Text[ thai ] = "喔｀腹喔涏箒喔氞笟"; }; ListBox LB_VARFORMAT @@ -220,7 +220,7 @@ TabPage TP_FLD_VAR TEXT[ chinese_traditional ] = "闅卞叆鐨(~B)"; TEXT[ arabic ] = "垌 阊祈"; TEXT[ greek ] = "嚏 锺狒"; - TEXT[ korean ] = "鞎堧炒鞛(~B)"; + TEXT[ korean ] = "靾箑(~B)"; TEXT[ turkish ] = "G鰎黱mez"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "invisi~ble"; @@ -238,7 +238,7 @@ TabPage TP_FLD_VAR Text [ swedish ] = "Numrering kapitelvis" ; Text [ danish ] = "Kapitelvis nummerering" ; Text [ italian ] = "Numerazione a capitoli" ; - Text [ spanish ] = "Numeraci髇 de cap韙ulos" ; + Text [ spanish ] = "Numeraci髇 por cap韙ulos" ; Text [ french ] = "Num閞otation par chapitre" ; Text [ dutch ] = "Hoofdstuksgewijs nummeren" ; Text [ portuguese ] = "Numera玢o por cap韙ulos" ; @@ -344,7 +344,7 @@ TabPage TP_FLD_VAR }; StringList [ russian ] = { - < "铃" ; > ; + < "湾" ; > ; }; StringList [ polish ] = { @@ -408,7 +408,7 @@ TabPage TP_FLD_VAR Text [ dutch ] = "~Scheidingsteken" ; Text [ portuguese ] = "~Separador" ; Text[ chinese_simplified ] = "鍒嗛殧绗(~S)"; - Text[ russian ] = "朽玟咫栩咫"; + Text[ russian ] = "朽玟咫栩."; Text[ polish ] = "Separator"; Text[ japanese ] = "鍖哄垏銈婅鍙(~S)"; Text[ chinese_traditional ] = "閫ｆ帴绗(~S)"; @@ -457,7 +457,7 @@ TabPage TP_FLD_VAR Text[ turkish ] = "~Ad"; Text[ language_user1 ] = " "; Text[ catalan ] = "No~m"; - Text[ finnish ] = "Ni~mi"; + Text[ finnish ] = "~Nimi"; Text[ thai ] = "喔娻阜喙垀喔"; }; Edit ED_VARNAME @@ -569,7 +569,7 @@ TabPage TP_FLD_VAR Text [ french ] = "Supprimer" ; Text [ swedish ] = "Radera" ; Text [ dutch ] = "Wissen" ; - Text [ spanish ] = "Eliminar" ; + Text [ spanish ] = "Borrar" ; Text [ english_us ] = "Delete" ; Text[ chinese_simplified ] = "鍒犻櫎"; Text[ russian ] = "愉嚯栩"; @@ -591,7 +591,7 @@ TabPage TP_FLD_VAR Text [ swedish ] = "Variabler" ; Text [ danish ] = "Variabler" ; Text [ italian ] = "Variabili" ; - Text [ spanish ] = "Predeterminaciones" ; + Text [ spanish ] = "Variables" ; Text [ french ] = "Variables" ; Text [ dutch ] = "Variabelen" ; Text [ portuguese ] = "Vari醰eis" ; @@ -609,3 +609,20 @@ TabPage TP_FLD_VAR Text[ finnish ] = "Muuttujat"; Text[ thai ] = "喔曕副喔о箒喔涏福"; }; + + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/fldui/inpdlg.src b/sw/source/ui/fldui/inpdlg.src index 36607f304c23..63a1f4861937 100644 --- a/sw/source/ui/fldui/inpdlg.src +++ b/sw/source/ui/fldui/inpdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: inpdlg.src,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:27:00 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -113,17 +113,18 @@ ModalDialog DLG_FLD_INPUT Text [ spanish ] = "Entrada" ; Text [ english_us ] = "Input" ; Readonly = TRUE ; - Text[ chinese_simplified ] = "输入"; + Text[ chinese_simplified ] = "杈撳叆"; Text[ russian ] = "骡钿"; Text[ polish ] = "Wej渃ie"; - Text[ japanese ] = "擖椡"; - Text[ chinese_traditional ] = "块"; + Text[ japanese ] = "鍏ュ姏"; + Text[ chinese_traditional ] = "杓稿叆"; Text[ arabic ] = "畔吻"; Text[ greek ] = "砰筢泫戕"; - Text[ korean ] = "涝仿"; + Text[ korean ] = "鞛呺牓"; Text[ turkish ] = "Giri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Entrada"; + Text[ thai ] = "喔涏箟喔笝喙喔傕箟喔"; }; MultiLineEdit ED_EDIT { @@ -147,20 +148,21 @@ ModalDialog DLG_FLD_INPUT Text [ danish ] = "Rediger" ; Text [ french ] = "蒬iter" ; Text [ swedish ] = "Redigera" ; - Text [ dutch ] = "Be~werken" ; + Text [ dutch ] = "Bewerken" ; Text [ spanish ] = "Editar" ; Text [ english_us ] = "Edit" ; - Text[ chinese_simplified ] = "编辑"; + Text[ chinese_simplified ] = "缂栬緫"; Text[ russian ] = "橡噔赅"; Text[ polish ] = "Edytuj"; - Text[ japanese ] = "曇廤"; - Text[ chinese_traditional ] = "絪胯"; + Text[ japanese ] = "绶ㄩ泦"; + Text[ chinese_traditional ] = "绶ㄨ集"; Text[ arabic ] = "释秧"; Text[ greek ] = "硼孱羼汜筮"; - Text[ korean ] = "祈笼"; + Text[ korean ] = "韼胳"; Text[ turkish ] = "D鼁enle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Editar"; + Text[ catalan ] = "Edita"; + Text[ thai ] = "喙佮竵喙夃箘喔"; }; OKButton BT_OK { @@ -186,24 +188,25 @@ ModalDialog DLG_FLD_INPUT Text [ dutch ] = "~Volgende" ; Text [ english_us ] = "~Next" ; Text [ italian ] = "~Avanti" ; - Text [ spanish ] = "~Avanzar" ; - Text [ french ] = "~Suivant" ; + Text [ spanish ] = "Continuar" ; + Text [ french ] = "Suivant" ; Text [ swedish ] = "~N鋝ta" ; Text [ danish ] = "N鎠te" ; Text [ portuguese ] = "~Seguinte" ; 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 ] = "輣leri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Siguiente"; + Text[ catalan ] = "~Seg黣nt"; Text[ finnish ] = "~Seuraava"; + Text[ thai ] = "~喔栢副喔斷箘喔"; }; HelpButton PB_HELP { @@ -219,20 +222,35 @@ ModalDialog DLG_FLD_INPUT Text [ french ] = "Champ de saisie" ; Text [ dutch ] = "Invoerveld" ; Text [ portuguese ] = "Campo de entrada" ; - Text[ chinese_simplified ] = "输入栏"; + Text[ chinese_simplified ] = "杈撳叆瀛楁"; Text[ russian ] = "项脲 忖钿"; Text[ polish ] = "Pole wprowadzania"; - Text[ japanese ] = "擖椡台百霓"; - Text[ chinese_traditional ] = "块逆"; + Text[ japanese ] = "鍏ュ姏銉曘偅銉笺儷銉"; + Text[ chinese_traditional ] = "杓稿叆娆勪綅"; Text[ arabic ] = "娃 畔吻"; Text[ greek ] = "绣溥 彘筢泫戕"; - Text[ korean ] = "涝仿鞘靛"; + Text[ korean ] = "鞛呺牓 頃勲摐"; Text[ turkish ] = "Giri alan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Campo de entrada"; + Text[ catalan ] = "Camp d'entrada"; Text[ finnish ] = "Sy鰐t鰇entt"; + Text[ thai ] = "喙冟釜喙堗箑喔傕笗喔傕箟喔浮喔灌弗"; }; + + + + + + + + + + + + + + diff --git a/sw/source/ui/fldui/javaedit.src b/sw/source/ui/fldui/javaedit.src index 18327c48433a..2e20683fda4e 100644 --- a/sw/source/ui/fldui/javaedit.src +++ b/sw/source/ui/fldui/javaedit.src @@ -2,9 +2,9 @@ * * $RCSfile: javaedit.src,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: os $ $Date: 2001-12-18 11:05:27 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -98,8 +98,9 @@ ModalDialog DLG_JAVAEDIT Text[ korean ] = "鞀ろ伂毽巾姼 鞙犿槙"; Text[ turkish ] = "Script tipi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Tipo de script"; + Text[ catalan ] = "Tipus d'script"; Text[ finnish ] = "Komentosarjatyyppi"; + Text[ thai ] = "喔娻笝喔脆笖喔竸喔｀复喔涏笗喙"; }; Edit ED_TYPE { @@ -124,7 +125,7 @@ ModalDialog DLG_JAVAEDIT Text [ danish ] = "URL" ; Text [ italian ] = "URL" ; Text [ spanish ] = "URL" ; - Text [ french ] = "~URL" ; + Text [ french ] = "URL" ; Text [ dutch ] = "~URL" ; Text[ chinese_simplified ] = "URL"; Text[ russian ] = "URL"; @@ -138,6 +139,7 @@ ModalDialog DLG_JAVAEDIT Text[ language_user1 ] = " "; Text[ catalan ] = "URL"; Text[ finnish ] = "URL-osoite"; + Text[ thai ] = "URL"; }; Edit ED_URL { @@ -165,7 +167,7 @@ ModalDialog DLG_JAVAEDIT Text [ portuguese ] = "~Texto" ; Text [ finnish ] = "~Teksti" ; Text [ danish ] = "Tekst" ; - Text [ french ] = "~Texte" ; + Text [ french ] = "Texte" ; Text [ swedish ] = "~Text" ; Text [ dutch ] = "~Tekst" ; Text [ spanish ] = "~Texto" ; @@ -182,7 +184,8 @@ ModalDialog DLG_JAVAEDIT Text[ korean ] = "韰嶌姢韸(~T)"; Text[ turkish ] = "~Metin"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Texto"; + Text[ catalan ] = "~Text"; + Text[ thai ] = "~喔傕箟喔竸喔о覆喔"; }; MultiLineEdit ED_EDIT { @@ -222,7 +225,8 @@ ModalDialog DLG_JAVAEDIT Text[ korean ] = "雮挫毄"; Text[ turkish ] = "葭erik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Contenido"; + Text[ catalan ] = "Contingut"; + Text[ thai ] = "喙喔權阜喙夃腑喔覆"; }; OKButton BTN_POST_OK { @@ -276,8 +280,9 @@ ModalDialog DLG_JAVAEDIT Text[ korean ] = "鞀ろ伂毽巾姼 韼胳"; Text[ turkish ] = "Script bearbeiten"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Editar script"; + Text[ catalan ] = "Edita script"; Text[ finnish ] = "Muokkaa komentosarjaa"; + Text[ thai ] = "喙佮竵喙夃箘喔傕釜喔勦福喔脆笡喔曕箤"; }; String STR_JAVA_INSERT { @@ -303,8 +308,9 @@ ModalDialog DLG_JAVAEDIT Text[ korean ] = "鞀ろ伂毽巾姼 靷届瀰"; Text[ turkish ] = "Script einf黦en"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar script"; + Text[ catalan ] = "Insereix script"; Text[ finnish ] = "Lis滗 komentosarja"; + Text[ thai ] = "喙佮笚喔｀竵喔竸喔｀复喔涏笗喙"; }; Text [ english_us ] = "Edit Script" ; Text [ portuguese_brazilian ] = "Script bearbeiten" ; @@ -325,7 +331,24 @@ ModalDialog DLG_JAVAEDIT Text[ korean ] = "鞀ろ伂毽巾姼 韼胳"; Text[ turkish ] = "Script'i d鼁enle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Editar script"; + Text[ catalan ] = "Edita script"; Text[ finnish ] = "Muokkaa komentosarjaa"; + Text[ thai ] = "喙佮竵喙夃箘喔傕釜喔勦福喔脆笡喔曕箤"; }; // ********************************************************************** EOF + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/fmtui/fmtui.src b/sw/source/ui/fmtui/fmtui.src index 88c1b6c47265..a10521793a12 100644 --- a/sw/source/ui/fmtui/fmtui.src +++ b/sw/source/ui/fmtui/fmtui.src @@ -2,9 +2,9 @@ * * $RCSfile: fmtui.src,v $ * - * $Revision: 1.1.1.6 $ + * $Revision: 1.2 $ * - * last change: $Author: kz $ $Date: 2001-07-26 22:36:06 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,26 +69,27 @@ String STR_FMT_STD TEXT [ italian ] = "(senza)" ; TEXT [ portuguese_brazilian ] = "(nenhum)" ; TEXT [ portuguese ] = "(nenhum)" ; - TEXT [ finnish ] = "(Ei mit滗n)" ; + TEXT [ finnish ] = "(ei mit滗n)" ; TEXT [ danish ] = "(ingen)" ; TEXT [ french ] = "(aucun(e))" ; TEXT [ swedish ] = "(ingen)" ; TEXT [ dutch ] = "(geen)" ; TEXT [ spanish ] = "(ninguna)" ; TEXT [ english_us ] = "(none)" ; - TEXT[ chinese_simplified ] = "(无)"; - TEXT[ russian ] = "(徨)"; + TEXT[ chinese_simplified ] = "(鏃)"; + TEXT[ russian ] = "(礤)"; TEXT[ polish ] = "(brak)"; - TEXT[ japanese ] = "(側偟)"; - TEXT[ chinese_traditional ] = "(礚)"; + TEXT[ japanese ] = "(銇仐)"; + TEXT[ chinese_traditional ] = "(鐒)"; TEXT[ arabic ] = "(认驿)"; TEXT[ dutch ] = "(geen)"; - TEXT[ chinese_simplified ] = "(无)"; + TEXT[ chinese_simplified ] = "(鏃)"; TEXT[ greek ] = "(赆磔磲)"; - TEXT[ korean ] = "(绝澜)"; + TEXT[ korean ] = "(鞐嗢潓)"; TEXT[ turkish ] = "(yok)"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "(ninguna)"; + TEXT[ catalan ] = "(cap)"; + TEXT[ thai ] = "(喙勦浮喙堗浮喔)"; }; String STR_TEMPLATE_WILDCARD { @@ -119,27 +120,40 @@ String STR_OVERWRITE TEXT [ italian ] = "\nSovrascrivere il modello?" ; TEXT [ portuguese_brazilian ] = "Deseja realmente gravar sobre o modelo?" ; TEXT [ portuguese ] = "Deseja realmente eliminar este modelo?" ; - TEXT [ finnish ] = "\nHaluatko varmasti poistaa t鋗鋘 mallipohjan?" ; + TEXT [ finnish ] = "\nHaluatko varmasti poistaa t鋗鋘 mallin?" ; TEXT [ danish ] = "Er du sikker p, at du vil overskrive denne skabelon?" ; TEXT [ french ] = "Voulez-vous vraiment 閏raser le mod鑜e ?" ; - TEXT [ swedish ] = "Vill Du verkligen skriva 鰒er den h鋜 mallen?" ; + TEXT [ swedish ] = "Vill du verkligen skriva 鰒er den h鋜 mallen?" ; TEXT [ dutch ] = "\nWilt u deze sjabloon werkelijk overschrijven?" ; TEXT [ spanish ] = "緿esea realmente sobrescribir la plantilla?" ; TEXT [ english_us ] = "\nAre you sure you want to delete this template?" ; - TEXT[ chinese_simplified ] = "真的要改写这个样式吗？"; + TEXT[ chinese_simplified ] = "鐪熺殑瑕佹敼鍐欒繖涓牱寮忓悧锛"; TEXT[ russian ] = "蔓 溴轳蜮栩咫 躅蜩蝈 玎戾龛螯 铗 犭铐?"; TEXT[ polish ] = "Chcesz na pewno skasowa ten szablon przez zapisanie?"; - TEXT[ japanese ] = "幂踢诎膫饢{摉偵嶍彍偟傑偡偐丠"; - TEXT[ chinese_traditional ] = "眤痷璶滦糶硂妓Α"; + TEXT[ japanese ] = "銉嗐兂銉椼儸銉笺儓銈掓湰褰撱伀鍓婇櫎銇椼伨銇欍亱銆"; + TEXT[ chinese_traditional ] = "鎮ㄧ湡瑕佽瀵欏嬫ǎ寮忥紵"; TEXT[ arabic ] = "遽 恃硐 惹彷卺 轻呤侨 萱 轻耷崛"; TEXT[ dutch ] = "\nWilt u deze sjabloon werkelijk overschrijven?"; - TEXT[ chinese_simplified ] = "真的要改写这个样式吗？"; + TEXT[ chinese_simplified ] = "鐪熺殑瑕佹敼鍐欒繖涓牱寮忓悧锛"; TEXT[ greek ] = "容脲翦 筮泔躐 磲 犴糸赆翎篝摅弭 麸 瘃躔;"; - TEXT[ korean ] = "\n捞 辑侥颇老阑 沥富肺 昏力窍矫摆嚼聪鳖?"; + TEXT[ korean ] = "鞚 靹滌嫕 韺岇澕鞚 雿柎鞊办嫓瓴犾姷雼堦箤?"; TEXT[ turkish ] = "Bu blonu silmek istedi餴nizden emin misiniz?"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "緿esea realmente sobrescribir la plantilla?"; + TEXT[ catalan ] = "\nEsteu segur de voler suprimir aquesta plantilla?"; + TEXT[ thai ] = "\n喔勦父喔撪箒喔權箞喙冟笀喔福喔粪腑喙勦浮喙堗笚喔掂箞喔曕箟喔竾喔佮覆喔｀弗喔氞箒喔∴箞喙佮笟喔氞笝喔掂箟?"; }; + + + + + + + + + + + + diff --git a/sw/source/ui/fmtui/tmpdlg.src b/sw/source/ui/fmtui/tmpdlg.src index 5d06c18a4d3b..5f143b02c507 100644 --- a/sw/source/ui/fmtui/tmpdlg.src +++ b/sw/source/ui/fmtui/tmpdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: tmpdlg.src,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: rt $ $Date: 2002-05-06 07:54:06 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,7 +75,7 @@ TabDialog DLG_TEMPLATE_1 Text [ italian ] = "Modello di carattere" ; Text [ portuguese_brazilian ] = "Estilo de caracter" ; Text [ portuguese ] = "Estilos de caracteres" ; - Text [ finnish ] = "Merkist鰊 tyyli" ; + Text [ finnish ] = "Merkkityyli" ; Text [ danish ] = "Tegntypografi" ; Text [ french ] = "Style de caract鑢es" ; Text [ swedish ] = "Teckenformatmall" ; @@ -115,7 +115,8 @@ TabDialog DLG_TEMPLATE_1 Text[ korean ] = "旮昙"; Text[ turkish ] = "Yaz齮ipi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fuente"; + Text[ catalan ] = "Tipus de lletra"; + Text[ thai ] = "喔曕副喔о腑喔编竵喔┼福"; }; PageItem { @@ -144,7 +145,8 @@ TabDialog DLG_TEMPLATE_1 Text[ korean ] = "旮昙 須臣"; Text[ turkish ] = "Yaz齮ipi efekti"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Efectos de fuente"; + Text[ catalan ] = "Efectes de lletra"; + Text[ thai ] = "喔ム副喔佮俯喔撪赴喔曕副喔о腑喔编竵喔┼福"; }; PageItem { @@ -154,13 +156,13 @@ TabDialog DLG_TEMPLATE_1 Text [ ENGLISH ] = "Position" ; Text[ english_us ] = "Position"; Text[ portuguese ] = "Posi玢o"; - Text[ russian ] = "项玷鲨"; + Text[ russian ] = "项腩驽龛"; Text[ greek ] = "容箸"; Text[ dutch ] = "Positie"; Text[ french ] = "Position"; Text[ spanish ] = "Posici髇"; Text[ italian ] = "Posizione"; - Text[ danish ] = "Start_ved"; + Text[ danish ] = "Placering"; Text[ swedish ] = "Position"; Text[ polish ] = "Pozycja"; Text[ portuguese_brazilian ] = "Position"; @@ -170,8 +172,9 @@ TabDialog DLG_TEMPLATE_1 Text[ chinese_traditional ] = "浣嶇疆"; Text[ turkish ] = "Konum"; Text[ arabic ] = "轻沔众"; - Text[ catalan ] = "Posici髇"; + Text[ catalan ] = "Posici"; Text[ finnish ] = "Sijainti"; + Text[ thai ] = "喔曕赋喙佮斧喔權箞喔"; }; PageItem { @@ -187,18 +190,19 @@ TabDialog DLG_TEMPLATE_1 Text[ french ] = "Mise en page asiatique"; Text[ spanish ] = "Dise駉 asi醫ico"; Text[ italian ] = "Layout asiatico"; - Text[ danish ] = "Asian layout"; + Text[ danish ] = "Asiatisk layout"; Text[ swedish ] = "Asiatisk layout"; Text[ polish ] = "Uk砤d azjatycki"; Text[ portuguese_brazilian ] = "Asian layout"; Text[ japanese ] = "鏃ユ湰瑾炪儸銈ゃ偄銈︺儓"; - Text[ korean ] = "鞎勳嫓鞎 霠堨澊鞎勳泝"; + Text[ korean ] = "頃滉竴 旮鞛愱即"; Text[ chinese_simplified ] = "涓棩闊╃増寮"; Text[ chinese_traditional ] = "涓棩闊撶増寮"; Text[ turkish ] = "Asian layout"; Text[ arabic ] = "饰仨 掠礞"; - Text[ catalan ] = "Dise駉 asi醫ico"; + Text[ catalan ] = "Format asi鄑ic"; Text[ finnish ] = "Aasialainen asettelu"; + Text[ thai ] = "喙喔勦箟喔侧箓喔勦福喔囙箒喔氞笟喙喔箑喔娻傅喔"; }; PageItem { @@ -227,21 +231,23 @@ TabDialog DLG_TEMPLATE_1 Text[ korean ] = "氚瓣步"; Text[ turkish ] = "Artalan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fondo"; + Text[ catalan ] = "Fons"; + Text[ thai ] = "喔炧阜喙夃笝喔弗喔编竾"; }; }; }; Text[ chinese_simplified ] = "瀛楃鏍峰紡"; - Text[ russian ] = "羊桦 珥嚓钼"; + Text[ russian ] = "羊桦 耔焘铍"; Text[ polish ] = "Styl znaku"; Text[ japanese ] = "鏂囧瓧銈广偪銈ゃ儷"; Text[ chinese_traditional ] = "瀛楀厓妯ｅ紡"; Text[ arabic ] = "溷 轻猛演"; Text[ greek ] = "郁蹼 麽襻牯揆"; - Text[ korean ] = "氍胳瀽 韰滍攲毽"; + Text[ korean ] = "氍胳瀽 鞀ろ儉鞚"; Text[ turkish ] = "Karakter bi鏸mi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Estilo de car醕ter"; + Text[ catalan ] = "Estil de car郼ter"; + Text[ thai ] = "喔ム副喔佮俯喔撪赴喔曕副喔о腑喔编竵喔傕福喔"; }; TabDialog DLG_TEMPLATE_2 { @@ -280,7 +286,7 @@ TabDialog DLG_TEMPLATE_2 Text [ danish ] = "Indrykning og mellemrum" ; Text [ french ] = "Retraits et 閏arts" ; Text [ swedish ] = "Indrag och avst錸d" ; - Text [ dutch ] = "Inspringen en afstanden" ; + Text [ dutch ] = "Inspringing en afstanden" ; Text [ spanish ] = "Sangr韆s y espacios" ; Text [ english_us ] = "Indents & Spacing" ; PageResID = TP_PARA_STD ; @@ -291,10 +297,11 @@ TabDialog DLG_TEMPLATE_2 Text[ chinese_traditional ] = "绺帓鍜岄枔闅"; Text[ arabic ] = "轻乓峭 媲崾惹谙"; Text[ greek ] = "朋秣蒡 赆 狃矬糗箦轵"; - Text[ korean ] = "霌れ棳鞊瓣赴鞕 臧勱博"; + Text[ korean ] = "霌れ棳鞊瓣赴 氚 臧勱博"; Text[ turkish ] = "Girinti ve aral齥lar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sangr韆s y espacios"; + Text[ catalan ] = "Sagnies i espaiat"; + Text[ thai ] = "喔｀赴喔⑧赴喙喔⑧阜喙夃腑喔囙箒喔ム赴喔｀赴喔⑧赴喔箞喔侧竾"; }; PageItem { @@ -321,8 +328,9 @@ TabDialog DLG_TEMPLATE_2 Text[ korean ] = "毵烄钉"; Text[ turkish ] = "Hizalama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Alineaci髇"; + Text[ catalan ] = "Alineament"; Text[ finnish ] = "Tasaus"; + Text[ thai ] = "喔堗副喔斷笗喔赤箒喔笝喙堗竾"; }; PageItem { @@ -343,7 +351,7 @@ TabDialog DLG_TEMPLATE_2 Text [ english_us ] = "Text Flow" ; PageResID = TP_PARA_EXT ; Text[ chinese_simplified ] = "鎹㈣鍜屽垎椤"; - Text[ russian ] = "项腩驽龛 磬 耱疣龛鲥"; + Text[ russian ] = "袜 耱疣龛鲥"; Text[ polish ] = "Tekst"; Text[ japanese ] = "浣撹"; Text[ chinese_traditional ] = "鎻涜鍜屽垎闋"; @@ -352,7 +360,8 @@ TabDialog DLG_TEMPLATE_2 Text[ korean ] = "韰嶌姢韸 頋愲"; Text[ turkish ] = "Metin ak"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Flujo del texto"; + Text[ catalan ] = "Flux del text"; + Text[ thai ] = "喔佮覆喔｀箘喔弗喔傕腑喔囙競喙夃腑喔勦抚喔侧浮"; }; PageItem { @@ -361,13 +370,13 @@ TabDialog DLG_TEMPLATE_2 Text [ ENGLISH ] = "Asian typography" ; Text[ english_us ] = "Asian Typography"; Text[ portuguese ] = "Tipografia asi醫ica"; - Text[ russian ] = "犁栲蝰觇 梏螓"; + Text[ russian ] = "犁栲蝰觐 铘铕祀屙桢"; Text[ greek ] = "馏檐糸赙 趱痫泷狯哚"; Text[ dutch ] = "Aziatische typografie"; Text[ french ] = "Typographie asiatique"; Text[ spanish ] = "Tipograf韆 asi醫ica"; Text[ italian ] = "Tipografia asiatica"; - Text[ danish ] = "Asian typography"; + Text[ danish ] = "Asiatisk typografi"; Text[ swedish ] = "Asiatisk typografi"; Text[ polish ] = "Typografia azjatycka"; Text[ portuguese_brazilian ] = "Asian typography"; @@ -377,8 +386,9 @@ TabDialog DLG_TEMPLATE_2 Text[ chinese_traditional ] = "涓棩闊撴枃瀛"; Text[ turkish ] = "Asian typography"; Text[ arabic ] = "糜徭 轻厝勤 轻掠礞砩"; - Text[ catalan ] = "Tipograf韆 asi醫ica"; + Text[ catalan ] = "Tipografia asi鄑ica"; Text[ finnish ] = "Aasialaiset merkit"; + Text[ thai ] = "喔佮覆喔｀笧喔脆浮喔炧箤喙佮笟喔氞箑喔箑喔娻傅喔"; }; PageItem { @@ -407,7 +417,8 @@ TabDialog DLG_TEMPLATE_2 Text[ korean ] = "旮昙"; Text[ turkish ] = "Yaz齮ipi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fuente"; + Text[ catalan ] = "Tipus de lletra"; + Text[ thai ] = "喔曕副喔о腑喔编竵喔┼福"; }; PageItem { @@ -436,7 +447,8 @@ TabDialog DLG_TEMPLATE_2 Text[ korean ] = "旮昙 須臣"; Text[ turkish ] = "Yaz tipi efektleri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Efectos de fuente"; + Text[ catalan ] = "Efectes de lletra"; + Text[ thai ] = "喔ム副喔佮俯喔撪赴喔曕副喔о腑喔编竵喔┼福"; }; PageItem { @@ -446,13 +458,13 @@ TabDialog DLG_TEMPLATE_2 Text [ ENGLISH ] = "Position" ; Text[ english_us ] = "Position"; Text[ portuguese ] = "Posi玢o"; - Text[ russian ] = "项玷鲨"; + Text[ russian ] = "项腩驽龛"; Text[ greek ] = "容箸"; Text[ dutch ] = "Positie"; Text[ french ] = "Position"; Text[ spanish ] = "Posici髇"; Text[ italian ] = "Posizione"; - Text[ danish ] = "Start_ved"; + Text[ danish ] = "Placering"; Text[ swedish ] = "Position"; Text[ polish ] = "Pozycja"; Text[ portuguese_brazilian ] = "Position"; @@ -462,8 +474,9 @@ TabDialog DLG_TEMPLATE_2 Text[ chinese_traditional ] = "浣嶇疆"; Text[ turkish ] = "蔺 unvan"; Text[ arabic ] = "轻沔众"; - Text[ catalan ] = "Posici髇"; + Text[ catalan ] = "Posici"; Text[ finnish ] = "Sijainti"; + Text[ thai ] = "喔曕赋喙佮斧喔權箞喔"; }; PageItem { @@ -479,18 +492,19 @@ TabDialog DLG_TEMPLATE_2 Text[ french ] = "Mise en page asiatique"; Text[ spanish ] = "Dise駉 asi醫ico"; Text[ italian ] = "Layout asiatico"; - Text[ danish ] = "Asian layout"; + Text[ danish ] = "Asiatisk layout"; Text[ swedish ] = "Asiatisk layout"; Text[ polish ] = "Uk砤d azjatycki"; Text[ portuguese_brazilian ] = "Asian layout"; Text[ japanese ] = "鏃ユ湰瑾炪儸銈ゃ偄銈︺儓"; - Text[ korean ] = "鞎勳嫓鞎 霠堨澊鞎勳泝"; + Text[ korean ] = "頃滉竴 旮鞛愱即"; Text[ chinese_simplified ] = "涓棩闊╃増寮"; Text[ chinese_traditional ] = "涓棩闊撶増寮"; Text[ turkish ] = "Asian layout"; Text[ arabic ] = "饰仨 掠礞"; - Text[ catalan ] = "Dise駉 asi醫ico"; + Text[ catalan ] = "Format asi鄑ic"; Text[ finnish ] = "Aasialainen asettelu"; + Text[ thai ] = "喙喔勦箟喔侧箓喔勦福喔囙箒喔氞笟喙喔箑喔娻傅喔"; }; PageItem { @@ -516,8 +530,9 @@ TabDialog DLG_TEMPLATE_2 Text[ korean ] = "氩堩樃 毵り赴旮"; Text[ turkish ] = "Numaralama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇"; + Text[ catalan ] = "Numeraci"; Text[ finnish ] = "Numerointi"; + Text[ thai ] = "喔ム赋喔斷副喔氞笗喔编抚喙喔ム競"; }; PageItem { @@ -537,7 +552,7 @@ TabDialog DLG_TEMPLATE_2 Text [ english_us ] = "Tabs" ; PageResID = TP_TABULATOR ; Text[ chinese_simplified ] = "鍒惰〃绗"; - Text[ russian ] = "亦狍蝾瘥"; + Text[ russian ] = "亦狍鲨"; Text[ polish ] = "Tabulatory"; Text[ japanese ] = "銈裤儢"; Text[ chinese_traditional ] = "瀹氫綅閸"; @@ -546,7 +561,8 @@ TabDialog DLG_TEMPLATE_2 Text[ korean ] = "韮"; Text[ turkish ] = "Sekmeler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Tabulaciones"; + Text[ catalan ] = "Pestanyes"; + Text[ thai ] = "喔｀赴喔⑧赴喔佮副喙夃笝"; }; PageItem { @@ -575,7 +591,8 @@ TabDialog DLG_TEMPLATE_2 Text[ korean ] = "雼澖 觳鞛 鞛レ嫕"; Text[ turkish ] = "Ba㭎arfler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Iniciales"; + Text[ catalan ] = "Caplletres"; + Text[ thai ] = "喔曕副喔о腑喔编竵喔┼福喔傕付喙夃笝喔曕箟喔權笚喔掂箞喔∴傅喔傕笝喔侧笖喙冟斧喔嵿箞"; }; PageItem { @@ -604,7 +621,8 @@ TabDialog DLG_TEMPLATE_2 Text[ korean ] = "氚瓣步"; Text[ turkish ] = "Artalan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fondo"; + Text[ catalan ] = "Fons"; + Text[ thai ] = "喔炧阜喙夃笝喔弗喔编竾"; }; PageItem { @@ -620,7 +638,7 @@ TabDialog DLG_TEMPLATE_2 Text [ french ] = "Bordure" ; Text [ swedish ] = "Inramning" ; Text [ dutch ] = "Omranding" ; - Text [ spanish ] = "Borde" ; + Text [ spanish ] = "Bordes" ; Text [ english_us ] = "Borders" ; PageResID = TP_BORDER ; Text[ chinese_simplified ] = "杈规"; @@ -633,7 +651,8 @@ TabDialog DLG_TEMPLATE_2 Text[ korean ] = "韰岆憪毽"; Text[ turkish ] = "Kenarl齥"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Borde"; + Text[ catalan ] = "Vores"; + Text[ thai ] = "喙喔箟喔權競喔笟"; }; PageItem { @@ -660,8 +679,9 @@ TabDialog DLG_TEMPLATE_2 Text[ korean ] = "臁瓣贝"; Text[ turkish ] = "Ko⺷l"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Condici髇"; + Text[ catalan ] = "Condici"; Text[ finnish ] = "Ehto"; + Text[ thai ] = "喙喔囙阜喙堗腑喔權箘喔"; }; }; }; @@ -672,10 +692,11 @@ TabDialog DLG_TEMPLATE_2 Text[ chinese_traditional ] = "娈佃惤妯ｅ紡"; Text[ arabic ] = "溷 蒉焉"; Text[ greek ] = "旭躔 疳襻泷荟秕"; - Text[ korean ] = "雼澖 韰滍攲毽"; + Text[ korean ] = "雼澖 鞀ろ儉鞚"; Text[ turkish ] = "Paragraf bi鏸mi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Estilo de p醨rafo"; + Text[ catalan ] = "Estil de par鄃raf"; + Text[ thai ] = "喔ム副喔佮俯喔撪赴喔⑧箞喔斧喔權箟喔"; }; TabDialog DLG_TEMPLATE_4 { @@ -745,7 +766,8 @@ TabDialog DLG_TEMPLATE_4 Text[ korean ] = "氚瓣步"; Text[ turkish ] = "Artalan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fondo"; + Text[ catalan ] = "Fons"; + Text[ thai ] = "喔炧阜喙夃笝喔弗喔编竾"; }; /* PageItem { @@ -857,8 +879,9 @@ TabDialog DLG_TEMPLATE_4 Text[ korean ] = "韼橃澊歆 鞀ろ儉鞚"; Text[ turkish ] = "Sayfa bi鏸mi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Estilo de p醙ina"; + Text[ catalan ] = "Estil de p鄃ina"; Text[ finnish ] = "Sivun tyyli"; + Text[ thai ] = "喔ム副喔佮俯喔撪赴喔笝喙夃覆"; }; String STR_PAGE_STD { @@ -868,7 +891,7 @@ String STR_PAGE_STD Text [ italian ] = "Pagina" ; Text [ portuguese_brazilian ] = "P?gina" ; Text [ portuguese ] = "P醙ina" ; - Text [ finnish ] = "Sivu " ; + Text [ finnish ] = "Sivu" ; Text [ danish ] = "Side" ; Text [ french ] = "Page" ; Text [ swedish ] = "Sida" ; @@ -885,7 +908,8 @@ String STR_PAGE_STD Text[ korean ] = "韼橃澊歆"; Text[ turkish ] = "Sayfa"; Text[ language_user1 ] = " "; - Text[ catalan ] = "P醙ina"; + Text[ catalan ] = "P鄃ina"; + Text[ thai ] = "喔笝喙夃覆"; }; String STR_PAGE_BORDER { @@ -900,7 +924,7 @@ String STR_PAGE_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 ] = "吾疣祀屙桢"; @@ -912,7 +936,8 @@ String STR_PAGE_BORDER Text[ korean ] = "韰岆憪毽"; Text[ turkish ] = "Kenarl齥"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Borde"; + Text[ catalan ] = "Vores"; + Text[ thai ] = "喙喔箟喔權競喔笟"; }; String STR_PAGE_HEADER { @@ -922,7 +947,7 @@ String STR_PAGE_HEADER Text [ italian ] = "Riga d'intestazione" ; Text [ portuguese_brazilian ] = "Cabe?alho" ; Text [ portuguese ] = "Cabe鏰lho" ; - Text [ finnish ] = "Yl鋙tsikko" ; + Text [ finnish ] = "Yl鋞unniste" ; Text [ danish ] = "Sidehoved" ; Text [ french ] = "En-t阾e" ; Text [ swedish ] = "Sidhuvud" ; @@ -939,7 +964,8 @@ String STR_PAGE_HEADER Text[ korean ] = "毹鸽Μ旮"; Text[ turkish ] = "躶tbilgi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezamiento"; + Text[ catalan ] = "Cap鏰lera"; + Text[ thai ] = "喔箞喔о笝喔副喔"; }; String STR_PAGE_FOOTER { @@ -950,7 +976,7 @@ String STR_PAGE_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" ; @@ -967,7 +993,8 @@ String STR_PAGE_FOOTER Text[ korean ] = "氚旊嫢旮"; Text[ turkish ] = "Altbilgi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Pie de p醙ina"; + Text[ catalan ] = "Peu de p鄃ina"; + Text[ thai ] = "喔箞喔о笝喔椸箟喔侧涪"; }; String STR_PAGE_TEXTGRID { @@ -986,13 +1013,14 @@ String STR_PAGE_TEXTGRID Text[ swedish ] = "Textraster"; Text[ polish ] = "Text Grid"; Text[ portuguese_brazilian ] = "Text Grid"; - Text[ japanese ] = "鏂囧瓧銈般儶銉冦儔绶"; - Text[ korean ] = "氍胳瀽 靾/鞐 靾"; + Text[ japanese ] = "琛屾暟銇ㄦ枃瀛楁暟"; + Text[ korean ] = "韰嶌姢韸 攴鸽Μ霌"; Text[ chinese_simplified ] = "鏂囧瓧鏍煎瓙绾"; Text[ chinese_traditional ] = "鏂囧瓧鏍煎瓙绶"; Text[ turkish ] = "Text Grid"; Text[ arabic ] = "Text Grid"; Text[ catalan ] = "Text Grid"; + Text[ thai ] = "Text Grid"; }; String STR_PAGE_COLUMN { @@ -1002,7 +1030,7 @@ String STR_PAGE_COLUMN Text [ italian ] = "Colonne" ; Text [ portuguese_brazilian ] = "Colunas" ; Text [ portuguese ] = "Colunas" ; - Text [ finnish ] = "Sarakkeet" ; + Text [ finnish ] = "Palstat" ; Text [ danish ] = "Kolonner" ; Text [ french ] = "Colonnes" ; Text [ swedish ] = "Kolumner" ; @@ -1010,7 +1038,7 @@ String STR_PAGE_COLUMN Text [ spanish ] = "Columnas" ; Text [ english_us ] = "Columns" ; Text[ chinese_simplified ] = "鏍"; - Text[ russian ] = "暑腩黻"; + Text[ russian ] = "羊铍狯"; Text[ polish ] = "Kolumny"; Text[ japanese ] = "娈电祫銇"; Text[ chinese_traditional ] = "娆"; @@ -1019,7 +1047,8 @@ String STR_PAGE_COLUMN Text[ korean ] = "雼"; Text[ turkish ] = "S黷un"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Columnas"; + Text[ catalan ] = "Columnes"; + Text[ thai ] = "喔勦腑喔ム副喔∴笝喙"; }; String STR_PAGE_FOOTNOTE { @@ -1047,7 +1076,8 @@ String STR_PAGE_FOOTNOTE Text[ korean ] = "臧侅＜"; Text[ turkish ] = "Dipnot"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nota al pie"; + Text[ catalan ] = "Nota al peu"; + Text[ thai ] = "喙喔娻复喔囙腑喔｀福喔"; }; TabDialog DLG_TEMPLATE_3 { @@ -1099,7 +1129,8 @@ TabDialog DLG_TEMPLATE_3 Text[ korean ] = "鞙犿槙"; Text[ turkish ] = "Tip"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Tipo"; + Text[ catalan ] = "Tipus"; + Text[ thai ] = "喔娻笝喔脆笖"; }; PageItem { @@ -1127,8 +1158,9 @@ TabDialog DLG_TEMPLATE_3 Text[ korean ] = "鞓奠厴"; Text[ turkish ] = "Se鏴nekler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Opciones"; + Text[ catalan ] = "Opcions"; Text[ finnish ] = "Asetukset"; + Text[ thai ] = "喔曕副喔о箑喔ム阜喔竵"; }; PageItem { @@ -1154,10 +1186,11 @@ TabDialog DLG_TEMPLATE_3 Text[ chinese_traditional ] = "鎻涜"; Text[ arabic ] = "轻瘦禽"; Text[ greek ] = "另徜唣膣箸"; - Text[ korean ] = "靾滍櫂"; + Text[ korean ] = "氍胳灔 氚办箻"; Text[ turkish ] = "Metin da瘕l齧"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ajuste"; + Text[ catalan ] = "Ajusta"; + Text[ thai ] = "喔曕副喔"; }; PageItem { @@ -1186,7 +1219,8 @@ TabDialog DLG_TEMPLATE_3 Text[ korean ] = "氚瓣步"; Text[ turkish ] = "Artalan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fondo"; + Text[ catalan ] = "Fons"; + Text[ thai ] = "喔炧阜喙夃笝喔弗喔编竾"; }; PageItem { @@ -1202,7 +1236,7 @@ TabDialog DLG_TEMPLATE_3 Text [ french ] = "Bordure" ; Text [ swedish ] = "Inramning" ; Text [ dutch ] = "Omranding" ; - Text [ spanish ] = "Borde" ; + Text [ spanish ] = "Bordes" ; Text [ english_us ] = "Borders" ; PageResID = TP_BORDER ; Text[ chinese_simplified ] = "杈规"; @@ -1215,7 +1249,8 @@ TabDialog DLG_TEMPLATE_3 Text[ korean ] = "韰岆憪毽"; Text[ turkish ] = "Kenarl齥"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Borde"; + Text[ catalan ] = "Vores"; + Text[ thai ] = "喙喔箟喔權競喔笟"; }; PageItem { @@ -1226,7 +1261,7 @@ TabDialog DLG_TEMPLATE_3 Text [ italian ] = "Colonne" ; Text [ portuguese_brazilian ] = "Colunas" ; Text [ portuguese ] = "Colunas" ; - Text [ finnish ] = "Sarakkeet" ; + Text [ finnish ] = "Palstat" ; Text [ danish ] = "Kolonner" ; Text [ french ] = "Colonnes" ; Text [ swedish ] = "Kolumner" ; @@ -1235,7 +1270,7 @@ TabDialog DLG_TEMPLATE_3 Text [ english_us ] = "Columns" ; PageResID = TP_COLUMN ; Text[ chinese_simplified ] = "鏍"; - Text[ russian ] = "暑腩黻"; + Text[ russian ] = "羊铍狯"; Text[ polish ] = "Kolumny"; Text[ japanese ] = "娈电祫銇"; Text[ chinese_traditional ] = "娆"; @@ -1244,7 +1279,8 @@ TabDialog DLG_TEMPLATE_3 Text[ korean ] = "雼"; Text[ turkish ] = "S黷un"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Columnas"; + Text[ catalan ] = "Columnes"; + Text[ thai ] = "喔勦腑喔ム副喔∴笝喙"; }; PageItem { @@ -1272,11 +1308,12 @@ TabDialog DLG_TEMPLATE_3 Text[ language_user1 ] = " "; Text[ catalan ] = "Macro"; Text[ finnish ] = "Makro"; + Text[ thai ] = "喔∴覆喙傕竸喔"; }; }; }; Text [ italian ] = "Modello di cornice" ; - Text [ spanish ] = "Estilo de marcos" ; + Text [ spanish ] = "Estilo de marco" ; Text [ french ] = "Style de cadre" ; Text [ dutch ] = "Kaderopmaakprofiel" ; Text [ swedish ] = "Ramformatmall" ; @@ -1290,11 +1327,12 @@ TabDialog DLG_TEMPLATE_3 Text[ chinese_traditional ] = "妗嗘ǎ寮"; Text[ arabic ] = "溷 咔涎"; Text[ greek ] = "郁蹼 痣衢筮秕"; - Text[ korean ] = "頂勲爤鞛 韰滍攲毽"; + Text[ korean ] = "頂勲爤鞛 鞀ろ儉鞚"; Text[ turkish ] = "莈r鏴ve bi鏸mi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Estilo de marcos"; + Text[ catalan ] = "Estil del marc"; Text[ finnish ] = "Kehyksen tyyli"; + Text[ thai ] = "喔ム副喔佮俯喔撪赴喔佮福喔笟"; }; TabDialog DLG_TEMPLATE_5 { @@ -1331,8 +1369,9 @@ TabDialog DLG_TEMPLATE_5 Text[ korean ] = "旮毹鸽Μ 旮绊樃"; Text[ turkish ] = "Madde ireti"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Vi馿tas"; + Text[ catalan ] = "Pics"; Text[ finnish ] = "Luettelomerkit"; + Text[ thai ] = "喔副喔嵿弗喔编竵喔┼笓喙屶箒喔笖喔囙斧喔编抚喔傕箟喔涪喙堗腑喔"; }; PageItem { @@ -1346,7 +1385,7 @@ TabDialog DLG_TEMPLATE_5 Text [ italian ] = "Tipo numerazione" ; Text [ spanish ] = "Tipo de numeraci髇" ; Text [ french ] = "Type de num閞otation" ; - Text [ dutch ] = "Nummeringstijl" ; + Text [ dutch ] = "Nummeringsstijl" ; Text [ portuguese ] = "Tipo de numera玢o" ; Text[ chinese_simplified ] = "缂栧彿绫诲瀷"; Text[ russian ] = "诣 眢戾疣鲨"; @@ -1354,12 +1393,13 @@ TabDialog DLG_TEMPLATE_5 Text[ japanese ] = "鐣彿浠樸亼銇ó椤"; Text[ chinese_traditional ] = "绶ㄨ櫉椤炲瀷"; Text[ arabic ] = "匮磙 轻恃揄"; - Text[ language_user1 ] = "MS Word, KeyID23136"; + Text[ language_user1 ] = "MS W; MS Word, KeyID23136"; Text[ greek ] = "郁蹼 狁哞扃箸"; - Text[ korean ] = "氩堩樃 毵り赴旮 鞙犿槙"; + Text[ korean ] = "氩堩樃 毵り赴旮 鞀ろ儉鞚"; Text[ turkish ] = "Numaralama t黵"; - Text[ catalan ] = "Tipo de numeraci髇"; + Text[ catalan ] = "Estil de numeraci"; Text[ finnish ] = "Numerointityyli"; + Text[ thai ] = "喔ム副喔佮俯喔撪赴喔ム赋喔斷副喔氞笗喔编抚喙喔ム競"; }; PageItem { @@ -1382,11 +1422,12 @@ TabDialog DLG_TEMPLATE_5 Text[ chinese_traditional ] = "澶х侗"; Text[ arabic ] = "兽禹"; Text[ greek ] = "拈荞桉"; - Text[ korean ] = "鞎勳泝韸鸽澕鞚"; + Text[ korean ] = "臧滌殧"; Text[ turkish ] = "Anahat"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Esquema"; + Text[ catalan ] = "Contorn"; Text[ finnish ] = "J鋝ennys"; + Text[ thai ] = "喙喔勦箟喔侧福喙堗覆喔"; }; PageItem { @@ -1403,17 +1444,18 @@ TabDialog DLG_TEMPLATE_5 Text [ dutch ] = "Afbeeldingen" ; Text [ portuguese ] = "Imagens" ; Text[ chinese_simplified ] = "鍥惧舰"; - Text[ russian ] = "需耋黻"; + Text[ russian ] = "灭圄梓羼觇 钺牝"; Text[ polish ] = "Grafiki"; Text[ japanese ] = "鍥"; Text[ chinese_traditional ] = "鍦栧舰"; Text[ arabic ] = "真"; Text[ greek ] = "民狯殛"; - Text[ korean ] = "攴鸽灅頂"; + Text[ korean ] = "攴鸽"; Text[ turkish ] = "Grafik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Im醙enes"; - Text[ finnish ] = "Kuvat"; + Text[ catalan ] = "Gr鄁ics"; + Text[ finnish ] = "Grafiikka"; + Text[ thai ] = "喔佮福喔侧笩喔脆竸"; }; PageItem { @@ -1430,7 +1472,7 @@ TabDialog DLG_TEMPLATE_5 Text [ dutch ] = "Positie" ; Text [ portuguese ] = "Posi玢o" ; Text[ chinese_simplified ] = "浣嶇疆"; - Text[ russian ] = "项玷鲨"; + Text[ russian ] = "项腩驽龛"; Text[ polish ] = "Pozycja"; Text[ japanese ] = "浣嶇疆"; Text[ chinese_traditional ] = "浣嶇疆"; @@ -1439,8 +1481,9 @@ TabDialog DLG_TEMPLATE_5 Text[ korean ] = "鞙勳箻"; Text[ turkish ] = "Konum"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Posici髇"; + Text[ catalan ] = "Posici"; Text[ finnish ] = "Sijainti"; + Text[ thai ] = "喔曕赋喙佮斧喔權箞喔"; }; PageItem { @@ -1460,14 +1503,15 @@ TabDialog DLG_TEMPLATE_5 Text[ russian ] = "相疣戾蝠"; Text[ polish ] = "Opcje"; Text[ japanese ] = "銈儣銈枫儳銉"; - Text[ language_user1 ] = "KW:Tilde entfernen falls noch vorhanden"; + Text[ language_user1 ] = "KW:T; KW:Tilde entfernen falls noch vorhanden"; Text[ chinese_traditional ] = "閬搁爡"; Text[ arabic ] = "雾茄鞘"; Text[ greek ] = "硼殡镢蒡"; - Text[ korean ] = "靷毄鞛 頇橁步 靹れ爼"; + Text[ korean ] = "鞓奠厴"; Text[ turkish ] = "Se鏴nekler"; - Text[ catalan ] = "~Opciones"; + Text[ catalan ] = "Opcions"; Text[ finnish ] = "Asetukset"; + Text[ thai ] = "喔曕副喔о箑喔ム阜喔竵"; }; }; }; @@ -1487,11 +1531,12 @@ TabDialog DLG_TEMPLATE_5 Text[ chinese_traditional ] = "绶ㄨ櫉妯ｅ紡"; Text[ arabic ] = "溷 恃揄"; Text[ greek ] = "旭躔 狁哞扃箸"; - Text[ korean ] = "氩堩樃 毵り赴旮 韰滍攲毽"; + Text[ korean ] = "氩堩樃 毵り赴旮 鞀ろ儉鞚"; Text[ turkish ] = "Numaralama bi鏸mi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Estilo de numeraci髇"; + Text[ catalan ] = "Estil de numeraci"; Text[ finnish ] = "Numerointityyli"; + Text[ thai ] = "喔ム副喔佮俯喔撪赴喔ム赋喔斷副喔氞笗喔编抚喙喔ム競"; }; @@ -1507,3 +1552,8 @@ TabDialog DLG_TEMPLATE_5 + + + + + diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 0c85570b0d7a..8bd1b2a88716 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -2,9 +2,9 @@ * * $RCSfile: column.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: fme $ $Date: 2002-12-10 09:44:49 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -187,6 +187,9 @@ SwColumnDlg::SwColumnDlg(Window* pParent, SwWrtShell& rSh) : USHORT nFullSectCnt = rWrtShell.GetFullSelectedSectionCount(); if( pCurrSection && ( !rWrtShell.HasSelection() || 0 != nFullSectCnt )) { + nSelectionWidth = rSh.GetSectionWidth(*pCurrSection->GetFmt()); + if ( !nSelectionWidth ) + nSelectionWidth = USHRT_MAX; pSectionSet = new SfxItemSet( rWrtShell.GetAttrPool(), aSectIds ); pSectionSet->Put( pCurrSection->GetFmt()->GetAttrSet() ); pColPgSet = pSectionSet; @@ -796,8 +799,7 @@ IMPL_LINK( SwColumnPage, UpdateColMgr, void *, pField ) //Maximalwerte setzen aCLNrEdt.SetMax(Max(1L, - Min(long(nMaxCols), long( pColMgr->GetActualSize() / - ((nGutterWidth + MINLAY)) )))); + Min(long(nMaxCols), long( pColMgr->GetActualSize() / (nGutterWidth + MINLAY)) ))); aCLNrEdt.SetLast(aCLNrEdt.GetMax()); aCLNrEdt.Reformat(); @@ -877,8 +879,7 @@ void SwColumnPage::Init() // Maximale Spaltenzahl setzen // Werte kleiner als 1 sind nicht erlaubt aCLNrEdt.SetMax(Max(1L, - Min(long(nMaxCols), long(pColMgr->GetActualSize() / nMinWidth)))); - + Min(long(nMaxCols), long( pColMgr->GetActualSize() / nMinWidth) ))); } /*------------------------------------------------------------------------ diff --git a/sw/source/ui/frmdlg/column.src b/sw/source/ui/frmdlg/column.src index f162b04204de..df3afe773b17 100644 --- a/sw/source/ui/frmdlg/column.src +++ b/sw/source/ui/frmdlg/column.src @@ -2,9 +2,9 @@ * * $RCSfile: column.src,v $ * - * $Revision: 1.43 $ + * $Revision: 1.44 $ * - * last change: $Author: os $ $Date: 2002-09-10 14:20:17 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,7 +76,7 @@ TabPage TP_COLUMN Text [ italian ] = "Colonne" ; Text [ portuguese_brazilian ] = "Colunas" ; Text [ portuguese ] = "Colunas" ; - Text [ finnish ] = "Sarakkeet" ; + Text [ finnish ] = "Palstat" ; Text [ danish ] = "Kolonner" ; Text [ french ] = "Colonnes" ; Text [ swedish ] = "Kolumner" ; @@ -93,12 +93,12 @@ TabPage TP_COLUMN Text[ language_user1 ] = " "; Text[ english_us ] = "Columns"; Text[ portuguese ] = "~Colunas"; - Text[ russian ] = "暑腩黻"; + Text[ russian ] = "羊铍狯"; Text[ greek ] = "~郁揠弪"; Text[ dutch ] = "~Kolommen"; Text[ french ] = "Colonnes"; Text[ spanish ] = "~Columnas"; - Text[ finnish ] = "Sarakkeet"; + Text[ finnish ] = "Palstat"; Text[ italian ] = "~Colonne"; Text[ danish ] = "~Kolonner"; Text[ swedish ] = "~Kolumner"; @@ -142,20 +142,20 @@ TabPage TP_COLUMN Text = "~Inhalt 黚er alle Spalten gleichm溥ig verteilen" ; Text [ ENGLISH ] = "Balance columns" ; Hide = TRUE; - Text[ english_us ] = "Evenly distribute contents to all columns"; + Text[ english_us ] = "Evenly distribute contents ~to all columns"; Text[ portuguese ] = "~Distribuir conte鷇o em todas as colunas por igual"; - Text[ russian ] = "朽耧疱溴腓螯 疣忭铎屦眍 耦溴疰桁铄 忸 怦艴 觐腩黻圊"; + Text[ russian ] = "朽耧疱溴腓螯 疣忭铎屦眍 耦溴饉骅祛 忸 怦艴 耱铍狯圊"; Text[ greek ] = "后 赆翎盹燹 麸 疱耖鬻镬蓓秕 箦 弪 糸 篝揠弪"; Text[ dutch ] = "Inhoud gelijkmatig verdelen over ~kolommen"; - Text[ french ] = "R閜artition r間uli鑢e du contenu sur toutes les ~colonnes"; - Text[ spanish ] = "Distribuci髇 uniforme del contenido sobre todas las columnas"; + Text[ french ] = "R閜artition r間uli鑢e du contenu sur toutes les colonnes"; + Text[ spanish ] = "D~istribuci髇 uniforme del contenido sobre todas las columnas"; Text[ italian ] = "Distribuisci in modo uniforme il contenuto di tutte le colonne."; Text[ danish ] = "Fordel indholdet j鎣nt over alle k~olonner"; Text[ swedish ] = "F鰎dela inneh錶l j鋗nt 鰒er ~alla kolumner"; Text[ polish ] = "Roz丑 zawarto滄 r體nomiernie we wszystkich kolumnach"; Text[ portuguese_brazilian ] = "Balance columns"; Text[ japanese ] = "鍐呭銈掑悇娈点伀鍧囩瓑閰嶅垎銇欍倠"; - Text[ korean ] = "雮挫毄鞚 氇摖 鞐挫棎 瓯胳硱 鞚检爼頃橁矊 攵勲鞍"; + Text[ korean ] = "雮挫毄鞚 臧 雼棎 攴犽摫頃橁矊 氚办箻"; Text[ chinese_simplified ] = "瀵圭О璋冩暣鏍忓"; Text[ chinese_traditional ] = "灏嶇ū瑾挎暣娆勫"; Text[ arabic ] = "舒翼 轻阃舒砬 卺 哚 轻泌阆 惹崾忧骓"; @@ -173,7 +173,7 @@ TabPage TP_COLUMN Text[ language_user1 ] = " "; Text[ english_us ] = "Settings"; Text[ portuguese ] = "Predefini珲es"; - Text[ russian ] = "青溧眄 珥圜屙"; + Text[ russian ] = "玉蜞眍怅"; Text[ greek ] = "旭镥痖腼戕"; Text[ dutch ] = "Instellingen"; Text[ french ] = "D閒initions"; @@ -185,7 +185,7 @@ TabPage TP_COLUMN Text[ polish ] = "Ustawienia domy渓ne"; Text[ portuguese_brazilian ] = "Colunas"; Text[ japanese ] = "銉椼儶銈汇儍銉"; - Text[ korean ] = "旮半掣 臧"; + Text[ korean ] = "靹れ爼"; Text[ chinese_simplified ] = "棰勭疆"; Text[ chinese_traditional ] = "闋愯ō"; Text[ turkish ] = "S黷un"; @@ -202,19 +202,19 @@ TabPage TP_COLUMN Left = TRUE ; Text[ english_us ] = "Column"; Text[ portuguese ] = "Coluna"; - Text[ russian ] = "暑腩黻"; + Text[ russian ] = "羊铍徨"; Text[ greek ] = "郁揠"; Text[ dutch ] = "Kolom"; Text[ french ] = "Colonne"; Text[ spanish ] = "Columna"; - Text[ finnish ] = "Sarake"; + Text[ finnish ] = "Palsta"; Text[ italian ] = "Colonna"; Text[ danish ] = "Kolonne"; Text[ swedish ] = "Kolumn"; Text[ polish ] = "Kolumna"; Text[ portuguese_brazilian ] = "Column"; Text[ japanese ] = "娈电暘鍙"; - Text[ korean ] = "雼"; + Text[ korean ] = "雼 氩堩樃"; Text[ chinese_simplified ] = "鍒"; Text[ chinese_traditional ] = "娆"; Text[ turkish ] = "Column"; @@ -379,7 +379,7 @@ TabPage TP_COLUMN Text[ language_user1 ] = " "; Text[ turkish ] = "Aral齥"; Text[ catalan ] = "Espaiat"; - Text[ finnish ] = "Objektiv鋖it"; + Text[ finnish ] = "V鋖it"; Text[ thai ] = "喔｀赴喔⑧赴喔箞喔侧竾"; }; MetricField ED_DIST1 @@ -428,7 +428,7 @@ TabPage TP_COLUMN Text [ italian ] = "~Larghezza autom." ; Text [ portuguese_brazilian ] = "Autom?tica ~largura" ; Text [ portuguese ] = "~Largura autom醫ica" ; - Text [ finnish ] = "~Automaattinen leveys" ; + Text [ finnish ] = "Automaattinen ~leveys" ; Text [ danish ] = "Automatisk bredde" ; Text [ french ] = "~Largeur automatique" ; Text [ swedish ] = "A~utomatisk bredd" ; @@ -437,7 +437,7 @@ TabPage TP_COLUMN Text [ english_us ] = "Auto~Width" ; TabStop = TRUE ; Text[ chinese_simplified ] = "鑷姩璋冩暣瀹藉害(~W)"; - Text[ russian ] = "棱蝾. 痂磬"; + Text[ russian ] = "棱蝾镱溽铕"; Text[ polish ] = "Automatyczna szeroko滄"; Text[ japanese ] = "骞呰嚜鍕曡鏁(~W)"; Text[ chinese_traditional ] = "鑷嫊瑾挎暣瀵害(~W)"; @@ -445,7 +445,7 @@ TabPage TP_COLUMN Text[ dutch ] = "A~utomatische breedte"; Text[ chinese_simplified ] = "鑷姩璋冩暣瀹藉害(~W)"; Text[ greek ] = "刘酎灬麸 痣荇矧"; - Text[ korean ] = "鞛愲彊 雱堧箘(~W)"; + Text[ korean ] = "鞛愲彊鞙茧 雱堧箘 臁办爼(~W)"; Text[ language_user1 ] = " "; Text[ turkish ] = "O~tomatik geniik"; Text[ catalan ] = "Llargada ~autom鄑ica"; @@ -460,7 +460,7 @@ TabPage TP_COLUMN Text[ language_user1 ] = " "; Text[ english_us ] = "Width and spacing"; Text[ portuguese ] = "Largura e espa鏰mento"; - Text[ russian ] = "罔痂磬 疣耨蝾龛"; + Text[ russian ] = "罔痂磬 桧蝈疴嚯"; Text[ greek ] = "须荇矧 赆 狃翎箸"; Text[ dutch ] = "Breedte en afstand"; Text[ french ] = "Largeur et 閏art"; @@ -472,7 +472,7 @@ TabPage TP_COLUMN Text[ polish ] = "Szeroko滄 i odst阷"; Text[ portuguese_brazilian ] = "Largura da coluna"; Text[ japanese ] = "骞呫仺闁撻殧"; - Text[ korean ] = "雱堧箘鞕 臧勱博"; + Text[ korean ] = "雱堧箘 氚 臧勱博"; Text[ chinese_simplified ] = "鏍忓鍜岄棿闅"; Text[ chinese_traditional ] = "娆勫鍙婇枔闅"; Text[ turkish ] = "S黷un genii餴"; @@ -492,7 +492,7 @@ TabPage TP_COLUMN Text [ portuguese_brazilian ] = "~Estilo" ; Text [ portuguese ] = "~Estilo" ; Text [ finnish ] = "~Viiva" ; - Text [ danish ] = "Type" ; + Text [ danish ] = "T~ype" ; Text [ french ] = "Type" ; Text [ swedish ] = "~Typ" ; Text [ dutch ] = "~Type" ; @@ -500,7 +500,7 @@ TabPage TP_COLUMN Text [ english_us ] = "~Line" ; Left = TRUE ; Text[ chinese_simplified ] = "绫诲瀷(~L)"; - Text[ russian ] = "诣"; + Text[ russian ] = "髓龛"; Text[ polish ] = "Typ"; Text[ japanese ] = "绋(~L)"; Text[ chinese_traditional ] = "椤炲瀷(~L)"; @@ -546,7 +546,7 @@ TabPage TP_COLUMN }; StringList [ finnish ] = { - < "Ei mit??n" ; Default ; > ; + < "Ei mit滗n" ; Default ; > ; }; StringList [ danish ] = { @@ -578,7 +578,7 @@ TabPage TP_COLUMN }; StringList [ russian ] = { - < "铃" ; Default ; > ; + < "湾" ; Default ; > ; }; StringList [ polish ] = { @@ -639,11 +639,11 @@ TabPage TP_COLUMN Text [ italian ] = "Altezza" ; Text [ portuguese_brazilian ] = "Altu~ra" ; Text [ portuguese ] = "Altu~ra" ; - Text [ finnish ] = "K~orkeus" ; - Text [ danish ] = "H鴍de" ; + Text [ finnish ] = "Korkeus" ; + Text [ danish ] = "H鴡jde" ; Text [ french ] = "Hauteur" ; Text [ swedish ] = "H鰚jd" ; - Text [ dutch ] = "~Hoogte" ; + Text [ dutch ] = "Hoo~gte" ; Text [ spanish ] = "A~ltura" ; Text [ english_us ] = "H~eight" ; Left = TRUE ; @@ -653,7 +653,7 @@ TabPage TP_COLUMN Text[ japanese ] = "楂樸仌(~E)"; Text[ chinese_traditional ] = "楂樺害(~E)"; Text[ arabic ] = "轻茄瘦勤"; - Text[ dutch ] = "~Hoogte"; + Text[ dutch ] = "Hoo~gte"; Text[ chinese_simplified ] = "楂樺害(~E)"; Text[ greek ] = "绝矧"; Text[ korean ] = "雴掛澊(~E)"; @@ -696,7 +696,7 @@ TabPage TP_COLUMN Text [ french ] = "Position" ; Text [ dutch ] = "~Positie" ; Text[ chinese_simplified ] = "浣嶇疆(~P)"; - Text[ russian ] = "项玷鲨"; + Text[ russian ] = "项腩驽龛"; Text[ polish ] = "Pozycja"; Text[ japanese ] = "浣嶇疆(~P)"; Text[ chinese_traditional ] = "浣嶇疆(~P)"; @@ -755,9 +755,9 @@ TabPage TP_COLUMN }; StringList [ finnish ] = { - < "Yl?osa" ; Default ; > ; + < "Yl鋜euna" ; Default ; > ; < "Keskitetty" ; Default ; > ; - < "Alaosa" ; Default ; > ; + < "Alareuna" ; Default ; > ; }; StringList [ danish ] = { @@ -946,6 +946,7 @@ TabPage TP_COLUMN Text[ arabic ] = "Properties"; Text[ catalan ] = "Opcions"; Text[ thai ] = "喔勦父喔撪釜喔∴笟喔编笗喔"; + Text[ portuguese_brazilian ] = "Propriedades"; }; FixedText FT_TEXTDIRECTION { @@ -959,8 +960,8 @@ TabPage TP_COLUMN Text[ russian ] = "Text ~direction"; Text[ greek ] = "Text ~direction"; Text[ dutch ] = "Text ~direction"; - Text[ french ] = "Encha頽ements"; - Text[ spanish ] = "~Direcci髇 del texto"; + Text[ french ] = "Orientation du texte"; + Text[ spanish ] = "~Direcci髇 de escritura"; Text[ finnish ] = "Text ~direction"; Text[ italian ] = "Testo"; Text[ danish ] = "Text ~direction"; @@ -1006,15 +1007,15 @@ TabPage TP_COLUMN }; StringList [ language_user1 ] = { - < "Links nach rechts" ; 0; > ; - < "Rechts nach links" ; 1; > ; - < "Einstellungen des 黚ergeordneten Objektes verwenden" ; 4; > ; + < "Link; Links nach rechts" ; 0; > ; + < "Rech; Rechts nach links" ; 1; > ; + < "Eins; Einstellungen des 黚ergeordneten Objektes verwenden" ; 4; > ; }; StringList [ korean ] = { < "鞕检鞐愳劀 鞓るジ飒届溂搿" ; 0; > ; < "鞓るジ飒届棎靹 鞕检鞙茧" ; 1; > ; - < "靸侅渼 臧滌泊鞚 靹れ爼 鞝侅毄" ; 4; > ; + < "靸侅渼 臧滌泊鞚 靹れ爼鞚 韰嶌姢韸胳潣 氍胳瀽 氚╉枼鞐 鞝侅毄" ; 4; > ; }; StringList [ chinese_traditional ] = { @@ -1046,9 +1047,15 @@ TabPage TP_COLUMN < "浠庡彸鍚戝乏" ; 1; > ; < "娌跨敤鐜版湁鐨勬枃瀛楁柟鍚戠殑璁惧畾" ; 4; > ; }; + StringList [ spanish ] = + { + < "De izquierda a derecha" ; 0; > ; + < "De derecha a izquierda" ; 1; > ; + < "Utilizar la configuraci髇 del objeto superior. " ; 4; > ; + }; }; Text[ chinese_simplified ] = "鏍"; - Text[ russian ] = "暑腩黻"; + Text[ russian ] = "羊铍狯"; Text[ polish ] = "Kolumny"; Text[ japanese ] = "娈电祫銇"; Text[ chinese_traditional ] = "娆"; @@ -1110,7 +1117,7 @@ ModalDialog DLG_COLUMN Text[ polish ] = "Zastosuj w"; Text[ portuguese_brazilian ] = "~Apply to:"; Text[ japanese ] = "瑷畾瀵捐薄(~A):"; - Text[ korean ] = "鞝侅毄(~A)"; + Text[ korean ] = "鞝侅毄 雽靸(~A)"; Text[ chinese_simplified ] = "閲囩敤鍒(~A)"; Text[ chinese_traditional ] = "濂楃敤鍒(~A)"; Text[ arabic ] = "守软 卺:"; @@ -1144,11 +1151,11 @@ ModalDialog DLG_COLUMN }; StringList [ language_user1 ] = { - < "Selektion" ; LISTBOX_SELECTION; > ; + < "Sele; Selektion" ; LISTBOX_SELECTION; > ; < " " ; LISTBOX_SECTION ; > ; - < "Selektierte Bereiche" ; LISTBOX_SECTIONS ; > ; - < "Rahmen" ; LISTBOX_FRAME ; > ; - < "Seitenvorlage:" ; LISTBOX_PAGE ; > ; + < "Sele; Selektierte Bereiche" ; LISTBOX_SECTIONS ; > ; + < "Rahm; Rahmen" ; LISTBOX_FRAME ; > ; + < "Seit; Seitenvorlage:" ; LISTBOX_PAGE ; > ; }; StringList [ english_us ] = { @@ -1177,10 +1184,10 @@ ModalDialog DLG_COLUMN StringList [ dutch ] = { < "Selectie" ; LISTBOX_SELECTION; > ; - < "Actueel bereik" ; LISTBOX_SECTION ; > ; + < "Huidig bereik" ; LISTBOX_SECTION ; > ; < "Geselecteerd bereik" ; LISTBOX_SECTIONS ; > ; < "Kader" ; LISTBOX_FRAME ; > ; - < "Pagina-opmaakprofiel: " ; LISTBOX_PAGE ; > ; + < "Pagina-opmaakprofiel:" ; LISTBOX_PAGE ; > ; }; StringList [ french ] = { @@ -1193,8 +1200,8 @@ ModalDialog DLG_COLUMN StringList [ spanish ] = { < "Selecci髇" ; LISTBOX_SELECTION; > ; - < "羠ea actual" ; LISTBOX_SECTION ; > ; - < "羠eas seleccionadas" ; LISTBOX_SECTIONS ; > ; + < "Secci髇 actual" ; LISTBOX_SECTION ; > ; + < "Secciones seleccionadas" ; LISTBOX_SECTIONS ; > ; < "Marco" ; LISTBOX_FRAME ; > ; < "Estilo de p醙ina: " ; LISTBOX_PAGE ; > ; }; @@ -1209,9 +1216,9 @@ ModalDialog DLG_COLUMN StringList [ russian ] = { < "蔓溴脲龛" ; LISTBOX_SELECTION; > ; - < "义牦 钺豚耱" ; LISTBOX_SECTION ; > ; - < "蔓溴脲眄铋 钺豚耱" ; LISTBOX_SECTIONS ; > ; - < "朽礻" ; LISTBOX_FRAME ; > ; + < "义牦祗 疣玟咫" ; LISTBOX_SECTION ; > ; + < "蔓溴脲眄铎 疣玟咫" ; LISTBOX_SECTIONS ; > ; + < "朽礻..." ; LISTBOX_FRAME ; > ; < "羊桦 耱疣龛鳆: " ; LISTBOX_PAGE ; > ; }; StringList [ italian ] = @@ -1257,8 +1264,8 @@ ModalDialog DLG_COLUMN StringList [ korean ] = { < "靹犿儩" ; LISTBOX_SELECTION; > ; - < "順勳灛 鞓侅棴" ; LISTBOX_SECTION ; > ; - < "靹犿儩霅 鞓侅棴" ; LISTBOX_SECTIONS ; > ; + < "順勳灛 甑棴" ; LISTBOX_SECTION ; > ; + < "靹犿儩霅 甑棴" ; LISTBOX_SECTIONS ; > ; < "頂勲爤鞛" ; LISTBOX_FRAME ; > ; < "韼橃澊歆 鞀ろ儉鞚: " ; LISTBOX_PAGE ; > ; }; @@ -1305,8 +1312,8 @@ ModalDialog DLG_COLUMN StringList [ finnish ] = { < "Valinta" ; LISTBOX_SELECTION; > ; - < "Nykyinen osio" ; LISTBOX_SECTION ; > ; - < "Valittu osio" ; LISTBOX_SECTIONS ; > ; + < "Nykyinen osa" ; LISTBOX_SECTION ; > ; + < "Valittu osa" ; LISTBOX_SECTIONS ; > ; < "Kehys" ; LISTBOX_FRAME ; > ; < "Sivun tyyli: " ; LISTBOX_PAGE ; > ; }; @@ -1326,7 +1333,7 @@ ModalDialog DLG_COLUMN Text[ french ] = "Colonnes"; Text[ spanish ] = "Columnas"; Text[ swedish ] = "Kolumner"; - Text[ russian ] = "暑腩黻"; + Text[ russian ] = "羊铍狯"; Text[ italian ] = "Colonne"; Text[ danish ] = "Kolonner"; Text[ polish ] = "Kolumny"; @@ -1339,8 +1346,27 @@ ModalDialog DLG_COLUMN Text[ language_user1 ] = " "; Text[ turkish ] = "S黷un"; Text[ catalan ] = "Columnes"; - Text[ finnish ] = "Sarakkeet"; + Text[ finnish ] = "Palstat"; Text[ thai ] = "喔勦腑喔ム副喔∴笝喙"; }; + + + + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/frmdlg/cption.src b/sw/source/ui/frmdlg/cption.src index a9acb5431349..0a085af62e00 100644 --- a/sw/source/ui/frmdlg/cption.src +++ b/sw/source/ui/frmdlg/cption.src @@ -2,9 +2,9 @@ * * $RCSfile: cption.src,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: os $ $Date: 2001-12-18 10:37:08 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -116,12 +116,12 @@ ModalDialog DLG_CAPTION Text [ italian ] = "~Opzioni" ; Text [ portuguese_brazilian ] = "~Op??s" ; Text [ portuguese ] = "~Op珲es" ; - Text [ finnish ] = "~Asetukset" ; + Text [ finnish ] = "A~setukset" ; Text [ danish ] = "Indstillinger" ; Text [ french ] = "~Options" ; Text [ swedish ] = "~Alternativ" ; Text [ dutch ] = "~Opties" ; - Text [ spanish ] = "~Opciones" ; + Text [ spanish ] = "Opciones" ; Text [ english_us ] = "~Options" ; Text[ chinese_simplified ] = "閫夐」(~O)"; Text[ russian ] = "相疣戾蝠"; @@ -133,7 +133,8 @@ ModalDialog DLG_CAPTION Text[ korean ] = "鞓奠厴(~O)"; Text[ turkish ] = "~Se鏴nekler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Opciones"; + Text[ catalan ] = "~Opcions"; + Text[ thai ] = "~喔曕副喔о箑喔ム阜喔竵"; }; FixedText TXT_SAMPLE { @@ -169,7 +170,8 @@ ModalDialog DLG_CAPTION Text[ korean ] = "氩旍＜(~T)"; Text[ turkish ] = "~Kategori"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Categor韆"; + Text[ catalan ] = "Ca~tegoria"; + Text[ thai ] = "喔涏福喔班箑~喔犩笚"; }; ComboBox BOX_CATEGORY { @@ -186,12 +188,12 @@ ModalDialog DLG_CAPTION Text = "~Nummerierung" ; Text [ English ] = "~Numbering" ; Text [ norwegian ] = "~Numbering" ; - Text [ italian ] = "~Numerazione" ; + Text [ italian ] = "Numerazione" ; Text [ portuguese_brazilian ] = "~Numera??o" ; Text [ portuguese ] = "~Numera玢o" ; Text [ finnish ] = "~Numerointi" ; Text [ danish ] = "Nummerering" ; - Text [ french ] = "~Num閞otation" ; + Text [ french ] = "Num閞otation" ; Text [ swedish ] = "~Numrering" ; Text [ dutch ] = "~Nummering" ; Text [ spanish ] = "Nu~meraci髇" ; @@ -207,7 +209,8 @@ ModalDialog DLG_CAPTION Text[ korean ] = "氩堩樃 毵り赴旮(~N)"; Text[ turkish ] = "~Numaralama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nu~meraci髇"; + Text[ catalan ] = "Nu~meraci"; + Text[ thai ] = "~喔ム赋喔斷副喔氞笗喔编抚喙喔ム競"; }; ListBox BOX_FORMAT { @@ -227,16 +230,16 @@ ModalDialog DLG_CAPTION Text [ italian ] = "~Dicitura" ; Text [ portuguese_brazilian ] = "~Legenda" ; Text [ portuguese ] = "~Texto para etiqueta" ; - Text [ finnish ] = "Kuva~otsikko" ; + Text [ finnish ] = "Kuvaotsikko" ; Text [ danish ] = "Billedtekst" ; Text [ french ] = "~Texte de l間ende" ; Text [ swedish ] = "~Bildtext" ; Text [ dutch ] = "~Opschrift" ; - Text [ spanish ] = "~Texto de etiqueta" ; + Text [ spanish ] = "~Texto de la etiqueta" ; Text [ english_us ] = "~Caption" ; Left = TRUE ; Text[ chinese_simplified ] = "鏍囩鏂(~C)"; - Text[ russian ] = "义犟 镱滹桉"; + Text[ russian ] = "袜玮囗桢"; Text[ polish ] = "Tekst etykiety"; Text[ japanese ] = "鍥宠〃鐣彿銉嗐偔銈广儓(~C)"; Text[ chinese_traditional ] = "妯欑堡鏂(~C)"; @@ -245,7 +248,8 @@ ModalDialog DLG_CAPTION Text[ korean ] = "旌§厴(~C)"; Text[ turkish ] = "R~esim yaz齭 metni"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Texto de etiqueta"; + Text[ catalan ] = "~Llegenda"; + Text[ thai ] = "~喔勦赋喔氞福喔｀涪喔侧涪喔犩覆喔"; }; Edit EDT_TEXT { @@ -263,12 +267,12 @@ ModalDialog DLG_CAPTION Text = "~Position" ; Text [ English ] = "~Position" ; Text [ norwegian ] = "~Posisjon" ; - Text [ italian ] = "~Posizione" ; + Text [ italian ] = "Posizione" ; Text [ portuguese_brazilian ] = "~Posi??o" ; Text [ portuguese ] = "~Posi玢o" ; - Text [ finnish ] = "~Sijainti" ; + Text [ finnish ] = "Sijainti" ; Text [ danish ] = "Placering" ; - Text [ french ] = "~Position" ; + Text [ french ] = "Position" ; Text [ swedish ] = "~Position" ; Text [ dutch ] = "~Positie" ; Text [ spanish ] = "~Posici髇" ; @@ -283,7 +287,8 @@ ModalDialog DLG_CAPTION Text[ korean ] = "鞙勳箻(~P)"; Text[ turkish ] = "K~onum"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Posici髇"; + Text[ catalan ] = "~Posici"; + Text[ thai ] = "~喔曕赋喙佮斧喔權箞喔"; }; ListBox BOX_POS { @@ -305,23 +310,24 @@ ModalDialog DLG_CAPTION Text[ portuguese ] = "~Aplicar contornos e sombreado"; Text[ russian ] = "橡桁屙栩 钺疣祀屙桢 蝈睃"; Text[ greek ] = "碰狁祜戕 疱耖泷莒灬麸 赆 箨檐"; - Text[ dutch ] = "~Omranding en schadow overnemen"; + Text[ dutch ] = "~Omranding en schaduw overnemen"; Text[ french ] = "~Appliquer bordure et ombre"; - Text[ spanish ] = "Aceptar ~borde y sombra"; + Text[ spanish ] = "~Aplicar borde y sombra"; Text[ italian ] = "~Applica bordo e ombra"; Text[ danish ] = "Overtag ramme og skygge"; Text[ swedish ] = "謣verta inramning och skugga"; Text[ polish ] = "Przejmij obramowanie i cie"; Text[ portuguese_brazilian ] = "~Copy border and shadow"; Text[ japanese ] = "澶栨灎銇ㄥ奖銇仼鐢(~A)"; - Text[ korean ] = "鞕戈辰靹犼臣 攴鸽鞛 鞝侅毄(~A)"; + Text[ korean ] = "韰岆憪毽 氚 攴鸽鞛 鞝侅毄(~A)"; Text[ chinese_simplified ] = "閲囩敤杈规鍜岄槾褰(~A)"; Text[ chinese_traditional ] = "鎺＄敤閭婃鍜岄櫚褰(~A)"; Text[ arabic ] = "守软 轻拖嫦 媲豳"; Text[ turkish ] = "~Kenarl齥 ve g鰈geyi kullan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Aceptar ~borde y sombra"; + Text[ catalan ] = "~Aplica la vora i l'ombra"; Text[ finnish ] = "~Lis滗 reuna ja varjostus"; + Text[ thai ] = "喙儈喔娻箟喙喔箟喔權競喔笟喙佮弗喔班箑喔囙覆"; }; FixedText FT_OBJECT_NAME { @@ -334,9 +340,9 @@ ModalDialog DLG_CAPTION Text[ russian ] = "~褥 钺牝"; Text[ greek ] = "柬镬 犴糸赍殪蓓秕"; Text[ dutch ] = "~Objectnaam"; - Text[ french ] = "~Nom de l'objet"; + Text[ french ] = "Nom de l'objet"; Text[ spanish ] = "~Nombre del objeto"; - Text[ italian ] = "~Nome oggetto"; + Text[ italian ] = "Nome oggetto"; Text[ danish ] = "Objektnavn"; Text[ swedish ] = "~Objektnamn"; Text[ polish ] = "Nazwa obiektu"; @@ -348,8 +354,9 @@ ModalDialog DLG_CAPTION Text[ arabic ] = "怯 轻咔其"; Text[ turkish ] = "N~esne ad"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Nombre del objeto"; + Text[ catalan ] = "Nom de l'o~bjecte"; Text[ finnish ] = "O~bjektin nimi"; + Text[ thai ] = "喔娻阜喙堗腑喔о副~喔曕笘喔"; }; Edit ED_OBJECT_NAME { @@ -374,17 +381,18 @@ ModalDialog DLG_CAPTION Text[ spanish ] = "Propiedades"; Text[ finnish ] = "Ominaisuudet"; Text[ italian ] = "Propriet"; - Text[ danish ] = "Settings"; + Text[ danish ] = "Egenskaber"; Text[ swedish ] = "Egenskaper"; Text[ polish ] = "W砤渃iwo渃i"; Text[ portuguese_brazilian ] = "Settings"; Text[ japanese ] = "灞炴"; - Text[ korean ] = "靹れ爼"; + Text[ korean ] = "霌彪 鞝曤炒"; Text[ chinese_simplified ] = "灞炴"; Text[ chinese_traditional ] = "灞"; Text[ turkish ] = "Settings"; Text[ arabic ] = "Settings"; - Text[ catalan ] = "Settings"; + Text[ catalan ] = "Propietats"; + Text[ thai ] = "喔勦父喔撪釜喔∴笟喔编笗喔"; }; String STR_BEGINNING { @@ -394,24 +402,25 @@ ModalDialog DLG_CAPTION Text [ italian ] = "All'inizio" ; Text [ portuguese_brazilian ] = "No in?cio" ; Text [ portuguese ] = "No in韈io" ; - Text [ finnish ] = "Ylh滗ll" ; + Text [ finnish ] = "Yl鋚uolella" ; Text [ danish ] = "Ved begyndelsen" ; Text [ french ] = "Au d閎ut" ; Text [ swedish ] = "I b鰎jan" ; - Text [ dutch ] = "Aan het begin" ; + Text [ dutch ] = "Aan begin" ; Text [ spanish ] = "Al principio" ; Text [ english_us ] = "Above" ; Text[ chinese_simplified ] = "鍦ㄨ捣濮嬩綅缃"; - Text[ russian ] = " 磬鬣脲"; + Text[ russian ] = "砚屦躞"; Text[ polish ] = "Na pocz箃ku"; Text[ japanese ] = "鏈鍒濄伀"; Text[ chinese_traditional ] = "鍦ㄨ捣濮嬩綅缃"; Text[ arabic ] = "蓓 轻认琼"; Text[ greek ] = "郁珥 狁鬓"; - Text[ korean ] = "鞁滌瀾"; + Text[ korean ] = "鞁滌瀾鞐愳劀"; Text[ turkish ] = "Ba⺶a"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Al principio"; + Text[ catalan ] = "A sobre"; + Text[ thai ] = "喔傕箟喔侧竾喔氞笝"; }; String STR_END { @@ -421,15 +430,15 @@ ModalDialog DLG_CAPTION Text [ italian ] = "Alla fine" ; Text [ portuguese_brazilian ] = "Ao final" ; Text [ portuguese ] = "No fim" ; - Text [ finnish ] = "Alhaalla" ; + Text [ finnish ] = "Alapuolella" ; Text [ danish ] = "Ved slutningen" ; Text [ french ] = " la fin" ; Text [ swedish ] = "I slutet" ; - Text [ dutch ] = "Aan het einde" ; + Text [ dutch ] = "Aan einde" ; Text [ spanish ] = "Al final" ; Text [ english_us ] = "Below" ; Text[ chinese_simplified ] = "鍦ㄧ粨鏉熶綅缃"; - Text[ russian ] = " 觐眦"; + Text[ russian ] = "秧桤"; Text[ polish ] = "Na ko馽u"; Text[ japanese ] = "鏈寰屻伀"; Text[ chinese_traditional ] = "鍦ㄧ祼鏉熶綅缃"; @@ -438,7 +447,8 @@ ModalDialog DLG_CAPTION Text[ korean ] = "雭"; Text[ turkish ] = "Sonda"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Al final"; + Text[ catalan ] = "Sota"; + Text[ thai ] = "喔傕箟喔侧竾喔ム箞喔侧竾"; }; String STR_ABOVE { @@ -448,7 +458,7 @@ ModalDialog DLG_CAPTION Text [ italian ] = "Al di sopra" ; Text [ portuguese_brazilian ] = "Acima" ; Text [ portuguese ] = "Acima" ; - Text [ finnish ] = "Ylh滗ll" ; + Text [ finnish ] = "Yl鋚uolella" ; Text [ danish ] = "Over" ; Text [ french ] = "Supra" ; Text [ swedish ] = "Ovanf鰎" ; @@ -465,7 +475,8 @@ ModalDialog DLG_CAPTION Text[ korean ] = "鞙"; Text[ turkish ] = "躶tte"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encima"; + Text[ catalan ] = "A sobre"; + Text[ thai ] = "喔傕箟喔侧竾喔氞笝"; }; String STR_CP_BELOW { @@ -475,7 +486,7 @@ ModalDialog DLG_CAPTION Text [ italian ] = "Al di sotto" ; Text [ portuguese_brazilian ] = "Abaixo" ; Text [ portuguese ] = "Abaixo" ; - Text [ finnish ] = "Alhaalla" ; + Text [ finnish ] = "Alapuolella" ; Text [ danish ] = "Under" ; Text [ french ] = "Infra" ; Text [ swedish ] = "Nedanf鰎" ; @@ -492,10 +503,11 @@ ModalDialog DLG_CAPTION Text[ korean ] = "鞎勲灅"; Text[ turkish ] = "Altta"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Debajo"; + Text[ catalan ] = "Sota"; + Text[ thai ] = "喔傕箟喔侧竾喔ム箞喔侧竾"; }; Text[ chinese_simplified ] = "鏍囩"; - Text[ russian ] = "项滹桉"; + Text[ russian ] = "袜玮囗桢"; Text[ polish ] = "Etykieta"; Text[ japanese ] = "鍥宠〃鐣彿"; Text[ chinese_traditional ] = "妯欑堡"; @@ -504,7 +516,8 @@ ModalDialog DLG_CAPTION Text[ korean ] = "旌§厴"; Text[ turkish ] = "Resim yaz齭"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Etiqueta"; + Text[ catalan ] = "Llegenda"; + Text[ thai ] = "喔勦赋喔氞福喔｀涪喔侧涪喔犩覆喔"; }; ModalDialog DLG_SEQUENCE_OPTION { @@ -545,7 +558,7 @@ ModalDialog DLG_SEQUENCE_OPTION Text [ swedish ] = "Numrering kapitelvis" ; Text [ danish ] = "Kapitelvis nummerering" ; Text [ italian ] = "Numerazione a capitoli" ; - Text [ spanish ] = "Numeraci髇 de cap韙ulos" ; + Text [ spanish ] = "Numeraci髇 por cap韙ulos" ; Text [ french ] = "Num閞otation par chapitre" ; Text [ dutch ] = "Hoofdstuksgewijs nummeren" ; Text [ portuguese ] = "Numera玢o por cap韙ulos" ; @@ -559,8 +572,9 @@ ModalDialog DLG_SEQUENCE_OPTION Text[ korean ] = "鞛ル硠搿 氩堩樃 毵り赴旮"; Text[ turkish ] = "B鰈黰e g鰎e numaralama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇 de cap韙ulos"; + Text[ catalan ] = "Numeraci de cap韙ols"; Text[ finnish ] = "Numerointi luvuittain"; + Text[ thai ] = "喔ム赋喔斷副喔氞笗喔编抚喙喔ム競喙傕笖喔⑧笟喔"; }; FixedText FT_LEVEL { @@ -587,8 +601,9 @@ ModalDialog DLG_SEQUENCE_OPTION Text[ korean ] = "靾橃(~L)"; Text[ turkish ] = "D~鼁ey"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Nivel"; + Text[ catalan ] = "~Nivell"; Text[ finnish ] = "~Taso"; + Text[ thai ] = "~喔｀赴喔斷副喔"; }; ListBox LB_LEVEL { @@ -647,7 +662,7 @@ ModalDialog DLG_SEQUENCE_OPTION }; StringList [ russian ] = { - < "铃" ; > ; + < "湾" ; > ; }; StringList [ polish ] = { @@ -683,12 +698,16 @@ ModalDialog DLG_SEQUENCE_OPTION }; StringList [ catalan ] = { - < "Ninguna" ; > ; + < "Cap" ; > ; }; StringList [ finnish ] = { < "Ei mit滗n" ; > ; }; + StringList [ thai ] = + { + < "喙勦浮喙堗浮喔" ; > ; + }; }; FixedText FT_SEPARATOR { @@ -717,6 +736,7 @@ ModalDialog DLG_SEQUENCE_OPTION Text[ language_user1 ] = " "; Text[ catalan ] = "~Separador"; Text[ finnish ] = "~Erotin"; + Text[ thai ] = "~喔曕副喔о箒喔⑧竵"; }; Edit ED_SEPARATOR { @@ -733,20 +753,42 @@ ModalDialog DLG_SEQUENCE_OPTION Text [ italian ] = "Opzioni sequenza" ; Text [ spanish ] = "Opciones de secuencias" ; Text [ french ] = "Options de s閝uence" ; - Text [ dutch ] = "Nummerreeks-opties" ; + Text [ dutch ] = "Nummerreeksopties" ; Text [ portuguese ] = "Op珲es de sequ阯cias" ; Text[ chinese_simplified ] = "鍙风爜搴忓垪閫夐」"; - Text[ russian ] = "相疣戾蝠 镱潢钼钽 眍戾疣"; + Text[ russian ] = "相疣戾蝠 滂囡噻铐 眍戾痤"; Text[ polish ] = "Opcje sekwencji"; Text[ japanese ] = "閫ｇ暘銈儣銈枫儳銉"; Text[ chinese_traditional ] = "绶ㄨ櫉搴忓垪閬搁爡"; Text[ arabic ] = "雾茄鞘 轻恃揄 轻闶俞俞"; Text[ greek ] = "硼殡镢蒡 挲觌秕 狁殍忐"; - Text[ korean ] = "靾瀽 氩旍渼 鞓奠厴"; + Text[ korean ] = "氩堩樃 氩旍渼 鞓奠厴"; Text[ turkish ] = "Numara aral se鏴nekleri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Opciones de secuencias"; + Text[ catalan ] = "Opcions de seqncies"; Text[ finnish ] = "Numeroalueen asetukset"; + Text[ thai ] = "喔曕副喔о箑喔ム阜喔竵喔娻箞喔о竾喔曕副喔о箑喔ム競"; }; // ********************************************************************** EOF + + + + + + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index c2917c493995..3d078123ccb9 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frmpage.cxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: os $ $Date: 2002-12-10 14:14:11 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -224,7 +224,8 @@ struct ResIdPair_Impl USHORT nVert; }; -#define MAX_PERCENT_WIDTH 254L +#define MAX_PERCENT_WIDTH 254L +#define MAX_PERCENT_HEIGHT 254L #define LB_FRAME 0x00000001L // Textbereich des Absatzes #define LB_PRTAREA 0x00000002L // Textbereich des Absatzes + Einzuege @@ -551,14 +552,14 @@ void lcl_InsertVectors(ListBox& rBox, const ::std::vector< String >& rNext, const ::std::vector< String >& rRemain) { ::std::vector< const String >::iterator aIt; + USHORT nEntry = 0; for(aIt = rPrev.begin(); aIt != rPrev.end(); aIt++) - rBox.InsertEntry(*aIt); + nEntry = rBox.InsertEntry(*aIt); for(aIt = rThis.begin(); aIt != rThis.end(); aIt++) - rBox.InsertEntry(*aIt); + nEntry = rBox.InsertEntry(*aIt); for(aIt = rNext.begin(); aIt != rNext.end(); aIt++) - rBox.InsertEntry(*aIt); - rBox.SetEntryData( - rBox.InsertEntry(String::CreateFromAscii("-------------")), (void*)(ULONG)1); + nEntry = rBox.InsertEntry(*aIt); + rBox.SetSeparatorPos(nEntry); //now insert all strings sorted USHORT nStartPos = rBox.GetEntryCount(); @@ -1042,7 +1043,7 @@ BOOL SwFrmPage::FillItemSet(SfxItemSet &rSet) else aSz.SetWidthPercent(0); if (aRelHeightCB.IsChecked()) - aSz.SetHeightPercent((BYTE)Min(100L, aHeightED.Convert(aHeightED.Normalize(nNewHeight), FUNIT_TWIP, FUNIT_CUSTOM))); + aSz.SetHeightPercent((BYTE)Min(MAX_PERCENT_HEIGHT, aHeightED.Convert(aHeightED.Normalize(nNewHeight), FUNIT_TWIP, FUNIT_CUSTOM))); else aSz.SetHeightPercent(0); @@ -1562,15 +1563,18 @@ IMPL_LINK( SwFrmPage, RelSizeClickHdl, CheckBox *, pBtn ) aWidthED.ShowPercent(pBtn->IsChecked()); aWidthED.MetricField::SetMax(MAX_PERCENT_WIDTH); } - else + else // pBtn == &aRelHeightCB + { aHeightED.ShowPercent(pBtn->IsChecked()); + aHeightED.MetricField::SetMax(MAX_PERCENT_HEIGHT); + } if (pBtn) // Nur wenn Handler durch Aenderung des Controllers gerufen wurde RangeModifyHdl(&aWidthED); // Werte wieder korrigieren if (pBtn == &aRelWidthCB) ModifyHdl(&aWidthED); - else + else // pBtn == &aRelHeightCB ModifyHdl(&aHeightED); return 0; @@ -2075,6 +2079,9 @@ void SwFrmPage::Init(const SfxItemSet& rSet, BOOL bReset) break; } } + //disable "original size" button if necessary + if(0 != (pSh->GetOLEObj()->GetMiscStatus() & SVOBJ_MISCSTATUS_SERVERRESIZE)) + aRealSizeBT.Disable(); } } @@ -3132,41 +3139,34 @@ void SwFrmAddPage::SetFormatUsed(BOOL bFmt) ---------------------------------------------------------------------------*/ IMPL_LINK(SwFrmAddPage, ChainModifyHdl, ListBox*, pBox) { - //prevent the selection of the separator - if(pBox->GetEntryData(pBox->GetSelectEntryPos())) - pBox->SelectEntryPos(0); - else - { - String sCurrentPrevChain, sCurrentNextChain; - if(aPrevLB.GetSelectEntryPos()) - sCurrentPrevChain = aPrevLB.GetSelectEntry(); - if(aNextLB.GetSelectEntryPos()) - sCurrentNextChain = aNextLB.GetSelectEntry(); - SwFrmFmt* pFmt = pWrtSh->GetFlyFrmFmt(); - if (pFmt) - { - BOOL bNextBox = &aNextLB == pBox; - ListBox& rChangeLB = bNextBox ? aPrevLB : aNextLB; - for(USHORT nEntry = rChangeLB.GetEntryCount(); nEntry > 1; nEntry--) - rChangeLB.RemoveEntry(nEntry - 1); - //determine chainable frames - ::std::vector< String > aPrevPageFrames; - ::std::vector< String > aThisPageFrames; - ::std::vector< String > aNextPageFrames; - ::std::vector< String > aRemainFrames; - pWrtSh->GetConnectableFrmFmts(*pFmt, bNextBox ? sCurrentNextChain : sCurrentPrevChain, !bNextBox, - aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames ); - lcl_InsertVectors(rChangeLB, - aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames); - String sToSelect = bNextBox ? sCurrentPrevChain : sCurrentNextChain; - if(rChangeLB.GetEntryPos(sToSelect) != LISTBOX_ENTRY_NOTFOUND) - rChangeLB.SelectEntry(sToSelect); - else - rChangeLB.SelectEntryPos(0); + String sCurrentPrevChain, sCurrentNextChain; + if(aPrevLB.GetSelectEntryPos()) + sCurrentPrevChain = aPrevLB.GetSelectEntry(); + if(aNextLB.GetSelectEntryPos()) + sCurrentNextChain = aNextLB.GetSelectEntry(); + SwFrmFmt* pFmt = pWrtSh->GetFlyFrmFmt(); + if (pFmt) + { + BOOL bNextBox = &aNextLB == pBox; + ListBox& rChangeLB = bNextBox ? aPrevLB : aNextLB; + for(USHORT nEntry = rChangeLB.GetEntryCount(); nEntry > 1; nEntry--) + rChangeLB.RemoveEntry(nEntry - 1); + //determine chainable frames + ::std::vector< String > aPrevPageFrames; + ::std::vector< String > aThisPageFrames; + ::std::vector< String > aNextPageFrames; + ::std::vector< String > aRemainFrames; + pWrtSh->GetConnectableFrmFmts(*pFmt, bNextBox ? sCurrentNextChain : sCurrentPrevChain, !bNextBox, + aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames ); + lcl_InsertVectors(rChangeLB, + aPrevPageFrames, aThisPageFrames, aNextPageFrames, aRemainFrames); + String sToSelect = bNextBox ? sCurrentPrevChain : sCurrentNextChain; + if(rChangeLB.GetEntryPos(sToSelect) != LISTBOX_ENTRY_NOTFOUND) + rChangeLB.SelectEntry(sToSelect); + else + rChangeLB.SelectEntryPos(0); - } } - return 0; } diff --git a/sw/source/ui/frmdlg/frmpage.src b/sw/source/ui/frmdlg/frmpage.src index d5bb777708a2..a3a3ab3bd049 100644 --- a/sw/source/ui/frmdlg/frmpage.src +++ b/sw/source/ui/frmdlg/frmpage.src @@ -2,9 +2,9 @@ * * $RCSfile: frmpage.src,v $ * - * $Revision: 1.48 $ + * $Revision: 1.49 $ * - * last change: $Author: os $ $Date: 2002-12-04 08:16:51 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -169,7 +169,7 @@ TabDialog DLG_FRM_STD Text[ chinese_traditional ] = "鎻涜"; Text[ arabic ] = "轻瘦禽"; Text[ greek ] = "另徜唣膣箸"; - Text[ korean ] = "靾滍櫂"; + Text[ korean ] = "氍胳灔 氚办箻"; Text[ turkish ] = "Metin da瘕l齧"; Text[ catalan ] = "Ajusta"; Text[ thai ] = "喔曕副喔"; @@ -212,7 +212,7 @@ TabDialog DLG_FRM_STD Text [ italian ] = "Bordo" ; Text [ portuguese_brazilian ] = "Borda" ; Text [ portuguese ] = "Contornos" ; - Text [ spanish ] = "Borde" ; + Text [ spanish ] = "Bordes" ; Text [ finnish ] = "Reunat" ; Text [ danish ] = "Ramme" ; Text [ french ] = "Bordure" ; @@ -433,7 +433,7 @@ TabDialog DLG_FRM_GRF Text[ chinese_traditional ] = "鎻涜"; Text[ arabic ] = "轻瘦禽"; Text[ greek ] = "另徜唣膣箸"; - Text[ korean ] = "靾滍櫂"; + Text[ korean ] = "氍胳灔 氚办箻"; Text[ turkish ] = "Metin da瘕l齧"; Text[ catalan ] = "Ajusta"; Text[ thai ] = "喔曕副喔"; @@ -490,7 +490,7 @@ TabDialog DLG_FRM_GRF Text[ chinese_traditional ] = "鍦栧舰"; Text[ arabic ] = "真焉"; Text[ greek ] = "民狯殛"; - Text[ korean ] = "攴鸽灅頂"; + Text[ korean ] = "攴鸽"; Text[ turkish ] = "Grafik"; Text[ catalan ] = "Imatge"; Text[ thai ] = "喔佮福喔侧笩喔脆竸"; @@ -533,7 +533,7 @@ TabDialog DLG_FRM_GRF Text [ italian ] = "Bordo" ; Text [ portuguese_brazilian ] = "Borda" ; Text [ portuguese ] = "Contornos" ; - Text [ spanish ] = "Borde" ; + Text [ spanish ] = "Bordes" ; Text [ finnish ] = "Reunat" ; Text [ danish ] = "Ramme" ; Text [ french ] = "Bordure" ; @@ -617,7 +617,7 @@ TabDialog DLG_FRM_GRF Text[ chinese_traditional ] = "鍦栧舰"; Text[ arabic ] = "真焉"; Text[ greek ] = "民狯殛"; - Text[ korean ] = "攴鸽灅頂"; + Text[ korean ] = "攴鸽"; Text[ turkish ] = "Grafik"; Text[ catalan ] = "Imatge"; Text[ thai ] = "喔佮福喔侧笩喔脆竸"; @@ -736,7 +736,7 @@ TabDialog DLG_FRM_OLE Text[ chinese_traditional ] = "鎻涜"; Text[ arabic ] = "轻瘦禽"; Text[ greek ] = "另徜唣膣箸"; - Text[ korean ] = "靾滍櫂"; + Text[ korean ] = "氍胳灔 氚办箻"; Text[ turkish ] = "Metin da瘕l齧"; Text[ catalan ] = "Ajusta"; Text[ thai ] = "喔曕副喔"; @@ -779,7 +779,7 @@ TabDialog DLG_FRM_OLE Text [ italian ] = "Bordo" ; Text [ portuguese_brazilian ] = "Borda" ; Text [ portuguese ] = "Contornos" ; - Text [ spanish ] = "Borde" ; + Text [ spanish ] = "Bordes" ; Text [ finnish ] = "Reunat" ; Text [ danish ] = "Ramme" ; Text [ french ] = "Bordure" ; @@ -955,7 +955,7 @@ TabPage TP_FRM_STD Text[ chinese_traditional ] = "鐩稿皪鐨(~I)"; Text[ arabic ] = "溆软"; Text[ greek ] = "喻弭殛"; - Text[ korean ] = "靸侂寑(~I)"; + Text[ korean ] = "牍勲頃橃棳(~I)"; Text[ turkish ] = "~G鰎eceli"; Text[ catalan ] = "Relat~iu"; Text[ finnish ] = "Suhteellinen"; @@ -980,7 +980,7 @@ TabPage TP_FRM_STD Text [ spanish ] = "A~ltura" ; Text [ english_us ] = "H~eight" ; Text[ chinese_simplified ] = "楂樺害(~E)"; - Text[ russian ] = "蔓耦蜞"; + Text[ russian ] = "聗铗"; Text[ polish ] = "Wys."; Text[ japanese ] = "楂樸仌(~E)"; Text[ chinese_traditional ] = "楂樺害(~E)"; @@ -1031,7 +1031,7 @@ TabPage TP_FRM_STD Text[ chinese_traditional ] = "鐩稿皪鐨(~L)"; Text[ arabic ] = "溆软"; Text[ greek ] = "喻弭殛"; - Text[ korean ] = "靸侂寑(~L)"; + Text[ korean ] = "牍勲頃橃棳(~L)"; Text[ turkish ] = "G~鰎eceli"; Text[ catalan ] = "Re~latiu"; Text[ finnish ] = "Suhteellinen"; @@ -1044,12 +1044,12 @@ TabPage TP_FRM_STD TabStop = TRUE ; Text = "~Abgleich" ; Text [ ENGLISH ] = "~Match" ; - Text [ english_us ] = "~Keep proportional" ; + Text [ english_us ] = "~Keep ratio" ; Text [ italian ] = "Proporzionale" ; - Text [ spanish ] = "Igualar proporciones" ; + Text [ spanish ] = "Proporcional" ; Text [ french ] = "Proportionnel" ; Text [ dutch ] = "~Proporties synchroniseren" ; - Text [ swedish ] = "Anpassa ~proportioner" ; + Text [ swedish ] = "Anpassa ~proportionellt" ; Text [ danish ] = "Bevar ~proportioner" ; Text [ portuguese_brazilian ] = "Abgle~ich" ; Text [ portuguese ] = "Pr~oporcional" ; @@ -1057,10 +1057,10 @@ TabPage TP_FRM_STD Text[ russian ] = "橡铒铕鲨铐嚯"; Text[ polish ] = "Prporcjonalnie"; Text[ japanese ] = "姣旂巼銈掍繚銇(~K)"; - Text[ chinese_traditional ] = "淇濇寔姣斿垪(~K)"; + Text[ chinese_traditional ] = "鍚屾鍖(~K)"; Text[ arabic ] = "室倾"; Text[ greek ] = "旭矬狁祜戕 犴犭镢殛"; - Text[ korean ] = "牍勳湪 臁办爼(~K)"; + Text[ korean ] = "牍勳湪鞚 攴犽摫頃橁矊 臁办爼(~K)"; Text[ turkish ] = "Orant~"; Text[ language_user1 ] = " "; Text[ catalan ] = "Prop~orcional"; @@ -1076,15 +1076,15 @@ TabPage TP_FRM_STD Text[ english_us ] = "AutoSize"; Text[ swedish ] = "Au~tomatisk storlek"; Text[ japanese ] = "銈点偆銈鸿嚜鍕曡鏁"; - Text[ korean ] = "鞛愲彊 韥赴 臁办爤"; + Text[ korean ] = "韥赴 鞛愲彊 臁办爤"; Text[ chinese_simplified ] = "鑷姩璋冩暣澶у皬(~G)"; Text[ chinese_traditional ] = "鑷嫊瑾挎暣澶у皬"; Text[ portuguese ] = "Alt~ura autom醫ica"; - Text[ russian ] = "棱蝾. 恹耦蜞"; + Text[ russian ] = "棱蝾镱溽铕"; Text[ greek ] = "刘酎灬麸 矧"; Text[ dutch ] = "Automatische h~oogte"; Text[ french ] = "Hauteur automatique"; - Text[ spanish ] = "Altura autom醫ica"; + Text[ spanish ] = "~Tama駉 autom醫ico"; Text[ finnish ] = "Automaattinen korkeus"; Text[ italian ] = "Altezza. ~auto"; Text[ danish ] = "Automatisk h~鴍de"; @@ -1317,7 +1317,7 @@ TabPage TP_FRM_STD Text [ french ] = "Ancrage" ; Text [ swedish ] = "F鰎ankring" ; Text [ dutch ] = "Verankering" ; - Text [ spanish ] = "Anclaje" ; + Text [ spanish ] = "Ancla" ; Text [ english_us ] = "Anchor" ; Text[ chinese_simplified ] = "閿佸畾"; Text[ russian ] = "哧铕"; @@ -1326,7 +1326,7 @@ TabPage TP_FRM_STD Text[ chinese_traditional ] = "閹栧畾"; Text[ arabic ] = "叛忧"; Text[ greek ] = "零挲聩箸"; - Text[ korean ] = "瓿犾爼"; + Text[ korean ] = "旮办 鞙勳箻"; Text[ turkish ] = "Sabitleme"; Text[ catalan ] = "Ancoratge"; Text[ thai ] = "喔浮喔"; @@ -1355,7 +1355,7 @@ TabPage TP_FRM_STD Text [ spanish ] = "Hori~zontal" ; Text [ english_us ] = "Hori~zontal" ; Text[ chinese_simplified ] = "姘村钩鏂瑰悜(~Z)"; - Text[ russian ] = "项 泐痂珙眚."; + Text[ russian ] = "妙痂珙眚嚯"; Text[ polish ] = "W poziomie"; Text[ japanese ] = "妯(~Z)"; Text[ chinese_traditional ] = "姘村钩鏂瑰悜(~Z)"; @@ -1505,7 +1505,7 @@ TabPage TP_FRM_STD Text [ spanish ] = "~Vertical" ; Text [ english_us ] = "~Vertical" ; Text[ chinese_simplified ] = "鍨傜洿鏂瑰悜(~V)"; - Text[ russian ] = "项 忮痱桕嚯"; + Text[ russian ] = "洛痱桕嚯"; Text[ polish ] = "W pionie"; Text[ japanese ] = "绺(~V)"; Text[ chinese_traditional ] = "鍨傜洿鏂瑰悜(~V)"; @@ -1672,7 +1672,7 @@ TabPage TP_GRF_EXT Text[ chinese_traditional ] = "鎹峰緫"; Text[ arabic ] = "茄嗜秦"; Text[ greek ] = "育礓弩"; - Text[ korean ] = "鞐瓣舶"; + Text[ korean ] = "毵來伂"; Text[ turkish ] = "Ba餷ant"; Text[ catalan ] = "Enlla"; Text[ thai ] = "喙喔娻阜喙堗腑喔∴箓喔⑧竾"; @@ -1785,7 +1785,7 @@ TabPage TP_GRF_EXT Text [ french ] = " la verticale" ; Text [ swedish ] = "~vertikalt" ; Text [ dutch ] = "verti~caal" ; - Text [ spanish ] = "~Vertical" ; + Text [ spanish ] = "~Verticalmente" ; Text [ english_us ] = "~Vertically" ; Text[ chinese_simplified ] = "鍨傜洿鏂瑰悜(~V)"; Text[ russian ] = "忮痱桕嚯"; @@ -1812,7 +1812,7 @@ TabPage TP_GRF_EXT Text[ greek ] = "锺閪纥眙獒"; Text[ dutch ] = "~horizontaal"; Text[ french ] = " l'horizontale"; - Text[ spanish ] = "~Horizontal"; + Text[ spanish ] = "~Horizontalmente"; Text[ italian ] = "~In orizzontale su"; Text[ danish ] = "vandret"; Text[ swedish ] = "h~orisontalt"; @@ -1848,7 +1848,7 @@ TabPage TP_GRF_EXT Text[ polish ] = "na wszystkich stronach"; Text[ portuguese_brazilian ] = "on all pages"; Text[ japanese ] = "銇欍伖銇︺伄銉氥兗銈"; - Text[ korean ] = "氇摖 韼橃澊鞝滌棎"; + Text[ korean ] = "氇摖 韼橃澊歆鞐"; Text[ chinese_simplified ] = "鍏ㄩ儴椤甸潰"; Text[ chinese_traditional ] = "鍦ㄦ墍鏈夐爜闈笂"; Text[ turkish ] = "on all pages"; @@ -1877,7 +1877,7 @@ TabPage TP_GRF_EXT Text[ polish ] = "na parzystych stronach"; Text[ portuguese_brazilian ] = "on even pages"; Text[ japanese ] = "宸︺儦銉笺偢"; - Text[ korean ] = "鞕检鞐"; + Text[ korean ] = "鞕检 韼橃澊歆"; Text[ chinese_simplified ] = "鍦ㄥ乏鏂归〉闈"; Text[ chinese_traditional ] = "鍦ㄥ乏闋佷笂"; Text[ turkish ] = "on even pages"; @@ -1906,7 +1906,7 @@ TabPage TP_GRF_EXT Text[ polish ] = "na prawych stronach"; Text[ portuguese_brazilian ] = "on odd pages"; Text[ japanese ] = "鍙炽儦銉笺偢"; - Text[ korean ] = "鞓るジ飒届棎"; + Text[ korean ] = "鞓るジ飒 韼橃澊歆"; Text[ chinese_simplified ] = "鍦ㄥ彸鏂归〉闈"; Text[ chinese_traditional ] = "鍦ㄥ彸闋佷笂"; Text[ turkish ] = "on odd pages"; @@ -2066,14 +2066,14 @@ TabPage TP_FRM_URL Text [ dutch ] = "~Frame" ; Text [ english_us ] = "Frame" ; Text [ italian ] = "~Frame" ; - Text [ spanish ] = "Frame" ; + Text [ spanish ] = "~Marco" ; Text [ french ] = "~Frame" ; Text [ swedish ] = "R~am" ; Text [ danish ] = "Frame" ; Text [ portuguese_brazilian ] = "~Frame" ; Text [ portuguese ] = "~Frame" ; Text[ chinese_simplified ] = "妗嗗璞"; - Text[ russian ] = "吗彗赅"; + Text[ russian ] = "责彘"; Text[ polish ] = "Frame"; Text[ japanese ] = "銉曘儸銉笺儬"; Text[ chinese_traditional ] = "瑷婃"; @@ -2105,7 +2105,7 @@ TabPage TP_FRM_URL Text [ swedish ] = "~V鋖j ut..." ; Text [ danish ] = "~Gennemse..." ; Text [ italian ] = "~Sfoglia..." ; - Text [ spanish ] = "Selecc~ionar..." ; + Text [ spanish ] = "~Buscar..." ; Text [ french ] = "S閘ectionner..." ; Text [ dutch ] = "Selec~teren..." ; Text [ portuguese ] = "~Seleccionar..." ; @@ -2170,7 +2170,7 @@ TabPage TP_FRM_URL Text[ polish ] = "~Server Site Image Map"; Text[ portuguese_brazilian ] = "~Server"; Text[ japanese ] = "銈点兗銉愩兗銈点偆銉 銈ゃ儭銉笺偢銉炪儍銉(~S)"; - Text[ korean ] = "靹滊矂 鞁胳澊韸 鞚措歆毵(~S)"; + Text[ korean ] = "靹滊矂 靷澊霌 鞚措歆毵(~S)"; Text[ chinese_simplified ] = "鏈嶅姟鍣ㄧ椤甸潰鍥惧儚鏄犲皠(~S)"; Text[ chinese_traditional ] = "浼烘湇鍣ㄩ爜闈㈠奖鍍忔槧灏(~S)"; Text[ turkish ] = "~Sunucu"; @@ -2334,7 +2334,7 @@ TabPage TP_FRM_ADD Text[ chinese_traditional ] = "涓婁竴鍊嬫嵎寰(~P)"; Text[ arabic ] = "轻忧绒"; Text[ greek ] = "旭镧泔屙"; - Text[ korean ] = "靹犽(~P)"; + Text[ korean ] = "鞚挫爠 鞐瓣舶(~P)"; Text[ turkish ] = "~謓ceki"; Text[ catalan ] = "~Anterior"; Text[ finnish ] = "~Edellinen linkki"; @@ -2462,7 +2462,7 @@ TabPage TP_FRM_ADD Text[ chinese_traditional ] = "涓嬩竴鍊嬫嵎寰(~N)"; Text[ arabic ] = "轻崆娃"; Text[ greek ] = "硼屙"; - Text[ korean ] = "頉勳瀯(~N)"; + Text[ korean ] = "雼れ潓 毵來伂(~N)"; Text[ turkish ] = "S~onraki"; Text[ catalan ] = "~Enlla seg黣nt"; Text[ finnish ] = "Seuraava linkki"; @@ -2671,7 +2671,7 @@ TabPage TP_FRM_ADD Text [ dutch ] = "~Grootte" ; Text [ portuguese ] = "~Tamanho" ; Text[ chinese_simplified ] = "澶у皬(~S)"; - Text[ russian ] = "朽珈屦"; + Text[ russian ] = "朽鐍戾"; Text[ polish ] = "Rozmiar"; Text[ japanese ] = "銈点偆銈(~S)"; Text[ chinese_traditional ] = "澶у皬(~S)"; @@ -2734,7 +2734,7 @@ TabPage TP_FRM_ADD Text[ chinese_traditional ] = "鍙法杓敮璁鏂囦欢(~E)"; Text[ arabic ] = "耷柔 後释秧 蓓 阌输 後扪橇 蒉"; Text[ greek ] = "孽磲酎翮翎 ~屦孱羼汜筮狎 箦 葶泷狯 酏痫 \"厅盹 汩 犴茔睐箸\""; - Text[ korean ] = "鞚疥赴 鞝勳毄 氍胳劀鞐愳劀 韼胳臧電(~E)"; + Text[ korean ] = "鞚疥赴 鞝勳毄 氍胳劀鞐愳劀 韼胳 臧電(~E)"; Text[ turkish ] = "Salt okunur belge i鏸nde d鼁enlenebilir"; Text[ catalan ] = "Es pot editar en documents de nom閟 lectura"; Text[ finnish ] = "~Muokattavissa vain luku -asiakirjassa"; @@ -2790,7 +2790,7 @@ TabPage TP_FRM_ADD Text[ polish ] = "W砤渃iwo渃i"; Text[ portuguese_brazilian ] = "Additional Setting"; Text[ japanese ] = "灞炴"; - Text[ korean ] = "於旉皜 靹れ爼"; + Text[ korean ] = "霌彪 鞝曤炒"; Text[ chinese_simplified ] = "灞炴"; Text[ chinese_traditional ] = "灞"; Text[ turkish ] = "Additional Setting"; @@ -2812,8 +2812,8 @@ TabPage TP_FRM_ADD Text[ russian ] = "~Text flow"; Text[ greek ] = "~Text flow"; Text[ dutch ] = "~Text flow"; - Text[ french ] = "Encha頽ements"; - Text[ spanish ] = "Flujo del texto"; + Text[ french ] = "Orientation du texte"; + Text[ spanish ] = "~Direcci髇 de escritura"; Text[ finnish ] = "~Text flow"; Text[ italian ] = "Testo"; Text[ danish ] = "~Text flow"; @@ -2892,12 +2892,12 @@ TabPage TP_FRM_ADD < "V鋘ster-till-h鰃er (horisontellt)" ; 0; > ; < "H鰃er-till-v鋘ster (horisontellt)" ; 1; > ; < "H鰃er-till-v鋘ster (vertikalt)" ; 2; > ; - < "Anv鋘d det 鰒erordnade objektets inst鋖lning" ; 4; > ; + < "Anv鋘d det 鰒erordnade objektets inst鋖lningar" ; 4; > ; }; StringList [ japanese ] = { < "宸︺亱銈夊彸銇 (妯浉銇)" ; 0; > ; - < "鍙炽亱銈夊乏銇 (绺︽浉銇)" ; 1; > ; + < "鍙炽亱銈夊乏銇 (妯浉銇)" ; 1; > ; < "鍙炽亱銈夊乏銇 (绺︽浉銇)" ; 2; > ; < "鍛ㄣ倞銇儐銈偣銉堛伄鏂囧瓧鏂瑰悜銇悎銈忋仜銈" ; 4; > ; }; @@ -2906,7 +2906,7 @@ TabPage TP_FRM_ADD < "鞕检鞐愳劀 鞓るジ飒届溂搿(臧搿)" ; 0; > ; < "鞓るジ飒届棎靹 鞕检鞙茧 (臧搿)" ; 1; > ; < "鞓るジ飒届棎靹 鞕检鞙茧 (靹鸽)" ; 2; > ; - < "靸侅渼 臧滌泊鞚 靹れ爼 鞝侅毄" ; 4; > ; + < "順勳灛 氍胳瀽 氚╉枼鞚 靹れ爼鞚 鞝侅毄" ; 4; > ; }; StringList [ chinese_simplified ] = { @@ -2932,3 +2932,18 @@ TabPage TP_FRM_ADD }; }; + + + + + + + + + + + + + + + diff --git a/sw/source/ui/frmdlg/frmui.src b/sw/source/ui/frmdlg/frmui.src index 75dd1b1121fa..d6cb9a9f6adf 100644 --- a/sw/source/ui/frmdlg/frmui.src +++ b/sw/source/ui/frmdlg/frmui.src @@ -2,9 +2,9 @@ * * $RCSfile: frmui.src,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: gt $ $Date: 2002-12-06 15:12:28 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,7 +71,7 @@ String STR_TOP TEXT [ italian ] = "Alto" ; TEXT [ portuguese_brazilian ] = "Topo" ; TEXT [ portuguese ] = "Em cima" ; - TEXT [ finnish ] = "~Yl鋙sa" ; + TEXT [ finnish ] = "~Yl鋜euna" ; TEXT [ danish ] = "Foroven" ; TEXT [ french ] = "En haut" ; TEXT [ swedish ] = "~講erst" ; @@ -99,7 +99,7 @@ String STR_BOTTOM TEXT [ italian ] = "Basso" ; TEXT [ portuguese_brazilian ] = "Base" ; TEXT [ portuguese ] = "~Base" ; - TEXT [ finnish ] = "~Alaosa" ; + TEXT [ finnish ] = "~Alareuna" ; TEXT [ danish ] = "Forneden" ; TEXT [ french ] = "En bas" ; TEXT [ swedish ] = "Nederst" ; @@ -124,15 +124,15 @@ String STR_CENTER_HORI TEXT = "M~itte" ; TEXT [ English ] = "Center" ; TEXT [ norwegian ] = "Centered" ; - TEXT [ italian ] = "Centrato" ; + TEXT [ italian ] = "Al centro" ; TEXT [ portuguese_brazilian ] = "Centralizado" ; TEXT [ portuguese ] = "Centrado" ; TEXT [ finnish ] = "~Keskitetty" ; TEXT [ danish ] = "Centreret" ; - TEXT [ french ] = "Centr" ; - TEXT [ swedish ] = "~Centrerad" ; + TEXT [ french ] = "Centre" ; + TEXT [ swedish ] = "~Centrerat" ; TEXT [ dutch ] = "~Gecentreerd" ; - TEXT [ spanish ] = "~Centrado" ; + TEXT [ spanish ] = "~Centro" ; TEXT [ english_us ] = "~Center" ; TEXT[ chinese_simplified ] = "灞呬腑(~C)"; TEXT[ russian ] = "项 鲥眚痼"; @@ -226,7 +226,7 @@ String STR_BELOW Text[ turkish ] = "Altta"; Text[ language_user1 ] = " "; Text[ catalan ] = "Sota"; - Text[ finnish ] = "Alhaalla"; + Text[ finnish ] = "Alapuolella"; Text[ thai ] = "喔傕箟喔侧竾喔ム箞喔侧竾"; }; /*----------------------------------------------------------------------- @@ -273,11 +273,11 @@ String STR_MIR_LEFT Text [ spanish ] = "Interior" ; Text [ french ] = "Int閞ieur" ; Text [ dutch ] = "Binnenin" ; - Text[ chinese_simplified ] = "鍐"; + Text[ chinese_simplified ] = "鍐呬晶"; Text[ russian ] = "马篁痂"; Text[ polish ] = "Wewn箃rz"; Text[ japanese ] = "鍐呭伌"; - Text[ chinese_traditional ] = "鍏"; + Text[ chinese_traditional ] = "鍐呭伌"; Text[ arabic ] = "锨吾"; Text[ greek ] = "朋羼殛"; Text[ korean ] = "雮措秬"; @@ -350,14 +350,14 @@ String STR_CENTER_VERT Text [ portuguese ] = "~Centro" ; Text [ english_us ] = "C~enter" ; Text [ portuguese_brazilian ] = "~Mitte" ; - Text [ swedish ] = "~Mitten" ; + Text [ swedish ] = "C~entrerat" ; Text [ danish ] = "Centreret" ; Text [ italian ] = "Centro" ; Text [ spanish ] = "~Centrado" ; - Text [ french ] = "~Milieu" ; + Text [ french ] = "Centre" ; Text [ dutch ] = "~Midden" ; Text[ chinese_simplified ] = "涓(~E)"; - Text[ russian ] = "项 皴疱滂礤"; + Text[ russian ] = "项皴疱滂礤"; Text[ polish ] = "Po渞odku"; Text[ japanese ] = "涓ぎ(~E)"; Text[ chinese_traditional ] = "涓(~E)"; @@ -367,7 +367,7 @@ String STR_CENTER_VERT Text[ turkish ] = "O~rta"; Text[ language_user1 ] = " "; Text[ catalan ] = "C~entrat"; - Text[ finnish ] = "~Keskit"; + Text[ finnish ] = "K~eskit"; Text[ thai ] = "喔晘喔｀竾喔佮弗喔侧竾"; }; String STR_FROMLEFT @@ -411,11 +411,11 @@ String STR_MIR_FROMLEFT Text [ spanish ] = "Desde el interior" ; Text [ french ] = "De l'int閞ieur" ; Text [ dutch ] = "Van binnen" ; - Text[ chinese_simplified ] = "浠庡唴"; + Text[ chinese_simplified ] = "浠庡唴渚"; Text[ russian ] = "马篁痂"; Text[ polish ] = "Od 渞odka"; Text[ japanese ] = "鍐呭伌銇嬨倝"; - Text[ chinese_traditional ] = "寰炲収"; + Text[ chinese_traditional ] = "寰炲唴鍋"; Text[ arabic ] = "沅 轻锨吾"; Text[ greek ] = "琉 弩羼殛"; Text[ korean ] = "鞎堨棎靹 攵韯"; @@ -441,7 +441,7 @@ String STR_REL_BORDER Text [ spanish ] = "Margen" ; Text [ french ] = "Marge" ; Text [ dutch ] = "Marge" ; - Text[ chinese_simplified ] = "椤佃竟璺"; + Text[ chinese_simplified ] = "杈硅窛"; Text[ russian ] = "项脲"; Text[ polish ] = "Margines"; Text[ japanese ] = "浣欑櫧"; @@ -462,20 +462,20 @@ String STR_REL_PRTAREA Text [ portuguese ] = "羠ea de texto" ; Text [ english_us ] = "Paragraph text area" ; Text [ portuguese_brazilian ] = "Textbereich" ; - Text [ swedish ] = "Textomr錮e" ; + Text [ swedish ] = "Textomr錮e i stycke" ; Text [ danish ] = "Tekstomr錮e" ; - Text [ italian ] = "Area del testo" ; - Text [ spanish ] = "羠ea de texto " ; - Text [ french ] = "Zone de texte" ; + Text [ italian ] = "Area del testo del paragrafo" ; + Text [ spanish ] = "羠ea de texto del p醨rafo" ; + Text [ french ] = "Zone de texte de paragraphe" ; Text [ dutch ] = "Tekstbereik" ; - Text[ chinese_simplified ] = "鏂囧瓧鍖哄煙"; + Text[ chinese_simplified ] = "娈佃惤鏂囧瓧鍖哄煙"; Text[ russian ] = "吾豚耱 蝈犟蜞"; Text[ polish ] = "Obszar tekstu"; - Text[ japanese ] = "鏂囨浉绡勫洸"; - Text[ chinese_traditional ] = "鏂囧瓧鍗鍩"; + Text[ japanese ] = "娈佃惤绡勫洸"; + Text[ chinese_traditional ] = "娈佃惤鏂囧瓧鍗鍩"; Text[ arabic ] = "湄寝 轻湔"; Text[ greek ] = "绣耖秣 赍殪蓓秕"; - Text[ korean ] = "韰嶌姢韸 鞓侅棴"; + Text[ korean ] = "雼澖鞚 韰嶌姢韸 鞓侅棴"; Text[ turkish ] = "Metin alan"; Text[ language_user1 ] = " "; Text[ catalan ] = "纑ea de text "; @@ -497,11 +497,11 @@ String STR_TOPPRT TEXT [ dutch ] = "Bovenrand" ; TEXT [ spanish ] = "Margen superior" ; TEXT [ english_us ] = "Upper Margin" ; - TEXT[ chinese_simplified ] = "涓婃柟椤佃竟璺"; + TEXT[ chinese_simplified ] = "椤甸潰杈硅窛 涓婃柟"; TEXT[ russian ] = "洛瘐龛 牮嚅"; TEXT[ polish ] = "G髍ny margines"; TEXT[ japanese ] = "涓婁綑鐧"; - TEXT[ chinese_traditional ] = "涓婇倞妗"; + TEXT[ chinese_traditional ] = "涓婃柟閭婃"; TEXT[ arabic ] = "轻迩阍 轻卺骓"; TEXT[ greek ] = "㈨ 疱耖棹耖"; TEXT[ korean ] = "鞙勳 鞐氨"; @@ -526,14 +526,14 @@ String STR_FLY_REL_PG_LEFT Text [ spanish ] = "Borde izquierdo del marco" ; Text [ french ] = "Bordure de cadre gauche" ; Text [ dutch ] = "Kaderrand links" ; - Text[ chinese_simplified ] = "宸︽杈"; + Text[ chinese_simplified ] = "妗嗚竟 宸︽柟"; Text[ russian ] = "隋恹 牮嚅 疣礻"; Text[ polish ] = "Lewa kraw阣 ramki"; Text[ japanese ] = "宸︿綑鐧"; - Text[ chinese_traditional ] = "宸︽閭"; + Text[ chinese_traditional ] = "妗嗛倞 宸︽柟"; Text[ arabic ] = "迩阍 轻咔涎 轻庙友"; Text[ greek ] = "绣耖棹耖 痣衢筮秕 - 狁轶翦褴"; - Text[ korean ] = "鞕检 頂勲爤鞛 鞕戈辰靹"; + Text[ korean ] = "鞕检 頂勲爤鞛 鞐氨"; Text[ turkish ] = "Sol 鏴r鏴ve kenar"; Text[ language_user1 ] = " "; Text[ catalan ] = "Vora esquerra del marc"; @@ -553,14 +553,14 @@ String STR_FLY_MIR_REL_PG_LEFT Text [ spanish ] = "Borde interior del marco" ; Text [ french ] = "Bordure de cadre int閞ieure" ; Text [ dutch ] = "Binnenste kaderrand" ; - Text[ chinese_simplified ] = "妗嗚竟鍐呭垯"; + Text[ chinese_simplified ] = "妗嗚竟 鍐呬晶"; Text[ russian ] = "马篁疱眄栝 牮嚅 疣礻"; Text[ polish ] = "Wewn阾rzna kraw阣 ramki"; Text[ japanese ] = "浣欑櫧 鍐呭伌"; - Text[ chinese_traditional ] = "妗嗛倞鍏у墖"; + Text[ chinese_traditional ] = "妗嗛倞 鍐呭伌"; Text[ arabic ] = "迩阍 轻咔涎 轻锨吾"; Text[ greek ] = "绣耖棹耖 痣衢筮秕 - 弩羼殛"; - Text[ korean ] = "雮措秬 頂勲爤鞛 鞕戈辰靹"; + Text[ korean ] = "雮措秬 頂勲爤鞛 鞐氨"; Text[ turkish ] = "葭 鏴r鏴ve kenar"; Text[ language_user1 ] = " "; Text[ catalan ] = "Vora interior del marc"; @@ -580,14 +580,14 @@ String STR_FLY_REL_PG_RIGHT Text [ spanish ] = "Borde derecho del marco" ; Text [ french ] = "Bordure de cadre droite" ; Text [ dutch ] = "Kaderrand rechts" ; - Text[ chinese_simplified ] = "鍙虫杈"; + Text[ chinese_simplified ] = "妗嗚竟 鍙虫柟"; Text[ russian ] = "橡噔 牮嚅 疣礻"; Text[ polish ] = "Prawa kraw阣 ramki"; Text[ japanese ] = "鍙充綑鐧"; - Text[ chinese_traditional ] = "鍙虫閭"; + Text[ chinese_traditional ] = "妗嗛倞 鍙虫柟"; Text[ arabic ] = "迩阍 轻咔涎 轻庙沅"; Text[ greek ] = "绣耖棹耖 痣衢筮秕 - 溴铋"; - Text[ korean ] = "鞓るジ飒 頂勲爤鞛 鞕戈辰靹"; + Text[ korean ] = "鞓るジ飒 頂勲爤鞛 鞐氨"; Text[ turkish ] = "Sa 鏴r鏴ve kenar"; Text[ language_user1 ] = " "; Text[ catalan ] = "Vora dreta del marc"; @@ -614,7 +614,7 @@ String STR_FLY_MIR_REL_PG_RIGHT Text[ chinese_traditional ] = "妗嗛倞澶栧伌"; Text[ arabic ] = "迩阍 轻咔涎 轻吻烟"; Text[ greek ] = "绣耖棹耖 痣衢筮秕 - 孱羼殛"; - Text[ korean ] = "鞕鸽秬 頂勲爤鞛 鞕戈辰靹"; + Text[ korean ] = "鞕鸽秬 頂勲爤鞛 鞐氨"; Text[ turkish ] = "D 鏴r鏴ve kenar"; Text[ language_user1 ] = " "; Text[ catalan ] = "Vora exterior del marc"; @@ -633,7 +633,7 @@ String STR_FLY_REL_PG_FRAME Text [ italian ] = "Intera cornice" ; Text [ spanish ] = "Marco entero" ; Text [ french ] = "Cadre entier" ; - Text [ dutch ] = "Compleet kader" ; + Text [ dutch ] = "Volledig kader" ; Text[ chinese_simplified ] = "鏁翠釜妗"; Text[ russian ] = "埋 疣礻"; Text[ polish ] = "Ca砤 ramka"; @@ -665,7 +665,7 @@ String STR_FLY_REL_PG_PRTAREA Text[ russian ] = "吾豚耱 蝈犟蝾忸 疣礻"; Text[ polish ] = "Obszar tekstu ramki"; Text[ japanese ] = "鏋犱粯銇戠瘎鍥"; - Text[ chinese_traditional ] = "妗嗗収鏂囧瓧鍗"; + Text[ chinese_traditional ] = "妗嗗唴鏂囧瓧鍗"; Text[ arabic ] = "湄寝 湔 轻咔涎"; Text[ greek ] = "绣耖秣 赍殪蓓秕 麸 痣衢筮秕"; Text[ korean ] = "頂勲爤鞛 韰嶌姢韸 鞓侅棴"; @@ -722,7 +722,7 @@ String STR_PRTAREA Text[ chinese_traditional ] = "娈佃惤鏂囧瓧鍗鍩"; Text[ arabic ] = "湄寝 湔 轻蒉焉"; Text[ greek ] = "绣耖秣 赍殪蓓秕 疳襻泷荟秕"; - Text[ korean ] = "雼澖 韰嶌姢韸 鞓侅棴"; + Text[ korean ] = "雼澖鞚 韰嶌姢韸 鞓侅棴"; Text[ turkish ] = "Paragraf metin alan"; Text[ language_user1 ] = " "; Text[ catalan ] = "纑ea de text del par鄃raf"; @@ -742,14 +742,14 @@ String STR_REL_PG_LEFT Text [ spanish ] = "Margen izquierdo de la p醙ina" ; Text [ french ] = "Marge gauche" ; Text [ dutch ] = "Paginarand links" ; - Text[ chinese_simplified ] = "宸︽柟椤佃竟璺"; + Text[ chinese_simplified ] = "椤甸潰杈硅窛 宸︽柟"; Text[ russian ] = "隋恹 牮嚅 耱疣龛鳆"; Text[ polish ] = "Lewy margines strony"; Text[ japanese ] = "銉氥兗銈镐綑鐧 宸"; - Text[ chinese_traditional ] = "宸﹂倞妗"; + Text[ chinese_traditional ] = "闋侀潰閭婃 宸︽柟"; Text[ arabic ] = "迩阍 轻蛰蜕 轻庙友"; Text[ greek ] = "绣耖棹耖 箦脒溽 - 狁轶翦褴"; - Text[ korean ] = "韼橃澊歆 鞐氨锛岇櫦飒"; + Text[ korean ] = "韼橃澊歆 鞐氨 鞕检"; Text[ turkish ] = "Sol sayfa kenar"; Text[ language_user1 ] = " "; Text[ catalan ] = "Marge esquerre de la p鄃ina"; @@ -768,15 +768,15 @@ String STR_MIR_REL_PG_LEFT Text [ italian ] = "Margine pagina interno" ; Text [ spanish ] = "Margen interior de la p醙ina" ; Text [ french ] = "Marge int閞ieure" ; - Text [ dutch ] = "Binnenste zijrand" ; - Text[ chinese_simplified ] = "鍐呬晶椤佃竟璺"; + Text [ dutch ] = "Binnenste paginarand" ; + Text[ chinese_simplified ] = "椤甸潰杈硅窛 鍐呬晶"; Text[ russian ] = "马篁疱眄栝 牮嚅 耱疣龛鳆"; Text[ polish ] = "Wewn阹zny margines strony"; Text[ japanese ] = "銉氥兗銈镐綑鐧 鍐呭伌"; - Text[ chinese_traditional ] = "閭婃鍏у伌"; + Text[ chinese_traditional ] = "闋侀潰閭婃 鍏у伌"; Text[ arabic ] = "迩阍 轻蛰蜕 轻锨吾"; Text[ greek ] = "绣耖棹耖 箦脒溽 - 弩羼殛"; - Text[ korean ] = "韼橃澊歆 鞐氨锛岇晥韼橃澊歆"; + Text[ korean ] = "韼橃澊歆 鞐氨 鞎堨"; Text[ turkish ] = "Sayfa kenar (i)"; Text[ language_user1 ] = " "; Text[ catalan ] = "Marge interior de la p鄃ina"; @@ -793,17 +793,17 @@ String STR_REL_PG_RIGHT Text [ swedish ] = "H鰃er sidmarginal" ; Text [ danish ] = "H鴍re siderand" ; Text [ italian ] = "Margine pagina destro" ; - Text [ spanish ] = "Margen derecho de la p醙ina" ; + Text [ spanish ] = "Borde derecho de la p醙ina" ; Text [ french ] = "Marge droite" ; Text [ dutch ] = "Paginarand rechts" ; - Text[ chinese_simplified ] = "鍙抽〉闈㈢┖鐧"; + Text[ chinese_simplified ] = "椤甸潰杈硅窛 鍙虫柟"; Text[ russian ] = "橡噔 牮嚅 耱疣龛鳆"; Text[ polish ] = "Prawy margines strony"; Text[ japanese ] = "銉氥兗銈镐綑鐧 鍙"; - Text[ chinese_traditional ] = "鍙抽爜闈㈢┖鐧"; + Text[ chinese_traditional ] = "闋侀潰閭婃 鍙虫柟"; Text[ arabic ] = "迩阍 轻蛰蜕 轻庙沅"; Text[ greek ] = "绣耖棹耖 箦脒溽 - 溴铋"; - Text[ korean ] = "韼橃澊歆 鞐氨锛岇槫毳胳"; + Text[ korean ] = "韼橃澊歆 鞐氨 鞓るジ飒"; Text[ turkish ] = "Sa sayfa kenar"; Text[ language_user1 ] = " "; Text[ catalan ] = "Marge dret de la p鄃ina"; @@ -822,15 +822,15 @@ String STR_MIR_REL_PG_RIGHT Text [ italian ] = "Margine pagina esterno" ; Text [ spanish ] = "Margen exterior de la p醙ina" ; Text [ french ] = "Marge ext閞ieure" ; - Text [ dutch ] = "Buitenste zijrand" ; - Text[ chinese_simplified ] = "澶栦晶椤佃竟璺"; + Text [ dutch ] = "Buitenste paginarand" ; + Text[ chinese_simplified ] = "椤甸潰杈硅窛 澶栦晶"; Text[ russian ] = "袜痼骓 牮嚅 耱疣龛鳆"; Text[ polish ] = "Zewn阾rzny margines strony"; Text[ japanese ] = "銉氥兗銈镐綑鐧 澶栧伌"; - Text[ chinese_traditional ] = "閭婃澶栧伌"; + Text[ chinese_traditional ] = "闋侀潰閭婃 澶栧伌"; Text[ arabic ] = "迩阍 轻蛰蜕 轻吻烟"; Text[ greek ] = "绣耖棹耖 箦脒溽 - 孱羼殛"; - Text[ korean ] = "韼橃澊歆 鞐氨锛岆皵旯レ"; + Text[ korean ] = "韼橃澊歆 鞐氨 氚旉攻飒"; Text[ turkish ] = "Sayfa kenar (d)"; Text[ language_user1 ] = " "; Text[ catalan ] = "Marge exterior de la p鄃ina"; @@ -850,14 +850,14 @@ String STR_REL_FRM_LEFT Text [ spanish ] = "Margen izquierdo del p醨rafo" ; Text [ french ] = "Marge de paragraphe gauche" ; Text [ dutch ] = "Alinearand links" ; - Text[ chinese_simplified ] = "宸︽钀介〉杈"; + Text[ chinese_simplified ] = "娈佃惤杈硅窛 宸︽柟"; Text[ russian ] = "隋恹 牮嚅 噌玎鲟"; Text[ polish ] = "Lewy margines akapitu"; Text[ japanese ] = "娈佃惤浣欑櫧 宸"; - Text[ chinese_traditional ] = "宸︽钀介爜閭"; + Text[ chinese_traditional ] = "娈佃惤闋侀倞 宸︽柟"; Text[ arabic ] = "迩阍 轻蒉焉 轻庙友"; Text[ greek ] = "绣耖棹耖 疳襻泷荟秕 - 狁轶翦褴"; - Text[ korean ] = "雼澖 鞐氨锛岇櫦飒"; + Text[ korean ] = "雼澖 鞐氨 鞕检"; Text[ turkish ] = "Paragraf kenar (sol)"; Text[ language_user1 ] = " "; Text[ catalan ] = "Marge esquerre del par鄃raf"; @@ -877,14 +877,14 @@ String STR_MIR_REL_FRM_LEFT Text [ spanish ] = "Margen interior del p醨rafo" ; Text [ french ] = "Marge de paragraphe int閞ieure" ; Text [ dutch ] = "Binnenste alinearand" ; - Text[ chinese_simplified ] = "闂撮殧鍐呰竟"; + Text[ chinese_simplified ] = "娈佃惤杈硅窛 鍐呭垯"; Text[ russian ] = "马篁疱眄栝 牮嚅 噌玎鲟"; Text[ polish ] = "Wewn阾rzny margines akapitu"; Text[ japanese ] = "娈佃惤浣欑櫧 鍐呭伌"; - Text[ chinese_traditional ] = "闁撻殧鍏ч倞"; + Text[ chinese_traditional ] = "娈佃惤闋侀倞 鍐呭伌"; Text[ arabic ] = "迩阍 轻蒉焉 轻锨吾"; Text[ greek ] = "绣耖棹耖 疳襻泷荟秕 - 弩羼殛"; - Text[ korean ] = "雼澖 鞐氨锛岇晥飒"; + Text[ korean ] = "鞎堨鞚 雼澖 鞐氨 "; Text[ turkish ] = "Paragraf kenar (i)"; Text[ language_user1 ] = " "; Text[ catalan ] = "Marge interior del par鄃raf"; @@ -901,17 +901,17 @@ String STR_REL_FRM_RIGHT Text [ swedish ] = "H鰃er styckemarginal" ; Text [ danish ] = "H鴍re afsnitsrand" ; Text [ italian ] = "Margine paragrafo destro" ; - Text [ spanish ] = "Margen derecho del p醨rafo" ; + Text [ spanish ] = "Borde derecho del p醨rafo" ; Text [ french ] = "Marge de paragraphe droite" ; Text [ dutch ] = "Alinearand rechts" ; - Text[ chinese_simplified ] = "鍙虫钀介〉杈"; + Text[ chinese_simplified ] = "娈佃惤杈硅窛 鍙虫柟"; Text[ russian ] = "橡噔 牮嚅 噌玎鲟"; Text[ polish ] = "Prawy margines akapitu"; Text[ japanese ] = "娈佃惤浣欑櫧 鍙"; - Text[ chinese_traditional ] = "鍙虫钀介爜閭"; + Text[ chinese_traditional ] = "娈佃惤闋侀倞 鍙虫柟"; Text[ arabic ] = "迩阍 轻蒉焉 轻庙沅"; Text[ greek ] = "绣耖棹耖 疳襻泷荟秕 - 溴铋"; - Text[ korean ] = "雼澖 鞐氨锛岇槫毳胳"; + Text[ korean ] = "雼澖 鞐氨 鞓るジ飒"; Text[ turkish ] = "Paragraf kenar (sa)"; Text[ language_user1 ] = " "; Text[ catalan ] = "Marge dret del par鄃raf"; @@ -931,14 +931,14 @@ String STR_MIR_REL_FRM_RIGHT Text [ spanish ] = "Margen exterior del p醨rafo" ; Text [ french ] = "Marge de paragraphe ext閞ieure " ; Text [ dutch ] = "Buitenste alinearand" ; - Text[ chinese_simplified ] = "娈佃惤闂撮殧澶栦晶"; + Text[ chinese_simplified ] = "娈佃惤杈硅窛 澶栦晶"; Text[ russian ] = "袜痼骓 牮嚅 噌玎鲟"; Text[ polish ] = "Zewn阾rzny margines akapitu"; Text[ japanese ] = "娈佃惤浣欑櫧 澶栧伌"; - Text[ chinese_traditional ] = "娈佃惤闁撻殧澶栧伌"; + Text[ chinese_traditional ] = "娈佃惤闋侀倞 澶栧伌"; Text[ arabic ] = "迩阍 轻蒉焉 轻吻烟"; Text[ greek ] = "绣耖棹耖 疳襻泷荟秕 - 孱羼殛"; - Text[ korean ] = "雼澖 鞐氨锛岆皵旯レ"; + Text[ korean ] = "雼澖 鞐氨 鞕鸽秬"; Text[ turkish ] = "Paragraf kenar (d)"; Text[ language_user1 ] = " "; Text[ catalan ] = "Marge exterior del par鄃raf"; @@ -957,7 +957,7 @@ String STR_REL_PG_FRAME Text [ italian ] = "Intera pagina" ; Text [ spanish ] = "P醙ina entera" ; Text [ french ] = "Page enti鑢e" ; - Text [ dutch ] = "Gehele pagina" ; + Text [ dutch ] = "Hele pagina" ; Text[ chinese_simplified ] = "鏁撮〉"; Text[ russian ] = "埋 耱疣龛鲟"; Text[ polish ] = "Ca砤 strona"; @@ -992,7 +992,7 @@ String STR_REL_PG_PRTAREA Text[ chinese_traditional ] = "闋侀潰鏂囧瓧鍗鍩"; Text[ arabic ] = "湄寝 湔 轻蛰蜕"; Text[ greek ] = "绣耖秣 赍殪蓓秕 箦脒溽"; - Text[ korean ] = "韼橃澊歆 韰嶌姢韸 鞓侅棴"; + Text[ korean ] = "韼橃澊歆鞚 韰嶌姢韸 鞓侅棴"; Text[ turkish ] = "Sayfa metin alan"; Text[ language_user1 ] = " "; Text[ catalan ] = "纑ea de text de la p鄃ina"; @@ -1043,7 +1043,7 @@ String STR_REL_CHAR Text [ french ] = "Caract鑢es" ; Text [ dutch ] = "Teken" ; Text[ chinese_simplified ] = "瀛楃"; - Text[ russian ] = "琼嚓"; + Text[ russian ] = "谚焘铍"; Text[ polish ] = "Znak"; Text[ japanese ] = "鏂囧瓧"; Text[ chinese_traditional ] = "瀛楀厓"; @@ -1096,7 +1096,7 @@ String STR_TOP_BASE Text [ swedish ] = "Baslinje ~鰒erst" ; Text [ danish ] = "Basislinje 鴙erst" ; Text [ italian ] = "Linea di base in ~alto" ; - Text [ spanish ] = "L韓ea de base ~encima" ; + Text [ spanish ] = "L韓ea de base ~arriba" ; Text [ french ] = "Ligne de base en ~haut" ; Text [ dutch ] = "Basis ~boven" ; Text[ chinese_simplified ] = "鍩虹嚎涓婃柟(~T)"; @@ -1110,7 +1110,7 @@ String STR_TOP_BASE Text[ turkish ] = "Taban 鏸zgisi ~黶t"; Text[ language_user1 ] = " "; Text[ catalan ] = "L韓ia de base ~amunt"; - Text[ finnish ] = "~Perusviiva ylh滗ll"; + Text[ finnish ] = "Perusviiva ~ylh滗ll"; Text[ thai ] = "喔氞福喔｀笚喔编笖喔愢覆喔權笚喔掂箞喔斷箟喔侧笝~喔氞笝"; }; String STR_BOTTOM_BASE @@ -1123,7 +1123,7 @@ String STR_BOTTOM_BASE Text [ swedish ] = "Baslinje ~nederst" ; Text [ danish ] = "Basislinje nederst" ; Text [ italian ] = "Base in ~basso" ; - Text [ spanish ] = "Base a~bajo" ; + Text [ spanish ] = "L韓ea de base a~bajo" ; Text [ french ] = "Ligne de base en ~bas" ; Text [ dutch ] = "Basis ~beneden" ; Text[ chinese_simplified ] = "鍩虹嚎涓嬫柟(~B)"; @@ -1150,7 +1150,7 @@ String STR_CENTER_BASE Text [ swedish ] = "Baslinje ~centrerad" ; Text [ danish ] = "Basislinje centreret" ; Text [ italian ] = "Linea di base ~centrata" ; - Text [ spanish ] = "Base ~centro" ; + Text [ spanish ] = "L韓ea de base ~centrada" ; Text [ french ] = "Ligne de base ~centr閑" ; Text [ dutch ] = "Basis ge~centreerd" ; Text[ chinese_simplified ] = "鍩虹嚎灞呬腑(~C)"; @@ -1174,7 +1174,7 @@ String STR_LINE_TOP Text [ dutch ] = "Bovenste regel" ; Text [ english_us ] = "Top of line" ; Text [ italian ] = "Riga in alto" ; - Text [ spanish ] = "L韓ea superior" ; + Text [ spanish ] = "L韓ea arriba" ; Text [ french ] = "Ligne en haut" ; Text [ swedish ] = "講ersta raden" ; Text [ danish ] = "R鎘ke 鴙erst" ; @@ -1191,7 +1191,7 @@ String STR_LINE_TOP Text[ turkish ] = "Sat齬 黶t"; Text[ language_user1 ] = " "; Text[ catalan ] = "L韓ia superior"; - Text[ finnish ] = "Viivan yl鋙sa"; + Text[ finnish ] = "Viivan yl鋜euna"; Text[ thai ] = "喔斷箟喔侧笝喔氞笝喔傕腑喔囙笟喔｀福喔椸副喔"; }; String STR_LINE_BOTTOM @@ -1201,7 +1201,7 @@ String STR_LINE_BOTTOM Text [ dutch ] = "Onderste regel" ; Text [ english_us ] = "Bottom of line" ; Text [ italian ] = "Riga in basso" ; - Text [ spanish ] = "L韓ea inferior" ; + Text [ spanish ] = "L韓ea abajo" ; Text [ french ] = "Ligne en bas" ; Text [ swedish ] = "Nedersta raden" ; Text [ danish ] = "R鎘ke nederst" ; @@ -1218,7 +1218,7 @@ String STR_LINE_BOTTOM Text[ turkish ] = "Sat齬 alt"; Text[ language_user1 ] = " "; Text[ catalan ] = "L韓ia inferior"; - Text[ finnish ] = "Viivan alaosa"; + Text[ finnish ] = "Viivan alareuna"; Text[ thai ] = "喔斷箟喔侧笝喔ム箞喔侧竾喔傕腑喔囙笟喔｀福喔椸副喔"; }; String STR_LINE_CENTER @@ -1245,7 +1245,7 @@ String STR_LINE_CENTER Text[ turkish ] = "Sat齬 ortala"; Text[ language_user1 ] = " "; Text[ catalan ] = "L韓ia centrada"; - Text[ finnish ] = "Viivan keskiosa"; + Text[ finnish ] = "Viivan keskikohta"; Text[ thai ] = "喔曕福喔囙竵喔ム覆喔囙競喔竾喔氞福喔｀笚喔编笖"; }; String STR_CHAR_TOP @@ -1262,7 +1262,7 @@ String STR_CHAR_TOP Text [ portuguese ] = "Car醕ter em cima" ; Text [ portuguese_brazilian ] = "Zeichen oben" ; Text[ chinese_simplified ] = "瀛楃涓婃柟"; - Text[ russian ] = "琼嚓 疋屦躞"; + Text[ russian ] = "谚焘铍 疋屦躞"; Text[ polish ] = "Znaki w g髍ze"; Text[ japanese ] = "鏂囧瓧銇笂"; Text[ chinese_traditional ] = "瀛楀厓涓婃柟"; @@ -1272,7 +1272,7 @@ String STR_CHAR_TOP Text[ turkish ] = "Karakter 黶t"; Text[ language_user1 ] = " "; Text[ catalan ] = "Car郼ter amunt"; - Text[ finnish ] = "Merkin yl鋙sa"; + Text[ finnish ] = "Merkin yl鋜euna"; Text[ thai ] = "喔斷箟喔侧笝喔氞笝喔傕腑喔囙笗喔编抚喔副喔佮競喔｀赴"; }; String STR_CHAR_BOTTOM @@ -1289,7 +1289,7 @@ String STR_CHAR_BOTTOM Text [ portuguese ] = "Car醕ter em baixo" ; Text [ portuguese_brazilian ] = "Zeichen unten" ; Text[ chinese_simplified ] = "瀛楃涓嬫柟"; - Text[ russian ] = "琼嚓 耥桤"; + Text[ russian ] = "谚焘铍 耥桤"; Text[ polish ] = "Znaki na dole"; Text[ japanese ] = "鏂囧瓧銇笅"; Text[ chinese_traditional ] = "瀛楀厓涓嬫柟"; @@ -1299,7 +1299,7 @@ String STR_CHAR_BOTTOM Text[ turkish ] = "Karakter alt"; Text[ language_user1 ] = " "; Text[ catalan ] = "Car郼ter avall"; - Text[ finnish ] = "Merkin alaosa"; + Text[ finnish ] = "Merkin alareuna"; Text[ thai ] = "喔斷箟喔侧笝喔ム箞喔侧竾喔傕腑喔囙笗喔编抚喔副喔佮競喔｀赴"; }; String STR_CHAR_CENTER @@ -1316,7 +1316,7 @@ String STR_CHAR_CENTER Text [ portuguese ] = "Car醕ter centrado" ; Text [ portuguese_brazilian ] = "Zeichen zentriert" ; Text[ chinese_simplified ] = "瀛楃灞呬腑"; - Text[ russian ] = "琼嚓 镱 鲥眚痼"; + Text[ russian ] = "谚焘铍 镱 鲥眚痼"; Text[ polish ] = "Znaki wy渞odkowane"; Text[ japanese ] = "鏂囧瓧銇腑澶"; Text[ chinese_traditional ] = "瀛楀厓缃腑"; @@ -1326,7 +1326,7 @@ String STR_CHAR_CENTER Text[ turkish ] = "Karakteri ortala"; Text[ language_user1 ] = " "; Text[ catalan ] = "Car郼ter centrat"; - Text[ finnish ] = "Merkin keskiosa"; + Text[ finnish ] = "Merkin keskikohta"; Text[ thai ] = "喔曕福喔囙竵喔ム覆喔囙競喔竾喔曕副喔о腑喔编竵喔傕福喔"; }; String STR_OLE_INSERT @@ -1370,11 +1370,11 @@ String STR_OLE_EDIT TEXT [ danish ] = "Rediger objekt" ; TEXT [ french ] = "蒬iter l'objet" ; TEXT [ swedish ] = "Redigera objekt" ; - TEXT [ dutch ] = "Een object bewerken" ; + TEXT [ dutch ] = "Object bewerken" ; TEXT [ spanish ] = "Editar objeto" ; TEXT [ english_us ] = "Edit object" ; TEXT[ chinese_simplified ] = "缂栬緫瀵硅薄"; - TEXT[ russian ] = "橡噔赅 钺牝"; + TEXT[ russian ] = "如戾龛螯 钺牝"; TEXT[ polish ] = "Edytuj obiekt"; TEXT[ japanese ] = "銈儣銈搞偋銈儓銇法闆"; TEXT[ chinese_traditional ] = "绶ㄨ集鐗╀欢"; @@ -1394,21 +1394,21 @@ String STR_COLL_HEADER TEXT [ italian ] = "(Modello: " ; TEXT [ portuguese_brazilian ] = "(Modelo: " ; TEXT [ portuguese ] = "(Modelo: " ; - TEXT [ finnish ] = " (Mallipohja: " ; + TEXT [ finnish ] = " (Malli: " ; TEXT [ danish ] = "(Skabelon: " ; TEXT [ french ] = "(mod鑜e : " ; - TEXT [ swedish ] = "(Mall: " ; + TEXT [ swedish ] = " (Mall: " ; TEXT [ dutch ] = "(Sjabloon: " ; TEXT [ spanish ] = "(Plantilla: " ; TEXT [ english_us ] = " (Template: " ; TEXT[ chinese_simplified ] = "(鏍峰紡锛 "; - TEXT[ russian ] = "(剜犭铐: "; + TEXT[ russian ] = " (剜犭铐: "; TEXT[ polish ] = "(Szablon: "; TEXT[ japanese ] = " (銉嗐兂銉椼儸銉笺儓锛 "; TEXT[ chinese_traditional ] = "(妯ｅ紡锛 "; TEXT[ arabic ] = "(轻耷崛: "; TEXT[ greek ] = "(旭躔: "; - TEXT[ korean ] = " ( 靹滌嫕 韺岇澕: "; + TEXT[ korean ] = "(靹滌嫕 韺岇澕: "; TEXT[ turkish ] = "(轪blon: "; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = " (Plantilla: "; @@ -1427,7 +1427,7 @@ String STR_FRMUI_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 ] = "吾疣祀屙桢"; @@ -1492,7 +1492,7 @@ String STR_FRMUI_WRAP Text[ chinese_traditional ] = "鎻涜"; Text[ arabic ] = "轻瘦禽"; Text[ greek ] = "另徜唣膣箸"; - Text[ korean ] = "氍胳瀽鞐 氚办箻"; + Text[ korean ] = "氍胳灔 氚办箻"; Text[ turkish ] = "Metin da瘕l齧"; Text[ language_user1 ] = " "; Text[ catalan ] = "Ajusta"; @@ -1509,7 +1509,7 @@ InfoBox MSG_COLUMN_ERR_BOUNDWIDTH MESSAGE [ italian ] = "La distanza tra le colonne supera la larghezza delle colonne" ; MESSAGE [ portuguese_brazilian ] = "Largura do guter excede largura da coluna." ; MESSAGE [ portuguese ] = "O espa鏾 entre as colunas grande demais para a largura das colunas." ; - MESSAGE [ finnish ] = "Sarakkeiden v鋖it ovat suurempia kuin sarakkeen leveys." ; + MESSAGE [ finnish ] = "Palstojen v鋖it ovat suurempia kuin palstan leveys." ; MESSAGE [ danish ] = "Kolonneafstanden er for stor til kolonnebredden." ; MESSAGE [ french ] = "蒫art entre les colonnes exc鑔e largeur de colonne." ; MESSAGE [ swedish ] = "F鋝tmarginalens bredd 鋜 f鰎 stor f鰎 kolumnbredden." ; @@ -1517,7 +1517,7 @@ InfoBox MSG_COLUMN_ERR_BOUNDWIDTH MESSAGE [ spanish ] = "La distancia entre columnas es demasiado grande para el ancho de las columnas." ; MESSAGE [ english_us ] = "Column spacing exceeds the column width." ; MESSAGE[ chinese_simplified ] = "鍒楅棿闅斿お澶э紝瓒呰繃鍒楀尯鍩熴"; - MESSAGE[ russian ] = "朽耨蝾龛 戾驿 觐腩黻囔 耠桫觐 犷朦 潆 痂睇 觐腩眍."; + MESSAGE[ russian ] = "软蝈疴嚯 戾驿 耱铍狯囔 镳邂噱 痂眢 耱铍狯钼."; MESSAGE[ polish ] = "Odst阷 mi阣zy kolumnami jest za du縴 dla ich szeroko渃i."; MESSAGE[ japanese ] = "鍒椼伄闁撻殧銇屽垪骞呫伀瀵俱仐銇﹀簝銇欍亷銇俱仚"; MESSAGE[ chinese_traditional ] = "娆勯枔闅斿お澶э紝瓒呴亷娆勫崁鍩熴"; @@ -1533,25 +1533,137 @@ String STR_REL_PG_TOP { TEXT = "Seitenrand oben" ; Text [ english_us ] = "Top page border" ; + Text[ portuguese ] = "Top page border"; + Text[ russian ] = "Top page border"; + Text[ greek ] = "Top page border"; + Text[ dutch ] = "Top page border"; + Text[ french ] = "Marge sup閞ieure"; + Text[ spanish ] = "Borde superior de la p醙ina"; + Text[ finnish ] = "Top page border"; + Text[ italian ] = "Margine superiore"; + Text[ danish ] = "Top page border"; + Text[ swedish ] = "Sidmarginal 鰒erst"; + Text[ polish ] = "Top page border"; + Text[ portuguese_brazilian ] = "Top page border"; + Text[ japanese ] = "銉氥兗銈镐綑鐧姐佷笂"; + Text[ korean ] = "韼橃澊歆 鞐氨 鞙勳"; + Text[ chinese_simplified ] = "椤甸潰杈硅窛 涓婃柟"; + Text[ chinese_traditional ] = "闋侀潰閭婃 涓婃柟"; + Text[ turkish ] = "Top page border"; + Text[ arabic ] = "Top page border"; + Text[ catalan ] = "Top page border"; + Text[ thai ] = "Top page border"; }; String STR_REL_PG_BOTTOM { TEXT = "Seitenrand unten" ; Text [ english_us ] = "Bottom page border" ; + Text[ portuguese ] = "Bottom page border"; + Text[ russian ] = "Bottom page border"; + Text[ greek ] = "Bottom page border"; + Text[ dutch ] = "Bottom page border"; + Text[ french ] = "Marge inf閞ieure"; + Text[ spanish ] = "Borde inferior de la p醙ina"; + Text[ finnish ] = "Bottom page border"; + Text[ italian ] = "Margine inferiore"; + Text[ danish ] = "Bottom page border"; + Text[ swedish ] = "Sidmarginal nederst"; + Text[ polish ] = "Bottom page border"; + Text[ portuguese_brazilian ] = "Bottom page border"; + Text[ japanese ] = "銉氥兗銈镐綑鐧姐佷笅"; + Text[ korean ] = "韼橃澊歆 鞐氨 鞎勲灅飒"; + Text[ chinese_simplified ] = "椤甸潰杈硅窛 涓嬫柟"; + Text[ chinese_traditional ] = "闋侀潰閭婃 涓嬫柟"; + Text[ turkish ] = "Bottom page border"; + Text[ arabic ] = "Bottom page border"; + Text[ catalan ] = "Bottom page border"; + Text[ thai ] = "Bottom page border"; }; String STR_REL_FRM_TOP { TEXT = "Absatzrand oben" ; Text [ english_us ] = "Top paragraph border" ; + Text[ portuguese ] = "Top paragraph border"; + Text[ russian ] = "Top paragraph border"; + Text[ greek ] = "Top paragraph border"; + Text[ dutch ] = "Top paragraph border"; + Text[ french ] = "Marge de paragraphe sup閞ieure"; + Text[ spanish ] = "Borde superior del p醨rafo"; + Text[ finnish ] = "Top paragraph border"; + Text[ italian ] = "Margine superiore paragrafo"; + Text[ danish ] = "Top paragraph border"; + Text[ swedish ] = "Styckemarginal 鰒erst"; + Text[ polish ] = "Top paragraph border"; + Text[ portuguese_brazilian ] = "Top paragraph border"; + Text[ japanese ] = "娈佃惤銇笂浣欑櫧"; + Text[ korean ] = "雼澖 鞐氨 鞙勳"; + Text[ chinese_simplified ] = "娈佃惤杈规 涓婃柟"; + Text[ chinese_traditional ] = "娈佃惤閭婃 涓婃柟"; + Text[ turkish ] = "Top paragraph border"; + Text[ arabic ] = "Top paragraph border"; + Text[ catalan ] = "Top paragraph border"; + Text[ thai ] = "Top paragraph border"; }; String STR_REL_FRM_BOTTOM { TEXT = "Absatzrand unten" ; Text [ english_us ] = "Bottom paragraph border" ; + Text[ portuguese ] = "Bottom paragraph border"; + Text[ russian ] = "Bottom paragraph border"; + Text[ greek ] = "Bottom paragraph border"; + Text[ dutch ] = "Bottom paragraph border"; + Text[ french ] = "Marge de paragraphe inf閞ieure"; + Text[ spanish ] = "Borde inferior del p醨rafo"; + Text[ finnish ] = "Bottom paragraph border"; + Text[ italian ] = "Margine inferiore paragrafo"; + Text[ danish ] = "Bottom paragraph border"; + Text[ swedish ] = "Styckemarginal nederst"; + Text[ polish ] = "Bottom paragraph border"; + Text[ portuguese_brazilian ] = "Bottom paragraph border"; + Text[ japanese ] = "娈佃惤銇笅浣欑櫧"; + Text[ korean ] = "雼澖 鞐氨 鞎勲灅飒"; + Text[ chinese_simplified ] = "娈佃惤杈规 涓嬫柟"; + Text[ chinese_traditional ] = "娈佃惤閭婃 涓嬫柟"; + Text[ turkish ] = "Bottom paragraph border"; + Text[ arabic ] = "Bottom paragraph border"; + Text[ catalan ] = "Bottom paragraph border"; + Text[ thai ] = "Bottom paragraph border"; }; String STR_FROMRIGHT { TEXT = "Von rechts" ; TEXT [ english_us ] = "From right" ; + TEXT[ portuguese ] = "From right"; + TEXT[ russian ] = "From right"; + TEXT[ greek ] = "From right"; + TEXT[ dutch ] = "From right"; + TEXT[ french ] = "De droite"; + TEXT[ spanish ] = "De la derecha"; + TEXT[ finnish ] = "From right"; + TEXT[ italian ] = "Da destra"; + TEXT[ danish ] = "From right"; + TEXT[ swedish ] = "Fr錸 h鰃er"; + TEXT[ polish ] = "From right"; + TEXT[ portuguese_brazilian ] = "From right"; + TEXT[ japanese ] = "鍙炽亱銈"; + TEXT[ korean ] = "鞓るジ飒届溂搿滊秬韯"; + TEXT[ chinese_simplified ] = "浠庡彸"; + TEXT[ chinese_traditional ] = "寰炲彸"; + TEXT[ turkish ] = "From right"; + TEXT[ arabic ] = "From right"; + TEXT[ catalan ] = "From right"; + TEXT[ thai ] = "From right"; }; + + + + + + + + + + + + diff --git a/sw/source/ui/frmdlg/makefile.mk b/sw/source/ui/frmdlg/makefile.mk index 3027e131d121..af46f368ea76 100644 --- a/sw/source/ui/frmdlg/makefile.mk +++ b/sw/source/ui/frmdlg/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: os $ $Date: 2001-02-09 07:41:30 $ +# last change: $Author: hr $ $Date: 2003-03-27 15:43:35 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -117,6 +117,11 @@ SLOFILES = \ $(SLO)$/uiborder.obj \ $(SLO)$/wrap.obj +.IF "$(OS)"=="SOLARIS" +NOOPTFILES = \ + $(SLO)$/frmex.obj +.ENDIF # "$(OS)"=="SOLARIS" + # --- Tagets ------------------------------------------------------- .INCLUDE : target.mk diff --git a/sw/source/ui/frmdlg/wrap.src b/sw/source/ui/frmdlg/wrap.src index d35aced4878c..2bd500fdf379 100644 --- a/sw/source/ui/frmdlg/wrap.src +++ b/sw/source/ui/frmdlg/wrap.src @@ -2,9 +2,9 @@ * * $RCSfile: wrap.src,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: os $ $Date: 2002-09-06 13:48:18 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,12 +78,12 @@ TabPage TP_FRM_WRAP Text[ ENGLISH ] = "Presets"; Text[ english_us ] = "Settings"; Text[ portuguese ] = "Predefini珲es"; - Text[ russian ] = "袜耱痤殛 镱 箪铍鬣龛"; + Text[ russian ] = "袜耱痤殛"; Text[ greek ] = "Presets"; Text[ dutch ] = "Standaard"; Text[ french ] = "D閒initions"; Text[ spanish ] = "Predeterminaciones"; - Text[ finnish ] = "Presets"; + Text[ finnish ] = "Asetukset"; Text[ italian ] = "Predefiniti"; Text[ danish ] = "Forudindstillinger"; Text[ swedish ] = "F鰎inst鋖lningar"; @@ -116,7 +116,7 @@ TabPage TP_FRM_WRAP Text [ portuguese ] = "~Nenhum" ; Text [ portuguese_brazilian ] = "~Kein" ; Text[ chinese_simplified ] = "鏃(~N)"; - Text[ russian ] = "铃"; + Text[ russian ] = "湾"; Text[ polish ] = "Brak"; Text[ japanese ] = "涓婁笅(~N)"; Text[ language_user1 ] = "湾"; @@ -126,7 +126,7 @@ TabPage TP_FRM_WRAP Text[ korean ] = "鞐嗢潓(~N)"; Text[ turkish ] = "~Yok"; Text[ catalan ] = "C~ap"; - Text[ finnish ] = "~Ei mit滗n"; + Text[ finnish ] = "Ei mit滗n"; Text[ thai ] = "喙剘喔∴箞喔∴傅"; }; ImageRadioButton RB_WRAP_LEFT @@ -143,7 +143,7 @@ TabPage TP_FRM_WRAP Text[ dutch ] = "~Links"; Text[ french ] = "Avant"; Text[ spanish ] = "Antes"; - Text[ finnish ] = "~Vasen:"; + Text[ finnish ] = "Vasen"; Text[ italian ] = "Prima"; Text[ danish ] = "Venstre"; Text[ swedish ] = "F鰎e"; @@ -172,9 +172,9 @@ TabPage TP_FRM_WRAP Text[ dutch ] = "~Rechts"; Text[ french ] = "Apr鑣"; Text[ spanish ] = "Despu閟"; - Text[ finnish ] = "~Oikea"; + Text[ finnish ] = "Oikea"; Text[ italian ] = "Dopo"; - Text[ danish ] = "H鴍re"; + Text[ danish ] = "H鴍~re"; Text[ swedish ] = "Efter"; Text[ polish ] = "Z prawej"; Text[ portuguese_brazilian ] = "~Rechts"; @@ -205,7 +205,7 @@ TabPage TP_FRM_WRAP Text [ portuguese ] = "~Paralelo" ; Text [ portuguese_brazilian ] = "~Parallel" ; Text[ chinese_simplified ] = "骞宠(~P)"; - Text[ russian ] = "相疣腚咫"; + Text[ russian ] = "项 觐眚箴"; Text[ polish ] = "R體n~olegle"; Text[ japanese ] = "涓″伌(~P)"; Text[ chinese_traditional ] = "骞宠(~P)"; @@ -214,7 +214,7 @@ TabPage TP_FRM_WRAP Text[ korean ] = "韽夗枆(~P)"; Text[ turkish ] = "~Paralel"; Text[ catalan ] = "~Paral.lel"; - Text[ finnish ] = "~Samansuuntainen"; + Text[ finnish ] = "Ymp鋜ill"; Text[ thai ] = "~喔傕笝喔侧笝"; }; ImageRadioButton RB_WRAP_THROUGH @@ -228,7 +228,7 @@ TabPage TP_FRM_WRAP Text [ italian ] = "Attraverso" ; Text [ portuguese_brazilian ] = "Circundarmento ~atrav?s" ; Text [ portuguese ] = "~Atrav閟 do objecto" ; - Text [ finnish ] = "~Kautta" ; + Text [ finnish ] = "L鋚i" ; Text [ danish ] = "Gennem" ; Text [ french ] = "Continu" ; Text [ swedish ] = "Genomfl鰚de" ; @@ -243,7 +243,7 @@ TabPage TP_FRM_WRAP Text[ chinese_traditional ] = "涓嶇挵绻(~U)"; Text[ arabic ] = "谌"; Text[ greek ] = "拈 燧箫"; - Text[ korean ] = "氍胳灔 頋愲ゴ旮(~U)"; + Text[ korean ] = "氚办箻 鞐嗢潓(~U)"; Text[ turkish ] = "~Metin arkas齨a g鰊der"; Text[ catalan ] = "~Continu"; Text[ thai ] = "~喔溹箞喔侧笝"; @@ -272,10 +272,10 @@ TabPage TP_FRM_WRAP Text[ chinese_traditional ] = "鏈閬(~O)"; Text[ arabic ] = "享淝沩唔"; Text[ greek ] = "孽磲扉贶"; - Text[ korean ] = "斓滌爜鞚(~O)"; + Text[ korean ] = "斓滌爜(~O)"; Text[ turkish ] = "D~inamik"; Text[ catalan ] = "Din鄜mic"; - Text[ finnish ] = "~Optimaalinen"; + Text[ finnish ] = "Optimaalinen"; Text[ thai ] = "喙~喔浮喔侧赴喔椸傅喙堗釜喔膏笖"; }; @@ -301,10 +301,10 @@ TabPage TP_FRM_WRAP Text[ chinese_traditional ] = "绗竴娈佃惤(~F)"; Text[ arabic ] = "轻蒉焉 轻面犰"; Text[ greek ] = "旭 疳褴泷狯飤"; - Text[ korean ] = "觳 雼澖(~F)"; + Text[ korean ] = "觳矆歆 雼澖(~F)"; Text[ turkish ] = "輑k paragraf"; Text[ catalan ] = "Primer par鄃ra~f"; - Text[ finnish ] = "~Ensimm鋓nen kappale"; + Text[ finnish ] = "Ensimm鋓nen kappale"; Text[ thai ] = "喔⑧箞喔斧喔權箟喔侧箒~喔｀竵"; }; CheckBox CB_TRANSPARENT @@ -332,7 +332,7 @@ TabPage TP_FRM_WRAP Text[ korean ] = "氚瓣步鞐(~K)"; Text[ turkish ] = "Arta~landa"; Text[ catalan ] = "En el ~fons"; - Text[ finnish ] = "~Taustalla"; + Text[ finnish ] = "Taustalla"; Text[ thai ] = "喙冟笝喔炧阜喙夃笝~喔弗喔编竾"; }; CheckBox CB_OUTLINE @@ -361,7 +361,7 @@ TabPage TP_FRM_WRAP Text[ korean ] = "鞙り辰(~C)"; Text[ turkish ] = "Kontu~r"; Text[ catalan ] = "~Contorn"; - Text[ finnish ] = "~匿riviiva"; + Text[ finnish ] = "匿riviiva"; Text[ thai ] = "喙~喔箟喔權箒喔笖喔囙福喔灌笡喔｀箞喔侧竾"; }; CheckBox CB_ONLYOUTSIDE @@ -437,7 +437,7 @@ TabPage TP_FRM_WRAP Text [ italian ] = "Sinistra" ; Text [ portuguese_brazilian ] = "~Esquerda" ; Text [ portuguese ] = "~Esquerda" ; - Text [ finnish ] = "~Vasen" ; + Text [ finnish ] = "Vasen" ; Text [ danish ] = "Venstre" ; Text [ french ] = " gauche" ; Text [ swedish ] = "~V鋘ster" ; @@ -482,7 +482,7 @@ TabPage TP_FRM_WRAP Text [ italian ] = "Destra" ; Text [ portuguese_brazilian ] = "~Direita" ; Text [ portuguese ] = "~Direita" ; - Text [ finnish ] = "~Oikea" ; + Text [ finnish ] = "Oikea" ; Text [ danish ] = "H鴍re" ; Text [ french ] = " droite" ; Text [ swedish ] = "H~鰃er" ; @@ -527,7 +527,7 @@ TabPage TP_FRM_WRAP Text [ italian ] = "In alto" ; Text [ portuguese_brazilian ] = "~Topo" ; Text [ portuguese ] = "~Topo" ; - Text [ finnish ] = "~Yl鋙sa" ; + Text [ finnish ] = "Yl鋜euna" ; Text [ danish ] = "~豽erst" ; Text [ french ] = "En haut" ; Text [ swedish ] = "~Uppe" ; @@ -572,7 +572,7 @@ TabPage TP_FRM_WRAP Text [ italian ] = "~Basso" ; Text [ portuguese_brazilian ] = "~Base" ; Text [ portuguese ] = "Em ~baixo" ; - Text [ finnish ] = "~Alaosa" ; + Text [ finnish ] = "Alareuna" ; Text [ danish ] = "Nederst" ; Text [ french ] = "En bas" ; Text [ swedish ] = "N~ere" ; @@ -617,7 +617,7 @@ TabPage TP_FRM_WRAP Text [ italian ] = "Distanze" ; Text [ portuguese_brazilian ] = "Margens" ; Text [ portuguese ] = "Espa鏰mento" ; - Text [ finnish ] = "Objektiv鋖it" ; + Text [ finnish ] = "V鋖it" ; Text [ danish ] = "Afstand" ; Text [ french ] = "蒫arts" ; Text [ swedish ] = "Avst錸d" ; @@ -664,5 +664,25 @@ TabPage TP_FRM_WRAP MaskColor = IMAGE_MASK_COLOR ; WRAP_IDLIST }; + }; + + + + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/globdoc/globdoc.src b/sw/source/ui/globdoc/globdoc.src index d3b29ce14eac..20b04b29918d 100644 --- a/sw/source/ui/globdoc/globdoc.src +++ b/sw/source/ui/globdoc/globdoc.src @@ -2,9 +2,9 @@ * * $RCSfile: globdoc.src,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: os $ $Date: 2002-04-19 09:51:12 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,22 +71,23 @@ String STR_HUMAN_SWGLOBDOC_NAME Text [ italian ] = "Documento master" ; Text [ spanish ] = "Documento maestro" ; Text [ french ] = "Document ma顃re" ; - Text [ dutch ] = "Master-document" ; + Text [ dutch ] = "Masterdocument" ; Text [ portuguese ] = "Documento-mestre" ; - Text[ chinese_simplified ] = "主控文档"; - Text[ russian ] = "秒噔睇 漕牦戾眚"; + Text[ chinese_simplified ] = "涓绘帶鏂囨。"; + Text[ russian ] = "杨耱噔眍 漕牦戾眚"; Text[ polish ] = "Dokument g丑wny"; - Text[ japanese ] = "辖腊霓翻逸"; - Text[ chinese_traditional ] = "北ゅン"; + Text[ japanese ] = "銉炪偣銈裤兗銉夈偔銉ャ儭銉炽儓"; + Text[ chinese_traditional ] = "涓绘帶鏂囦欢"; Text[ arabic ] = "阌输 郧汜"; - Text[ dutch ] = "Master-document"; - Text[ chinese_simplified ] = "主控文档"; + Text[ dutch ] = "Masterdocument"; + Text[ chinese_simplified ] = "涓绘帶鏂囨。"; Text[ greek ] = "K轱 葶泷狯"; - Text[ korean ] = "付胶磐 巩辑"; + Text[ korean ] = "毵堨姢韯 氍胳劀"; Text[ turkish ] = "Ana belge"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Documento maestro"; - Text[ finnish ] = "P滗asiakirja"; + Text[ catalan ] = "Document mestre"; + Text[ finnish ] = "Perusasiakirja"; + Text[ thai ] = "喙喔竵喔覆喔｀笗喙夃笝喔夃笟喔编笟"; }; String STR_WRITER_GLOBALDOC_FULLTYPE_40 { @@ -102,24 +103,25 @@ String STR_WRITER_GLOBALDOC_FULLTYPE TEXT [ English ] = "%PRODUCTNAME 6.0 Master Document" ; TEXT[ english_us ] = "%PRODUCTNAME 6.0 Master Document"; TEXT[ portuguese ] = "%PRODUCTNAME 6.0 Documento-mestre"; - TEXT[ russian ] = "秒噔睇 漕牦戾眚 (%PRODUCTNAME 6.0)"; + TEXT[ russian ] = "杨耱噔眍 漕牦戾眚 (%PRODUCTNAME 6.0)"; TEXT[ greek ] = "%PRODUCTNAME 6.0 - 数耖 葶泷狯"; - TEXT[ dutch ] = "%PRODUCTNAME 6.0 Master Document"; + TEXT[ dutch ] = "%PRODUCTNAME 6.0 Masterdocument"; TEXT[ french ] = "%PRODUCTNAME 6.0 Document ma顃re"; - TEXT[ spanish ] = "%PRODUCTNAME 6.0 Documento maestro"; + TEXT[ spanish ] = "%PRODUCTNAME 6.0 - Documento maestro"; TEXT[ italian ] = "Documento master %PRODUCTNAME 6.0"; - TEXT[ danish ] = "%PRODUCTNAME 6.0 Master Document"; + TEXT[ danish ] = "%PRODUCTNAME 6.0 Hoveddokument"; TEXT[ swedish ] = "Samlingsdokument %PRODUCTNAME 6.0"; TEXT[ polish ] = "%PRODUCTNAME 6.0 - Dokument g丑wny"; TEXT[ portuguese_brazilian ] = "%PRODUCTNAME 6.0 Master Document"; - TEXT[ japanese ] = "%PRODUCTNAME 6.0 辖腊霓翻逸"; - TEXT[ korean ] = "%PRODUCTNAME 6.0 付胶磐 巩辑"; - TEXT[ chinese_simplified ] = "%PRODUCTNAME 6.0 主控文档"; - TEXT[ chinese_traditional ] = "%PRODUCTNAME 6.0 北ゅン"; + TEXT[ japanese ] = "%PRODUCTNAME 6.0 銉炪偣銈裤兗銉夈偔銉ャ儭銉炽儓"; + TEXT[ korean ] = "%PRODUCTNAME 6.0 毵堨姢韯 氍胳劀"; + TEXT[ chinese_simplified ] = "%PRODUCTNAME 6.0 涓绘帶鏂囨。"; + TEXT[ chinese_traditional ] = "%PRODUCTNAME 6.0 涓绘帶鏂囦欢"; TEXT[ turkish ] = "%PRODUCTNAME 6.0 Master Document"; TEXT[ arabic ] = "%PRODUCTNAME 6.0 Master Document"; - TEXT[ catalan ] = "%PRODUCTNAME 6.0 Master Document"; - TEXT[ finnish ] = "%PRODUCTNAME 6.0 Global Dokument"; + TEXT[ catalan ] = "%PRODUCTNAME 6.0 Document mestre"; + TEXT[ finnish ] = "%PRODUCTNAME 6.0 -perusasiakirja"; + TEXT[ thai ] = "喙喔竵喔覆喔｀笗喙夃笝喔夃笟喔编笟 %PRODUCTNAME 6.0 "; }; #define MN_SW_GLOBAL @@ -128,3 +130,8 @@ String STR_WRITER_GLOBALDOC_FULLTYPE #include "swmn.hrc" + + + + + diff --git a/sw/source/ui/inc/app.hrc b/sw/source/ui/inc/app.hrc index 68c8c15230be..e67dbaf985bf 100644 --- a/sw/source/ui/inc/app.hrc +++ b/sw/source/ui/inc/app.hrc @@ -2,9 +2,9 @@ * * $RCSfile: app.hrc,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: os $ $Date: 2002-11-29 12:14:11 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -118,7 +118,7 @@ #define STR_REDLINE_UNKNOWN_AUTHOR (RC_APP_BEGIN + 76) #define STR_WESTERN_FONT (RC_APP_BEGIN + 77) #define STR_CJK_FONT (RC_APP_BEGIN + 78) -#define MSG_INS_MERGE_FIELDS (RC_APP_BEGIN + 79) +//#define MSG_INS_MERGE_FIELDS (RC_APP_BEGIN + 79) #define MSG_PRINT_AS_MERGE (RC_APP_BEGIN + 80) #define MSG_MERGE_SOURCE_UNAVAILABLE (RC_APP_BEGIN + 81) #define MSG_DATA_SOURCES_UNAVAILABLE (RC_APP_BEGIN + 82) diff --git a/sw/source/ui/inc/chartins.hxx b/sw/source/ui/inc/chartins.hxx index 119ff72d9e5b..8142ecb3d415 100644 --- a/sw/source/ui/inc/chartins.hxx +++ b/sw/source/ui/inc/chartins.hxx @@ -2,9 +2,9 @@ * * $RCSfile: chartins.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: os $ $Date: 2002-12-10 14:27:45 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,8 +71,8 @@ #include <sfx2/basedlgs.hxx> #endif -#ifndef _FIXED_HXX //autogen -#include <vcl/fixed.hxx> +#ifndef _STDCTRL_HXX +#include <svtools/stdctrl.hxx> #endif #ifndef _BUTTON_HXX //autogen @@ -99,7 +99,7 @@ class SwInsertChartDlg : public SfxModelessDialog FixedText aRangeFt; AutoEdit aRangeEd; - FixedText aTextFt; + FixedInfo aTextFt; HelpButton aHelp; CancelButton aCancel; @@ -117,6 +117,7 @@ class SwInsertChartDlg : public SfxModelessDialog String aAktTableName; BOOL bUpdateChartData; BOOL bChartInserted; + BOOL bChildOpen; void UpdateData(); virtual BOOL Close(); @@ -132,6 +133,8 @@ public: DECL_LINK( FinishHdl, Button* ); DECL_LINK( CloseHdl, Button* ); DECL_LINK( ClickHdl, CheckBox* ); + + virtual void Activate(); }; #endif diff --git a/sw/source/ui/inc/edtwin.hxx b/sw/source/ui/inc/edtwin.hxx index c3476542c14f..ed6e057b4855 100644 --- a/sw/source/ui/inc/edtwin.hxx +++ b/sw/source/ui/inc/edtwin.hxx @@ -2,9 +2,9 @@ * * $RCSfile: edtwin.hxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: os $ $Date: 2002-11-06 12:47:47 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -302,6 +302,9 @@ public: static void _InitStaticData(); static void _FinitStaticData(); + //#i3370# remove quick help to prevent saving of autocorrection suggestions + void StopQuickHelp(); + SwEditWin(Window *pParent, SwView &); virtual ~SwEditWin(); }; diff --git a/sw/source/ui/inc/fldtdlg.hxx b/sw/source/ui/inc/fldtdlg.hxx index d7eaa7a41a3e..ccb1a7d22a1c 100644 --- a/sw/source/ui/inc/fldtdlg.hxx +++ b/sw/source/ui/inc/fldtdlg.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fldtdlg.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: os $ $Date: 2002-11-29 12:11:46 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,6 +79,7 @@ class SwFldDlg: public SfxTabDialog { SwChildWinWrapper* pChildWin; BOOL bHtmlMode; + BOOL bDataBaseMode; virtual BOOL Close(); virtual SfxItemSet* CreateInputItemSet( USHORT nId ); diff --git a/sw/source/ui/inc/fldwrap.hxx b/sw/source/ui/inc/fldwrap.hxx index 4784d04265cf..50b5df670af9 100644 --- a/sw/source/ui/inc/fldwrap.hxx +++ b/sw/source/ui/inc/fldwrap.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fldwrap.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:39 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,6 +74,20 @@ public: virtual BOOL ReInitDlg(SwDocShell *pDocSh); void ShowPage(USHORT nPage = 0); }; +/* -----------------04.02.2003 14:14----------------- + * field dialog only showing database page to support + * mail merge + * --------------------------------------------------*/ +class SwFldDataOnlyDlgWrapper : public SwChildWinWrapper +{ +public: + SwFldDataOnlyDlgWrapper( Window* pParent, USHORT nId, + SfxBindings* pBindings, SfxChildWinInfo* pInfo ); + + SFX_DECL_CHILDWINDOW(SwFldDataOnlyDlgWrapper); + + virtual BOOL ReInitDlg(SwDocShell *pDocSh); +}; #endif diff --git a/sw/source/ui/inc/mailmrge.hxx b/sw/source/ui/inc/mailmrge.hxx index b187a375dece..6fa5d7dde817 100644 --- a/sw/source/ui/inc/mailmrge.hxx +++ b/sw/source/ui/inc/mailmrge.hxx @@ -2,9 +2,9 @@ * * $RCSfile: mailmrge.hxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: os $ $Date: 2002-11-29 12:14:11 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,6 +80,10 @@ #include <vcl/edit.hxx> #endif +#ifndef _STDCTRL_HXX +#include <svtools/stdctrl.hxx> +#endif + #ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> #endif @@ -206,5 +210,26 @@ public: BOOL IsThisDocument() const {return aThisDocRB.IsChecked();} }; +/* -----------------04.02.2003 13:41----------------- + * + * --------------------------------------------------*/ +class SwMailMergeFieldConnectionsDlg : public ModalDialog +{ + FixedLine aConnectionsFL; + RadioButton aUseExistingRB; + RadioButton aCreateNewRB; + + FixedInfo aInfoFI; + + OKButton aOK; + CancelButton aCancel; + HelpButton aHelp; +public: + SwMailMergeFieldConnectionsDlg(Window* pParent); + ~SwMailMergeFieldConnectionsDlg(); + + BOOL IsUseExistingConnections() const {return aUseExistingRB.IsChecked();} +}; + #endif diff --git a/sw/source/ui/inc/pview.hxx b/sw/source/ui/inc/pview.hxx index c94ecffd5b25..ef488977fbc3 100644 --- a/sw/source/ui/inc/pview.hxx +++ b/sw/source/ui/inc/pview.hxx @@ -2,9 +2,9 @@ * * $RCSfile: pview.hxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: od $ $Date: 2002-12-06 16:16:06 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -92,20 +92,22 @@ class SwRect; class DataChangedEvent; class CommandEvent; class SvtAccessibilityOptions; +// OD 12.12.2002 #103492# +class SwPagePreviewLayout; class SwPagePreViewWin : public Window { ViewShell* mpViewShell; - USHORT mnSttPage, mnVirtPage, mnSelectedPage; + USHORT mnSttPage, mnVirtPage; BYTE mnRow, mnCol; - Size maPxWinSize, maPgSize; - // OD 02.12.2002 #103492 - Size maPreviewDocSize; + Size maPxWinSize; Fraction maScale; SwPagePreView& mrView; // OD 02.12.2002 #103492# bool mbCalcScaleForPreviewLayout; Rectangle maPaintedPreviewDocRect; + // OD 12.12.2002 #103492# + SwPagePreviewLayout* mpPgPrevwLayout; void SetPagePreview( BYTE nRow, BYTE nCol ); @@ -120,7 +122,8 @@ public: virtual void MouseButtonDown(const MouseEvent& rMEvt); virtual void DataChanged( const DataChangedEvent& ); - void SetViewShell( ViewShell* pShell ) { mpViewShell = pShell; } + void SetViewShell( ViewShell* pShell ); + ViewShell* GetViewShell() const { return mpViewShell; } BYTE GetRow() const { return mnRow; } @@ -134,7 +137,27 @@ public: void SetSttPage( USHORT n ) { mnSttPage = mnVirtPage = n; if( !n ) ++mnVirtPage; } - USHORT& GetSelectedPage() {return mnSelectedPage;} + /** get selected page number of document preview + + OD 13.12.2002 #103492# + + @author OD + + @return selected page number + */ + sal_uInt16 SelectedPage() const; + + /** set selected page number in document preview + + OD 13.12.2002 #103492# + + @author OD + + @param _nSelectedPageNum + input parameter - physical page number of page that will be the selected one. + */ + void SetSelectedPage( sal_uInt16 _nSelectedPageNum ); + //JP 19.08.98: bei Einspaltigkeit gibt es keine 0. Seite! USHORT GetDefSttPage() const { return 1 == mnCol ? 1 : 0; } @@ -143,27 +166,25 @@ public: const Size& GetWinSize() const { return maPxWinSize; } void SetWinSize( const Size& rNewSize ); - enum MoveMode{ MV_CALC, MV_PAGE_UP, MV_PAGE_DOWN, MV_DOC_STT, MV_DOC_END }; + // OD 18.12.2002 #103492# - add <MV_SELPAGE>, <MV_SCROLL> + enum MoveMode{ MV_CALC, MV_PAGE_UP, MV_PAGE_DOWN, MV_DOC_STT, MV_DOC_END, + MV_SELPAGE, MV_SCROLL, MV_NEWWINSIZE }; int MovePage( int eMoveMode ); // erzeuge den String fuer die StatusLeiste void GetStatusStr( String& rStr, USHORT nPageCount ) const; - void GetOptimalSize( Size& rSize ) const; void RepaintCoreRect( const SwRect& rRect ); /** method to adjust preview to a new zoom factor OD 02.12.2002 #103492# - paint of preview is prepare and performed for a new zoom factor + paint of preview is prepared for a new zoom factor @author OD */ void AdjustPreviewToNewZoom( const sal_uInt16 nZoomFactor ); - const Size& GetPreviewDocSize() const - { return maPreviewDocSize;} - const Rectangle& GetPaintedPreviewDocRect() const { return maPaintedPreviewDocRect;} void Scroll(long nXMove, long nYMove); @@ -208,6 +229,12 @@ class SwPagePreView: public SfxViewShell USHORT mnPageCount; BOOL bNormalPrint; + // OD 09.01.2003 #106334# + // new members to reset design mode at draw view for form shell on switching + // back from writer page preview to normal view. + sal_Bool mbResetFormDesignMode:1; + sal_Bool mbFormDesignModeToReset:1; + void Init(const SwViewOption* = 0); Point AlignToPixel(const Point& rPt) const; @@ -228,6 +255,21 @@ class SwPagePreView: public SfxViewShell void CalcAndSetBorderPixel( SvBorder &rToFill, FASTBOOL bInner ); + /** help method to execute SfxRequest FN_PAGE_UP and FN_PAGE_DOWN + + OD 04.03.2003 #107369# + + @param _bPgUp + input parameter - boolean that indicates, if FN_PAGE_UP or FN_PAGE_DOWN + has to be executed. + + @param _pReq + optional input parameter - pointer to the <SfxRequest> instance, if existing. + + @author OD + */ + void _ExecPgUpAndPgDown( const bool _bPgUp, + SfxRequest* _pReq = 0 ); protected: virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); @@ -284,6 +326,32 @@ public: //apply Accessiblity options void ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOptions); + // OD 09.01.2003 #106334# - inline method to request values of new members + // <mbResetFormDesignMode> and <mbFormDesignModeToReset> + inline sal_Bool ResetFormDesignMode() const + { + return mbResetFormDesignMode; + } + + inline sal_Bool FormDesignModeToReset() const + { + return mbFormDesignModeToReset; + } + + /** adjust position of vertical scrollbar + + OD 19.02.2003 #107369 + Currently used, if the complete preview layout rows fit into to the given + window, if a new page is selected and this page is visible. + + @author OD + + @param _nNewThumbPos + input parameter - new position, which will be assigned to the vertical + scrollbar. + */ + void SetVScrollbarThumbPos( const sal_uInt16 _nNewThumbPos ); + SwPagePreView( SfxViewFrame* pFrame, SfxViewShell* ); ~SwPagePreView(); }; diff --git a/sw/source/ui/inc/shells.hrc b/sw/source/ui/inc/shells.hrc index a21b7873bed3..458bce22870f 100644 --- a/sw/source/ui/inc/shells.hrc +++ b/sw/source/ui/inc/shells.hrc @@ -2,9 +2,9 @@ * * $RCSfile: shells.hrc,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: os $ $Date: 2002-08-30 10:33:47 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -129,7 +129,9 @@ #define STR_NAME_GROUP_LABEL (RC_SHELLS_BEGIN + 58) #define STR_NAME_GROUP_DIALOG (RC_SHELLS_BEGIN + 59) -#define SHELLS_ACT_END STR_NAME_GROUP_DIALOG +#define RID_MODULE_TOOLBOX (RC_SHELLS_BEGIN + 60) + +#define SHELLS_ACT_END RID_MODULE_TOOLBOX #if SHELLS_ACT_END > RC_SHELLS_END #error Resource-Id Ueberlauf in #file, #line diff --git a/sw/source/ui/inc/swdtflvr.hxx b/sw/source/ui/inc/swdtflvr.hxx index c08ee612ec9d..91a2d8197be6 100644 --- a/sw/source/ui/inc/swdtflvr.hxx +++ b/sw/source/ui/inc/swdtflvr.hxx @@ -2,9 +2,9 @@ * * $RCSfile: swdtflvr.hxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: mba $ $Date: 2002-07-01 13:03:28 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,6 +86,7 @@ class SwTextBlocks; class SwWrtShell; class Reader; class SvxClipboardFmtItem; +class ViewShell; enum TransferBufferType { @@ -110,6 +111,9 @@ class SwTransferable : public TransferableHelper ::so3::SvBaseLinkRef refDdeLink; SwWrtShell *pWrtShell; + /* #96392# Added pCreatorView to distinguish SwFrameShell from + SwWrtShell. */ + const ViewShell *pCreatorView; SwDocFac *pClpDocFac; Graphic *pClpGraphic, *pClpBitmap, *pOrigGrf; INetBookmark *pBkmk; // URL und Beschreibung! @@ -224,7 +228,7 @@ public: static int PasteFormat( SwWrtShell& rSh, TransferableDataHelper& rData, ULONG nFormat ); - static void FillClipFmtItem( SwWrtShell& rSh, + static void FillClipFmtItem( const SwWrtShell& rSh, const TransferableDataHelper& rData, SvxClipboardFmtItem & rToFill ); @@ -234,8 +238,11 @@ public: void SetCleanUp( BOOL bFlag ) { bCleanUp = bFlag; } // Interfaces for Selection - static void CreateSelection( SwWrtShell& rSh ); - static void ClearSelection( SwWrtShell& rSh ); + /* #96392# Added pCreator to distinguish SwFrameShell from SwWrtShell. */ + static void CreateSelection( SwWrtShell & rSh, + const ViewShell * pCreator = NULL ); + static void ClearSelection( SwWrtShell& rSh, + const ViewShell * pCreator = NULL ); }; diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index 7ce4fcd5bb07..e1c5c67498d1 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -2,9 +2,9 @@ * * $RCSfile: view.hxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: tl $ $Date: 2002-11-13 14:29:01 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -292,7 +292,9 @@ class SwView: public SfxViewShell bInInnerResizePixel : 1, bIsApi : 1, bPasteState : 1, - bPasteSpecialState : 1 + bPasteSpecialState : 1, + bInMailMerge : 1, + bInDtor : 1 //detect destructor to prevent creating of sub shells while closing ; // Methoden fuers Suchen @@ -405,6 +407,9 @@ protected: const SwFrmFmt* GetLastTblFrmFmt() const {return pLastTableFormat;} void SetLastTblFrmFmt(const SwFrmFmt* pSet) {pLastTableFormat = pSet;} + // form letter execution + void GenerateFormLetter(BOOL bUseCurrentDocument); + public: SFX_DECL_VIEWFACTORY(SwView); @@ -600,6 +605,8 @@ public: BOOL IsPasteAllowed(); BOOL IsPasteSpecialAllowed(); + // Enable mail merge - mail merge field dialog enabled + void EnableMailMerge(BOOL bEnable = TRUE); //apply Accessiblity options void ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOptions); diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index 896e001aa46f..a040cb8ad3b7 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -2,9 +2,9 @@ * * $RCSfile: cntex.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: os $ $Date: 2002-10-22 07:16:13 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -387,7 +387,8 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample( lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_USE_DASH, 0 != (nIdxOptions&TOI_DASH )); lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_USE_UPPER_CASE, 0 != (nIdxOptions&TOI_INITIAL_CAPS )); - lcl_SetProp(xInfo, xIdxProps, UNO_NAME_LABEL_CATEGORY, rDesc.GetSequenceName()); + String aTmpName( SwStyleNameMapper::GetSpecialExtraProgName( rDesc.GetSequenceName() ) ); + lcl_SetProp(xInfo, xIdxProps, UNO_NAME_LABEL_CATEGORY, aTmpName ); lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_CREATE_FROM_LABELS, !rDesc.IsCreateFromObjectNames()); sal_Int16 nSet = text::ChapterFormat::NAME_NUMBER; diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 1ba409e00b80..d8f2ba49558b 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -2,9 +2,9 @@ * * $RCSfile: cnttab.cxx,v $ * - * $Revision: 1.49 $ + * $Revision: 1.50 $ * - * last change: $Author: os $ $Date: 2002-10-30 10:41:05 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -724,7 +724,7 @@ IMPL_LINK( SwMultiTOXTabDialog, ShowPreviewHdl, CheckBox *, pBox ) Window *pTopmostParent = this; while(pTopmostParent->GetParent()) pTopmostParent = pTopmostParent->GetParent(); - ::Rectangle aRect(GetWindowExtentsRelative(pTopmostParent)); + ::Rectangle aRect(GetClientWindowExtentsRelative(pTopmostParent)); ::Point aPos = aRect.TopLeft(); Size aSize = GetSizePixel(); if(pBox) diff --git a/sw/source/ui/index/cnttab.src b/sw/source/ui/index/cnttab.src index 9e634b870c8e..96df04c34276 100644 --- a/sw/source/ui/index/cnttab.src +++ b/sw/source/ui/index/cnttab.src @@ -2,9 +2,9 @@ * * $RCSfile: cnttab.src,v $ * - * $Revision: 1.63 $ + * $Revision: 1.64 $ * - * last change: $Author: rt $ $Date: 2002-12-09 09:58:11 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -141,7 +141,7 @@ String STR_LEVEL Text[ polish ] = "Poziom "; Text[ japanese ] = "銉儥銉 "; Text[ greek ] = "硼唣邃 "; - Text[ korean ] = "瓿勳傅 "; + Text[ korean ] = "靾橃"; Text[ chinese_traditional ] = "绱 "; Text[ arabic ] = "轻阌舒 "; Text[ turkish ] = "D鼁ey "; @@ -212,7 +212,7 @@ TabDialog DLG_MULTI_TOX Text[ polish ] = "Indeks"; Text[ portuguese_brazilian ] = "Index"; Text[ japanese ] = "鐩銇ㄧ储寮"; - Text[ korean ] = "靸夓澑"; + Text[ korean ] = "靸夓澑/氇╈皑"; Text[ chinese_simplified ] = "鐩綍"; Text[ chinese_traditional ] = "鐩寗"; Text[ arabic ] = "蒎延"; @@ -272,7 +272,7 @@ TabDialog DLG_MULTI_TOX Text[ chinese_traditional ] = "妯ｅ紡"; Text[ arabic ] = "娩闱"; Text[ greek ] = "旭躔"; - Text[ korean ] = "韰滍攲毽"; + Text[ korean ] = "鞀ろ儉鞚"; Text[ turkish ] = "轪blonlar"; Text[ language_user1 ] = " "; Text[ catalan ] = "Estils"; @@ -412,7 +412,7 @@ TabDialog DLG_MULTI_TOX Text[ polish ] = "Wstaw indeks"; Text[ portuguese_brazilian ] = "Insert index"; Text[ japanese ] = "鐩銇ㄧ储寮曘伄鎸垮叆"; - Text[ korean ] = "靸夓澑 靷届瀰"; + Text[ korean ] = "靸夓澑 氚 氇╈皑 靷届瀰"; Text[ chinese_simplified ] = "鎻掑叆鐩綍"; Text[ chinese_traditional ] = "鎻掑叆鐩寗"; Text[ arabic ] = "畔亚 蒎延"; @@ -429,7 +429,7 @@ TabDialog DLG_MULTI_TOX Text[ polish ] = "Wstaw indeks"; Text[ portuguese_brazilian ] = "Insert index"; Text[ japanese ] = "鐩銇ㄧ储寮曘伄鎸垮叆"; - Text[ korean ] = "靸夓澑 靷届瀰"; + Text[ korean ] = "靸夓澑 氚 氇╈皑 靷届瀰"; Text[ chinese_simplified ] = "鎻掑叆鐩綍"; Text[ chinese_traditional ] = "鎻掑叆鐩寗"; Text[ arabic ] = "畔亚 蒎延"; @@ -465,7 +465,7 @@ TabPage TP_TOX_SELECT Text[ polish ] = "Typ i tytu"; Text[ portuguese_brazilian ] = "Type and title"; Text[ japanese ] = "绋銇ㄣ偪銈ゃ儓銉"; - Text[ korean ] = "鞙犿槙瓿 鞝滊"; + Text[ korean ] = "鞙犿槙 氚 鞝滊"; Text[ chinese_simplified ] = "绫诲瀷鍜屾爣棰"; Text[ chinese_traditional ] = "椤炲瀷鍜屾椤"; Text[ arabic ] = "轻滏 媲嶷滏卿"; @@ -708,7 +708,7 @@ TabPage TP_TOX_SELECT StringList [ korean ] = { < "氇╈皑" ; TO_CONTENT ;> ; - < "韨れ泴霌 靸夓澑" ; TO_INDEX ;> ; + < "靸夓澑" ; TO_INDEX ;> ; < "靷巾檾 靸夓澑" ; TO_ILLUSTRATION ;> ; < "響 靸夓澑" ; TO_TABLE ;> ; < "靷毄鞛 鞝曥潣" ; TO_USER ;> ; @@ -806,7 +806,7 @@ TabPage TP_TOX_SELECT Text[ polish ] = "Chroniony przed r阠znymi zmianami"; Text[ portuguese_brazilian ] = "Protected against manual changes"; Text[ japanese ] = "浠绘剰澶夋洿銇嬨倝淇濊"; - Text[ korean ] = "靾橂彊 氤瓴届溂搿 攵韯 氤错樃"; + Text[ korean ] = "鞛勳潣 氤瓴届溂搿滊秬韯 氤错樃"; Text[ chinese_simplified ] = "闃叉鎵嬪姩鏇存敼"; Text[ chinese_traditional ] = "涓嶅厑瑷辨墜鍕曡畩鏇"; Text[ arabic ] = "阃沩 窒 轻售眄亚 轻硐骓"; @@ -836,7 +836,7 @@ TabPage TP_TOX_SELECT Text[ polish ] = "Utw髍z indeks"; Text[ portuguese_brazilian ] = "Create index of"; Text[ japanese ] = "鐩銇ㄧ储寮曘伄浣滄垚"; - Text[ korean ] = "鞚鸽嵄鞀 毵岆摛旮"; + Text[ korean ] = "靸夓澑 氚 氇╈皑 毵岆摛旮"; Text[ chinese_simplified ] = "鏂板鐩綍"; Text[ chinese_traditional ] = "鏂板鐩寗"; Text[ turkish ] = "Create index of"; @@ -852,7 +852,7 @@ TabPage TP_TOX_SELECT Text [ ENGLISH ] = "Type" ; Text[ english_us ] = "for"; Text[ portuguese ] = "Tipo"; - Text[ russian ] = "碾"; + Text[ russian ] = "潆"; Text[ greek ] = "瞄"; Text[ dutch ] = "voor"; Text[ french ] = "Pour"; @@ -864,7 +864,7 @@ TabPage TP_TOX_SELECT Text[ polish ] = "Dotyczy"; Text[ portuguese_brazilian ] = "Type"; Text[ japanese ] = "瀵捐薄"; - Text[ korean ] = "鞙犿槙"; + Text[ korean ] = "雽靸"; Text[ chinese_simplified ] = "鐢ㄤ簬"; Text[ chinese_traditional ] = "鐢ㄦ柤"; Text[ turkish ] = "Type"; @@ -1019,7 +1019,7 @@ TabPage TP_TOX_SELECT Text[ polish ] = "Ewaluuj do poziomu"; Text[ portuguese_brazilian ] = "Evaluation level"; Text[ japanese ] = "娆°伄銉儥銉伨銇ч仼鐢"; - Text[ korean ] = "韽夑皜 雼硠"; + Text[ korean ] = "雼れ潓 靾橃旯岇 鞝侅毄"; Text[ chinese_simplified ] = "鍖呮嫭绾у埆"; Text[ chinese_traditional ] = "鍖呮嫭绱氬垾"; Text[ turkish ] = "辵 d鼁eye kadar:"; @@ -1127,7 +1127,7 @@ TabPage TP_TOX_SELECT Text[ polish ] = "Inne style"; Text[ portuguese_brazilian ] = "additional styles"; Text[ japanese ] = "銇濄伄浠栥伄銈广偪銈ゃ儷(~A)"; - Text[ korean ] = "旮绊儉 韰滍攲毽(~A)"; + Text[ korean ] = "鞀ろ儉鞚 鞓奠厴(~A)"; Text[ chinese_simplified ] = "鍏跺畠鏍峰紡(~A)"; Text[ chinese_traditional ] = "鍏朵粬妯ｅ紡(~A)"; Text[ arabic ] = "娩闱 胖禽砩"; @@ -1399,7 +1399,7 @@ TabPage TP_TOX_SELECT StringList [ korean ] = { < "彀胳“" ; > ; - < "氩旍＜鞕 氩堩樃" ; > ; + < "氩旍＜ 氚 氩堩樃" ; > ; < "旌§厴 韰嶌姢韸" ; > ; }; StringList [ chinese_simplified ] = @@ -1542,7 +1542,7 @@ TabPage TP_TOX_SELECT Text[ greek ] = "吁汴蓓赳 ~戾"; Text[ dutch ] = "Samenvatten ~met -"; Text[ french ] = "A~vec -"; - Text[ spanish ] = "U~nir con -"; + Text[ spanish ] = "~Combinar con -"; Text[ italian ] = "Riunisci ~con -"; Text[ danish ] = "Kombiner med -"; Text[ swedish ] = "Kombinera ~med -"; @@ -1595,7 +1595,7 @@ TabPage TP_TOX_SELECT Text [ ENGLISH ] = "Capitalize entries"; Text[ english_us ] = "AutoCapitalize entries"; Text[ portuguese ] = "~Escrever entradas em mai鷖culas autom."; - Text[ russian ] = "蓦屐屙螓 玎汶噔睇扈 狍赈囔 (噔蝾.)"; + Text[ russian ] = "青汶噔睇扈 狍赈囔 (噔蝾爨蜩麇耜)"; Text[ greek ] = "陪泷狯蒡 狨麸燔豉 戾 赍鲠脶哚 泷莒灬翎"; Text[ dutch ] = "Items automatisch met ~hoofdletter"; Text[ french ] = "Entr閑s en majuscules (autom.)"; @@ -1606,7 +1606,7 @@ TabPage TP_TOX_SELECT Text[ polish ] = "Zaczynaj wpisy autom. od wielkiej litery"; Text[ portuguese_brazilian ] = "Capitalize entries"; Text[ japanese ] = "瑾為牠銈掕嚜鍕曠殑銇ぇ鏂囧瓧銇仚銈"; - Text[ korean ] = "鞛呺牓 鞛愲彊鞙茧 雽氍胳瀽"; + Text[ korean ] = "鞏措憪毳 鞛愲彊鞙茧 雽氍胳瀽搿 氚旉繄"; Text[ chinese_simplified ] = "鑷姩杞崲鎴愬ぇ鍐欐潯鐩"; Text[ chinese_traditional ] = "杞夊嫊杞夋彌鎴愬ぇ瀵瓧姣"; Text[ arabic ] = "认 轻畔吻崆 让脱 呷硌 梳耷祈丘"; @@ -1656,7 +1656,7 @@ TabPage TP_TOX_SELECT Text[ greek ] = "~榴麇唢 翎铋睃扃箸"; Text[ dutch ] = "~Concordantiebestand"; Text[ french ] = "Fichier ~concordance"; - Text[ spanish ] = "~Archivo concordancia"; + Text[ spanish ] = "~Archivo de concordancia"; Text[ italian ] = "File di conco~rdanza"; Text[ danish ] = "Konkordansfil"; Text[ swedish ] = "Konkordansfil"; @@ -1865,7 +1865,7 @@ TabPage TP_TOX_SELECT Text[ polish ] = "Grafiki"; Text[ portuguese_brazilian ] = "Graphics"; Text[ japanese ] = "鍥"; - Text[ korean ] = "攴鸽灅頂"; + Text[ korean ] = "攴鸽"; Text[ chinese_simplified ] = "鍥惧舰"; Text[ chinese_traditional ] = "鍦栧舰"; Text[ arabic ] = "真"; @@ -1923,7 +1923,7 @@ TabPage TP_TOX_SELECT Text[ polish ] = "Poziom ze 焤骴砤"; Text[ portuguese_brazilian ] = "Use level from source"; Text[ japanese ] = "銈傘仺銇珷銇儸銉欍儷"; - Text[ korean ] = "鞗愲灅 鞛レ棎靹滌潣 靾橃 靷毄"; + Text[ korean ] = "鞗愲灅 鞛レ溂搿滊秬韯 靾橃 靷毄"; Text[ chinese_simplified ] = "浣跨敤婧愮珷鑺傜殑绾"; Text[ chinese_traditional ] = "绱氬緸婧愮珷绡"; Text[ arabic ] = "怯饰锨 阌舒 沅 轻菡 轻阏涎"; @@ -2276,18 +2276,18 @@ TabPage TP_TOX_SELECT Text[ russian ] = "[none]"; Text[ greek ] = "[none]"; Text[ dutch ] = "[none]"; - Text[ french ] = "[none]"; - Text[ spanish ] = "[none]"; + Text[ french ] = "[aucun(e)]"; + Text[ spanish ] = "[Ninguno]"; Text[ finnish ] = "[none]"; - Text[ italian ] = "[none]"; + Text[ italian ] = "[nessuno]"; Text[ danish ] = "[none]"; - Text[ swedish ] = "[none]"; + Text[ swedish ] = "[ingen]"; Text[ polish ] = "[none]"; Text[ portuguese_brazilian ] = "[none]"; - Text[ japanese ] = "[none]"; - Text[ korean ] = "[none]"; - Text[ chinese_simplified ] = "[none]"; - Text[ chinese_traditional ] = "[none]"; + Text[ japanese ] = "[銇仐]"; + Text[ korean ] = "[鞐嗢潓]"; + Text[ chinese_simplified ] = "[鏃燷"; + Text[ chinese_traditional ] = "[鐒"; Text[ turkish ] = "[none]"; Text[ arabic ] = "[none]"; Text[ catalan ] = "[none]"; @@ -2312,7 +2312,7 @@ TabPage TP_TOX_SELECT Text[ polish ] = "Formatowanie wpis體"; Text[ portuguese_brazilian ] = "Formatting of the marks"; Text[ japanese ] = "闋呯洰銇浉寮"; - Text[ korean ] = "鞛呺牓 靹滌嫕 歆鞝"; + Text[ korean ] = "頃 靹滌嫕"; Text[ chinese_simplified ] = "鏉＄洰鐨勬牸寮忓寲"; Text[ chinese_traditional ] = "闋呯洰鐨勬牸寮忓寲"; Text[ arabic ] = "输禹 轻畔吻崆"; @@ -2339,7 +2339,7 @@ TabPage TP_TOX_SELECT Text[ polish ] = "Plik selekcyjny, przeznaczony dla skorowidza (*.sdi)"; Text[ portuguese_brazilian ] = "Mark up file for index"; Text[ japanese ] = "绱㈠紩鐢ㄣ伄閬告姙銉曘偂銈ゃ儷 (*.sdi)"; - Text[ korean ] = "韨れ泴霌 靸夓澑鞚 鞙勴暅 靹犿儩 響滌嫓 韺岇澕 (*.sdi)"; + Text[ korean ] = "靸夓澑鞖 靹犿儩 韺岇澕 (*.sdi)"; Text[ chinese_simplified ] = "鐢ㄤ簬绱㈠紩鐩綍鐨勬爣璁版枃浠(*.sdi)"; Text[ chinese_traditional ] = "鐢ㄦ柤绱㈠紩鐩寗鐨勬瑷樻獢妗(*.sdi)"; Text[ arabic ] = "汜 轻释享 後蒎延 轻萌滔 (*.sdi)"; @@ -2848,7 +2848,7 @@ TabPage TP_TOX_ENTRY Text[ polish ] = "Tabulator"; Text[ portuguese_brazilian ] = "Tab stop"; Text[ japanese ] = "銈裤儢"; - Text[ korean ] = "韮 鞙勳箻"; + Text[ korean ] = "韮 靹れ爼 鞙勳箻"; Text[ chinese_simplified ] = "鍒惰〃绗"; Text[ chinese_traditional ] = "瀹氫綅閸"; Text[ arabic ] = "卺倾 滔驷"; @@ -3036,7 +3036,7 @@ TabPage TP_TOX_ENTRY Text[ polish ] = "Styl znak體: "; Text[ portuguese_brazilian ] = "Character style: "; Text[ japanese ] = "鏂囧瓧銈广偪銈ゃ儷: "; - Text[ korean ] = "氍胳瀽 鞙犿槙: "; + Text[ korean ] = "氍胳瀽 鞀ろ儉鞚: "; Text[ chinese_simplified ] = "瀛楃鏍峰紡锛 "; Text[ chinese_traditional ] = "瀛楀厓妯ｅ紡锛 "; Text[ arabic ] = "溷 轻猛演: "; @@ -3055,7 +3055,7 @@ TabPage TP_TOX_ENTRY Text [ ENGLISH ] = "All" ; Text[ english_us ] = "~All"; Text[ portuguese ] = "~N韛eis todos"; - Text[ russian ] = "埋 箴钼龛"; + Text[ russian ] = "埋 ~箴钼龛"; Text[ greek ] = "茧~ 翎 屦唣邃"; Text[ dutch ] = "~Alle niveaus"; Text[ french ] = "Tous"; @@ -3094,7 +3094,7 @@ TabPage TP_TOX_ENTRY Text[ polish ] = "Rozdzia nr."; Text[ portuguese_brazilian ] = "Chapter no."; Text[ japanese ] = "绔犵暘鍙"; - Text[ korean ] = "鞛 氩堩樃."; + Text[ korean ] = "鞛 氩堩樃"; Text[ chinese_simplified ] = "绔犺妭缂栧彿"; Text[ chinese_traditional ] = "绔犵瘈绶ㄨ櫉"; Text[ arabic ] = "艳 轻菡"; @@ -3116,7 +3116,7 @@ TabPage TP_TOX_ENTRY Text[ greek ] = "叔哽屙 赆翎齄耖箸"; Text[ dutch ] = "Tekst~item"; Text[ french ] = "Texte"; - Text[ spanish ] = "Te~xto entrada"; + Text[ spanish ] = "Te~xto de entrada"; Text[ italian ] = "Testo voce"; Text[ danish ] = "Ele~menttekst"; Text[ swedish ] = "~Posttext"; @@ -3181,7 +3181,7 @@ TabPage TP_TOX_ENTRY Text[ polish ] = "Numer str."; Text[ portuguese_brazilian ] = "Page no."; Text[ japanese ] = "銉氥兗銈哥暘鍙"; - Text[ korean ] = "韼橃澊歆 氩堩樃."; + Text[ korean ] = "韼橃澊歆 氩堩樃"; Text[ chinese_simplified ] = "椤电爜"; Text[ chinese_traditional ] = "闋佺⒓"; Text[ arabic ] = "艳 轻蛰蜕"; @@ -3298,7 +3298,7 @@ TabPage TP_TOX_ENTRY Text[ greek ] = "梳糗胥珞"; Text[ dutch ] = "~Verwijderen"; Text[ french ] = "Supprimer"; - Text[ spanish ] = "~Eliminar"; + Text[ spanish ] = "~Borrar"; Text[ italian ] = "Ri~muovi"; Text[ danish ] = "Fjern"; Text[ swedish ] = "~Ta bort"; @@ -3334,7 +3334,7 @@ TabPage TP_TOX_ENTRY Text[ polish ] = "Styl znaku"; Text[ portuguese_brazilian ] = "Character style"; Text[ japanese ] = "鏂囧瓧銈广偪銈ゃ儷"; - Text[ korean ] = "氍胳瀽 鞙犿槙"; + Text[ korean ] = "氍胳瀽 鞀ろ儉鞚"; Text[ chinese_simplified ] = "瀛楃鏍峰紡"; Text[ chinese_traditional ] = "瀛楀厓妯ｅ紡"; Text[ arabic ] = "溷 轻猛演"; @@ -3549,9 +3549,9 @@ TabPage TP_TOX_ENTRY }; StringList [ korean ] = { - < "靾瀽 氩旍渼毵" ; > ; + < "氩堩樃 氩旍渼毵" ; > ; < "靹る獏毵" ; > ; - < "靾瀽 氩旍渼鞕 靹る獏" ; > ; + < "氩堩樃 氩旍渼 氚 靹る獏" ; > ; }; StringList [ chinese_simplified ] = { @@ -3615,7 +3615,7 @@ TabPage TP_TOX_ENTRY Text[ polish ] = "Pozycja tabulatora"; Text[ portuguese_brazilian ] = "Tab stop position"; Text[ japanese ] = "銈裤儢浣嶇疆"; - Text[ korean ] = "韮 鞙勳箻"; + Text[ korean ] = "韮 靹れ爼 鞙勳箻"; Text[ chinese_simplified ] = "鍒惰〃绗︿綅缃"; Text[ chinese_traditional ] = "瀹氫綅閸典綅缃"; Text[ arabic ] = "沔众 卺倾 轻滔驷"; @@ -3654,7 +3654,7 @@ TabPage TP_TOX_ENTRY Text[ russian ] = "扬疣忄"; Text[ greek ] = "郁镞鏖箸 溴铋"; Text[ dutch ] = "Rechtslijnend"; - Text[ french ] = "Align droite"; + Text[ french ] = "Aligner droite"; Text[ spanish ] = "Alinear a la derecha"; Text[ finnish ] = "Tasaa oikealle"; Text[ italian ] = "Bordo dest~ro"; @@ -3713,14 +3713,14 @@ TabPage TP_TOX_ENTRY Text[ greek ] = "容箸 篝珉镨弭 犴茈镢 戾 翮 弩秣 麸 瘃雉秕 翮 疳襻泷荟秕"; Text[ dutch ] = "~Positie in verhouding tot de inspringing uit het alinea-opmaakprofiel."; Text[ french ] = "P~osition en fonction du style de paragraphe (retrait)"; - Text[ spanish ] = "Posici髇 relativa a sangr韆 de estilo de p醨rafo"; + Text[ spanish ] = "P~osici髇 relativa a la sangr韆 del estilo de p醨rafo"; Text[ italian ] = "P~osizione relativa al rientro del modello di paragrafo"; Text[ danish ] = "Ta~bulatorernes position relativ til indrykningen fra afsnitstypografien"; Text[ swedish ] = "Tabbarnas p~osition relativ till indraget fr錸 styckeformatmallen"; Text[ polish ] = "Pozycja relatywna do wci阠ia ze stylu akapitu"; Text[ portuguese_brazilian ] = "Position relativ to the paragraph style indent"; Text[ japanese ] = "銈裤儢浣嶇疆銇钀姐偣銈裤偆銉伄銈ゃ兂銉囥兂銉堛亱銈(~V)"; - Text[ korean ] = "雼澖 鞀ろ儉鞚检潣 觳 氍胳灔 霌れ棳鞊瓣赴鞐 甏霠悳 韮 鞙勳箻(~V)"; + Text[ korean ] = "韮潣 鞙勳箻電 雼澖 鞀ろ儉鞚检潣 霌れ棳鞊瓣赴鞐 旮办頃橃棳 歆鞝(~V)"; Text[ chinese_simplified ] = "璋冩暣鍒惰〃绗﹀拰娈佃惤鏍峰紡缂╄繘鐨勪綅缃(~V)"; Text[ chinese_traditional ] = "瀹氫綅閸典綅缃拰娈佃惤妯ｅ紡鐨勭府鎺掍繚鎸佺浉灏嶄綅缃(~V)"; Text[ arabic ] = "沔众 卺倾鞘 轻滔驷 溆壬 崤仪蜕 溷 轻蒉焉"; @@ -3749,7 +3749,7 @@ TabPage TP_TOX_ENTRY Text[ polish ] = "Styl znaku wpis體 g丑wnych"; Text[ portuguese_brazilian ] = "Character style of main entries"; Text[ japanese ] = "涓婚爡鐩伄鏂囧瓧銈广偪銈ゃ儷"; - Text[ korean ] = "欤 頃鞚 氍胳瀽 鞙犿槙"; + Text[ korean ] = "欤 頃鞚 氍胳瀽 鞀ろ儉鞚"; Text[ chinese_simplified ] = "涓绘潯鐩殑瀛楃鏍峰紡"; Text[ chinese_traditional ] = "涓婚爡鐩殑瀛楀厓妯ｅ紡"; Text[ arabic ] = "溷 轻猛演 後畔吻崆 轻哑碛砩"; @@ -3845,7 +3845,7 @@ TabPage TP_TOX_ENTRY Text[ polish ] = "Format"; Text[ portuguese_brazilian ] = "Format"; Text[ japanese ] = "鏇稿紡"; - Text[ korean ] = "靹滌嫕 歆鞝"; + Text[ korean ] = "靹滌嫕"; Text[ chinese_simplified ] = "鏍煎紡鍖"; Text[ chinese_traditional ] = "鏍煎紡鍖"; Text[ arabic ] = "轻输禹"; @@ -3931,7 +3931,7 @@ TabPage TP_TOX_ENTRY Text[ polish ] = "Sortuj wed硊g"; Text[ portuguese_brazilian ] = "Sort by ..."; Text[ japanese ] = "琛ㄧず闋嗗簭"; - Text[ korean ] = "鞐 鞚橅暅 鞝曤牞 ..."; + Text[ korean ] = "鞝曤牞 旮办"; Text[ chinese_simplified ] = "鎺掑簭鎸夌収"; Text[ chinese_traditional ] = "绶ㄦ帓鎸夌収"; Text[ arabic ] = "轻菅 陀"; @@ -4427,7 +4427,7 @@ TabPage TP_TOX_STYLES Text[ chinese_traditional ] = "妯欐簴(~D)"; Text[ arabic ] = "禽恃侵"; Text[ greek ] = "旭镥痖腼戕"; - Text[ korean ] = "旮半掣 臧(~D)"; + Text[ korean ] = "旮半掣臧(~D)"; Text[ turkish ] = "Standart"; Text[ catalan ] = "~Per defecte"; Text[ finnish ] = "~Oletus"; @@ -4627,7 +4627,7 @@ ModalDialog DLG_ADD_IDX_STYLES Text[ polish ] = "Nie przypisany"; Text[ portuguese_brazilian ] = "Not applied"; Text[ japanese ] = "閬╃敤銇仐"; - Text[ korean ] = "鞝侅毄霅橃 鞎婌晿鞀惦媹雼."; + Text[ korean ] = "鞝侅毄 鞎堧惃"; Text[ chinese_simplified ] = "涓嶈鎸囧畾"; Text[ chinese_traditional ] = "涓嶆寚瀹"; Text[ arabic ] = "徙 硎 授眄溴"; @@ -4650,7 +4650,7 @@ ModalDialog DLG_ADD_IDX_STYLES Text[ polish ] = "Przypisz styl"; Text[ portuguese_brazilian ] = "Assign styles"; Text[ japanese ] = "銈广偪銈ゃ儷銇仼鐢"; - Text[ korean ] = "韰滍攲毽 頃犽嫻"; + Text[ korean ] = "鞀ろ儉鞚 鞝侅毄"; Text[ chinese_simplified ] = "鎸囧畾鏍峰紡"; Text[ chinese_traditional ] = "鎸囧畾妯ｅ紡"; Text[ arabic ] = "授眄 轻娩闱"; @@ -4759,14 +4759,14 @@ ModalDialog DLG_CREATE_AUTOMARK Text[ greek ] = "1. 孰彘溥"; Text[ dutch ] = "1e sleutel"; Text[ french ] = "Cl 1"; - Text[ spanish ] = "1era clave"; + Text[ spanish ] = "1ra clave"; Text[ italian ] = "1 criterio"; Text[ danish ] = "1. n鴊le"; Text[ swedish ] = "1 nyckel"; Text[ polish ] = "1 klucz"; Text[ portuguese_brazilian ] = "1. Key"; Text[ japanese ] = "鍒嗛銈裤偆銉堛儷1"; - Text[ korean ] = "1氩堨Ц 韨"; + Text[ korean ] = "1. 韨"; Text[ chinese_simplified ] = "绗竴涓叧閿瓧"; Text[ chinese_traditional ] = "绗竴鍊嬮棞閸靛瓧"; Text[ arabic ] = "轻爿是 轻面"; @@ -4785,14 +4785,14 @@ ModalDialog DLG_CREATE_AUTOMARK Text[ greek ] = "2. 孰彘溥"; Text[ dutch ] = "2e sleutel"; Text[ french ] = "Cl 2"; - Text[ spanish ] = "2da llave"; + Text[ spanish ] = "2a clave"; Text[ italian ] = "2 criterio"; Text[ danish ] = "2. n鴊le"; Text[ swedish ] = "2 nyckel"; Text[ polish ] = "2 klucz"; Text[ portuguese_brazilian ] = "2. Key"; Text[ japanese ] = "鍒嗛銈裤偆銉堛儷2"; - Text[ korean ] = "2氩堨Ц 韨"; + Text[ korean ] = "2. 韨"; Text[ chinese_simplified ] = "绗簩涓叧閿瓧"; Text[ chinese_traditional ] = "绗簩鍊嬮棞閸靛瓧"; Text[ arabic ] = "轻爿是 轻饲漤"; @@ -4818,7 +4818,7 @@ ModalDialog DLG_CREATE_AUTOMARK Text[ polish ] = "Komentarz"; Text[ portuguese_brazilian ] = "Comment"; Text[ japanese ] = "銈炽儭銉炽儓"; - Text[ korean ] = "欤检劃"; + Text[ korean ] = "靹る獏"; Text[ chinese_simplified ] = "娉ㄨВ"; Text[ chinese_traditional ] = "瑷昏В"; Text[ arabic ] = "授犴"; @@ -4844,7 +4844,7 @@ ModalDialog DLG_CREATE_AUTOMARK Text[ polish ] = "Dok砤dnie"; Text[ portuguese_brazilian ] = "Match case"; Text[ japanese ] = "鏂囧瓧鍖哄垾"; - Text[ korean ] = "鞛愳劯頌 甑秳"; + Text[ korean ] = "雽氍胳瀽 氚 靻岆鞛愲ゼ 甑秳"; Text[ chinese_simplified ] = "绮剧‘"; Text[ chinese_traditional ] = "绮剧⒑"; Text[ arabic ] = "阖侨奚 颓嵘 轻猛演"; @@ -4987,3 +4987,8 @@ ModalDialog DLG_CREATE_AUTOMARK + + + + + diff --git a/sw/source/ui/index/idxmrk.src b/sw/source/ui/index/idxmrk.src index c897264d8d3e..45481143bb4f 100644 --- a/sw/source/ui/index/idxmrk.src +++ b/sw/source/ui/index/idxmrk.src @@ -2,9 +2,9 @@ * * $RCSfile: idxmrk.src,v $ * - * $Revision: 1.31 $ + * $Revision: 1.32 $ * - * last change: $Author: iha $ $Date: 2002-08-08 14:10:07 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,7 +68,27 @@ #define IDX_PHONETIC_LISTBOX_DESCRIPTION \ Text = "Phonetische Lesart"; \ Text[English] = "Phonetic reading"; \ -Text[ english_us ] = "Phonetic reading"; +Text[ english_us ] = "Phonetic reading"; \ + Text[ portuguese ] = "Phonetic reading"; \ + Text[ russian ] = "Phonetic reading"; \ + Text[ greek ] = "Phonetic reading"; \ + Text[ dutch ] = "Phonetic reading"; \ + Text[ french ] = "Lecture phon閠ique"; \ + Text[ spanish ] = "Lectura fon閠ica"; \ + Text[ finnish ] = "Phonetic reading"; \ + Text[ italian ] = "Lettura fonetica"; \ + Text[ danish ] = "Phonetic reading"; \ + Text[ swedish ] = "Fonetisk l鋝ning"; \ + Text[ polish ] = "Phonetic reading"; \ + Text[ portuguese_brazilian ] = "Phonetic reading"; \ + Text[ japanese ] = "瑾伩"; \ + Text[ korean ] = "氚滌潓 響滉赴"; \ + Text[ chinese_simplified ] = "璇煶鎻忚堪"; \ + Text[ chinese_traditional ] = "瑾為煶鎻忚堪"; \ + Text[ turkish ] = "Phonetic reading"; \ + Text[ arabic ] = "Phonetic reading"; \ + Text[ catalan ] = "Phonetic reading"; \ + Text[ thai ] = "Phonetic reading"; #define IDX_DIALOG_WINDOW \ Window WIN_DLG \ @@ -155,7 +175,7 @@ Text[ english_us ] = "Phonetic reading"; 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)"; \ @@ -197,7 +217,7 @@ Text[ english_us ] = "Phonetic reading"; QuickHelpText[ polish ] = "Nowy indeks u縴tkownika";\ QuickHelpText[ portuguese_brazilian ] = "New user defined index";\ QuickHelpText[ japanese ] = "鏂般仐銇勩儲銉笺偠銉煎畾缇┿伄绱㈠紩";\ - QuickHelpText[ korean ] = "靸 靷毄鞛愳爼鞚 靸夓澑";\ + QuickHelpText[ korean ] = "靸 靷毄鞛 鞝曥潣 靸夓澑";\ QuickHelpText[ chinese_simplified ] = "鏂板缓浣跨敤鑰呰嚜瀹氱洰褰";\ QuickHelpText[ chinese_traditional ] = "鏂板浣跨敤鑰呰嚜瑷傜洰閷";\ QuickHelpText[ arabic ] = "蒎延 滔硐 阙演 沅 奕 轻阌饰香";\ @@ -262,7 +282,7 @@ Text[ english_us ] = "Phonetic reading"; Text[ chinese_traditional ] = "妯欒"; \ Text[ arabic ] = "轻释享"; \ Text[ greek ] = "愚灬眢";\ - Text[ korean ] = "靹犿儩 響滌嫓";\ + Text[ korean ] = "靹犿儩";\ Text[ turkish ] = "Se鏸m";\ Text[ language_user1 ] = " ";\ Text[ catalan ] = "Marca";\ @@ -349,7 +369,7 @@ Text[ english_us ] = "Phonetic reading"; Text [ italian ] = "Chiave ~1" ; \ Text [ portuguese_brazilian ] = "~1. Tecla" ; \ Text [ portuguese ] = "~1 chave" ; \ - Text [ finnish ] = "Ensimm鋓nen avain" ; \ + Text [ finnish ] = "~1. avain" ; \ Text [ danish ] = "~1. n鴊le" ; \ Text [ french ] = "Cl 1" ; \ Text [ swedish ] = "Sorteringskod ~1" ; \ @@ -364,7 +384,7 @@ Text[ english_us ] = "Phonetic reading"; Text[ chinese_traditional ] = "绗竴鍊嬮棞閸靛瓧"; \ Text[ arabic ] = "轻爿是 轻面"; \ Text[ greek ] = "~1 觌彘溥";\ - Text[ korean ] = "1氩堨Ц 韨";\ + Text[ korean ] = "1. 韨";\ Text[ turkish ] = "~1. Anahtar";\ Text[ language_user1 ] = " ";\ Text[ catalan ] = "Clau ~1a";\ @@ -389,12 +409,12 @@ Text[ english_us ] = "Phonetic reading"; Text [ italian ] = "Chiave ~2" ; \ Text [ portuguese_brazilian ] = "~2. Tecla" ; \ Text [ portuguese ] = "~2 chave" ; \ - Text [ finnish ] = "~Toinen avain" ; \ + Text [ finnish ] = "~2. avain" ; \ Text [ danish ] = "~2. n鴊le" ; \ Text [ french ] = "Cl 2" ; \ Text [ swedish ] = "Sorteringskod ~2" ; \ Text [ dutch ] = "~2e sleutel" ; \ - Text [ spanish ] = "~2da clave" ; \ + Text [ spanish ] = "~2a clave" ; \ Text [ english_us ] = "~2nd key" ; \ Left = TRUE ; \ Text[ chinese_simplified ] = "绗簩涓叧閿瓧"; \ @@ -404,7 +424,7 @@ Text[ english_us ] = "Phonetic reading"; Text[ chinese_traditional ] = "绗簩鍊嬮棞閸靛瓧"; \ Text[ arabic ] = "轻爿是 轻饲漤"; \ Text[ greek ] = "~2 孰彘溥";\ - Text[ korean ] = "2氩堨Ц 韨";\ + Text[ korean ] = "~2. 韨";\ Text[ turkish ] = "~2. Anahtar";\ Text[ language_user1 ] = " ";\ Text[ catalan ] = "Clau ~2a";\ @@ -550,10 +570,10 @@ Text[ english_us ] = "Phonetic reading"; Hide = TRUE; \ Text[ english_us ] = "~Apply to all similar texts."; \ Text[ portuguese ] = "~Aplicar a todos os textos semelhantes."; \ - Text[ russian ] = "橡桁屙栩 觐 怦屐 钿桧嚓钼 蝈犟蜞"; \ + Text[ russian ] = "橡桁屙栩 觐 怦屐 怩铈溴龛"; \ Text[ dutch ] = "~Alle gelijkluidende teksten"; \ Text[ french ] = "~Appliquer tous les textes similaires."; \ - Text[ spanish ] = "~Aplicar a todos los textos iguales."; \ + Text[ spanish ] = "~Aplicar a todos los textos similares"; \ Text[ italian ] = "~Applica a tutti i testi simili"; \ Text[ danish ] = "~Anvend p alle lignende tekster."; \ Text[ swedish ] = "~Anv鋘d p alla liknande texter."; \ @@ -564,7 +584,7 @@ Text[ english_us ] = "Phonetic reading"; Text[ chinese_traditional ] = "鐢ㄦ柤鎵鏈夌浉鍚岀殑鍏ф枃(~A)"; \ Text[ arabic ] = "守软 卺 哚 轻湔嬲 轻闶闱酸."; \ Text[ greek ] = "碰狁祜戕 箦 翎 疳顸祜獒 赍哽屙.";\ - Text[ korean ] = "氇摖 臧欖潃 韰嶌姢韸胳棎 鞝侅毄(~A)";\ + Text[ korean ] = "氍胳劀 雮挫棎靹 臧欖潃 氍胳瀽鞐挫棎 雽頃 鞝侅毄(~A)";\ Text[ turkish ] = "~T黰 e metinlere uygula.";\ Text[ language_user1 ] = " ";\ Text[ catalan ] = "~Aplica-ho a tots els textos semblants.";\ @@ -580,7 +600,7 @@ Text[ english_us ] = "Phonetic reading"; Hide = TRUE;\ Text[ english_us ] = "Ma~tch case";\ Text[ portuguese ] = "Procura e~xacta";\ - Text[ russian ] = "翌黜 镱桉";\ + Text[ russian ] = "喻栩囹 疱汨耱";\ Text[ greek ] = "陵耖廪 犴徭摁珞";\ Text[ dutch ] = "~Exact dezelfde tekens";\ Text[ french ] = "Respecter la casse";\ @@ -591,13 +611,13 @@ Text[ english_us ] = "Phonetic reading"; Text[ polish ] = "Dok砤dne wyszukiwanie";\ Text[ portuguese_brazilian ] = "Match case";\ Text[ japanese ] = "澶ф枃瀛椼仺灏忔枃瀛椼倰鍖哄垾銇欍倠(~T)";\ - Text[ korean ] = "雽/靻岆鞛 甑秳(~T)";\ + Text[ korean ] = "雽氍胳瀽 氚 靻岆鞛愲ゼ 甑秳(~T)";\ Text[ chinese_simplified ] = "绮剧‘鎼滃(~T)";\ Text[ chinese_traditional ] = "绮剧⒑鎼滃皨(~T)";\ Text[ arabic ] = "韧 限磙";\ Text[ turkish ] = "B躖躃/k黭 ~harf duyarl";\ Text[ catalan ] = "Coincid鑞cia e~xacta";\ - Text[ finnish ] = "Sa~ma kirjainkoko";\ + Text[ finnish ] = "Sama kirjainkoko";\ Text[ thai ] = "喔曕副喔о笧喔脆浮喔炧箤喔椸傅喙堗笗喔喔囙竵喔编笝";\ }; \ CheckBox CB_WORDONLY \ @@ -609,18 +629,18 @@ Text[ english_us ] = "Phonetic reading"; Hide = TRUE;\ Text[ english_us ] = "~Whole words only";\ Text[ portuguese ] = "S ~palavras inteiras";\ - Text[ russian ] = "翌朦觐 怦 耠钼";\ + Text[ russian ] = "翌朦觐 耠钼 鲥腓觐";\ Text[ greek ] = "厅盹 镫腌皴 胼铄轵";\ Text[ dutch ] = "Alleen hele ~woorden";\ Text[ french ] = "Uniquement les mots entiers";\ - Text[ spanish ] = "Solo palabras e~nteras";\ + Text[ spanish ] = "~S髄o palabras completas";\ Text[ italian ] = "Solo parole intere";\ Text[ danish ] = "~Kun hele ord";\ Text[ swedish ] = "Bara hela ~ord";\ Text[ polish ] = "Tylko ca砮 wyrazy";\ Text[ portuguese_brazilian ] = "Whole words only";\ Text[ japanese ] = "鍗樿獮銇ㄣ仐銇(~W)";\ - Text[ korean ] = "鞎堧步頃 雼柎毵(~W)";\ + Text[ korean ] = "雼柎 雼渼搿(~W)";\ Text[ chinese_simplified ] = "鍙厑璁稿崟璇(~W)";\ Text[ chinese_traditional ] = "鍍呮槸鍠(~W)";\ Text[ arabic ] = "哚闱 咔汜 蒉";\ @@ -809,7 +829,7 @@ ModalDialog DLG_NEW_USER_IDX }; Text[ english_us ] = "Create New User-defined Index"; Text[ portuguese ] = "Criar novo 韓dice personalizado"; - Text[ russian ] = "杨玟囹 箨噻囹咫 镱朦珙忄蝈"; + Text[ russian ] = "杨玟囹 眍恹 箨噻囹咫"; Text[ greek ] = "溺扉秕胥哚 磔秕 艴皴翮襁秕 黢摅翮"; Text[ dutch ] = "Nieuwe gebruikersindex defini雛en"; Text[ french ] = "Cr閍tion d'un nouvel index personnalis"; @@ -882,7 +902,7 @@ String STR_IDXMRK_INSERT Text[ chinese_traditional ] = "鎻掑叆鐩寗姊濈洰"; Text[ arabic ] = "畔亚 畔吻 蒎延"; Text[ greek ] = "砰筢泫戕 赆翎齄耖箸 艴皴翮襁秕"; - Text[ korean ] = "靸夓澑 頃 靷届瀰"; + Text[ korean ] = "靸夓澑 氚 氇╈皑 頃 靷届瀰"; Text[ turkish ] = "Dizin giri㱮 ekle"; Text[ language_user1 ] = " "; Text[ catalan ] = "Insereix una entrada d'韓dex"; @@ -919,7 +939,7 @@ String STR_IDXMRK_INSERT Text[ arabic ] = "沅 耷谙 软卿鞘 轻阊翘";\ Text[ turkish ] = "Kaynak鏰 veritaban齨dan";\ Text[ catalan ] = "Des de la base de ~dades de la bibliografia";\ - Text[ finnish ] = "Bibliografia~tietokannasta";\ + Text[ finnish ] = "L鋒deluettelo~tietokannasta";\ Text[ thai ] = "喔堗覆喔亊喔愢覆喔權競喙夃腑喔∴腹喔ム笟喔｀福喔撪覆喔權父喔佮福喔";\ }; \ RadioButton RB_FROMDOCCONTENT \ @@ -969,14 +989,14 @@ String STR_IDXMRK_INSERT Text[ polish ] = "Autor";\ Text[ portuguese_brazilian ] = "Author";\ Text[ japanese ] = "钁楄";\ - Text[ korean ] = "鞛戩劚鞛";\ + Text[ korean ] = "鞝鞛";\ Text[ chinese_simplified ] = "浣滆";\ Text[ chinese_traditional ] = "浣滆";\ Text[ arabic ] = "轻隳彷";\ Text[ turkish ] = "Yazan";\ Text[ language_user1 ] = " ";\ Text[ catalan ] = "Autor";\ - Text[ finnish ] = "Laatija";\ + Text[ finnish ] = "Tekij";\ Text[ thai ] = "喔溹腹喙夃箑喔傕傅喔⑧笝";\ }; \ FixedText FI_AUTHOR \ @@ -1039,7 +1059,7 @@ String STR_IDXMRK_INSERT Text[ polish ] = "Skr髏";\ Text[ portuguese_brazilian ] = "Short name";\ Text[ japanese ] = "鐣ョО(~N)";\ - Text[ korean ] = "歆ъ潃 鞚措(~N)";\ + Text[ korean ] = "鞎届弓(~N)";\ Text[ chinese_simplified ] = "绠绉(~N)";\ Text[ chinese_traditional ] = "绨＄煭鎻忚堪鏂(~N)";\ Text[ arabic ] = "轻怯 轻阄收";\ @@ -1173,7 +1193,7 @@ String STR_IDXMRK_INSERT Text[ french ] = "~Nouveau";\ Text[ spanish ] = "N~uevo";\ Text[ italian ] = "Nuovo";\ - Text[ danish ] = "Ny";\ + Text[ danish ] = "~Ny";\ Text[ swedish ] = "N~y";\ Text[ polish ] = "Nowy";\ Text[ portuguese_brazilian ] = "Create entry";\ @@ -1198,11 +1218,11 @@ String STR_IDXMRK_INSERT Text[ portuguese ] = "~Editar";\ Text[ russian ] = "橡噔赅";\ Text[ greek ] = "硼孱羼汜筮";\ - Text[ dutch ] = "~Bewerken";\ + Text[ dutch ] = "B~ewerken";\ Text[ french ] = "蒬iter";\ Text[ spanish ] = "Editar";\ Text[ italian ] = "~Modifica";\ - Text[ danish ] = "Rediger";\ + Text[ danish ] = "~Rediger";\ Text[ swedish ] = "~Redigera";\ Text[ polish ] = "~Edytuj";\ Text[ portuguese_brazilian ] = "Edit";\ @@ -1233,14 +1253,14 @@ String STR_IDXMRK_INSERT Text[ polish ] = "Modyfikuj";\ Text[ portuguese_brazilian ] = "Apply";\ Text[ japanese ] = "澶夋洿";\ - Text[ korean ] = "靾橃爼";\ + Text[ korean ] = "氤瓴";\ Text[ chinese_simplified ] = "鏇存敼";\ Text[ chinese_traditional ] = "璁婃洿";\ Text[ arabic ] = "守软";\ Text[ turkish ] = "De餴⺶ir";\ Text[ language_user1 ] = " ";\ Text[ catalan ] = "Modifica";\ - Text[ finnish ] = "Muokkaa";\ + Text[ finnish ] = "Muuta";\ Text[ thai ] = "喔斷副喔斷箒喔涏弗喔囙箒喔佮箟喙勦競";\ }; \ }; @@ -1316,7 +1336,7 @@ ModalDialog DLG_CREATE_AUTH_ENTRY Text[ polish ] = "Dane wpisu"; Text[ portuguese_brazilian ] = "Entry data"; Text[ japanese ] = "鍏ュ姏銉囥兗銈"; - Text[ korean ] = "鞛呺牓 雿办澊韯"; + Text[ korean ] = "頃 雿办澊韯"; Text[ chinese_simplified ] = "鏉＄洰鏁版嵁"; Text[ chinese_traditional ] = "姊濈洰璩囨枡"; Text[ arabic ] = "软卿鞘 轻畔吻"; @@ -1328,7 +1348,7 @@ ModalDialog DLG_CREATE_AUTH_ENTRY }; Text[ english_us ] = "Define Bibliography Entry"; Text[ portuguese ] = "Definir entrada bibliogr醘ica"; - Text[ russian ] = "青溧螯 屐屙 耧桉赅 腓蝈疣蝮瘥"; + Text[ russian ] = "青溧螯 徼犭桀沭圄梓羼牦 耨牦"; Text[ greek ] = "像轶禳 赆翎齄耖箸 忾怆轱泷狯哚"; Text[ dutch ] = "Item voor literatuurlijst defini雛en"; Text[ french ] = "D閒inir une entr閑 de bibliographie"; @@ -1345,7 +1365,7 @@ ModalDialog DLG_CREATE_AUTH_ENTRY Text[ arabic ] = "授秧 畔吻 蓓 蒎延 轻阊翘"; Text[ turkish ] = "Kaynak鏰 giri㱮ni tan齧la"; Text[ catalan ] = "Defineix entrada de bibliografia"; - Text[ finnish ] = "M滗rit bibliografiamerkint"; + Text[ finnish ] = "M滗rit l鋒deluettelomerkint"; Text[ thai ] = "喔｀赴喔氞父喔｀覆喔⑧竵喔侧福喔氞福喔｀笓喔侧笝喔膏竵喔｀浮"; }; String STR_AUTHMRK_EDIT @@ -1355,7 +1375,7 @@ String STR_AUTHMRK_EDIT Text[ english_us ] = "Edit Bibliography Entry"; Text[ portuguese ] = "Editar entrada bibliogr醘ica"; - Text[ russian ] = "橡噔赅 屐屙蜞 耧桉赅 腓蝈疣蝮瘥"; + Text[ russian ] = "橡噔赅 徼犭桀沭圄梓羼觐 耨觇"; Text[ greek ] = "硼孱羼汜筮 赆翎齄耖箸 忾怆轱泷狯哚"; Text[ dutch ] = "Item voor literatuurlijst bewerken"; Text[ french ] = "蒬iter une entr閑 de bibliographie"; @@ -1371,9 +1391,9 @@ String STR_AUTHMRK_EDIT Text[ chinese_traditional ] = "绶ㄨ集鍙冭冩枃鐛荤洰閷勬鐩"; Text[ arabic ] = "释秧 畔吻 蓓 蒎延 轻阊翘"; Text[ turkish ] = "Kaynak鏰 dizini giri㱮ni d鼁enle"; - Text[ language_user1 ] = "EM28.9.01: MODALDIALOG title"; + Text[ language_user1 ] = "EM28; EM28.9.01: MODALDIALOG title"; Text[ catalan ] = "Edita entrada de bibliografia"; - Text[ finnish ] = "Muokkaa bibliografiamerkint滗"; + Text[ finnish ] = "Muokkaa l鋒deluettelomerkint滗"; Text[ thai ] = "喙佮竵喙夃箘喔傕福喔侧涪喔佮覆喔｀笟喔｀福喔撪覆喔權父喔佮福喔"; }; String STR_AUTHMRK_INSERT @@ -1383,7 +1403,7 @@ String STR_AUTHMRK_INSERT Text[ english_us ] = "Insert Bibliography Entry"; Text[ portuguese ] = "Inserir entrada bibliogr醘ica"; - Text[ russian ] = "埋蜞忤螯 屐屙 耧桉赅 腓蝈疣蝮瘥"; + Text[ russian ] = "埋蜞忤螯 徼犭桀沭圄梓羼牦 耨牦"; Text[ greek ] = "砰筢泫戕 赆翎齄耖箸 忾怆轱泷狯哚"; Text[ dutch ] = "Item invoegen in literatuurlijst"; Text[ french ] = "Insertion d'une entr閑 de bibliographie"; @@ -1399,9 +1419,9 @@ String STR_AUTHMRK_INSERT Text[ chinese_traditional ] = "鎻掑叆鍙冭冩枃鐛荤洰閷勬鐩"; Text[ arabic ] = "畔亚 畔吻 蓓 蒎延 轻阊翘"; Text[ turkish ] = "Kaynak鏰 dizini giri㱮 ekle"; - Text[ language_user1 ] = "EM28.9.01: MODALDIALOG title"; + Text[ language_user1 ] = "EM28; EM28.9.01: MODALDIALOG title"; Text[ catalan ] = "Insereix entrada de bibliografia"; - Text[ finnish ] = "Lis滗 bibliografiamerkint"; + Text[ finnish ] = "Lis滗 l鋒deluettelomerkint"; Text[ thai ] = "喙佮笚喔｀竵喔｀覆喔⑧竵喔侧福喔氞福喔｀笓喔侧笝喔膏竵喔｀浮"; }; QueryBox DLG_CHANGE_AUTH_ENTRY @@ -1412,7 +1432,7 @@ QueryBox DLG_CHANGE_AUTH_ENTRY MESSAGE [ English ] = "The bibliography entry is already contained in the document with different data. Do you want to adjust the existing bibliography entries?" ; MESSAGE[ english_us ] = "The document already contains the bibliography entry but with different data. Do you want to adjust the existing entries?"; MESSAGE[ portuguese ] = "A entrada bibliogr醘ica j existe no documento com dados diferentes. Ajustar as entradas existentes?"; - MESSAGE[ russian ] = "蒡 玎镨顸 徼犭桀沭圄梃 礤觐蝾瘥扈 铗腓黜 溧眄 箧 耦溴疰栩 漕牦戾眚. 蔓 躅蜩蝈 耦汶囫钼囹 耦溴疰帙桢 玎镨耔?"; + MESSAGE[ russian ] = "蒡 漕牦戾眚 箧 耦溴疰栩 徼犭桀沭圄棹, 眍 漯筱桁 溧眄. 杨汶囫钼囹 耋耱怏桢 耨觇?"; MESSAGE[ greek ] = " 赆翎齄耖箸 忾怆轱柁赙 躔荞麇 掬 篝 葶泷狯 戾 溟狯锺弭殛 溴滹燧磲. 容脲翦 磲 弼狁祜篝稞 翎 磔 溴滹燧磲;"; MESSAGE[ dutch ] = "Het bibliografie-item bevindt zich reeds met andere gegevens in het document. Wilt u de bestaande items aanpassen?"; MESSAGE[ french ] = "L'entr閑 de bibliographie existe d閖 en relation avec des donn閑s diff閞entes dans le document. Voulez-vous ajuster les entr閑s existantes ?"; @@ -1429,6 +1449,29 @@ QueryBox DLG_CHANGE_AUTH_ENTRY MESSAGE[ arabic ] = "畔吻 轻阊腾 沔替 惹彷卺 蓓 轻阌输 热砬淝 阄梳萆. 遽 恃硐 汜橇闵 轻畔吻崆 轻沔替仙"; MESSAGE[ turkish ] = "Kaynak鏰 giri㱮, farkl veriler ile belgede mevcut."; MESSAGE[ catalan ] = "L'entrada bibliogr鄁ica ja existeix amb dades diferents en el document. Voleu ajustar les dades ja existents?"; - MESSAGE[ finnish ] = "Asiakirja sis鋖t滗 jo bibliografiamerkinn鋘, mutta siin on eri tiedot. Haluatko muokata olemassa olevia merkint鰆?"; + MESSAGE[ finnish ] = "Asiakirja sis鋖t滗 jo l鋒deluettelomerkinn鋘, mutta siin on eri tiedot. Haluatko muokata olemassa olevia merkint鰆?"; MESSAGE[ thai ] = "喙喔竵喔覆喔｀浮喔掂福喔侧涪喔佮覆喔｀笟喔｀福喔撪覆喔權父喔佮福喔∴腑喔⑧腹喙堗箒喔ム箟喔о箒喔曕箞喔∴傅喔傕箟喔浮喔灌弗喔椸傅喙堗笗喙堗覆喔囙竵喔编笝 喔勦父喔撪笗喙夃腑喔囙竵喔侧福喔涏福喔编笟喔｀覆喔⑧竵喔侧福喔椸傅喙堗浮喔掂腑喔⑧腹喙堗斧喔｀阜喔箘喔∴箞?"; }; + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/index/multmrk.src b/sw/source/ui/index/multmrk.src index 801be071c948..8a88aad5aee5 100644 --- a/sw/source/ui/index/multmrk.src +++ b/sw/source/ui/index/multmrk.src @@ -2,9 +2,9 @@ * * $RCSfile: multmrk.src,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: vg $ $Date: 2001-07-14 20:17:03 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -92,27 +92,28 @@ ModalDialog DLG_MULTMRK Text [ norwegian ] = "Choice" ; Text [ italian ] = "Selezione" ; Text [ portuguese_brazilian ] = "Escolha" ; - Text [ portuguese ] = "Op珲es" ; - Text [ finnish ] = "M滗ritykset" ; - Text [ danish ] = "Udvalg" ; + Text [ portuguese ] = "Selec玢o" ; + Text [ finnish ] = "Valinta" ; + Text [ danish ] = "V鎙g" ; Text [ french ] = "S閘ection" ; Text [ swedish ] = "Urval" ; Text [ dutch ] = "Selectie" ; Text [ spanish ] = "Selecci髇" ; Text [ english_us ] = "Selection" ; - Text[ chinese_simplified ] = "选择"; + Text[ chinese_simplified ] = "閫夋嫨"; Text[ russian ] = "蔓犷"; Text[ polish ] = "Wyb髍"; - Text[ japanese ] = "慖戰"; - Text[ chinese_traditional ] = "匡"; + Text[ japanese ] = "閬告姙"; + Text[ chinese_traditional ] = "閬稿彇"; Text[ arabic ] = "释享"; Text[ dutch ] = "Selectie"; - Text[ chinese_simplified ] = "选择"; + Text[ chinese_simplified ] = "閫夋嫨"; Text[ greek ] = "硼殡镢"; - Text[ korean ] = "急琶"; + Text[ korean ] = "靹犿儩"; Text[ turkish ] = "Se鏸m"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Opci髇"; + Text[ catalan ] = "Opci"; + Text[ thai ] = "喙喔ム阜喔竵"; }; FixedText FT_ENTRY { @@ -132,19 +133,20 @@ ModalDialog DLG_MULTMRK Text [ spanish ] = "蚽dice" ; Text [ english_us ] = "Index" ; Left = TRUE ; - Text[ chinese_simplified ] = "目录"; + Text[ chinese_simplified ] = "鐩綍"; Text[ russian ] = "雨噻囹咫"; Text[ polish ] = "Indeks"; - Text[ japanese ] = "嶕堷"; - Text[ chinese_traditional ] = "ヘ魁"; + Text[ japanese ] = "绱㈠紩"; + Text[ chinese_traditional ] = "鐩寗"; Text[ arabic ] = "轻蒎延"; Text[ dutch ] = "Index"; - Text[ chinese_simplified ] = "目录"; + Text[ chinese_simplified ] = "鐩綍"; Text[ greek ] = "捧皴艮耖"; - Text[ korean ] = "祸牢"; + Text[ korean ] = "靸夓澑"; Text[ turkish ] = "Dizin"; Text[ language_user1 ] = " "; - Text[ catalan ] = "蚽dice"; + Text[ catalan ] = "蚽dex"; + Text[ thai ] = "喔斷副喔娻笝喔"; }; FixedText FT_TEXT { @@ -170,19 +172,20 @@ ModalDialog DLG_MULTMRK Text [ spanish ] = "Entrada" ; Text [ english_us ] = "Entry" ; Left = TRUE ; - Text[ chinese_simplified ] = "条目"; + Text[ chinese_simplified ] = "鏉＄洰"; Text[ russian ] = "蓦屐屙"; Text[ polish ] = "Wpis"; - Text[ japanese ] = "崁栚"; - Text[ chinese_traditional ] = "兵ヘ"; + Text[ japanese ] = "闋呯洰"; + Text[ chinese_traditional ] = "姊濈洰"; Text[ arabic ] = "轻畔吻"; Text[ dutch ] = "Item"; - Text[ chinese_simplified ] = "条目"; + Text[ chinese_simplified ] = "鏉＄洰"; Text[ greek ] = "梳翎齄耖箸"; - Text[ korean ] = "亲格"; + Text[ korean ] = "頃"; Text[ turkish ] = "Giri"; Text[ language_user1 ] = " "; Text[ catalan ] = "Entrada"; + Text[ thai ] = "喔｀覆喔⑧竵喔侧福"; }; ListBox LB_TOX { @@ -205,19 +208,34 @@ ModalDialog DLG_MULTMRK Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; }; - Text[ chinese_simplified ] = "目录标记"; - Text[ russian ] = "蔓溴脲龛 箨噻囹咫"; + Text[ chinese_simplified ] = "鐩綍鏍囪"; + Text[ russian ] = "悟戾蜿 箨噻囹咫"; Text[ polish ] = "Znaczniki indeksu"; - Text[ japanese ] = "搊榐崁栚"; - Text[ chinese_traditional ] = "ヘ魁夹癘"; + Text[ japanese ] = "鐧婚尣闋呯洰"; + Text[ chinese_traditional ] = "鐩寗妯欒"; Text[ arabic ] = "释享锨 轻蒎延"; Text[ dutch ] = "Indexmarkeringen"; - Text[ chinese_simplified ] = "目录标记"; + Text[ chinese_simplified ] = "鐩綍鏍囪"; Text[ greek ] = "隅燔眢彘 艴皴翮襁秕"; - Text[ korean ] = "祸牢 付农钎矫"; + Text[ korean ] = "靸夓澑 響滌嫓"; Text[ turkish ] = "Dizin i鏸n iretlenen girier"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Marcas del 韓dice"; + Text[ catalan ] = "Marques de l'韓dex"; + Text[ thai ] = "喔椸赋喙喔勦福喔粪箞喔竾喔浮喔侧涪喔斷副喔娻笝喔"; }; + + + + + + + + + + + + + + diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index cc297a9fd62b..a2339c91102a 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -2,9 +2,9 @@ * * $RCSfile: olmenu.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: hbrinkm $ $Date: 2002-11-21 14:06:15 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -330,8 +330,7 @@ sal_uInt16 SwSpellPopup::Execute( Window* pWin, const Point& rWordPos ) pSh->StartAction(); pSh->DelLeft(); - const Sequence< OUString > aAlts( xSpellAlt->getAlternatives() ); - const OUString *pString = aAlts.getConstArray(); + const OUString *pString = xSpellAlt->getAlternatives().getConstArray(); DBG_ASSERT( 0 <= nAltIdx && nAltIdx <= xSpellAlt->getAlternativesCount(), "index out of range"); String aTmp( pString[ nAltIdx ] ); diff --git a/sw/source/ui/lingu/olmenu.src b/sw/source/ui/lingu/olmenu.src index e056f386f671..558955b4d5cf 100644 --- a/sw/source/ui/lingu/olmenu.src +++ b/sw/source/ui/lingu/olmenu.src @@ -2,9 +2,9 @@ * * $RCSfile: olmenu.src,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: os $ $Date: 2002-12-02 13:45:02 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,8 +76,8 @@ Menu MN_SPELL_POPUP Text[ language_user1 ] = "triple dots (...) are required now at the end of the text"; Text [ english_us ] = "~Spellcheck..." ; Text [ italian ] = "Controllo ~ortografico..." ; - Text [ spanish ] = "Ortogra~f韆..." ; - Text [ french ] = "~Orthographe..." ; + Text [ spanish ] = "~Revisi髇 ortogr醘ica..." ; + Text [ french ] = "V閞ification ~orthographique..." ; Text [ dutch ] = "~Spellingcontrole..." ; Text [ swedish ] = "~R鋞tstavning..." ; Text [ danish ] = "~Stavekontrol" ; @@ -86,13 +86,13 @@ Menu MN_SPELL_POPUP Text[ chinese_simplified ] = "鎷煎啓妫鏌(~S)..."; Text[ russian ] = "橡钼屦赅 铕纛沭圄梃..."; Text[ polish ] = "~Pisownia..."; - Text[ japanese ] = "鏂囩珷鏍℃(~S)..."; + Text[ japanese ] = "鏂囨浉鏍℃(~S)..."; Text[ chinese_traditional ] = "鎷煎妾㈡煡(~S)..."; Text[ arabic ] = "~氏揄 陪崆祈"; Text[ dutch ] = "~Spellingcontrole..."; Text[ chinese_simplified ] = "鎷煎啓妫鏌(~S)..."; Text[ greek ] = "像栾銅襻鲞"; - Text[ korean ] = "毵烄钉氩(~S)"; + Text[ korean ] = "毵烄钉氩 瓴靷..."; Text[ turkish ] = "~Yaz齧 k齦avuzu"; Text[ catalan ] = "Ortogra~fia"; Text[ finnish ] = "~Oikeinkirjoituksen tarkistus..."; @@ -180,7 +180,7 @@ Menu MN_SPELL_POPUP Text [ swedish ] = "Auto~Korrigering" ; Text [ danish ] = "AutoKorrektur" ; Text [ italian ] = "Correzione automatica" ; - Text [ spanish ] = "Auto~Correcci髇" ; + Text [ spanish ] = "~Correcci髇 autom醫ica" ; Text [ french ] = "AutoCo~rrection" ; Text [ dutch ] = "Auto~Correctie" ; Text [ portuguese ] = "Auto~Correc玢o" ; @@ -193,7 +193,7 @@ Menu MN_SPELL_POPUP Text[ dutch ] = "Auto~Correctie"; Text[ chinese_simplified ] = "鑷姩鏇存"; Text[ greek ] = "刘麸~拈棂箸"; - Text[ korean ] = "鞛愲彊瓿犾龚"; + Text[ korean ] = "鞛愲彊 靾橃爼"; Text[ turkish ] = "Otomatik d鼁eltme"; Text[ language_user1 ] = " "; Text[ catalan ] = "Auto~correcci"; @@ -336,3 +336,4 @@ String STR_HYP_OK + diff --git a/sw/source/ui/misc/bookmark.src b/sw/source/ui/misc/bookmark.src index c3b82d69dff4..45ba2594ed6d 100644 --- a/sw/source/ui/misc/bookmark.src +++ b/sw/source/ui/misc/bookmark.src @@ -2,9 +2,9 @@ * * $RCSfile: bookmark.src,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: kz $ $Date: 2001-07-13 21:58:38 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -119,23 +119,24 @@ ModalDialog DLG_INSERT_BOOKMARK TEXT [ portuguese ] = "E~liminar" ; TEXT [ finnish ] = "~Poista" ; 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" ; TABSTOP = TRUE ; DISABLE = TRUE ; - TEXT[ chinese_simplified ] = "删除(~D)"; + TEXT[ chinese_simplified ] = "鍒犻櫎(~D)"; TEXT[ russian ] = "愉嚯栩"; TEXT[ polish ] = "~Usu"; - TEXT[ japanese ] = "嶍彍(~D)"; - TEXT[ chinese_traditional ] = "埃(~D)"; + TEXT[ japanese ] = "鍓婇櫎(~D)"; + TEXT[ chinese_traditional ] = "鍒櫎(~D)"; TEXT[ greek ] = "拈徙襻鲛"; - TEXT[ korean ] = "昏力(~D)"; + TEXT[ korean ] = "靷牅(~D)"; TEXT[ arabic ] = "托"; TEXT[ turkish ] = "~Sil"; - TEXT[ catalan ] = "~Eliminar"; + TEXT[ catalan ] = "~Suprimeix"; + TEXT[ thai ] = "~喔ム笟"; }; FixedLine FL_BOOKMARK { @@ -154,27 +155,29 @@ ModalDialog DLG_INSERT_BOOKMARK TEXT [ dutch ] = "Tekstmarkeringen" ; TEXT [ spanish ] = "Marcas de texto" ; TEXT [ english_us ] = "Bookmarks" ; - TEXT[ chinese_simplified ] = "书签"; - TEXT[ russian ] = "义犟蝾恹 镱戾蜿"; + TEXT[ chinese_simplified ] = "涔︾"; + TEXT[ russian ] = "青觌噤觇"; TEXT[ polish ] = "Zak砤dki"; - TEXT[ japanese ] = "梅侥习"; - TEXT[ chinese_traditional ] = "ずゅ夹乓"; + TEXT[ japanese ] = "銉嗐偔銈广儓銉炪兗銈"; + TEXT[ chinese_traditional ] = "鍏ф枃妯欑堡"; TEXT[ greek ] = "隅燔溟 赍殪蓓秕"; - TEXT[ korean ] = "氓哎乔"; + TEXT[ korean ] = "毂呹皥頂"; TEXT[ arabic ] = "旁茄鞘 阊腾砩"; TEXT[ turkish ] = "Metin ireti"; - TEXT[ catalan ] = "Marcas de texto"; + TEXT[ catalan ] = "Marques de text"; + TEXT[ thai ] = "喔椸傅喙堗竸喔编箞喔"; }; - TEXT[ chinese_simplified ] = "插入书签"; - TEXT[ russian ] = "埋蜞怅 蝈犟蝾忸 镱戾蜿"; + TEXT[ chinese_simplified ] = "鎻掑叆涔︾"; + TEXT[ russian ] = "埋蜞怅 玎觌噤觇"; TEXT[ polish ] = "Wstaw zak砤dk"; - TEXT[ japanese ] = "梅侥习競虘}擖"; - TEXT[ chinese_traditional ] = "础ずゅ夹乓"; + TEXT[ japanese ] = "銉嗐偔銈广儓銉炪兗銈伄鎸垮叆"; + TEXT[ chinese_traditional ] = "鎻掑叆鍏ф枃妯欑堡"; TEXT[ greek ] = "砰筢泫戕 箸灬溟稞 赍殪蓓秕"; - TEXT[ korean ] = "氓哎乔 火涝"; + TEXT[ korean ] = "毂呹皥頂 靷届瀰"; TEXT[ arabic ] = "畔亚 旁茄 阊腾砩"; TEXT[ turkish ] = "Metin ireti ekle"; - TEXT[ catalan ] = "Insertar marca"; + TEXT[ catalan ] = "Insereix marca"; + TEXT[ thai ] = "喙佮笚喔｀竵喔椸傅喙堗竸喔编箞喔"; }; String STR_REMOVE_WARNING { @@ -182,27 +185,42 @@ String STR_REMOVE_WARNING Text [English] = "The following characters are not valid and have been removed: "; Text[ english_us ] = "The following characters are not valid and have been removed: "; Text[ portuguese ] = "Os seguintes caracteres foram eliminados porque n鉶 s鉶 v醠idos: "; - Text[ russian ] = "央邃簋 珥嚓 礤 漕矬耜帼蝰 镱铎 狍潴 箐嚯屙: "; + Text[ russian ] = "央邃簋 耔焘铍 礤漕矬耱桁 狍潴 箐嚯屙: "; Text[ greek ] = "祥 彡秕栾 麽襻牯揆弪 蓣秕 溟徙襻鲥 屦彘滢 溴 暹磲 葶牾耧. "; - Text[ dutch ] = "De volgende tekens zijn niet toegestaan en werden daarom verwijderd. "; + Text[ dutch ] = "De volgende tekens zijn niet toegestaan en zijn daarom verwijderd. "; Text[ french ] = "Les caract鑢es suivants ont 閠 supprim閟 car ils ne sont pas permis : "; - Text[ spanish ] = "Los siguientes caracteres han sido eliminados porque no se permiten: "; + Text[ spanish ] = "Los siguientes caracteres se han borrado por no ser v醠idos: "; Text[ italian ] = "I caratteri seguenti non sono ammessi e per questo eliminati. "; Text[ danish ] = "De f鴏gende tegn er ikke tilladte og er derfor blevet fjernet: "; Text[ swedish ] = "F鰈jande tecken 鋜 inte till錿na och har d鋜f鰎 tagits bort: "; Text[ polish ] = "Nast阷uj筩y znak jest niedozwolony i zosta dlatego usuni阾y: "; Text[ portuguese_brazilian ] = "The following characters are not valid and have been removed: "; - Text[ japanese ] = "師偺暥帤偼嫋壜偝傟偰偄側偄偨傔彍嫀偝傟傑偟偨丅 "; - Text[ korean ] = "促澜苞 鞍篮 巩磊甸篮 蜡瓤窍瘤 臼酒辑 力芭登菌嚼聪促: "; - Text[ chinese_simplified ] = "下列字符无效且已经被删除： "; - Text[ chinese_traditional ] = "礚τ砆埃 "; + Text[ japanese ] = "娆°伄鏂囧瓧銇ū鍙仌銈屻仸銇勩仾銇勩仧銈侀櫎鍘汇仌銈屻伨銇椼仧銆 "; + Text[ korean ] = "雼れ潓瓿 臧欖潃 氍胳瀽電 項堨毄霅橃 鞎婈赴 霑岆鞐 鞝滉卑霅橃棃鞀惦媹雼: "; + Text[ chinese_simplified ] = "涓嬪垪瀛楃鏃犳晥涓斿凡缁忚鍒犻櫎锛 "; + Text[ chinese_traditional ] = "涓嬪垪鐨勫瓧鍨嬬劇鏁堣岃鍒櫎锛 "; Text[ arabic ] = "轻猛演 轻是犴 垌 涨嵬伞 徨星 抒 托蒎: "; Text[ turkish ] = "A瘕daki karakterler ge鏴rli de餴ller ve bu nedenle 琮kart齦d齦ar: "; - Text[ catalan ] = "Los siguientes caracteres han sido eliminados porque no se permiten: "; + Text[ catalan ] = "Els seg黣nts car郼ters s'han eliminat perqu no es permeten: "; Text[ finnish ] = "Seuraavat merkit eiv鋞 ole kelvollisia ja ne poistettiin: "; + Text[ thai ] = "喔曕副喔о腑喔编竵喔傕福喔班笗喔侧浮喔權傅喙夃箘喔∴箞喔栢腹喔佮笗喙夃腑喔囙箒喔ム赴喔栢腹喔佮箑喔覆喔腑喔佮箒喔ム箟喔: "; }; + + + + + + + + + + + + + + diff --git a/sw/source/ui/misc/docfnote.src b/sw/source/ui/misc/docfnote.src index d787d31f799b..20795169d0a4 100644 --- a/sw/source/ui/misc/docfnote.src +++ b/sw/source/ui/misc/docfnote.src @@ -2,9 +2,9 @@ * * $RCSfile: docfnote.src,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:17:38 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,7 +76,7 @@ TabDialog DLG_DOC_FOOTNOTE Text [ portuguese ] = "Op珲es de notas de rodap" ; Text [ finnish ] = "Alaviitteen asetukset" ; Text [ danish ] = "Fodnoteindstillinger" ; - Text [ french ] = "Param鑤res des notes de bas de page" ; + Text [ french ] = "Param閠rage des notes de bas de page" ; Text [ swedish ] = "Fotnotsinst鋖lning" ; Text [ dutch ] = "Voetnootinstelling" ; Text [ spanish ] = "Opciones de notas al pie" ; @@ -102,18 +102,19 @@ TabDialog DLG_DOC_FOOTNOTE Text [ french ] = "Notes de bas de page" ; Text [ dutch ] = "Voetnoten" ; Text [ portuguese ] = "Notas de rodap" ; - Text[ chinese_simplified ] = "注脚"; + Text[ chinese_simplified ] = "娉ㄨ剼"; Text[ russian ] = "秧铖觇"; Text[ polish ] = "Przypisy dolne"; - Text[ japanese ] = "媟拲"; - Text[ chinese_traditional ] = "爹竲"; + Text[ japanese ] = "鑴氭敞"; + Text[ chinese_traditional ] = "瑷昏叧"; Text[ arabic ] = "玩窃 虞犴"; Text[ greek ] = "震矬珈彘彘"; - Text[ korean ] = "阿林"; + Text[ korean ] = "臧侅＜"; Text[ turkish ] = "Dipnot"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Notas al pie"; + Text[ catalan ] = "Notes al peu"; Text[ finnish ] = "Alaviitteet"; + Text[ thai ] = "喙喔娻复喔囙腑喔｀福喔"; }; PageItem { @@ -130,32 +131,34 @@ TabDialog DLG_DOC_FOOTNOTE Text [ french ] = "Notes de fin" ; Text [ dutch ] = "Eindnoten" ; Text [ portuguese ] = "Notas finais" ; - Text[ chinese_simplified ] = "尾注"; + Text[ chinese_simplified ] = "灏炬敞"; Text[ russian ] = "暑眦邂 耥铖觇"; Text[ polish ] = "Przypisy ko馽."; - Text[ japanese ] = "暥枛媟拲"; - Text[ chinese_traditional ] = "Ю爹"; + Text[ japanese ] = "鏂囨湯鑴氭敞"; + Text[ chinese_traditional ] = "灏捐ɑ"; Text[ arabic ] = "授犴耷 问倾砩"; Text[ greek ] = "隅戾辋箦轵 糨腼躜"; - Text[ korean ] = "固林"; + Text[ korean ] = "氙胳＜"; Text[ turkish ] = "Sonnot"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Notas finales"; - Text[ finnish ] = "Loppuhuomautukset"; + Text[ catalan ] = "Notes finals"; + Text[ finnish ] = "Loppuviitteet"; + Text[ thai ] = "喔箟喔侧竾喔复喔囙笚喙夃覆喔⑧箑喔｀阜喙堗腑喔"; }; }; }; - Text[ chinese_simplified ] = "设定注脚"; + Text[ chinese_simplified ] = "璁惧畾娉ㄨ剼"; Text[ russian ] = "袜耱痤殛 耥铖铌"; Text[ polish ] = "Ustawienie przypis體 dolnych"; - Text[ japanese ] = "媟拲偺愝掕"; - Text[ chinese_traditional ] = "砞﹚爹竲"; + Text[ japanese ] = "鑴氭敞銇ō瀹"; + Text[ chinese_traditional ] = "瑷畾瑷昏叧"; Text[ arabic ] = "炮锨 轻颓皂 轻虞犴"; Text[ greek ] = "氧桁唧彘 躔矬珈彘妁"; - Text[ korean ] = "阿林 汲沥"; + Text[ korean ] = "臧侅＜ 氚 氙胳＜ 靹れ爼"; Text[ turkish ] = "Dipnot ayarlar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Opciones de notas al pie"; + Text[ catalan ] = "Opcions de notes al peu"; + Text[ thai ] = "喔佮赋喔笝喔斷箑喔娻复喔囙腑喔｀福喔"; }; TabPage TP_FOOTNOTEOPTION { @@ -182,17 +185,18 @@ TabPage TP_FOOTNOTEOPTION Text [ spanish ] = "Numeraci髇 autom醫ica" ; Text [ english_us ] = "AutoNumbering" ; Group = TRUE ; - Text[ chinese_simplified ] = "自动编号"; - Text[ russian ] = "棱蝾爨蜩麇耜 眢戾疣鲨"; + Text[ chinese_simplified ] = "鑷姩缂栧彿"; + Text[ russian ] = "棱蝾眢戾疣鲨"; Text[ polish ] = "Automatyczna numeracja"; - Text[ japanese ] = "帺摦斣崋晅偗"; - Text[ chinese_traditional ] = "笆絪腹"; + Text[ japanese ] = "鑷嫊鐣彿浠樸亼"; + Text[ chinese_traditional ] = "鑷嫊绶ㄨ櫉"; Text[ arabic ] = "恃揄 梳耷祈"; Text[ greek ] = "刘酎灬翮 狁哞扃箸"; - Text[ korean ] = "磊悼 锅龋概扁扁"; + Text[ korean ] = "鞛愲彊 氩堩樃 毵り赴旮"; Text[ turkish ] = "Otomatik numaralama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇 autom醫ica"; + Text[ catalan ] = "Numeraci autom鄑ica"; + Text[ thai ] = "喔ム赋喔斷副喔氞笗喔编抚喙喔ム競喔副喔曕箓喔權浮喔编笗喔"; }; FixedText FT_NUMTYPE { @@ -205,21 +209,22 @@ TabPage TP_FOOTNOTEOPTION Text[ russian ] = "腕戾疣鲨"; Text[ greek ] = "榴哞~扃箸"; Text[ dutch ] = "~Nummering"; - Text[ french ] = "Nu~m閞otation"; + Text[ french ] = "Num閞otation"; Text[ spanish ] = "~Numeraci髇"; Text[ italian ] = "Numerazione"; - Text[ danish ] = "Numbering"; + Text[ danish ] = "Nu~mmerering"; Text[ swedish ] = "Nu~mrering"; Text[ polish ] = "Numeracja"; Text[ portuguese_brazilian ] = "Numbering"; - Text[ japanese ] = "斣崋偺庬椶(~B)"; - Text[ korean ] = "锅龋概扁扁(~B)"; - Text[ chinese_simplified ] = "编号(~B)"; - Text[ chinese_traditional ] = "絪腹(~B)"; + Text[ japanese ] = "鐣彿銇ó椤(~B)"; + Text[ korean ] = "氩堩樃 毵り赴旮(~B)"; + Text[ chinese_simplified ] = "缂栧彿(~B)"; + Text[ chinese_traditional ] = "绶ㄨ櫉(~B)"; Text[ turkish ] = "Numbering"; Text[ arabic ] = "轻恃揄"; - Text[ catalan ] = "~Numeraci髇"; - Text[ finnish ] = "Nu~mmerierung"; + Text[ catalan ] = "~Numeraci"; + Text[ finnish ] = "Nu~merointi"; + Text[ thai ] = "喔ム赋喔斷副喔氞笗喔编抚喙~喔ム競"; }; ListBox LB_NUMVIEW { @@ -239,25 +244,26 @@ TabPage TP_FOOTNOTEOPTION Left = TRUE ; Text [ english_us ] = "~Start at" ; Text [ italian ] = "Ini~zia con" ; - Text [ spanish ] = "Comen~zar en" ; + Text [ spanish ] = "Comenzar en" ; Text [ french ] = "Commencer avec" ; Text [ dutch ] = "~Begin met" ; Text [ swedish ] = "B鰚rja med" ; Text [ danish ] = "Begynd med" ; Text [ portuguese_brazilian ] = "Be~ginn bei" ; Text [ portuguese ] = "~Iniciar em" ; - Text[ chinese_simplified ] = "开始从(~S)"; + Text[ chinese_simplified ] = "寮濮嬩粠(~S)"; Text[ russian ] = "袜鬣螯 "; Text[ polish ] = "Zacznij od"; - Text[ japanese ] = "奐巒媟拲斣崋(~S)"; - Text[ chinese_traditional ] = "秨﹍眖(~S)"; + Text[ japanese ] = "闁嬪鐣彿(~S)"; + Text[ chinese_traditional ] = "闁嬪寰(~S)"; Text[ arabic ] = "轻认 溶"; Text[ greek ] = "容箸 尻赀礴箸"; - Text[ korean ] = "俊辑 矫累(~S)"; + Text[ korean ] = "鞁滌瀾 氩堩樃(~S)"; Text[ turkish ] = "B~aang"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Comen~zar en"; - Text[ finnish ] = "~Aloita kohdasta"; + Text[ catalan ] = "~S'inicia a"; + Text[ finnish ] = "~Aloitus"; + Text[ thai ] = "喙~喔｀复喙堗浮喔椸傅喙"; }; NumericField FLD_OFFSET { @@ -285,18 +291,19 @@ TabPage TP_FOOTNOTEOPTION Text[ french ] = "~Comptage"; Text[ spanish ] = "Contar"; Text[ italian ] = "Conteggio"; - Text[ danish ] = "Counting"; + Text[ danish ] = "~Punkttegn"; Text[ swedish ] = "R鋕~ning"; Text[ polish ] = "Ustawienia numeracji"; Text[ portuguese_brazilian ] = "Counting"; - Text[ japanese ] = "斣崋晅偗(~C)"; - Text[ korean ] = "墨款飘(~C)"; - Text[ chinese_simplified ] = "计数(~C)"; - Text[ chinese_traditional ] = "璸计(~C)"; + Text[ japanese ] = "鐣彿浠樸亼(~C)"; + Text[ korean ] = "氩堩樃 毵り赴旮(~C)"; + Text[ chinese_simplified ] = "璁℃暟(~C)"; + Text[ chinese_traditional ] = "瑷堟暩(~C)"; Text[ turkish ] = "Counting"; Text[ arabic ] = "授锨"; - Text[ catalan ] = "Contar"; - Text[ finnish ] = "~Z鋒lung"; + Text[ catalan ] = "~Compta"; + Text[ finnish ] = "~Lasketaan"; + Text[ thai ] = "~喔權副喔"; }; ListBox LB_NUMCOUNT { @@ -387,9 +394,9 @@ TabPage TP_FOOTNOTEOPTION }; StringList [ chinese_simplified ] = { - < "每页" ; > ; - < "每章" ; > ; - < "每文档" ; > ; + < "姣忛〉" ; > ; + < "姣忕珷" ; > ; + < "姣忔枃妗" ; > ; }; StringList [ russian ] = { @@ -405,15 +412,15 @@ TabPage TP_FOOTNOTEOPTION }; StringList [ japanese ] = { - < "瓦凹迋矀" ; > ; - < "復偛偲" ; > ; - < "暥彂偛偲" ; > ; + < "銉氥兗銈搞仈銇" ; > ; + < "绔犮仈銇" ; > ; + < "鏂囨浉銇斻仺" ; > ; }; StringList [ chinese_traditional ] = { - < "–" ; > ; - < "–彻" ; > ; - < "–ゅン" ; > ; + < "姣忛爜" ; > ; + < "姣忕珷" ; > ; + < "姣忓嬫枃浠" ; > ; }; StringList [ arabic ] = { @@ -429,9 +436,9 @@ TabPage TP_FOOTNOTEOPTION }; StringList [ korean ] = { - < "率 寸" ; > ; - < "厘 付促" ; > ; - < "巩辑 寸" ; > ; + < "韼橃澊歆 雼" ; > ; + < "鞛ル雼" ; > ; + < "氍胳劀雼" ; > ; }; StringList [ turkish ] = { @@ -447,9 +454,15 @@ TabPage TP_FOOTNOTEOPTION }; StringList [ catalan ] = { - < "Por p醙ina" ; > ; - < "Por cap韙ulo" ; > ; - < "Por documento" ; > ; + < "Per p鄃ina" ; > ; + < "Per cap韙ol" ; > ; + < "Per document" ; > ; + }; + StringList [ thai ] = + { + < "喔曕箞喔斧喔權箟喔" ; > ; + < "喔曕箞喔笟喔" ; > ; + < "喔曕箞喔箑喔竵喔覆喔" ; > ; }; }; FixedText FT_PREFIX @@ -459,7 +472,7 @@ TabPage TP_FOOTNOTEOPTION Text = "~Davor" ; Text [ ENGLISH ] = "Before" ; Text [ norwegian ] = "F鴕" ; - Text [ italian ] = "~Davanti" ; + Text [ italian ] = "Davanti" ; Text [ portuguese_brazilian ] = "Antes" ; Text [ portuguese ] = "An~tes" ; Text [ finnish ] = "~Ennen" ; @@ -467,20 +480,21 @@ TabPage TP_FOOTNOTEOPTION Text [ french ] = "Avant" ; Text [ swedish ] = "~Framf鰎" ; Text [ dutch ] = "~Ervoor" ; - Text [ spanish ] = "~Delante" ; + Text [ spanish ] = "Delante" ; Text [ english_us ] = "~Before" ; Left = TRUE ; - Text[ chinese_simplified ] = "之前(~B)"; + Text[ chinese_simplified ] = "涔嬪墠(~B)"; Text[ russian ] = "念"; Text[ polish ] = "Przed"; - Text[ japanese ] = "斣崋慜(~B)"; - Text[ chinese_traditional ] = "ぇ玡(~B)"; + Text[ japanese ] = "鐣彿鍓(~B)"; + Text[ chinese_traditional ] = "涔嬪墠(~B)"; Text[ arabic ] = "奕"; Text[ greek ] = "旭轫 狃"; - Text[ korean ] = "捞傈(~B)"; + Text[ korean ] = "氩堩樃 鞎(~B)"; Text[ turkish ] = "謓~黱de"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Delante"; + Text[ catalan ] = "~Abans"; + Text[ thai ] = "~喔佮箞喔笝"; }; Edit ED_PREFIX { @@ -506,20 +520,21 @@ TabPage TP_FOOTNOTEOPTION Text [ french ] = "Apr鑣" ; Text [ swedish ] = "B~akom" ; Text [ dutch ] = "E~rachter" ; - Text [ spanish ] = "D~etr醩" ; + Text [ spanish ] = "Detr醩" ; Text [ english_us ] = "~After" ; Left = TRUE ; - Text[ chinese_simplified ] = "之后(~A)"; + Text[ chinese_simplified ] = "涔嬪悗(~A)"; Text[ russian ] = "项耠"; Text[ polish ] = "Za"; - 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 ] = "A~rkas齨da"; Text[ language_user1 ] = " "; - Text[ catalan ] = "D~etr醩"; + Text[ catalan ] = "D~espr閟"; + Text[ thai ] = "~喔弗喔编竾喔堗覆喔"; }; Edit ED_SUFFIX { @@ -545,18 +560,19 @@ TabPage TP_FOOTNOTEOPTION Text [ french ] = "Position" ; Text [ dutch ] = "Positie" ; Text [ portuguese ] = "Posi玢o" ; - Text[ chinese_simplified ] = "位置"; - Text[ russian ] = "项玷鲨"; + Text[ chinese_simplified ] = "浣嶇疆"; + Text[ russian ] = "项腩驽龛"; Text[ polish ] = "Pozycja"; - Text[ japanese ] = "埵抲"; - Text[ chinese_traditional ] = "竚"; + Text[ japanese ] = "浣嶇疆"; + Text[ chinese_traditional ] = "浣嶇疆"; Text[ arabic ] = "轻沔众"; Text[ greek ] = "容箸"; - Text[ korean ] = "困摹"; + Text[ korean ] = "鞙勳箻"; Text[ turkish ] = "Konum"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Posici髇"; + Text[ catalan ] = "Posici"; Text[ finnish ] = "Sijainti"; + Text[ thai ] = "喔曕赋喙佮斧喔權箞喔"; }; RadioButton RB_POS_PAGE { @@ -565,29 +581,30 @@ TabPage TP_FOOTNOTEOPTION Text = "Seiten~ende" ; Text [ ENGLISH ] = "End of ~page" ; Text [ norwegian ] = "End of ~page" ; - Text [ italian ] = "Fine ~pagina" ; + Text [ italian ] = "Fine pagina" ; Text [ portuguese_brazilian ] = "Final de ~p?gina" ; Text [ portuguese ] = "Fim de ~p醙ina" ; Text [ finnish ] = "~Sivun loppu" ; Text [ danish ] = "Sidens slutning" ; - Text [ french ] = "Fin de ~page" ; + Text [ french ] = "Fin de la page" ; Text [ swedish ] = "S~idslut" ; Text [ dutch ] = "Pag~ina-einde" ; Text [ spanish ] = "Fin de ~p醙ina" ; Text [ english_us ] = "~End of page" ; TabStop = TRUE ; Group = TRUE ; - Text[ chinese_simplified ] = "页尾(~E)"; + Text[ chinese_simplified ] = "椤电殑缁撴潫浣嶇疆(~E)"; Text[ russian ] = "暑礤 耱疣龛鳆"; Text[ polish ] = "Koniec strony"; - 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 ] = "Sayfa so~nu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fin de ~p醙ina"; + Text[ catalan ] = "Fi de ~p鄃ina"; + Text[ thai ] = "~喔椸箟喔侧涪喔笝喙夃覆"; }; RadioButton RB_POS_CHAPTER { @@ -596,27 +613,28 @@ TabPage TP_FOOTNOTEOPTION Text = "Do~kumentende" ; Text [ ENGLISH ] = "End of ~doc." ; Text [ norwegian ] = "Slutt p ~dok." ; - Text [ italian ] = "Fine ~documento" ; + Text [ italian ] = "Fine documento" ; Text [ portuguese_brazilian ] = "Final de~doc." ; Text [ portuguese ] = "Fim do ~documento" ; - Text [ finnish ] = "Asiakirjan l~oppu" ; + Text [ finnish ] = "Asiakirjan loppu" ; Text [ danish ] = "Dokumentets slutn." ; - Text [ french ] = "Fin de ~document" ; + Text [ french ] = "Fin du document" ; Text [ swedish ] = "Do~kumentslut" ; Text [ dutch ] = "~Documenteinde" ; Text [ spanish ] = "F~in del documento" ; Text [ english_us ] = "En~d of document" ; - Text[ chinese_simplified ] = "文档尾端(~D)"; + Text[ chinese_simplified ] = "鏂囨。鐨勭粨鏉熶綅缃(~D)"; Text[ russian ] = "暑礤 漕牦戾眚"; Text[ polish ] = "Koniec dokumentu"; - Text[ japanese ] = "暥彂枛(~D)"; - Text[ chinese_traditional ] = "ゅンЮ狠(~D)"; + Text[ japanese ] = "鏂囨浉鏈(~D)"; + Text[ chinese_traditional ] = "鏂囦欢鐨勭祼鏉熶綅缃(~D)"; Text[ arabic ] = "溴琼 轻阌输"; Text[ greek ] = "暂腼 赍殪蓓秕"; - Text[ korean ] = "巩辑 场(~)"; + Text[ korean ] = "氍胳劀 雭(~D)"; Text[ turkish ] = "~Belge sonu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "F~in del documento"; + Text[ catalan ] = "Fin~al del document"; + Text[ thai ] = "喔椸箟喔瞺喔⑧箑喔竵喔覆喔"; }; FixedLine FL_TEMPL { @@ -635,17 +653,18 @@ TabPage TP_FOOTNOTEOPTION Text [ dutch ] = "Opmaakprofielen" ; Text [ spanish ] = "Estilos" ; Text [ english_us ] = "Styles" ; - Text[ chinese_simplified ] = "样式"; + Text[ chinese_simplified ] = "鏍峰紡"; Text[ russian ] = "羊桦"; Text[ polish ] = "Style"; - Text[ japanese ] = "嚼操"; - Text[ chinese_traditional ] = "妓Α"; + Text[ japanese ] = "銈广偪銈ゃ儷"; + Text[ chinese_traditional ] = "妯ｅ紡"; Text[ arabic ] = "娩闱"; Text[ greek ] = "旭躔"; - Text[ korean ] = "蜡屈"; + Text[ korean ] = "鞀ろ儉鞚"; Text[ turkish ] = "Bi鏸m"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Estilos"; + Text[ catalan ] = "Estils"; + Text[ thai ] = "喔ム副喔佮俯喔撪赴"; }; FixedText FT_PARA_TEMPL { @@ -654,28 +673,29 @@ TabPage TP_FOOTNOTEOPTION Text = "~Absatz" ; Text [ ENGLISH ] = "~Paragraph" ; Text [ norwegian ] = "~Paragraf" ; - Text [ italian ] = "~Paragrafo" ; + Text [ italian ] = "Paragrafo" ; Text [ portuguese_brazilian ] = "~Par?grafo" ; Text [ portuguese ] = "~Par醙rafo" ; Text [ finnish ] = "~Kappale" ; Text [ danish ] = "Afsnit" ; - Text [ french ] = "~Paragraphe" ; + Text [ french ] = "Paragraphe" ; Text [ swedish ] = "Sty~cke" ; Text [ dutch ] = "~Alinea" ; Text [ spanish ] = "P醨ra~fo" ; Text [ english_us ] = "Pa~ragraph" ; Left = TRUE ; - Text[ chinese_simplified ] = "段落(~R)"; + Text[ chinese_simplified ] = "娈佃惤(~R)"; Text[ russian ] = "泪玎"; Text[ polish ] = "Akapit"; - Text[ japanese ] = "抜棊(~R)"; - Text[ chinese_traditional ] = "琿辅(~R)"; + Text[ japanese ] = "娈佃惤(~R)"; + Text[ chinese_traditional ] = "娈佃惤(~R)"; Text[ arabic ] = "蒉焉"; Text[ greek ] = "嗅褴泷狯矧"; - Text[ korean ] = "窜遏(~R)"; + Text[ korean ] = "雼澖(~R)"; Text[ turkish ] = "~Paragraf"; Text[ language_user1 ] = " "; - Text[ catalan ] = "P醨ra~fo"; + Text[ catalan ] = "Par鄃ra~f"; + Text[ thai ] = "喔⑧箞喔瓇喔笝喙夃覆"; }; ListBox LB_PARA_TEMPL { @@ -694,7 +714,7 @@ TabPage TP_FOOTNOTEOPTION Text = "~Seite" ; Text [ ENGLISH ] = "~Page" ; Text [ norwegian ] = "~Page" ; - Text [ italian ] = "~Pagina" ; + Text [ italian ] = "Pagina" ; Text [ portuguese_brazilian ] = "~P?gina" ; Text [ portuguese ] = "~P醙ina" ; Text [ finnish ] = "~Sivu" ; @@ -705,17 +725,18 @@ TabPage TP_FOOTNOTEOPTION Text [ spanish ] = "P醻gina" ; Text [ english_us ] = "~Page" ; Left = TRUE ; - Text[ chinese_simplified ] = "页(~P)"; + Text[ chinese_simplified ] = "椤(~P)"; Text[ russian ] = "羊疣龛鲟"; Text[ polish ] = "Strona"; - 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 ] = "~Sayfa"; Text[ language_user1 ] = " "; - Text[ catalan ] = "P醻gina"; + Text[ catalan ] = "P鄜gina"; + Text[ thai ] = "~喔笝喙夃覆"; }; ListBox LB_PAGE_TEMPL { @@ -734,25 +755,26 @@ TabPage TP_FOOTNOTEOPTION Text[ english_us ] = "Character Styles"; Text[ portuguese ] = "Estilos de caracteres"; - Text[ russian ] = "羊桦 珥嚓钼"; + Text[ russian ] = "羊桦 耔焘铍"; Text[ greek ] = "郁蹼 麽襻牯揆"; Text[ dutch ] = "Tekenopmaakprofielen"; Text[ french ] = "Styles de caract鑢es"; Text[ spanish ] = "Estilos de car醕ter"; Text[ italian ] = "Modelli di carattere"; - Text[ danish ] = "Tegntypografi"; + Text[ danish ] = "Tegntypografier"; Text[ swedish ] = "Teckenformatmallar"; Text[ polish ] = "Style znak體"; Text[ portuguese_brazilian ] = "Character styles"; - Text[ japanese ] = "暥帤嚼操"; - Text[ korean ] = "巩磊 蜡屈"; - Text[ chinese_simplified ] = "字符样式"; - Text[ chinese_traditional ] = "じ妓Α"; + Text[ japanese ] = "鏂囧瓧銈广偪銈ゃ儷"; + Text[ korean ] = "氍胳瀽 鞀ろ儉鞚"; + Text[ chinese_simplified ] = "瀛楃鏍峰紡"; + Text[ chinese_traditional ] = "瀛楀厓妯ｅ紡"; Text[ arabic ] = "娩闱 猛演"; Text[ turkish ] = "Karakter bi鏸mi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Estilos de car醕ter"; + Text[ catalan ] = "Estils de car郼ter"; Text[ finnish ] = "Merkkityylit"; + Text[ thai ] = "喔ム副喔佮俯喔撪赴喔曕副喔о腑喔编竵喔傕福喔"; }; FixedText FT_ANCHR_CHARFMT { @@ -770,18 +792,19 @@ TabPage TP_FOOTNOTEOPTION Text [ french ] = "Zone de ~texte" ; Text [ dutch ] = "~Tekstbereik" ; Text [ portuguese ] = "~羠ea de texto" ; - Text[ chinese_simplified ] = "文字区域(~X)"; + Text[ chinese_simplified ] = "鏂囧瓧鍖哄煙(~X)"; Text[ russian ] = "吾豚耱 蝈犟蜞"; Text[ polish ] = "Obszar tekstu"; - Text[ japanese ] = "暥彂斖埻(~X)"; - Text[ chinese_traditional ] = "ゅ跋办(~X)"; + Text[ japanese ] = "鏂囨浉绡勫洸(~X)"; + Text[ chinese_traditional ] = "鏂囧瓧鍗鍩(~X)"; Text[ arabic ] = "湄寝 轻湔"; Text[ greek ] = "绣溥 赍殪蓓秕"; - Text[ korean ] = "咆胶飘 康开(~X)"; + Text[ korean ] = "氍胳劀 鞓侅棴(~X)"; Text[ turkish ] = "Metin a~lan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "羠ea de ~texto"; + Text[ catalan ] = "纑ea de ~text"; Text[ finnish ] = "Teksti~alue"; + Text[ thai ] = "喔炧阜喙夃笝喔椸傅喙堗競喙夃腑~喔勦抚喔侧浮"; }; ListBox LB_ANCHR_CHARFMT { @@ -804,22 +827,23 @@ TabPage TP_FOOTNOTEOPTION Text [ swedish ] = "Fotnotsomr錮e" ; Text [ danish ] = "Fodnoteomr錮e" ; Text [ italian ] = "Area note a pi pagina" ; - Text [ spanish ] = "羠ea de ~nota al pie" ; - Text [ french ] = "Plage de la ~note" ; + Text [ spanish ] = "羠ea de nota al pie" ; + Text [ french ] = "Section des notes" ; Text [ dutch ] = "Voetnoten~bereik" ; Text [ portuguese ] = "羱rea de rodap" ; - Text[ chinese_simplified ] = "注脚区域(~F)"; + Text[ chinese_simplified ] = "娉ㄨ剼鍖哄煙(~F)"; Text[ russian ] = "吾豚耱 耥铖觇"; Text[ polish ] = "Obszar przyp. doln."; - Text[ japanese ] = "媟拲斖埻(~F)"; - Text[ chinese_traditional ] = "爹竲絛瞅(~F)"; + Text[ japanese ] = "鑴氭敞绡勫洸(~F)"; + Text[ chinese_traditional ] = "瑷昏叧绡勫湇(~F)"; Text[ arabic ] = "湄寝 轻颓皂 轻虞犴"; Text[ greek ] = "绣溥 躔矬珈彘妁"; - Text[ korean ] = "阿林 康开(~F)"; + Text[ korean ] = "臧侅＜ 鞓侅棴(~F)"; Text[ turkish ] = "D~ipnot alan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "羠ea de ~nota al pie"; - Text[ finnish ] = "~Alaviitealue"; + Text[ catalan ] = "纑ea de ~nota al peu"; + Text[ finnish ] = "Ala~viitealue"; + Text[ thai ] = "喔炧阜喙夃笝喔椸傅喙堗箑~喔娻复喔囙腑喔｀福喔"; }; ListBox LB_TEXT_CHARFMT { @@ -841,23 +865,24 @@ TabPage TP_FOOTNOTEOPTION Text [ portuguese_brazilian ] = "Aviso de continua??o" ; Text [ portuguese ] = "Continua玢o das notas de rodap" ; Text [ finnish ] = "Jatkoilmoitus" ; - Text [ danish ] = "Henvisningstekst for flersidede fodnoter" ; + Text [ danish ] = "Tekst i flersidede fodnoter" ; Text [ french ] = "Indication de suite" ; Text [ swedish ] = "H鋘visningstext f鰎 flersidiga fotnoter" ; - Text [ dutch ] = "Verwijstekst bij voetnoten verdeeld over meer dan een pagina" ; + Text [ dutch ] = "Verwijstekst bij voetnoten verdeeld over meer dan 殚n pagina" ; Text [ spanish ] = "Indicaci髇 para notas al pie en varias p醙inas" ; Text [ english_us ] = "Continuation notice" ; - Text[ chinese_simplified ] = "多页注脚的提示文"; + Text[ chinese_simplified ] = "澶氶〉娉ㄨ剼鐨勬彁绀烘枃"; Text[ russian ] = "雨噻囗桢 镳钿铍驽龛 耥铖觇"; Text[ polish ] = "Wskaz體ka dotycz筩a kontynuacji przypis體 dolnych"; - Text[ japanese ] = "媟拲偑師瓦凹迋蓱眰瓖蹅虙崍訌憘"; - Text[ chinese_traditional ] = "爹竲矗ボゅ"; + Text[ japanese ] = "鑴氭敞銇屾銉氥兗銈搞伀缍氥亸闅涖伄娉ㄦ剰鏇搞亶"; + Text[ chinese_traditional ] = "澶氶爜瑷昏叧鐨勬彁绀烘枃"; Text[ arabic ] = "汜峭偕 卺 赃 玩窃 虞犴 蓓 眠搜 沅 蛰蜕"; Text[ greek ] = "叔哽屙 篚焘秕朕 汩 痫膈筝腴溴 躔矬珈彘彘"; - Text[ korean ] = "咯矾 率狼 阿林俊 措茄 曼绊"; + Text[ korean ] = "臧侅＜ 瓿勳啀 鞁 欤检潣 響滌嫓"; Text[ turkish ] = "Devam eden dipnotu ile ilgili bilgi metni"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Indicaci髇 para notas al pie en varias p醙inas"; + Text[ catalan ] = "Indicaci per notes al peu en diverses p鄃ines"; + Text[ thai ] = "喙佮笀喙夃竾喙冟斧喙夃笚喔｀覆喔氞腑喔⑧箞喔侧竾喔曕箞喔箑喔權阜喙堗腑喔"; }; FixedText FT_CONT { @@ -869,25 +894,26 @@ TabPage TP_FOOTNOTEOPTION Text [ italian ] = "Alla fine del pi pagina" ; Text [ portuguese_brazilian ] = "~Continuado" ; Text [ portuguese ] = "~No final da nota" ; - Text [ finnish ] = "Ala~selitteen loppu" ; + Text [ finnish ] = "Alaselitteen loppu" ; Text [ danish ] = "Ved fodnotens slutning" ; Text [ french ] = "En ~fin de note" ; Text [ swedish ] = "Vid slutet av f~otnoten" ; - Text [ dutch ] = "~Voetnooteinde" ; + Text [ dutch ] = "Eind van ~voetnoot" ; Text [ spanish ] = "Final de n~ota al pie" ; Text [ english_us ] = "End ~of footnote" ; Left = TRUE ; - Text[ chinese_simplified ] = "注脚尾端(~O)"; + Text[ chinese_simplified ] = "娉ㄨ剼鐨勭粨鏉熶綅缃(~O)"; Text[ russian ] = " 觐眦 耥铖觇"; Text[ polish ] = "Na koncu przypis體 dolnych"; - Text[ japanese ] = "媟拲枛(~O)"; - Text[ chinese_traditional ] = "爹竲挡Ю(~O)"; + Text[ japanese ] = "鑴氭敞鏈(~O)"; + Text[ chinese_traditional ] = "鍦ㄨɑ鑵崇祼灏(~O)"; Text[ arabic ] = "阡 溴琼 轻颓皂 轻虞犴"; Text[ greek ] = "郁 糨腼 翮 躔~矬珈暹珧"; - Text[ korean ] = "阿林 场俊(~O)"; + Text[ korean ] = "臧侅＜ 雭濎棎(~O)"; Text[ turkish ] = "~Dipnot alt齨da"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Final de n~ota al pie"; + Text[ catalan ] = "Final ~de la nota al peu"; + Text[ thai ] = "喔椸箟喔侧涪~喔傕腑喔囙箑喔娻复喔囙腑喔｀福喔"; }; Edit ED_CONT { @@ -905,10 +931,10 @@ TabPage TP_FOOTNOTEOPTION Text = "A~uf Folgeseite" ; Text [ ENGLISH ] = "~Started" ; Text [ norwegian ] = "~Startet" ; - Text [ italian ] = "Alla pagina succ." ; + Text [ italian ] = "Alla pagina successiva" ; Text [ portuguese_brazilian ] = "~Iniciado" ; Text [ portuguese ] = "~P醙ina seguinte" ; - Text [ finnish ] = "~Seuraavan sivun aloitus" ; + Text [ finnish ] = "Seuraavan sivun aloitus" ; Text [ danish ] = "P n鎠te side" ; Text [ french ] = "~Sur la page suivante" ; Text [ swedish ] = "~P f鰈jande sida" ; @@ -916,17 +942,18 @@ TabPage TP_FOOTNOTEOPTION Text [ spanish ] = "En p醙. sig~uiente" ; Text [ english_us ] = "Star~t of next page" ; Left = TRUE ; - Text[ chinese_simplified ] = "從续页開始(~T)"; + Text[ chinese_simplified ] = "寰炵画椤甸枊濮(~T)"; Text[ russian ] = "央邃簋 耱疣龛鲟"; Text[ polish ] = "Na nastepnej stronie"; - Text[ japanese ] = "師偺瓦凹(~T)"; + Text[ japanese ] = "娆°伄銉氥兗銈(~T)"; Text[ language_user1 ] = " "; - Text[ chinese_traditional ] = "眖尿秨﹍(~T)"; + Text[ chinese_traditional ] = "寰炵簩闋侀枊濮(~T)"; Text[ arabic ] = "卺 轻蛰蜕 轻是犴"; Text[ greek ] = "郁珥 鍉瘘戾礴 箦脒溽"; - Text[ korean ] = "促澜 率俊(~T)"; + Text[ korean ] = "雼れ潓 韼橃澊歆 鞁滌瀾(~T)"; Text[ turkish ] = "~Sonraki sayfada"; - Text[ catalan ] = "En p醙. sig~uiente"; + Text[ catalan ] = "A p鄃. seg~黣nt"; + Text[ thai ] = "喙喔｀复喙垀喔∴斧喔權箟喔侧笘喔编笖喙勦笡"; }; Edit ED_CONT_FROM { @@ -963,17 +990,18 @@ TabPage TP_ENDNOTEOPTION Text [ spanish ] = "Numeraci髇 autom醫ica" ; Text [ english_us ] = "AutoNumbering" ; Group = TRUE ; - Text[ chinese_simplified ] = "自动编号"; - Text[ russian ] = "棱蝾爨蜩麇耜 眢戾疣鲨"; + Text[ chinese_simplified ] = "鑷姩缂栧彿"; + Text[ russian ] = "棱蝾眢戾疣鲨"; Text[ polish ] = "Automatyczna numeracja"; - Text[ japanese ] = "帺摦斣崋晅偗"; - Text[ chinese_traditional ] = "笆絪腹"; + Text[ japanese ] = "鑷嫊鐣彿浠樸亼"; + Text[ chinese_traditional ] = "鑷嫊绶ㄨ櫉"; Text[ arabic ] = "恃揄 梳耷祈"; Text[ greek ] = "刘酎灬翮 狁哞扃箸"; - Text[ korean ] = "磊悼 锅龋概扁扁"; + Text[ korean ] = "鞛愲彊 氩堩樃 毵り赴旮"; Text[ turkish ] = "Otomatik numaralama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇 autom醫ica"; + Text[ catalan ] = "Numeraci autom鄑ica"; + Text[ thai ] = "喔ム赋喔斷副喔氞笗喔编抚喙喔ム競喔副喔曕箓喔權浮喔编笗喔"; }; FixedText FT_NUMTYPE { @@ -986,21 +1014,22 @@ TabPage TP_ENDNOTEOPTION Text[ russian ] = "腕戾疣鲨"; Text[ greek ] = "榴哞靱珞"; Text[ dutch ] = "Nu~mmering"; - Text[ french ] = "Nu~m閞otation"; + Text[ french ] = "Num閞otation"; Text[ spanish ] = "Numeraci髇"; Text[ italian ] = "Numerazione"; - Text[ danish ] = "Numbering"; + Text[ danish ] = "Nu~mmerering"; Text[ swedish ] = "Nu~mrering"; Text[ polish ] = "Numeracja"; Text[ portuguese_brazilian ] = "Numbering"; - Text[ japanese ] = "斣崋偺庬椶(~N)"; - Text[ korean ] = "锅龋概扁扁(~N)"; - Text[ chinese_simplified ] = "编号(~N)"; - Text[ chinese_traditional ] = "絪腹(~N)"; + Text[ japanese ] = "鐣彿銇ó椤(~N)"; + Text[ korean ] = "氩堩樃 毵り赴旮(~N)"; + Text[ chinese_simplified ] = "缂栧彿(~N)"; + Text[ chinese_traditional ] = "绶ㄨ櫉(~N)"; Text[ turkish ] = "Numbering"; Text[ arabic ] = "轻恃揄"; - Text[ catalan ] = "Numeraci髇"; - Text[ finnish ] = "Nu~mmerierung"; + Text[ catalan ] = "Numeraci"; + Text[ finnish ] = "~Numerointi"; + Text[ thai ] = "~喔ム赋喔斷副喔氞笗喔编抚喙喔ム競"; }; ListBox LB_NUMVIEW { @@ -1031,25 +1060,26 @@ TabPage TP_ENDNOTEOPTION Left = TRUE ; Text [ english_us ] = "~Start at" ; Text [ italian ] = "Ini~zia con" ; - Text [ spanish ] = "Comen~zar en" ; + Text [ spanish ] = "Comenzar en" ; Text [ french ] = "Commencer avec" ; Text [ dutch ] = "~Begin met" ; Text [ swedish ] = "~B鰎ja med" ; Text [ danish ] = "Begynd med" ; Text [ portuguese_brazilian ] = "Be~ginn bei" ; Text [ portuguese ] = "~Iniciar em" ; - Text[ chinese_simplified ] = "开始从(~S)"; + Text[ chinese_simplified ] = "寮濮嬩粠(~S)"; Text[ russian ] = "袜鬣螯 "; Text[ polish ] = "Zacznij od"; - Text[ japanese ] = "奐巒暥枛媟拲斣崋(~S)"; - Text[ chinese_traditional ] = "秨﹍眖(~S)"; + Text[ japanese ] = "闁嬪鐣彿(~S)"; + Text[ chinese_traditional ] = "闁嬪寰(~S)"; Text[ arabic ] = "轻认 溶"; Text[ greek ] = "容箸 尻赀礴箸"; - Text[ korean ] = "俊辑 矫累(~S)"; + Text[ korean ] = "鞁滌瀾 氩堩樃(~S)"; Text[ turkish ] = "B~aang"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Comen~zar en"; - Text[ finnish ] = "~Aloita kohdasta"; + Text[ catalan ] = "Comen~鏰 a"; + Text[ finnish ] = "~Aloitus"; + Text[ thai ] = "喙~喔｀复喙堗浮喔椸傅喙"; }; NumericField FLD_OFFSET { @@ -1084,7 +1114,7 @@ TabPage TP_ENDNOTEOPTION Text = "~Davor" ; Text [ ENGLISH ] = "Before" ; Text [ norwegian ] = "F鴕" ; - Text [ italian ] = "~Davanti" ; + Text [ italian ] = "Davanti" ; Text [ portuguese_brazilian ] = "Antes" ; Text [ portuguese ] = "An~tes" ; Text [ finnish ] = "~Ennen" ; @@ -1092,20 +1122,21 @@ TabPage TP_ENDNOTEOPTION Text [ french ] = "Avant" ; Text [ swedish ] = "~Framf鰎" ; Text [ dutch ] = "~Ervoor" ; - Text [ spanish ] = "~Delante" ; + Text [ spanish ] = "Delante" ; Text [ english_us ] = "~Before" ; Left = TRUE ; - Text[ chinese_simplified ] = "之前(~B)"; + Text[ chinese_simplified ] = "涔嬪墠(~B)"; Text[ russian ] = "念"; Text[ polish ] = "Przed"; - Text[ japanese ] = "斣崋慜(~B)"; - Text[ chinese_traditional ] = "ぇ玡(~B)"; + Text[ japanese ] = "鐣彿鍓(~B)"; + Text[ chinese_traditional ] = "涔嬪墠(~B)"; Text[ arabic ] = "奕"; Text[ greek ] = "旭轫 狃"; - Text[ korean ] = "捞傈(~B)"; + Text[ korean ] = "氩堩樃 鞎(~B)"; Text[ turkish ] = "謓黱de"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Delante"; + Text[ catalan ] = "~Abans"; + Text[ thai ] = "~喔佮箞喔笝"; }; Edit ED_PREFIX { @@ -1131,20 +1162,21 @@ TabPage TP_ENDNOTEOPTION Text [ french ] = "Apr鑣" ; Text [ swedish ] = "Ba~kom" ; Text [ dutch ] = "E~rachter" ; - Text [ spanish ] = "D~etr醩" ; + Text [ spanish ] = "Detr醩" ; Text [ english_us ] = "~After" ; Left = TRUE ; - Text[ chinese_simplified ] = "之后(~A)"; + Text[ chinese_simplified ] = "涔嬪悗(~A)"; Text[ russian ] = "项耠"; Text[ polish ] = "Za"; - 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 ] = "A~rkas齨da"; Text[ language_user1 ] = " "; - Text[ catalan ] = "D~etr醩"; + Text[ catalan ] = "D~espr閟"; + Text[ thai ] = "~喔弗喔编竾喔堗覆喔"; }; Edit ED_SUFFIX { @@ -1168,29 +1200,30 @@ TabPage TP_ENDNOTEOPTION Text = "Seiten~ende" ; Text [ ENGLISH ] = "End of ~page" ; Text [ norwegian ] = "End of ~page" ; - Text [ italian ] = "Fine ~pagina" ; + Text [ italian ] = "Fine pagina" ; Text [ portuguese_brazilian ] = "Final de ~p?gina" ; Text [ portuguese ] = "Fim de ~p醙ina" ; Text [ finnish ] = "~Sivun loppu" ; Text [ danish ] = "Sidens slutning" ; - Text [ french ] = "Fin de ~page" ; + Text [ french ] = "Fin de la page" ; Text [ swedish ] = "S~idslut" ; Text [ dutch ] = "Pag~ina-einde" ; Text [ spanish ] = "Fin de ~p醙ina" ; Text [ english_us ] = "End ~of page" ; TabStop = TRUE ; Group = TRUE ; - Text[ chinese_simplified ] = "页尾(~O)"; + Text[ chinese_simplified ] = "椤电殑缁撴潫浣嶇疆(~O)"; Text[ russian ] = "暑礤 耱疣龛鳆"; Text[ polish ] = "Koniec strony"; - Text[ japanese ] = "瓦凹迻(~O)"; - Text[ chinese_traditional ] = "Ю(~O)"; + Text[ japanese ] = "銉氥兗銈告湯(~O)"; + Text[ chinese_traditional ] = "闋佺殑绲愭潫浣嶇疆(~O)"; Text[ arabic ] = "溴琼 轻蛰蜕"; Text[ greek ] = "暂腼 箦脒溽"; - Text[ korean ] = "率 付瘤阜(~O)"; + Text[ korean ] = "韼橃澊歆 雭(~O)"; Text[ turkish ] = "Sayfa so~nu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fin de ~p醙ina"; + Text[ catalan ] = "Fi de ~p鄃ina"; + Text[ thai ] = "喔箞喔о笝喔椸箟喔侧涪~喔傕腑喔囙斧喔權箟喔"; }; RadioButton RB_POS_CHAPTER { @@ -1199,27 +1232,28 @@ TabPage TP_ENDNOTEOPTION Text = "~Dokumentende" ; Text [ ENGLISH ] = "End of ~doc." ; Text [ norwegian ] = "Slutt p ~dok." ; - Text [ italian ] = "Fine ~documento" ; + Text [ italian ] = "Fine documento" ; Text [ portuguese_brazilian ] = "Final de~doc." ; Text [ portuguese ] = "Fim do ~documento" ; Text [ finnish ] = "~Asiakirjan loppu" ; Text [ danish ] = "Dokumentets slutn." ; - Text [ french ] = "Fin de ~document" ; + Text [ french ] = "Fin du document" ; Text [ swedish ] = "~Dokumentslut" ; Text [ dutch ] = "~Documenteinde" ; Text [ spanish ] = "Fin del ~documento" ; Text [ english_us ] = "End of ~document" ; - Text[ chinese_simplified ] = "文档尾端(~D)"; + Text[ chinese_simplified ] = "鏂囨。鐨勭粨鏉熶綅缃(~D)"; Text[ russian ] = "暑礤 漕牦戾眚"; Text[ polish ] = "Koniec dokumentu"; - Text[ japanese ] = "暥彂枛(~D)"; - Text[ chinese_traditional ] = "ゅンЮ狠(~D)"; + Text[ japanese ] = "鏂囨浉鏈(~D)"; + Text[ chinese_traditional ] = "鏂囦欢鐨勭祼鏉熶綅缃(~D)"; Text[ arabic ] = "溴琼 轻阌输"; Text[ greek ] = "暂腼 赍殪蓓秕"; - Text[ korean ] = "巩辑 场(~D)"; + Text[ korean ] = "氍胳劀 雭(~D)"; Text[ turkish ] = "~Belge sonu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fin del ~documento"; + Text[ catalan ] = "Final del ~document"; + Text[ thai ] = "喔箞喔о笝喔椸箟喔侧涪喔傕腑喔囙箑~喔竵喔覆喔"; }; FixedLine FL_TEMPL { @@ -1238,17 +1272,18 @@ TabPage TP_ENDNOTEOPTION Text [ dutch ] = "Opmaakprofielen" ; Text [ spanish ] = "Estilos" ; Text [ english_us ] = "Styles" ; - Text[ chinese_simplified ] = "样式"; + Text[ chinese_simplified ] = "鏍峰紡"; Text[ russian ] = "羊桦"; Text[ polish ] = "Style"; - Text[ japanese ] = "嚼操"; - Text[ chinese_traditional ] = "妓Α"; + Text[ japanese ] = "銈广偪銈ゃ儷"; + Text[ chinese_traditional ] = "妯ｅ紡"; Text[ arabic ] = "娩闱"; Text[ greek ] = "旭躔"; - Text[ korean ] = "蜡屈"; + Text[ korean ] = "鞀ろ儉鞚"; Text[ turkish ] = "Bi鏸m"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Estilos"; + Text[ catalan ] = "Estils"; + Text[ thai ] = "喔ム副喔佮俯喔撪赴"; }; FixedText FT_PARA_TEMPL { @@ -1257,28 +1292,29 @@ TabPage TP_ENDNOTEOPTION Text = "~Absatz" ; Text [ ENGLISH ] = "~Paragraph" ; Text [ norwegian ] = "~Paragraf" ; - Text [ italian ] = "~Paragrafo" ; + Text [ italian ] = "Paragrafo" ; Text [ portuguese_brazilian ] = "~Par?grafo" ; Text [ portuguese ] = "~Par醙rafo" ; Text [ finnish ] = "~Kappale" ; Text [ danish ] = "Afsnit" ; - Text [ french ] = "~Paragraphe" ; + Text [ french ] = "Paragraphe" ; Text [ swedish ] = "Sty~cke" ; Text [ dutch ] = "~Alinea" ; Text [ spanish ] = "P醨ra~fo" ; Text [ english_us ] = "Pa~ragraph" ; Left = TRUE ; - Text[ chinese_simplified ] = "段落(~R)"; + Text[ chinese_simplified ] = "娈佃惤(~R)"; Text[ russian ] = "泪玎"; Text[ polish ] = "Akapit"; - Text[ japanese ] = "抜棊(~R)"; - Text[ chinese_traditional ] = "琿辅(~R)"; + Text[ japanese ] = "娈佃惤(~R)"; + Text[ chinese_traditional ] = "娈佃惤(~R)"; Text[ arabic ] = "蒉焉"; Text[ greek ] = "嗅褴泷狯矧"; - Text[ korean ] = "窜遏(~R)"; + Text[ korean ] = "雼澖(~R)"; Text[ turkish ] = "~Paragraf"; Text[ language_user1 ] = " "; - Text[ catalan ] = "P醨ra~fo"; + Text[ catalan ] = "Par鄃ra~f"; + Text[ thai ] = "喔⑧箞喔瓇喔笝喙夃覆"; }; ListBox LB_PARA_TEMPL { @@ -1297,7 +1333,7 @@ TabPage TP_ENDNOTEOPTION Text = "~Seite" ; Text [ ENGLISH ] = "~Page" ; Text [ norwegian ] = "~Page" ; - Text [ italian ] = "~Pagina" ; + Text [ italian ] = "Pagina" ; Text [ portuguese_brazilian ] = "~P?gina" ; Text [ portuguese ] = "~P醙ina" ; Text [ finnish ] = "~Sivu" ; @@ -1308,17 +1344,18 @@ TabPage TP_ENDNOTEOPTION Text [ spanish ] = "P醻gina" ; Text [ english_us ] = "~Page" ; Left = TRUE ; - Text[ chinese_simplified ] = "页(~P)"; - Text[ russian ] = "羊疣龛鲟"; + Text[ chinese_simplified ] = "椤(~P)"; + Text[ russian ] = "羊疣龛~鲟"; Text[ polish ] = "Strona"; - 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 ] = "~Sayfa"; Text[ language_user1 ] = " "; - Text[ catalan ] = "P醻gina"; + Text[ catalan ] = "P鄜gina"; + Text[ thai ] = "~喔笝喙夃覆"; }; ListBox LB_PAGE_TEMPL { @@ -1336,25 +1373,26 @@ TabPage TP_ENDNOTEOPTION Text [ ENGLISH ] = "Character styles" ; Text[ english_us ] = "Character Styles"; Text[ portuguese ] = "Estilos de caracteres"; - Text[ russian ] = "羊桦 珥嚓钼"; + Text[ russian ] = "羊桦 耔焘铍"; Text[ greek ] = "郁蹼 麽襻牯揆"; Text[ dutch ] = "Tekenopmaakprofielen"; Text[ french ] = "Styles de caract鑢es"; Text[ spanish ] = "Estilos de car醕ter"; Text[ italian ] = "Modelli di carattere"; - Text[ danish ] = "Tegntypografi"; + Text[ danish ] = "Tegntypografier"; Text[ swedish ] = "Teckenformatmallar"; Text[ polish ] = "Style znak體"; Text[ portuguese_brazilian ] = "Character styles"; - Text[ japanese ] = "暥帤嚼操"; - Text[ korean ] = "巩磊 蜡屈"; - Text[ chinese_simplified ] = "字符样式"; - Text[ chinese_traditional ] = "じ妓Α"; + Text[ japanese ] = "鏂囧瓧銈广偪銈ゃ儷"; + Text[ korean ] = "氍胳瀽 鞀ろ儉鞚"; + Text[ chinese_simplified ] = "瀛楃鏍峰紡"; + Text[ chinese_traditional ] = "瀛楀厓妯ｅ紡"; Text[ arabic ] = "娩闱 猛演"; Text[ turkish ] = "Karakter bi鏸mi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Estilos de car醕ter"; + Text[ catalan ] = "Estils de car郼ter"; Text[ finnish ] = "Merkkityylit"; + Text[ thai ] = "喔ム副喔佮俯喔撪赴喔曕副喔о腑喔编竵喔傕福喔"; }; FixedText FT_ANCHR_CHARFMT { @@ -1370,19 +1408,20 @@ TabPage TP_ENDNOTEOPTION Text [ italian ] = "Area del testo" ; Text [ spanish ] = "羠ea de ~texto" ; Text [ french ] = "Zone de ~texte" ; - Text [ dutch ] = "~Eindemarkeringsbereik" ; + Text [ dutch ] = "T~ekstbereik" ; Text [ portuguese ] = "羠ea de te~xto" ; - Text[ chinese_simplified ] = "文字区域(~X)"; - Text[ russian ] = "吾豚耱 蝈犟蜞"; + Text[ chinese_simplified ] = "鏂囧瓧鍖哄煙(~X)"; + Text[ russian ] = "义犟"; Text[ polish ] = "Obszar tekstu"; - Text[ japanese ] = "暥彂斖埻(~X)"; - Text[ chinese_traditional ] = "ゅ跋办(~X)"; + Text[ japanese ] = "鏂囨浉绡勫洸(~X)"; + Text[ chinese_traditional ] = "鏂囧瓧鍗鍩(~X)"; Text[ arabic ] = "湄寝 轻湔"; Text[ greek ] = "绣溥 赍殪蓓秕"; - Text[ korean ] = "咆胶飘 康开(~X)"; + Text[ korean ] = "氍胳劀 鞓侅棴(~X)"; Text[ turkish ] = "Metin ~alan"; - Text[ catalan ] = "羠ea de ~texto"; - Text[ finnish ] = "Teksti~alue"; + Text[ catalan ] = "纑ea de ~text"; + Text[ finnish ] = "Tekstialue"; + Text[ thai ] = "喔炧阜喙夃笝喔椸傅喙堗競喙夃腑~喔勦抚喔侧浮"; }; ListBox LB_ANCHR_CHARFMT { @@ -1405,21 +1444,22 @@ TabPage TP_ENDNOTEOPTION Text [ swedish ] = "Slutnotsomr錮e" ; Text [ danish ] = "Slutnoteomr錮e" ; Text [ italian ] = "Area note di chiusura" ; - Text [ spanish ] = "羠ea de n~ota al final" ; - Text [ french ] = "Plage de la ~note" ; + Text [ spanish ] = "羠ea de n~otas finales" ; + Text [ french ] = "Section des notes" ; Text [ dutch ] = "~Eindnotenbereik" ; Text [ portuguese ] = "羠ea de ~nota final" ; - Text[ chinese_simplified ] = "尾注区域(~E)"; - Text[ russian ] = "吾豚耱 觐眦邂铋 耥铖觇"; + Text[ chinese_simplified ] = "灏炬敞鍖哄煙(~E)"; + Text[ russian ] = "暑眦邂 耥铖赅"; Text[ polish ] = "Obszar przyp. ko馽."; - 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 ] = "S~onnot alan"; - Text[ catalan ] = "羠ea de n~ota al final"; + Text[ catalan ] = "纑ea de n~ota al final"; Text[ finnish ] = "~Loppuviitealue"; + Text[ thai ] = "喔炧阜喙夃笝喔椸傅喙垀喔箟喔侧竾喔复喔囙笚喙夃覆喔⑧箑喔｀阜喙堗腑喔"; }; ListBox LB_TEXT_CHARFMT { @@ -1445,20 +1485,21 @@ TabPage TP_ENDNOTEOPTION Text [ danish ] = "Henvisningstekst for flersidede fodnoter" ; Text [ french ] = "Indication de suite" ; Text [ swedish ] = "H鋘visningstext f鰎 flersidiga fotnoter" ; - Text [ dutch ] = "Verwijstekst bij voetnoten verdeeld over meer dan een pagina" ; + Text [ dutch ] = "Verwijstekst bij voetnoten verdeeld over meer dan 殚n pagina" ; Text [ spanish ] = "Indicaci髇 para notas al pie en varias p醙inas" ; Text [ english_us ] = "Continuation notice" ; - Text[ chinese_simplified ] = "多页注脚的提示文"; - Text[ russian ] = "雨噻囹咫 蝈犟 潆 耥铖铌 磬 礤耜铍桴 耱疣龛鲟"; + Text[ chinese_simplified ] = "澶氶〉娉ㄨ剼鐨勬彁绀烘枃"; + Text[ russian ] = "雨噻囗桢 镳钿铍驽龛 耥铖觇"; Text[ polish ] = "Wskaz體ka dotycz筩a kontynuacji przypis體 dolnych"; - Text[ japanese ] = "媟拲偑師瓦凹迋蓱眰瓖蹅虙崍訌憘"; - Text[ chinese_traditional ] = "爹竲矗ボゅ"; + Text[ japanese ] = "鑴氭敞銇屾銉氥兗銈搞伀缍氥亸闅涖伄娉ㄦ剰鏇搞亶"; + Text[ chinese_traditional ] = "澶氶爜瑷昏叧鐨勬彁绀烘枃"; Text[ arabic ] = "汜峭偕 卺 赃 玩窃 虞犴 蓓 眠搜 沅 蛰蜕"; Text[ greek ] = "叔哽屙 篚焘秕朕 汩 痫膈筝腴溴 躔矬珈彘彘"; - Text[ korean ] = "咯矾 率狼 阿林俊 措茄 曼绊"; + Text[ korean ] = "臧侅＜ 瓿勳啀 鞁 欤检潣 響滌嫓"; Text[ turkish ] = "Devam eden dipnotu ile ilgili bilgi metni"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Indicaci髇 para notas al pie en varias p醙inas"; + Text[ catalan ] = "Indicaci per notes al peu en diverses p鄃ines"; + Text[ thai ] = "喙佮笀喙夃竾喙冟斧喙夃笚喔｀覆喔氞腑喔⑧箞喔侧竾喔曕箞喔箑喔權阜喙堗腑喔"; }; FixedText FT_CONT { @@ -1478,17 +1519,18 @@ TabPage TP_ENDNOTEOPTION Text [ spanish ] = "P醙ina ~siguiente" ; Text [ english_us ] = "~Following page" ; Left = TRUE ; - Text[ chinese_simplified ] = "续页(~F)"; + Text[ chinese_simplified ] = "缁〉(~F)"; Text[ russian ] = "央邃簋 耱疣龛鲟"; Text[ polish ] = "Nast阷. str."; - Text[ japanese ] = "師偺瓦凹(~F)"; - Text[ chinese_traditional ] = "尿(~F)"; + Text[ japanese ] = "娆°伄銉氥兗銈(~F)"; + Text[ chinese_traditional ] = "绾岄爜(~F)"; Text[ arabic ] = "轻蛰蜕 轻是犴"; Text[ greek ] = "硼屙 箦脒溽"; - Text[ korean ] = "促澜 率(~F)"; + Text[ korean ] = "雼れ潓 韼橃澊歆(~F)"; Text[ turkish ] = "~Sonraki sayfa"; Text[ language_user1 ] = " "; - Text[ catalan ] = "P醙ina ~siguiente"; + Text[ catalan ] = "P鄃ina ~seg黣nt"; + Text[ thai ] = "喔笝喙夃覆~喔權傅喙"; }; Edit ED_CONT { @@ -1517,17 +1559,18 @@ TabPage TP_ENDNOTEOPTION Text [ spanish ] = "~Comenzar" ; Text [ english_us ] = "~Start" ; Left = TRUE ; - Text[ chinese_simplified ] = "开始(~S)"; + Text[ chinese_simplified ] = "寮濮(~S)"; Text[ russian ] = "袜鬣腩"; Text[ polish ] = "Pocz箃ek"; - Text[ japanese ] = "奐巒(~S)"; + Text[ japanese ] = "闁嬪(~S)"; Text[ language_user1 ] = " "; - Text[ chinese_traditional ] = "秨﹍(~S)"; + Text[ chinese_traditional ] = "闁嬪(~S)"; Text[ arabic ] = "轻认"; Text[ greek ] = "抨赀礴箸"; - Text[ korean ] = "矫累(~S)"; + Text[ korean ] = "鞁滌瀾(~S)"; Text[ turkish ] = "~Baang"; - Text[ catalan ] = "~Comenzar"; + Text[ catalan ] = "~Inicia"; + Text[ thai ] = "喙~喔｀复喙堗浮"; }; Edit ED_CONT_FROM { @@ -1542,3 +1585,19 @@ TabPage TP_ENDNOTEOPTION + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/misc/glosbib.src b/sw/source/ui/misc/glosbib.src index cdd9c169ef0d..be80c505deb7 100644 --- a/sw/source/ui/misc/glosbib.src +++ b/sw/source/ui/misc/glosbib.src @@ -2,9 +2,9 @@ * * $RCSfile: glosbib.src,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:18:56 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,7 +74,7 @@ ModalDialog DLG_BIB_BASE Text [ dutch ] = "Bereiken bewerken" ; Text [ english_us ] = "Edit Categories" ; Text [ italian ] = "Modifica categorie" ; - Text [ spanish ] = "Modificar 醨eas" ; + Text [ spanish ] = "Editar categor韆s" ; Text [ french ] = "蒬ition des cat間ories" ; Text [ swedish ] = "Redigera omr錮en" ; Text [ danish ] = "Rediger omr錮er" ; @@ -99,17 +99,18 @@ ModalDialog DLG_BIB_BASE Text [ spanish ] = "~Nuevo" ; Text [ english_us ] = "~New" ; TabStop = TRUE ; - Text[ chinese_simplified ] = "新建(~N)"; - Text[ russian ] = "杨玟~囹"; + Text[ chinese_simplified ] = "鏂板缓(~N)"; + Text[ russian ] = "杨玟囹"; Text[ polish ] = "Nowy"; - 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 ] = "~Yeni"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Nuevo"; + Text[ catalan ] = "~Nou"; + Text[ thai ] = "喙儈喔浮喙"; }; PushButton PB_DELETE { @@ -124,24 +125,25 @@ ModalDialog DLG_BIB_BASE Text [ portuguese ] = "E~liminar" ; Text [ finnish ] = "~Poista" ; 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" ; TabStop = TRUE ; Disable = TRUE ; - Text[ chinese_simplified ] = "删除(~D)"; + Text[ chinese_simplified ] = "鍒犻櫎(~D)"; Text[ russian ] = "愉嚯栩"; Text[ polish ] = "Usu"; - Text[ japanese ] = "嶍彍(~D)"; - Text[ chinese_traditional ] = "埃(~D)"; + Text[ japanese ] = "鍓婇櫎(~D)"; + Text[ chinese_traditional ] = "鍒櫎(~D)"; Text[ arabic ] = "托"; Text[ greek ] = "拈徙襻鲛"; - Text[ korean ] = "昏力(~D)"; + Text[ korean ] = "靷牅(~D)"; Text[ turkish ] = "~Sil"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Eliminar"; + Text[ catalan ] = "~Suprimeix"; + Text[ thai ] = "~喔ム笟"; }; PushButton PB_RENAME { @@ -160,18 +162,19 @@ ModalDialog DLG_BIB_BASE Text [ portuguese ] = "~Mudar nome" ; TabStop = TRUE ; Text[ portuguese_brazilian ] = "Ren~ame"; - Text[ chinese_simplified ] = "重命名(~R)"; + Text[ chinese_simplified ] = "閲嶅懡鍚(~R)"; Text[ russian ] = "襄疱桁屙钼囹"; Text[ polish ] = "Zmie nazw"; - Text[ japanese ] = "柤慜偺曄峏(~R)"; - Text[ chinese_traditional ] = "穝㏑(~R)"; + Text[ japanese ] = "鍚嶅墠銇鏇(~R)"; + Text[ chinese_traditional ] = "閲嶆柊鍛藉悕(~R)"; Text[ arabic ] = "炮窍 轻视沩"; Text[ greek ] = "体麸盹灬筮"; - Text[ korean ] = "捞抚 官操扁(~R)"; + Text[ korean ] = "鞚措 氚旉靖旮(~R)"; Text[ turkish ] = "Y~eniden adland齬"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Cambiar nombre"; + Text[ catalan ] = "~Reanomena"; Text[ finnish ] = "~Nime uudelleen"; + Text[ thai ] = "喙~喔涏弗喔掂箞喔⑧笝喔娻阜喙堗腑"; }; FixedText FT_BIB { @@ -184,23 +187,24 @@ ModalDialog DLG_BIB_BASE Text [ portuguese_brazilian ] = "Grupo" ; Text [ portuguese ] = "Categoria" ; Text [ finnish ] = "Luokka" ; - Text [ danish ] = "Omr錮e" ; + Text [ danish ] = "Omr錮etitel" ; Text [ french ] = "Cat間orie" ; Text [ swedish ] = "Omr錮e" ; Text [ dutch ] = "Bereik" ; - Text [ spanish ] = "羠ea" ; + Text [ spanish ] = "Categor韆" ; Text [ english_us ] = "Category" ; - Text[ chinese_simplified ] = "区域标题"; + Text[ chinese_simplified ] = "鍒嗙被鏍囬"; Text[ russian ] = "枢蝈泐痂"; Text[ polish ] = "Tytu kategorii"; - Text[ japanese ] = "皋侔踢柤"; - Text[ chinese_traditional ] = "跋办夹肈"; + Text[ japanese ] = "銈般儷銉笺儣鍚"; + Text[ chinese_traditional ] = "鍒嗛妯欓"; Text[ arabic ] = "萜"; Text[ greek ] = "赃綦矧 赆翮泔襁狎"; - Text[ korean ] = "备开"; + Text[ korean ] = "鞓侅棴 鞝滊"; Text[ turkish ] = "Kategori"; Text[ language_user1 ] = " "; Text[ catalan ] = "Area"; + Text[ thai ] = "喔涏福喔班箑喔犩笚"; }; OKButton BT_OK { @@ -236,25 +240,26 @@ ModalDialog DLG_BIB_BASE Text = "Pfad" ; Text [ ENGLISH ] = "Path" ; Text[ english_us ] = "Path"; - Text[ portuguese ] = "Path"; + Text[ portuguese ] = "Atalho"; Text[ russian ] = "象螯"; Text[ greek ] = "拈徜耧燹"; - Text[ dutch ] = "Path"; + Text[ dutch ] = "Pad"; Text[ french ] = "Chemin"; Text[ spanish ] = "Ruta"; - Text[ finnish ] = "Path"; + Text[ finnish ] = "Polku"; Text[ italian ] = "Percoso"; - Text[ danish ] = "Path"; + Text[ danish ] = "Sti"; Text[ swedish ] = "S鰇v鋑"; Text[ polish ] = "宑ie縦a"; Text[ portuguese_brazilian ] = "Path"; - Text[ japanese ] = "蔬"; - Text[ korean ] = "版肺"; - Text[ chinese_simplified ] = "路径"; - Text[ chinese_traditional ] = "隔畖"; + Text[ japanese ] = "銉戙偣"; + Text[ korean ] = "瓴诫"; + Text[ chinese_simplified ] = "璺緞"; + Text[ chinese_traditional ] = "璺緫"; Text[ turkish ] = "Path"; Text[ arabic ] = "Path"; - Text[ catalan ] = "Path"; + Text[ catalan ] = "Cam"; + Text[ thai ] = "喙喔箟喔權笚喔侧竾"; }; ListBox LB_PATH { @@ -272,25 +277,26 @@ ModalDialog DLG_BIB_BASE Text = "Auswahlliste" ; Text [ ENGLISH ] = "Group" ; Text[ english_us ] = "Selection list"; - Text[ portuguese ] = "Group"; + Text[ portuguese ] = "Lista de selec玢o"; Text[ russian ] = "扬桉铌 恹犷疣"; Text[ greek ] = "诉篝 屦殡镢掾"; - Text[ dutch ] = "Group"; + Text[ dutch ] = "Keuzelijst"; Text[ french ] = "Liste de s閘ection"; Text[ spanish ] = "Lista de selecci髇"; - Text[ finnish ] = "Group"; + Text[ finnish ] = "Valintaluettelo"; Text[ italian ] = "Lista di scelta"; - Text[ danish ] = "Group"; + Text[ danish ] = "Udvalgsliste"; Text[ swedish ] = "Urvalslista"; Text[ polish ] = "Lista wyboru"; Text[ portuguese_brazilian ] = "Group"; - Text[ japanese ] = "慖戰亟"; - Text[ korean ] = "弊缝"; - Text[ chinese_simplified ] = "选择列单"; - Text[ chinese_traditional ] = "匡拒睲虫"; + Text[ japanese ] = "閬告姙銉偣銉"; + Text[ korean ] = "攴鸽９"; + Text[ chinese_simplified ] = "閫夋嫨鍒楀崟"; + Text[ chinese_traditional ] = "閬告搰娓呭柈"; Text[ turkish ] = "Group"; Text[ arabic ] = "Group"; - Text[ catalan ] = "Group"; + Text[ catalan ] = "Grup"; + Text[ thai ] = "喙喔ム阜喔竵喔｀覆喔⑧竵喔侧福"; }; Control TLB_GROUPS { @@ -311,18 +317,19 @@ ModalDialog DLG_BIB_BASE #endif Sort = TRUE ; };*/ - Text[ chinese_simplified ] = "编辑区域"; + Text[ chinese_simplified ] = "缂栬緫鍒嗙被"; Text[ russian ] = "橡噔赅 赅蝈泐痂"; Text[ polish ] = "Edytuj obszary"; - Text[ japanese ] = "皋侔踢偺曇廤"; - Text[ chinese_traditional ] = "絪胯跋办"; + Text[ japanese ] = "銈般儷銉笺儣銇法闆"; + Text[ chinese_traditional ] = "绶ㄨ集鍒嗛"; Text[ arabic ] = "释秧 轻萜鞘"; Text[ greek ] = "硼孱羼汜筮 赆翮泔耖"; - Text[ korean ] = "备开 祈笼"; + Text[ korean ] = "鞓侅棴 韼胳"; Text[ turkish ] = "Kategorileri d鼁enle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Modificar 醨eas"; + Text[ catalan ] = "Edita les categories"; Text[ finnish ] = "Muokkaa luokkia"; + Text[ thai ] = "喙佮竵喙夃箘喔傕笡喔｀赴喙喔犩笚"; }; /* String STR_GLOSSARY_BIB_DLG @@ -343,3 +350,17 @@ String STR_GLOSSARY_BIB_DLG + + + + + + + + + + + + + + diff --git a/sw/source/ui/misc/glossary.src b/sw/source/ui/misc/glossary.src index bc55856ab900..fa73ceb73772 100644 --- a/sw/source/ui/misc/glossary.src +++ b/sw/source/ui/misc/glossary.src @@ -2,9 +2,9 @@ * * $RCSfile: glossary.src,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: os $ $Date: 2001-12-18 10:05:25 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,7 +81,7 @@ ModalDialog DLG_GLOSSARY Text [ french ] = "AutoTexte" ; Text [ swedish ] = "AutoText" ; Text [ dutch ] = "AutoTekst" ; - Text [ spanish ] = "AutoTexto" ; + Text [ spanish ] = "Texto autom醫ico" ; Text [ english_us ] = "AutoText" ; Moveable = TRUE ; CheckBox CB_INSERT_TIP @@ -101,17 +101,18 @@ ModalDialog DLG_GLOSSARY Text [ portuguese_brazilian ] = "~Rest des Namens bei der Eingabe als Tip anzeigen" ; Text [ portuguese ] = "Mostrar ~resto do nome como sugest鉶 durante a digita玢o" ; Text[ chinese_simplified ] = "鑷姩鏄剧ず杈撳叆鏂囨彁绀(~D)"; - Text[ russian ] = "橡 忖钿 镱赅琨忄螯 忮顸 噔蝾蝈犟 赅 镱漶赅珀"; + Text[ russian ] = "橡邃豚汔螯 玎戾眢 镳 磬犷疱"; Text[ polish ] = "Wy渨ietl w trakcie pisania pozosta彻 cz隃 s硂wa"; Text[ japanese ] = "鍏ュ姏涓伀銉嗐偔銈广儓銉栥儹銉冦偗鍚嶃倰銉掋兂銉堣〃绀恒仚銈(~D)"; Text[ chinese_traditional ] = "鑷嫊瀹屾垚椤ず(~D)"; Text[ arabic ] = "谘 绒砩 畔吻 轻湔 轻梳耷祈 盟淝 轻呤侨 卺 赃 梳沩"; Text[ greek ] = "澎鲕黹箸 麸 躔镩痫 綮揿狒矧 麸 镯狒矧 篚焘秕朕 赆糗 翮 彘筢泫戕"; - Text[ korean ] = "鞛呺牓鞁 臁办柛鞙茧靹 雮橂ǜ歆 鞚措 響滌嫓(~D)"; + Text[ korean ] = "鞛呺牓鞁 雮橂ǜ歆 鞚措鞚 鞝滌晥 鞚措鞙茧 響滌嫓(~D)"; Text[ turkish ] = "Giri s齬as齨da ad齨 tamam齨 鰊eri olarak g鰎黱t黮e"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Muestra el resto del nombre como sugerencia durante la entrada"; + Text[ catalan ] = "~Mostra la resta del nom com a sugger鑞cia durant l'entrada"; Text[ finnish ] = "~Ehdota nime kirjoitettaessa"; + Text[ thai ] = "喙亊喔笖喔囙笢喔ム笂喔粪箞喔釜喙堗抚喔權笚喔掂箞喙喔弗喔粪腑喙喔涏箛喔權竸喔赤箒喔權赴喔權赋喔傕笓喔班笧喔脆浮喔炧箤"; }; FixedText FT_NAME { @@ -125,7 +126,7 @@ ModalDialog DLG_GLOSSARY Text [ portuguese ] = "~Nome" ; Text [ finnish ] = "~Nimi" ; Text [ danish ] = "Navn" ; - Text [ french ] = "~Nom" ; + Text [ french ] = "Nom" ; Text [ swedish ] = "~Namn" ; Text [ dutch ] = "~Naam" ; Text [ spanish ] = "N~ombre" ; @@ -141,7 +142,8 @@ ModalDialog DLG_GLOSSARY Text[ korean ] = "鞚措(~N)"; Text[ turkish ] = "Ad"; Text[ language_user1 ] = " "; - Text[ catalan ] = "N~ombre"; + Text[ catalan ] = "~Nom"; + Text[ thai ] = "~喔娻阜喙堗腑"; }; Edit ED_NAME { @@ -177,10 +179,11 @@ ModalDialog DLG_GLOSSARY Text[ chinese_traditional ] = "绺(~S)"; Text[ arabic ] = "轻俏收茄"; Text[ greek ] = "榴鏖~贶"; - Text[ korean ] = "氚旊臧旮(~S)"; + Text[ korean ] = "氚旊 臧旮(~S)"; Text[ turkish ] = "K齭altma"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Abrev."; + Text[ catalan ] = "~Drecera"; + Text[ thai ] = "~喔椸覆喔囙弗喔编笖"; }; Edit ED_SHORTNAME { @@ -207,7 +210,7 @@ ModalDialog DLG_GLOSSARY Text[ portuguese ] = "s leitura"; Text[ russian ] = "蝾朦觐 潆 黩屙"; Text[ greek ] = "禳盹 汩 犴茔睐箸"; - Text[ dutch ] = "schrijfbeveiligd"; + Text[ dutch ] = "Alleen-lezen"; Text[ french ] = "en lecture seule"; Text[ spanish ] = "solo lectura"; Text[ italian ] = "di sola lettura"; @@ -216,13 +219,14 @@ ModalDialog DLG_GLOSSARY Text[ polish ] = "tylko do odczytu"; Text[ portuguese_brazilian ] = "readonly"; Text[ japanese ] = "鏇搞亶杈笺伩淇濊"; - Text[ korean ] = "鞚疥赴鞝勳毄"; + Text[ korean ] = "鞚疥赴 鞝勳毄"; Text[ chinese_simplified ] = "闃叉敼鍐"; Text[ chinese_traditional ] = "鍞畝"; Text[ turkish ] = "readonly"; Text[ arabic ] = "後扪橇 蒉"; - Text[ catalan ] = "solo lectura"; + Text[ catalan ] = "nom閟 lectura"; Text[ finnish ] = "Vain luku"; + Text[ thai ] = "喔箞喔侧笝喔涪喙堗覆喔囙箑喔斷傅喔⑧抚"; }; }; FixedLine FL_RELATIVE @@ -233,7 +237,7 @@ ModalDialog DLG_GLOSSARY Text[ italian ] = "Salvare i collegamenti in modo relativo"; Text[ portuguese_brazilian ] = "Verkn黳fungen relativ speichern"; Text[ portuguese ] = "Guardar liga珲es em modo relativo"; - Text[ danish ] = "Gem k鎑erne relativt"; + Text[ danish ] = "Gem k鎑er relativt"; Text[ french ] = "Enregistrement relatif des liens"; Text[ swedish ] = "Spara l鋘kar relativt"; Text[ dutch ] = "Koppelingen relatief opslaan"; @@ -242,16 +246,17 @@ ModalDialog DLG_GLOSSARY Text[ chinese_simplified ] = "瀛樼洏鐩稿鐨勯摼鎺"; Text = "Verkn黳fungen relativ speichern" ; Text[ chinese_traditional ] = "鍎插瓨鐩稿皪鐨勬嵎寰"; - Text[ russian ] = "杨躔囗栩 耨觇 铗眍."; + Text[ russian ] = "杨躔囗栩 耨觇 铗眍耔蝈朦眍"; Text[ greek ] = "喻弭殛 狃镨揸艴箸 篚礓蒹妁"; Text[ polish ] = "Zapisz 彻cza wzgl阣nie"; Text[ japanese ] = "銉兂銈伄鐩稿淇濆瓨"; - Text[ korean ] = "鞐 甏頃 靸侂寑鞝 鞐瓣舶 鞝鞛"; + Text[ korean ] = "毵來伂毳 雼れ潓 旮办鞙茧 鞝鞛"; Text[ arabic ] = "洼 轻茄嗜秦鞘 洼偾 溆软丘"; Text[ turkish ] = "Ba餷ant齦ar g鰎eceli kaydet"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Guardar v韓culos relativamente"; + Text[ catalan ] = "Desa els enlla鏾s relativament"; Text[ finnish ] = "Linkkien tallennussuhde"; + Text[ thai ] = "喔氞副喔權笚喔多竵喔佮覆喔｀箑喔娻阜喙堗腑喔∴箓喔⑧竾喔副喔∴笧喔编笚喔樴箤喔佮副喔"; }; CheckBox CB_FILE_REL { @@ -262,7 +267,7 @@ ModalDialog DLG_GLOSSARY TabStop = TRUE ; Text [ english_us ] = "~File system" ; Text [ italian ] = "Al file system" ; - Text [ spanish ] = "En el ~sistema de archivos" ; + Text [ spanish ] = "~Sistema de archivos" ; Text [ french ] = "Dans le syst鑝e de ~fichiers" ; Text [ dutch ] = "In b~estandsysteem" ; Text [ swedish ] = "I ~filsystemet" ; @@ -270,7 +275,7 @@ ModalDialog DLG_GLOSSARY Text [ portuguese_brazilian ] = "Im ~Dateisystem" ; Text [ portuguese ] = "~No sistema de ficheiros" ; Text[ chinese_simplified ] = "鍦ㄦ枃浠剁郴缁熷唴(~F)"; - Text[ russian ] = " 耔耱屐 羿殡钼"; + Text[ russian ] = "脏殡钼铋 耔耱屐"; Text[ polish ] = "W systemie plik體"; Text[ japanese ] = "銉曘偂銈ゃ儷銈枫偣銉嗐儬鍐(~F)"; Text[ chinese_traditional ] = "妾旀绯荤当(~F)"; @@ -279,8 +284,9 @@ ModalDialog DLG_GLOSSARY Text[ korean ] = "韺岇澕 鞁滌姢韰(~F)"; Text[ turkish ] = "Dosya sistemi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "En el ~sistema de archivos"; + Text[ catalan ] = "Sistema de ~fitxers"; Text[ finnish ] = "~Tiedostoj鋜jestelm"; + Text[ thai ] = "喔｀赴喔氞赴喙亊喔熰箟喔"; }; CheckBox CB_NET_REL { @@ -291,14 +297,14 @@ ModalDialog DLG_GLOSSARY Text [ english_us ] = "Inte~rnet" ; Text [ italian ] = "In ~Internet" ; Text [ spanish ] = "En I~nternet" ; - Text [ french ] = "Sur l'~Internet" ; - Text [ dutch ] = "In Interne~t" ; + Text [ french ] = "Sur ~Internet" ; + Text [ dutch ] = "Op het interne~t" ; Text [ swedish ] = "P ~Internet" ; Text [ danish ] = "p ~Internettet" ; Text [ portuguese_brazilian ] = "Im ~Internet" ; Text [ portuguese ] = "Na ~Internet" ; Text[ chinese_simplified ] = "鍦ㄥ浗闄呬簰鑱旂綉鍐(~R)"; - Text[ russian ] = " 软蝈痦弪"; + Text[ russian ] = "软蝈痦弪"; Text[ polish ] = "W Int~ernecie"; Text[ japanese ] = "銈ゃ兂銈裤兗銉嶃儍銉堝唴(~R)"; Text[ chinese_traditional ] = "Inte~rnet"; @@ -307,8 +313,9 @@ ModalDialog DLG_GLOSSARY Text[ korean ] = "鞚疙劙雱(~R)"; Text[ turkish ] = "Internet"; Text[ language_user1 ] = " "; - Text[ catalan ] = "En I~nternet"; + Text[ catalan ] = "Inte~rnet"; Text[ finnish ] = "~Internet"; + Text[ thai ] = "喔复喔權箑喔椸腑~喔｀箤喙喔權箛喔"; }; Window WIN_EXAMPLE { @@ -329,12 +336,12 @@ ModalDialog DLG_GLOSSARY Text [ ENGLISH ] = "Show ~preview" ; Text[ english_us ] = "Sho~w preview"; Text[ portuguese ] = "~Mostrar Previsualizar"; - Text[ russian ] = "玛膻麒螯 镳铖祛蝠"; + Text[ russian ] = "橡邃忄痂蝈朦睇 镳铖祛蝠"; Text[ greek ] = "澎鲕黹箸 瘃镥痖箨珞珧"; Text[ dutch ] = "~Voorbeeld weergeven"; - Text[ french ] = "Afficher l'~aper鐄"; + Text[ french ] = "Afficher l'aper鐄"; Text[ spanish ] = "Mostrar pre~visualizaci髇"; - Text[ italian ] = "Mostra ~anteprima"; + Text[ italian ] = "Mostra anteprima"; Text[ danish ] = "Vis eksempel"; Text[ swedish ] = "Visa f鰎handsvisning"; Text[ polish ] = "Wy渨ietl podgl筪"; @@ -346,8 +353,9 @@ ModalDialog DLG_GLOSSARY Text[ arabic ] = "刨迩 轻阙琼渖"; Text[ turkish ] = "謓izlemeyi g鰎黱t黮e"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Mostrar pre~visualizaci髇"; + Text[ catalan ] = "Mostra pre~visualitzaci"; Text[ finnish ] = "N鋣t ~esikatselu"; + Text[ thai ] = "喙佮釜喔攡喔囙笗喔编抚喔涪喙堗覆喔"; }; OKButton PB_INSERT { @@ -362,7 +370,7 @@ ModalDialog DLG_GLOSSARY Text [ portuguese ] = "~Inserir" ; Text [ finnish ] = "~Lis滗" ; Text [ danish ] = "~Inds鎡" ; - Text [ french ] = "~Ins閞er" ; + Text [ french ] = "Ins閞er" ; Text [ swedish ] = "Infog~a" ; Text [ dutch ] = "~Invoegen" ; Text [ spanish ] = "~Insertar" ; @@ -384,7 +392,8 @@ ModalDialog DLG_GLOSSARY Text[ korean ] = "靷届瀰(~I)"; Text[ turkish ] = "Ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Insertar"; + Text[ catalan ] = "~Insereix"; + Text[ thai ] = "喙亊喔椸福喔"; }; CancelButton PB_CLOSE { @@ -399,7 +408,7 @@ ModalDialog DLG_GLOSSARY Text [ portuguese ] = "~Fechar" ; Text [ finnish ] = "~Sulje" ; Text [ danish ] = "~Luk" ; - Text [ french ] = "~Fermer" ; + Text [ french ] = "Fermer" ; Text [ swedish ] = "~St鋘g" ; Text [ dutch ] = "~Sluiten" ; Text [ spanish ] = "~Cerrar" ; @@ -415,7 +424,8 @@ ModalDialog DLG_GLOSSARY Text[ korean ] = "雼赴(~C)"; Text[ turkish ] = "Kapat"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Cerrar"; + Text[ catalan ] = "~Tanca"; + Text[ thai ] = "~喔涏复喔"; }; HelpButton PB_HELP { @@ -432,12 +442,12 @@ ModalDialog DLG_GLOSSARY Text [ italian ] = "Testo auto." ; Text [ portuguese_brazilian ] = "Texto autom?tico" ; Text [ portuguese ] = "AutoTe~xto" ; - Text [ finnish ] = "~Automaattinen teksti" ; + Text [ finnish ] = "Autom. ~teksti" ; Text [ danish ] = "AutoTekst" ; Text [ french ] = "~AutoTexte" ; Text [ swedish ] = "AutoTe~xt" ; Text [ dutch ] = "~AutoTekst" ; - Text [ spanish ] = "AutoTe~xto" ; + Text [ spanish ] = "~Texto autom醫ico" ; Text [ english_us ] = "AutoTe~xt" ; TabStop = TRUE ; Text[ chinese_simplified ] = "鑷姩鍥炬枃闆(~X)"; @@ -447,10 +457,11 @@ ModalDialog DLG_GLOSSARY Text[ chinese_traditional ] = "鑷嫊鍦栨枃闆(~X)"; Text[ arabic ] = "湔 梳耷祈"; Text[ greek ] = "刘麸~叔哽屙"; - Text[ korean ] = "鞛愲彊韰嶌姢韸(~X)"; + Text[ korean ] = "鞛愲彊 韰嶌姢韸(~X)"; Text[ turkish ] = "Otomatik metin"; Text[ language_user1 ] = " "; - Text[ catalan ] = "AutoTe~xto"; + Text[ catalan ] = "AutoTe~xt"; + Text[ thai ] = "喔傕箟喔瓇喔勦抚喔侧浮喔副喔曕箓喔權浮喔编笗喔"; }; PushButton PB_BIB { @@ -474,13 +485,14 @@ ModalDialog DLG_GLOSSARY Text[ russian ] = "枢蝈泐痂..."; Text[ polish ] = "Obszary..."; Text[ japanese ] = "銈般儷銉笺儣(~A)..."; - Text[ chinese_traditional ] = "鍗鍩(~A)..."; + Text[ chinese_traditional ] = "鍒嗛(~A)..."; Text[ arabic ] = "萜鞘..."; Text[ greek ] = "梳翮泔襁弪..."; - Text[ korean ] = "鞓侅棴(~A)..."; + Text[ korean ] = "攵勲(~A)..."; Text[ turkish ] = "B鰈黰ler..."; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Areas..."; + Text[ catalan ] = "C~ategories..."; + Text[ thai ] = "喔泘喔｀赴喙喔犩笚..."; }; PushButton PB_PATH { @@ -508,8 +520,9 @@ ModalDialog DLG_GLOSSARY Text[ korean ] = "瓴诫(~P)..."; Text[ turkish ] = "Veri yolu..."; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Ruta..."; + Text[ catalan ] = "~Cam..."; Text[ finnish ] = "~Polku..."; + Text[ thai ] = "喙~喔箟喔權笚喔侧竾..."; }; String ST_READONLY_PATH { @@ -517,24 +530,25 @@ ModalDialog DLG_GLOSSARY Text [ ENGLISH ] = "The directories of 'AutoText' don't have write access. Do you want to call the path settings dialog?" ; Text[ english_us ] = "The 'AutoText' directories are read-only. Do you want to call the path settings dialog?"; Text[ portuguese ] = "Os direct髍ios de 'AutoTexto' s鉶 s de leitura. Abrir a caixa de di醠ogo dos atalhos?"; - Text[ russian ] = "枢蜞腩 'AutoText' 镳邃磬珥圜屙 蝾朦觐 潆 黩屙. 蔓 躅蜩蝈 恹玮囹 滂嚯钽 玎溧龛 矬蜩?"; + Text[ russian ] = "枢蜞腩 'AutoText' 镳邃磬珥圜屙 蝾朦觐 潆 黩屙. 蔓玮囹 滂嚯钽 玎溧龛 矬蜩?"; Text[ greek ] = "腻 躔荞黠蹴 溟赆辋灬翎 屦孱羼汜筮狎 汩 麸躜 赆翎朦泔躜 麸 '刘麸叔哽屙'. 容脲翦 磲 赆胼箦翦 麸 溟茈镢 溟徜耧燹;"; - Text[ dutch ] = "Voor de directory's van 'AutoTekst' bestaan geen schrijfrechten. Wilt u de dialoog voor het defini雛en van het pad oproepen?"; + Text[ dutch ] = "Voor de directory's van 'AutoTekst' bestaan geen schrijfrechten. Wilt u het dialoogvenster voor het defini雛en van het pad oproepen?"; Text[ french ] = "Aucun droit d'閏riture n'existe pour les r閜ertoires 'AutoText'. Voulez-vous appeler la bo顃e de dialogue des chemins ?"; - Text[ spanish ] = "No existen derechos de escritura para los directorios 'AutoTexto'. 緿esea abrir el di醠ogo de rutas?"; + Text[ spanish ] = "No existen derechos de escritura para los directorios de 'Texto autom醫ico'. 緿esea abrir el di醠ogo de rutas?"; Text[ italian ] = "La cartella 'AutoText' di sola lettura. Volete richiamare il dialogo del percorso?"; Text[ danish ] = "Der findes ingen skriverettigheder til 'AutoTekst'-bibliotekerne. Vil du 錬ne stidialogen?"; - Text[ swedish ] = "Det saknas skrivr鋞tigheter f鰎 katalogerna f鰎 'AutoText'. Vill Du 鰌pna s鰇v鋑sdialogen?"; + Text[ swedish ] = "Det saknas skrivr鋞tigheter f鰎 katalogerna f鰎 'AutoText'. Vill du 鰌pna s鰇v鋑sdialogen?"; Text[ polish ] = "Katalogi 'Autotekst' s tylko do odczytu. Czy wywo砤 dialog 渃ie縦i?"; Text[ portuguese_brazilian ] = "The directories of 'AutoText' don't have write access. Do you want to call the path settings dialog?"; Text[ japanese ] = "銆屽叆鍔涙敮鎻淬嶃伄銉囥偅銉偗銉堛儶銇浉銇嶈炯銇夸繚璀枫仌銈屻仸銇勩伨銇涖倱銆傘儜銈硅ō瀹氥伄銉銈ゃ偄銉偘銉溿儍銈偣銈掑懠銇冲嚭銇椼伨銇欍亱銆"; - Text[ korean ] = "'AutoText' 霐旊爥韱犽Μ電 鞚疥赴 鞝勳毄鞛呺媹雼. 瓴诫 靹れ爼 雽頇旍儊鞛愲ゼ 順胳稖頃橁矤鞀惦媹旯?"; + Text[ korean ] = "'AutoText' 霐旊爥韱犽Μ電 鞚疥赴 鞝勳毄鞛呺媹雼. 瓴诫 靹れ爼 雽頇旍儊鞛愲ゼ 順胳稖頃橃嫓瓴犾姷雼堦箤?"; Text[ chinese_simplified ] = "\"鑷姩鍥炬枃闆哱"鐨勭洰褰曚笉鍙互鏀瑰啓銆傝鎵撳紑璺緞瀵硅瘽鏍忥紵"; Text[ chinese_traditional ] = "<AutoText>鐩寗鏄敮璁鐨勩傝鎵撻枊涓鍊嬭矾寰戝皪瑭辨柟锛"; Text[ turkish ] = "The directories of 'AutoText' don't have write access. Do you want to call the path settings dialog?"; Text[ arabic ] = "崆 适孑 娃孓 呤侨 嵯崆漆 '轻湔 轻梳耷祈'. 遽 恃硐 菔 阊融 轻玩茄 轻吻 扰谙窍鞘 轻阌茄"; - Text[ catalan ] = "No existen derechos de escritura para los directorios 'AutoTexto'. 緿esea abrir el di醠ogo de rutas?"; + Text[ catalan ] = "No existeixen drets d'escriptura pels directoris 'AutoText'. Voleu obrir el quadre de camins?"; Text[ finnish ] = "Automaattisen tekstin hakemistot ovat vain luku -hakemistoja. Haluatko avata hakemistopolun m滗ritysvalintaikkunan?"; + Text[ thai ] = "喙勦笖喙喔｀箛喔佮笚喔福喔掂箞 '喔傕箟喔竸喔о覆喔∴腑喔编笗喙傕笝喔∴副喔曕复' 喙佮笟喔氞腑喙堗覆喔權腑喔⑧箞喔侧竾喙喔斷傅喔⑧抚 喔勦父喔撪笗喙夃腑喔囙竵喔侧福喙喔｀傅喔⑧竵喔佮覆喔｀竵喔赤斧喔權笖喙喔箟喔權笚喔侧竾喙勦笖喔赴喔ム箛喔竵喔福喔粪腑喙勦浮喙?"; }; Menu MNU_EDIT { @@ -564,10 +578,11 @@ ModalDialog DLG_GLOSSARY Text[ chinese_traditional ] = "闁嬪暉鏂版獢(~N)"; Text[ arabic ] = "~滔硐"; Text[ greek ] = "~溺扉秕胥哚"; - Text[ korean ] = "靸堧(~N)"; + Text[ korean ] = "靸堧 毵岆摛旮(~N)"; Text[ turkish ] = "~Yeni"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Nuevo"; + Text[ catalan ] = "~Nou"; + Text[ thai ] = "喙儈喔浮喙"; }; MenuItem { @@ -594,8 +609,9 @@ ModalDialog DLG_GLOSSARY Text[ korean ] = "靸堧 (韰嶌姢韸 毵)"; Text[ turkish ] = "Yeni (yaln齴ca metin)"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nuevo (solo ~texto)"; + Text[ catalan ] = "Nou (nom閟 ~text)"; Text[ finnish ] = "Uusi (vain teksti)"; + Text[ thai ] = "喙冟斧喔∴箞 (喔傕箟喔竸喔о覆喔∴腑喔⑧箞喔侧竾喙喔斷傅喔⑧抚)"; }; MenuItem { @@ -622,8 +638,9 @@ ModalDialog DLG_GLOSSARY Text[ arabic ] = "溆"; Text[ turkish ] = "Kopyala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Copiar"; - Text[ finnish ] = "~Kopioi"; + Text[ catalan ] = "~Copia"; + Text[ finnish ] = "K~opioi"; + Text[ thai ] = "~喔勦副喔斷弗喔竵"; }; MenuItem { @@ -652,7 +669,8 @@ ModalDialog DLG_GLOSSARY Text[ korean ] = "氚旉靖旮"; Text[ turkish ] = "De餴⺶ir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ree~mplazar"; + Text[ catalan ] = "Ree~mpla鏰"; + Text[ thai ] = "喙佮笚喔權笚喔掂箞"; }; MenuItem { @@ -663,7 +681,7 @@ ModalDialog DLG_GLOSSARY Text [ english_us ] = "Rep~lace (text only)" ; Text [ portuguese_brazilian ] = "Substituir (nur Text)" ; Text [ swedish ] = "E~rs鋞t (bara text)" ; - Text [ danish ] = "Erstat (kun tekst)" ; + Text [ danish ] = "E~rstat (kun tekst)" ; Text [ italian ] = "Sostituisci (solo testo)" ; Text [ spanish ] = "Reemplazar (s髄o texto)" ; Text [ french ] = "~Remplacer (texte seulement)" ; @@ -676,11 +694,12 @@ ModalDialog DLG_GLOSSARY Text[ chinese_traditional ] = "浠ｆ浛(绱旀枃瀛)(~L)"; Text[ arabic ] = "怯嗜锨 (湔 蒉)"; Text[ greek ] = "另糸赆糗篝狍 (禳盹 赍哽屙)"; - Text[ korean ] = "官操扁 (咆胶飘父)(~L)"; + Text[ korean ] = "氚旉靖旮 (韰嶌姢韸鸽)(~L)"; Text[ turkish ] = "De餴⺶ir (yaln齴ca metin)"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Reemplazar (s髄o texto)"; + Text[ catalan ] = "Reempla鏰 (nom閟 text)"; Text[ finnish ] = "Kor~vaa (vain teksti)"; + Text[ thai ] = "喙佮笚~喔權笚喔掂箞 (喔傕箟喔竸喔о覆喔∴腑喔⑧箞喔侧竾喙喔斷傅喔⑧抚)"; }; MenuItem { @@ -707,8 +726,9 @@ ModalDialog DLG_GLOSSARY Text[ korean ] = "鞚措 氚旉靖旮..."; Text[ turkish ] = "Yeniden adland齬..."; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Cambiar nombre..."; + Text[ catalan ] = "Reanomena..."; Text[ finnish ] = "Nime uudelleen..."; + Text[ thai ] = "喙喔涏弗喔掂箞喔⑧笝喔娻阜喙堗腑..."; }; MenuItem { @@ -726,7 +746,7 @@ ModalDialog DLG_GLOSSARY Text [ french ] = "~Supprimer" ; Text [ swedish ] = "~Radera" ; Text [ dutch ] = "~Verwijderen" ; - Text [ spanish ] = "~Eliminar" ; + Text [ spanish ] = "~Borrar" ; Text [ english_us ] = "~Delete" ; Text[ chinese_simplified ] = "鍒犻櫎(~D)"; Text[ russian ] = "愉嚯栩"; @@ -738,7 +758,8 @@ ModalDialog DLG_GLOSSARY Text[ korean ] = "靷牅(~D)"; Text[ turkish ] = "Sil"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Eliminar"; + Text[ catalan ] = "~Suprimeix"; + Text[ thai ] = "~喔ム笟"; }; MenuItem { @@ -771,7 +792,8 @@ ModalDialog DLG_GLOSSARY Text[ korean ] = "韼胳(~E)"; Text[ turkish ] = "D鼁enle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Editar"; + Text[ catalan ] = "~Edita"; + Text[ thai ] = "喙亊喔佮箟喙勦競"; }; MenuItem { @@ -805,6 +827,7 @@ ModalDialog DLG_GLOSSARY Text[ turkish ] = "Makro..."; Text[ language_user1 ] = " "; Text[ catalan ] = "~Macro..."; + Text[ thai ] = "~喔∴覆喙傕竸喔..."; }; MenuItem { @@ -823,7 +846,7 @@ ModalDialog DLG_GLOSSARY Text[ dutch ] = "~Importeren..."; Text[ french ] = "~Importer..."; Text[ spanish ] = "~Importar..."; - Text[ italian ] = "~Importa..."; + Text[ italian ] = "Importa..."; Text[ danish ] = "~Importer..."; Text[ swedish ] = "~Importera..."; Text[ polish ] = "~Importuj..."; @@ -834,8 +857,9 @@ ModalDialog DLG_GLOSSARY Text[ chinese_traditional ] = "鍖叆(~I)..."; Text[ arabic ] = "怯薯亚..."; Text[ turkish ] = "~葭e aktar..."; - Text[ catalan ] = "~Importar..."; - Text[ finnish ] = "~Tuo"; + Text[ catalan ] = "~Importa..."; + Text[ finnish ] = "~Tuo..."; + Text[ thai ] = "~喔權赋喙喔傕箟喔..."; }; }; }; @@ -849,7 +873,8 @@ ModalDialog DLG_GLOSSARY Text[ korean ] = "鞛愲彊 韰嶌姢韸"; Text[ turkish ] = "Otomatik metin"; Text[ language_user1 ] = " "; - Text[ catalan ] = "AutoTexto"; + Text[ catalan ] = "AutoText"; + Text[ thai ] = "喔傕箟喔竸喔о覆喔∴腑喔编笗喙傕笝喔∴副喔曕复"; }; InfoBox MSG_DOUBLE_SHORTNAME { @@ -868,16 +893,17 @@ InfoBox MSG_DOUBLE_SHORTNAME MESSAGE [ spanish ] = "Esta abreviatura ya est en uso. lija otro nombre por favor!" ; MESSAGE [ english_us ] = "Shortcut name already exists. Please choose another name." ; MESSAGE[ chinese_simplified ] = "宸茬粡瀛樺湪杩欎釜缂╁啓銆傝杈撳叆鍙﹀涓涓缉鍐欏悕绉帮紒"; - MESSAGE[ russian ] = "蒡 耦牮帙屙桢 箧 耋耱怏弪. 项驵塍轳蜞, 恹徨痂蝈 漯筱铄 桁!"; + MESSAGE[ russian ] = "蒡 耦牮帙屙桢 箧 耋耱怏弪. 蔓徨痂蝈 漯筱铄 桁."; MESSAGE[ polish ] = "Te inicja硑 ju zosta硑 u縴te. Prosz poda inn nazw!"; MESSAGE[ japanese ] = "銇撱伄銈枫儳銉笺儓銈儍銉堛伅銇欍仹銇娇鐢ㄣ仌銈屻仸銇勩伨銇欍傚垾銇悕鍓嶃倰閬告姙銇椼仸銇忋仩銇曘亜銆"; MESSAGE[ chinese_traditional ] = "宸茬稉浣跨敤浜嗛欏嬬府瀵傝珛鎮ㄨ几鍏ヤ竴鍊嬩笉鍚岀殑鍚嶇ū锕"; MESSAGE[ arabic ] = "逍 轻俏收茄 沔替 惹彷卺. 轻烟橇 怯饰锨 怯 滔硐!"; MESSAGE[ greek ] = "葬 狁鏖贶 躔荞黠蹴 掬. 嗅襻赆膻 彘筌沐翦 贶痫轱 茈腼 镬!"; - MESSAGE[ korean ] = "氚旊臧旮 鞚措鞚 鞚措 靷毄欷戩瀰雼堧嫟. 雼るジ 鞚措鞚 靹犿儩頃橃嫮鞁滌槫"; + MESSAGE[ korean ] = "氚旊 臧旮 鞚措鞚 鞚措 靷毄欷戩瀰雼堧嫟. 雼るジ 鞚措鞚 靹犿儩頃橃嫮鞁滌槫"; MESSAGE[ turkish ] = "Bu k齭altma mevcut durumda. Ba⺧a bir ad se鏸n!"; MESSAGE[ language_user1 ] = " "; - MESSAGE[ catalan ] = "Esta abreviatura ya est en uso. lija otro nombre por favor!"; + MESSAGE[ catalan ] = "La drecera del nom ja existeix. Si us plau, escolliu un altre nom."; + MESSAGE[ thai ] = "喔娻阜喙堗腑喔椸覆喔囙弗喔编笖喔∴傅喔涪喔灌箞喙佮弗喙夃抚 喔佮福喔膏笓喔侧箑喔ム阜喔竵喔娻阜喙堗腑喔阜喙堗笝"; }; QueryBox MSG_QUERY_DELETE { @@ -895,7 +921,7 @@ QueryBox MSG_QUERY_DELETE MESSAGE [ french ] = "Supprimer l'AutoTexte ?" ; MESSAGE [ swedish ] = "Skall AutoText raderas?" ; MESSAGE [ dutch ] = "AutoTekst wissen?" ; - MESSAGE [ spanish ] = "緿esea eliminar el AutoTexto?" ; + MESSAGE [ spanish ] = "緿esea borrar el Texto autom醫ico?" ; MESSAGE [ english_us ] = "Delete AutoText?" ; MESSAGE[ chinese_simplified ] = "鎮ㄨ鍒犻櫎鑷姩鍥炬枃闆?"; MESSAGE[ russian ] = "愉嚯栩 噔蝾蝈犟?"; @@ -904,26 +930,27 @@ QueryBox MSG_QUERY_DELETE MESSAGE[ chinese_traditional ] = "瑕佸埅闄よ嚜鍕曞湒鏂囬泦?"; MESSAGE[ arabic ] = "遽 恃硐 托 轻湔 轻梳耷祈"; MESSAGE[ greek ] = "拈徙襻鲛 刘麸叔殪蓓秕;"; - MESSAGE[ korean ] = "鞛愲彊 韰嶌姢韸鸽ゼ 靷牅頃橁矤鞀惦媹旯?"; + MESSAGE[ korean ] = "鞛愲彊 韰嶌姢韸鸽ゼ 靷牅頃橃嫓瓴犾姷雼堦箤?"; MESSAGE[ turkish ] = "Otomatik metin silinsin mi?"; MESSAGE[ language_user1 ] = " "; - MESSAGE[ catalan ] = "緿esea eliminar el AutoTexto?"; + MESSAGE[ catalan ] = "Voleu eliminar l'AutoText?"; + MESSAGE[ thai ] = "喔ム笟喔傕箟喔竸喔о覆喔∴腑喔编笗喙傕笝喔∴副喔曕复喔福喔粪腑喙勦浮喙?"; }; String STR_QUERY_DELETE_GROUP1 { TEXT = "Soll der Bereich " ; TEXT [ English ] = "Delete Group " ; TEXT [ english_us ] = "Delete the category " ; - Text [ dutch ] = "Wilt u het bereik " ; + Text [ dutch ] = "Wilt u het bereik" ; Text [ italian ] = "Cancellare la categoria " ; - Text [ spanish ] = "緿esea usted eliminar " ; + Text [ spanish ] = "Borrar la categor韆" ; Text [ french ] = "Supprimer la cat間orie " ; Text [ swedish ] = "Ska kategorin " ; Text [ danish ] = "Skal omr錮et " ; Text [ portuguese ] = "Deseja eliminar " ; Text [ portuguese_brazilian ] = "Soll der Bereich " ; Text[ chinese_simplified ] = "瑕佸垹闄よ繖涓尯鍩 "; - Text[ russian ] = "愉嚯栩 "; + Text[ russian ] = "愉嚯栩 赅蝈泐痂 "; Text[ polish ] = "Czy ten obszar "; Text[ japanese ] = "銈般儷銉笺儣 "; Text[ chinese_traditional ] = "瑕佸埅闄ら欏嬪崁鍩 "; @@ -932,8 +959,9 @@ String STR_QUERY_DELETE_GROUP1 Text[ korean ] = "鞓侅棴鞚"; Text[ turkish ] = "B鰈黰 "; Text[ language_user1 ] = " "; - Text[ catalan ] = "緿esea usted eliminar "; + Text[ catalan ] = "Suprimeix la categoria "; Text[ finnish ] = "Poistetaan luokka "; + Text[ thai ] = "喔ム笟喔涏福喔班箑喔犩笚 "; }; String STR_QUERY_DELETE_GROUP2 { @@ -943,14 +971,14 @@ String STR_QUERY_DELETE_GROUP2 TEXT [ english_us ] = "?" ; Text [ dutch ] = "wissen?" ; Text [ italian ] = "?" ; - Text [ spanish ] = "la categor韆?" ; + Text [ spanish ] = "?" ; Text [ french ] = "?" ; Text [ swedish ] = "raderas?" ; Text [ danish ] = "slettes?" ; Text [ portuguese ] = "a sec玢o?" ; Text [ portuguese_brazilian ] = "gel?cht werden?" ; Text[ chinese_simplified ] = "锛"; - Text[ russian ] = "钺豚耱?"; + Text[ russian ] = "?"; Text[ polish ] = "ma zosta usuni阾y?"; Text[ japanese ] = " 銈掑墛闄ゃ仐銇俱仚銇嬶紵"; Text[ chinese_traditional ] = "?"; @@ -959,8 +987,9 @@ String STR_QUERY_DELETE_GROUP2 Text[ greek ] = "磲 溟徙襻鲥;"; Text[ korean ] = " 靷牅頃橁矤鞀惦媹旯岋紵"; Text[ turkish ] = "silinsin mi?"; - Text[ catalan ] = "la categor韆?"; + Text[ catalan ] = "?"; Text[ finnish ] = "?"; + Text[ thai ] = "?"; }; String STR_GLOSSARY { @@ -971,7 +1000,7 @@ String STR_GLOSSARY Text [ portuguese_brazilian ] = "Textblock : " ; Text [ portuguese ] = "M骴ulo de texto : " ; Text [ french ] = "Module de texte : " ; - Text [ dutch ] = "Tekstbouwsteen : " ; + Text [ dutch ] = "Tekstbouwsteen:" ; Text [ spanish ] = "M骴ulo de texto : " ; Text [ danish ] = "Tekstelement : " ; Text [ swedish ] = "Textblock : " ; @@ -984,10 +1013,11 @@ String STR_GLOSSARY Text[ chinese_traditional ] = "鑷嫊鍦栨枃闆嗘鐩細"; Text[ arabic ] = "阡昭 轻湔 : "; Text[ greek ] = "造揿 赍殪蓓秕 : "; - Text[ korean ] = "韰嶌姢韸 敫旊 : "; + Text[ korean ] = "鞛愲彊 韰嶌姢韸 : "; Text[ turkish ] = "Metin 鲳esi: "; Text[ language_user1 ] = " "; - Text[ catalan ] = "M骴ulo de texto : "; + Text[ catalan ] = "M騞ul de text : "; + Text[ thai ] = "喔傕箟喔竸喔о覆喔∴腑喔编笗喙傕笝喔∴副喔曕复 : "; }; ModalDialog DLG_RENAME_GLOS { @@ -1022,7 +1052,7 @@ ModalDialog DLG_RENAME_GLOS Text [ english_us ] = "Na~me" ; Text [ italian ] = "Nome" ; Text [ spanish ] = "N~ombre" ; - Text [ french ] = "~Nom" ; + Text [ french ] = "Nom" ; Text [ swedish ] = "Na~mn" ; Text [ danish ] = "Navn" ; Text [ portuguese_brazilian ] = "Na~me" ; @@ -1037,8 +1067,9 @@ ModalDialog DLG_RENAME_GLOS Text[ korean ] = "鞚措(~M)"; Text[ turkish ] = "Ad"; Text[ language_user1 ] = " "; - Text[ catalan ] = "N~ombre"; - Text[ finnish ] = "Ni~mi"; + Text[ catalan ] = "No~m"; + Text[ finnish ] = "~Nimi"; + Text[ thai ] = "喔娻阜喙垀喔"; }; Edit ED_ON { @@ -1070,11 +1101,12 @@ ModalDialog DLG_RENAME_GLOS Text[ chinese_traditional ] = "绺(~C)"; Text[ arabic ] = "轻俏收茄"; Text[ greek ] = "吁眙艴箸"; - Text[ korean ] = "氚旊臧旮(~C)"; + Text[ korean ] = "氚旊 臧旮(~C)"; Text[ turkish ] = "K齭altma"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Abrev."; + Text[ catalan ] = "Dre~cera"; Text[ finnish ] = "~Pikavalinta"; + Text[ thai ] = "喔椸覆喔噡喔ム副喔"; }; Edit ED_OS { @@ -1095,22 +1127,23 @@ ModalDialog DLG_RENAME_GLOS Text [ italian ] = "~Nuovo" ; Text [ spanish ] = "~Nuevo" ; Text [ french ] = "Nou~veau" ; - Text [ swedish ] = "~Ny" ; + Text [ swedish ] = "~Nytt" ; Text [ danish ] = "Ny" ; Text [ portuguese ] = "~Novo" ; Text [ portuguese_brazilian ] = "~Neu" ; Text[ chinese_simplified ] = "鏂板缓(~N)"; - Text[ russian ] = "杨玟~囹"; + Text[ russian ] = "皖恹"; Text[ polish ] = "Nowy"; Text[ japanese ] = "鏂拌(~N)"; Text[ chinese_traditional ] = "闁嬪暉鏂版獢(~N)"; Text[ arabic ] = "滔硐"; Text[ greek ] = "溺扉秕胥哚"; - Text[ korean ] = "靸堧(~N)"; + Text[ korean ] = "靸堧 毵岆摛旮(~N)"; Text[ turkish ] = "Yeni"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Nuevo"; + Text[ catalan ] = "~Nou"; Text[ finnish ] = "~Uusi"; + Text[ thai ] = "喙儈喔浮喙"; }; Edit ED_NN { @@ -1131,7 +1164,7 @@ ModalDialog DLG_RENAME_GLOS Text [ spanish ] = "~Abreviatura" ; Text [ french ] = "~Abr." ; Text [ dutch ] = "~Afkorting" ; - Text [ swedish ] = "~Ers鋞t" ; + Text [ swedish ] = "F鰎~kortning" ; Text [ danish ] = "Erstat" ; Text [ portuguese_brazilian ] = "~K?zel" ; Text [ portuguese ] = "S~ubstituir" ; @@ -1142,11 +1175,12 @@ ModalDialog DLG_RENAME_GLOS Text[ chinese_traditional ] = "绺(~S)"; Text[ arabic ] = "轻俏收茄"; Text[ greek ] = "榴鏖~贶"; - Text[ korean ] = "氚旊臧旮(~S)"; + Text[ korean ] = "氚旊 臧旮(~S)"; Text[ turkish ] = "K齭altma"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Abreviatura"; + Text[ catalan ] = "~Drecera"; Text[ finnish ] = "~Pikavalinta"; + Text[ thai ] = "~喔椸覆喔囙弗喔编笖"; }; Edit ED_NS { @@ -1177,11 +1211,12 @@ ModalDialog DLG_RENAME_GLOS Text[ chinese_traditional ] = "閲嶆柊鍛藉悕鑷嫊鍦栨枃闆嗘鐩"; Text[ arabic ] = "炮窍 视沩 猛 氵驿鞘 轻湔"; Text[ greek ] = "体麸盹灬筮 綮揿狒矧 赍殪蓓秕"; - Text[ korean ] = "韰嶌姢韸 敫旊 鞚措 氚旉靖旮"; + Text[ korean ] = "鞛愲彊 韰嶌姢韸 鞚措 氚旉靖旮"; Text[ turkish ] = "Metin 鲳esini yeniden adland齬"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Cambiar nombre al m骴ulo de texto"; + Text[ catalan ] = "Cambia en nom al m騞ul de text"; Text[ finnish ] = "Nime automaattinen teksti uudelleen"; + Text[ thai ] = "喙喔涏弗喔掂箞喔⑧笝喔娻阜喙堗腑喔傕箟喔竸喔о覆喔∴腑喔编笗喙傕笝喔∴副喔曕复"; }; String STR_SAVE_GLOSSARY { @@ -1203,11 +1238,12 @@ String STR_SAVE_GLOSSARY Text[ arabic ] = "洼 阡昭 轻湔"; Text [ English ] = "Save textblock" ; Text[ greek ] = "琉镨揸艴箸 綮揿狒矧 赍殪蓓秕"; - Text[ korean ] = "韰嶌姢韸 敫旊 鞝鞛"; + Text[ korean ] = "鞛愲彊 韰嶌姢韸 鞝鞛"; Text[ turkish ] = "Metin 鲳esi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Guardar m骴ulo de texto"; + Text[ catalan ] = "Desa el m騞ul de text"; Text[ finnish ] = "Tallenna automaattinen teksti"; + Text[ thai ] = "喔氞副喔權笚喔多竵喔傕箟喔竸喔о覆喔∴腑喔编笗喙傕笝喔∴副喔曕复"; }; InfoBox MSG_NO_GLOSSARIES { @@ -1225,13 +1261,35 @@ InfoBox MSG_NO_GLOSSARIES MESSAGE[ swedish ] = "Den h鋜 filen inneh錶ler inga textblock."; MESSAGE[ polish ] = "Plik ten nie zawiera 縜dnych blok體 tekstu."; MESSAGE[ portuguese_brazilian ] = "There are no textblocks in this file."; - MESSAGE[ japanese ] = "偙偺抬操偵偼梅侥剔郫競獋爞鑲軅箓駚B"; - MESSAGE[ korean ] = "捞 颇老俊绰 咆胶飘 葛点捞 绝嚼聪促. ."; - MESSAGE[ chinese_simplified ] = "这个文件内不包含自动图文集条目。"; - MESSAGE[ chinese_traditional ] = "硂郎ずぃ笆瓜ゅ栋兵ヘ"; + MESSAGE[ japanese ] = "銇撱伄銉曘偂銈ゃ儷銇伅銉嗐偔銈广儓銉栥儹銉冦偗銇屻亗銈娿伨銇涖倱銆"; + MESSAGE[ korean ] = "鞚 韺岇澕鞐愲姅 鞛愲彊 韰嶌姢韸戈皜 鞐嗢姷雼堧嫟."; + MESSAGE[ chinese_simplified ] = "杩欎釜鏂囦欢鍐呬笉鍖呭惈鑷姩鍥炬枃闆嗘潯鐩"; + MESSAGE[ chinese_traditional ] = "鍦ㄩ欏嬫獢妗堝収涓嶅瓨鍦ㄨ嚜鍕曞湒鏂囬泦姊濈洰銆"; MESSAGE[ arabic ] = "崆 硗舒 逍 轻汜 卺 呤 湔砩."; MESSAGE[ turkish ] = "Bu dosya metin bile㧐nleri i鏴rmiyor"; - MESSAGE[ catalan ] = "Este archivo no contiene m骴ulos de texto."; + MESSAGE[ catalan ] = "Aquest fitxer no cont m騞uls de text."; MESSAGE[ finnish ] = "Tiedostossa ei ole automaattista teksti."; + MESSAGE[ thai ] = "喙勦浮喙堗浮喔掂競喙夃腑喔勦抚喔侧浮喔副喔曕箓喔權浮喔编笗喔脆箖喔權箒喔熰箟喔∴笝喔掂箟"; }; + + + + + + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/misc/insfnote.src b/sw/source/ui/misc/insfnote.src index 0f9834e42bc5..2fc81caf126c 100644 --- a/sw/source/ui/misc/insfnote.src +++ b/sw/source/ui/misc/insfnote.src @@ -2,9 +2,9 @@ * * $RCSfile: insfnote.src,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:21:29 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,7 +77,7 @@ ModalDialog DLG_INS_FOOTNOTE Text [ portuguese ] = "Inserir nota de rodap" ; Text [ finnish ] = "Lis滗 alaviite" ; Text [ danish ] = "Inds鎡 fodnote" ; - Text [ french ] = "Ins閞er une note de bas de page" ; + Text [ french ] = "Insertion d'une note de bas de page" ; Text [ swedish ] = "Infoga fotnot" ; Text [ dutch ] = "Voetnoot invoegen" ; Text [ spanish ] = "Insertar nota al pie" ; @@ -138,12 +138,12 @@ ModalDialog DLG_INS_FOOTNOTE Text = "~Automatisch" ; Text [ ENGLISH ] = "~Auto" ; Text [ norwegian ] = "~Auto" ; - Text [ italian ] = "~Automatico" ; + Text [ italian ] = "Automatico" ; Text [ portuguese_brazilian ] = "~Auto" ; Text [ portuguese ] = "~Autom醫ico" ; Text [ finnish ] = "~Automaattinen" ; Text [ danish ] = "Automatisk" ; - Text [ french ] = "~Automatique" ; + Text [ french ] = "Automatique" ; Text [ swedish ] = "~Automatisk" ; Text [ dutch ] = "~Automatisch" ; Text [ spanish ] = "~Autom醫ico" ; @@ -151,17 +151,18 @@ ModalDialog DLG_INS_FOOTNOTE TabStop = TRUE ; Group = TRUE ; Check = TRUE ; - Text[ chinese_simplified ] = "自动(~A)"; - Text[ russian ] = "棱蝾"; + Text[ chinese_simplified ] = "鑷姩(~A)"; + Text[ russian ] = "棱蝾爨蜩麇耜"; Text[ polish ] = "~Automatycznie"; - 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 ] = "~Otomatik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Autom醫ico"; + Text[ catalan ] = "~Autom鄑ic"; + Text[ thai ] = "~喔副喔曕箓喔權浮喔编笗喔"; }; RadioButton RB_NUMBER_CHAR { @@ -175,22 +176,23 @@ ModalDialog DLG_INS_FOOTNOTE Text [ portuguese ] = "~Caracteres" ; Text [ finnish ] = "~Merkki" ; Text [ danish ] = "Tegn" ; - Text [ french ] = "~Caract鑢e" ; + Text [ french ] = "Caract鑢es" ; Text [ swedish ] = "~Tecken" ; Text [ dutch ] = "~Teken" ; Text [ spanish ] = "~Caracteres" ; Text [ english_us ] = "~Character" ; - Text[ chinese_simplified ] = "字符(~C)"; - Text[ russian ] = "琼嚓"; + Text[ chinese_simplified ] = "瀛楃(~C)"; + Text[ russian ] = "谚~焘铍"; Text[ polish ] = "Znak"; - Text[ japanese ] = "暥帤(~C)"; - Text[ chinese_traditional ] = "じ(~C)"; + Text[ japanese ] = "鏂囧瓧(~C)"; + Text[ chinese_traditional ] = "瀛楀厓(~C)"; Text[ arabic ] = "猛演"; Text[ greek ] = "揍襻牯揆弪"; - Text[ korean ] = "巩磊(~C)"; + Text[ korean ] = "靷毄鞛 鞝曥潣(~C)"; Text[ turkish ] = "~Karakter"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Caracteres"; + Text[ catalan ] = "~Car郼ters"; + Text[ thai ] = "~喔曕副喔о腑喔编竵喔傕福喔"; }; FixedLine FL_NUMBER { @@ -209,17 +211,18 @@ ModalDialog DLG_INS_FOOTNOTE Text [ dutch ] = "Nummering" ; Text [ spanish ] = "Numeraci髇" ; Text [ english_us ] = "Numbering" ; - Text[ chinese_simplified ] = "编号"; + Text[ chinese_simplified ] = "缂栧彿"; Text[ russian ] = "腕戾疣鲨"; Text[ polish ] = "Numeracja"; - Text[ japanese ] = "斣崋晅偗"; - Text[ chinese_traditional ] = "絪腹"; + Text[ japanese ] = "鐣彿浠樸亼"; + Text[ chinese_traditional ] = "绶ㄨ櫉"; Text[ arabic ] = "轻恃揄"; Text[ greek ] = "榴哞扃箸"; - Text[ korean ] = "锅龋概扁扁"; + Text[ korean ] = "氩堩樃 毵り赴旮"; Text[ turkish ] = "Numaralama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇"; + Text[ catalan ] = "Numeraci"; + Text[ thai ] = "喔ム赋喔斷副喔氞笗喔编抚喙喔ム競"; }; PushButton BT_NUMBER_CHAR { @@ -241,22 +244,23 @@ ModalDialog DLG_INS_FOOTNOTE Text [ portuguese_brazilian ] = "~Fu?note" ; Text [ swedish ] = "~Fotnot" ; Text [ danish ] = "Fodnote" ; - Text [ italian ] = "~Nota a pi pagina" ; + Text [ italian ] = "Nota a pi pagina" ; Text [ spanish ] = "N~ota al pie" ; - Text [ french ] = "Note de bas de pa~ge..." ; + Text [ french ] = "Note de bas de page" ; Text [ dutch ] = "~Voetnoot" ; - Text[ chinese_simplified ] = "注脚(~F)"; - Text[ russian ] = "吾磬"; + Text[ chinese_simplified ] = "娉ㄨ剼(~F)"; + Text[ russian ] = "C眍耜"; Text[ polish ] = "Przypis ~dolny"; - Text[ japanese ] = "媟拲(~F)"; - Text[ chinese_traditional ] = "爹竲(~F)"; + Text[ japanese ] = "鑴氭敞(~F)"; + Text[ chinese_traditional ] = "瑷昏叧(~F)"; Text[ arabic ] = "颓皂 虞犴"; Text[ greek ] = "震矬珈暹"; - Text[ korean ] = "阿林(~F)"; + Text[ korean ] = "臧侅＜(~F)"; Text[ turkish ] = "~Dipnot"; Text[ language_user1 ] = " "; - Text[ catalan ] = "N~ota al pie"; - Text[ finnish ] = "~Alaviite"; + Text[ catalan ] = "~Nota al peu"; + Text[ finnish ] = "Alaviite"; + Text[ thai ] = "喙~喔娻复喔囙腑喔｀福喔"; }; RadioButton RB_TYPE_ENDNOTE { @@ -269,22 +273,23 @@ ModalDialog DLG_INS_FOOTNOTE Text [ portuguese_brazilian ] = "~Endnote" ; Text [ swedish ] = "~Slutnot" ; Text [ danish ] = "Slutnote" ; - Text [ italian ] = "~Nota di chiusura" ; - Text [ spanish ] = "Nota al ~final" ; + Text [ italian ] = "Nota di chiusura" ; + Text [ spanish ] = "Nota ~final" ; Text [ french ] = "~Note de fin" ; Text [ dutch ] = "~Eindnoot" ; - Text[ chinese_simplified ] = "尾注(~E)"; - Text[ russian ] = "暑眦邂"; + Text[ chinese_simplified ] = "灏炬敞(~E)"; + Text[ russian ] = "暑眦邂 耥铖赅"; Text[ polish ] = "P~rzypis ko馽owy"; - 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 ] = "~Sonnot"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nota al ~final"; - Text[ finnish ] = "~Loppuhuomautus"; + Text[ catalan ] = "Nota ~final"; + Text[ finnish ] = "~Loppuviite"; + Text[ thai ] = "~喔箟喔侧竾喔复喔囙笚喙夃覆喔⑧箑喔｀阜喙堗腑喔"; }; FixedLine FL_TYPE { @@ -301,32 +306,47 @@ ModalDialog DLG_INS_FOOTNOTE Text [ french ] = "Type" ; Text [ dutch ] = "Type" ; Text [ portuguese ] = "Tipo" ; - Text[ chinese_simplified ] = "类型"; + Text[ chinese_simplified ] = "绫诲瀷"; Text[ russian ] = "诣"; Text[ polish ] = "Typ"; - Text[ japanese ] = "庬椶"; - Text[ chinese_traditional ] = "摸"; + Text[ japanese ] = "绋"; + Text[ chinese_traditional ] = "椤炲瀷"; Text[ arabic ] = "轻滏"; Text[ greek ] = "札痫"; - Text[ korean ] = "辆幅"; + Text[ korean ] = "膦呺"; Text[ turkish ] = "T黵"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Tipo"; + Text[ catalan ] = "Tipus"; Text[ finnish ] = "Tyyppi"; + Text[ thai ] = "喔娻笝喔脆笖"; }; - Text[ chinese_simplified ] = "插入注脚"; + Text[ chinese_simplified ] = "鎻掑叆娉ㄨ剼"; Text[ russian ] = "埋蜞忤螯 耥铖牦"; Text[ polish ] = "Wstaw przypis dolny"; - Text[ japanese ] = "媟拲偺憓擖"; - Text[ chinese_traditional ] = "础爹竲"; + Text[ japanese ] = "鑴氭敞銇尶鍏"; + Text[ chinese_traditional ] = "鎻掑叆瑷昏叧"; Text[ arabic ] = "畔亚 颓皂 虞犴"; Text[ greek ] = "旭矬柁赙 躔矬珈暹珧"; - Text[ korean ] = "阿林 火涝"; + Text[ korean ] = "臧侅＜ 靷届瀰"; Text[ turkish ] = "Dipnot ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar nota al pie"; + Text[ catalan ] = "Insereix una nota al peu"; + Text[ thai ] = "喙佮笚喔｀竵喙喔娻复喔囙腑喔｀福喔"; }; + + + + + + + + + + + + + diff --git a/sw/source/ui/misc/insrule.cxx b/sw/source/ui/misc/insrule.cxx index b20390d5c468..67771f59ef3e 100644 --- a/sw/source/ui/misc/insrule.cxx +++ b/sw/source/ui/misc/insrule.cxx @@ -2,9 +2,9 @@ * * $RCSfile: insrule.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: os $ $Date: 2002-09-16 13:15:45 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:43:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -144,9 +144,9 @@ SwInsertGrfRulerDlg::~SwInsertGrfRulerDlg() String SwInsertGrfRulerDlg::GetGraphicName() { String sRet; - nSelPos -=2; //align selection position with ValueSet index - if(nSelPos < aGrfNames.Count()) - sRet = URIHelper::SmartRelToAbs(*(String*) aGrfNames.GetObject(nSelPos)); + USHORT nSel = nSelPos - 2; //align selection position with ValueSet index + if(nSel < aGrfNames.Count()) + sRet = URIHelper::SmartRelToAbs(*(String*) aGrfNames.GetObject(nSel)); return sRet; } diff --git a/sw/source/ui/misc/insrule.src b/sw/source/ui/misc/insrule.src index bf6a621edd66..33408a0fa759 100644 --- a/sw/source/ui/misc/insrule.src +++ b/sw/source/ui/misc/insrule.src @@ -2,9 +2,9 @@ * * $RCSfile: insrule.src,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:22:42 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,24 +79,25 @@ ModalDialog DLG_INSERT_RULER Text [ english_us ] = "Selection" ; Text [ portuguese_brazilian ] = "Auswahl" ; Text [ swedish ] = "Urval" ; - Text [ danish ] = "Udvalg" ; + Text [ danish ] = "V鎙g" ; Text [ italian ] = "Selezione" ; Text [ spanish ] = "Selecci髇" ; Text [ french ] = "S閘ection" ; Text [ dutch ] = "Selectie" ; Text [ portuguese ] = "Selec玢o" ; - Text[ chinese_simplified ] = "选择"; + Text[ chinese_simplified ] = "閫夋嫨"; Text[ russian ] = "蔓犷"; Text[ polish ] = "Wyb髍"; - Text[ japanese ] = "慖戰"; - Text[ chinese_traditional ] = "匡"; + Text[ japanese ] = "閬告姙"; + Text[ chinese_traditional ] = "閬稿彇"; Text[ arabic ] = "释享"; Text[ greek ] = "硼殡镢"; - Text[ korean ] = "急琶"; + Text[ korean ] = "靹犿儩"; Text[ turkish ] = "Se鏸m"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Selecci髇"; + Text[ catalan ] = "Selecci"; Text[ finnish ] = "Valinta"; + Text[ thai ] = "喙喔ム阜喔竵"; }; Control VS_EXAMPLE { @@ -132,7 +133,7 @@ ModalDialog DLG_INSERT_RULER Text = "Einfach" ; Text [ English ] = "Simple" ; Text [ portuguese ] = "Simples" ; - Text [ english_us ] = "Single" ; + Text [ english_us ] = "Plain" ; Text [ portuguese_brazilian ] = "Einfach" ; Text [ swedish ] = "Enkel" ; Text [ danish ] = "Enkelt" ; @@ -140,42 +141,58 @@ ModalDialog DLG_INSERT_RULER Text [ spanish ] = "Sencilla" ; Text [ french ] = "Simple" ; Text [ dutch ] = "Enkel" ; - Text[ chinese_simplified ] = "单线"; + Text[ chinese_simplified ] = "鍗曠嚎"; Text[ russian ] = "吾磬"; Text[ polish ] = "Pojedyncze"; - Text[ japanese ] = "驾踢"; - Text[ chinese_traditional ] = "虫絬"; + Text[ japanese ] = "銈枫兂銉椼儷"; + Text[ chinese_traditional ] = "鍠窔"; Text[ arabic ] = "爿严"; Text[ greek ] = "琉朦"; - Text[ korean ] = "窜老"; + Text[ korean ] = "雼垳"; Text[ turkish ] = "Tek"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sencilla"; + Text[ catalan ] = "Senzilla"; Text[ finnish ] = "Yksitt鋓nen"; + Text[ thai ] = "喙喔斷傅喙堗涪喔"; }; Text [ english_us ] = "Insert Horizontal Ruler" ; Text [ portuguese_brazilian ] = "Horizontale Linie einf?en" ; Text [ swedish ] = "Infoga horisontell linje" ; Text [ danish ] = "Inds鎡 vandret linje" ; Text [ italian ] = "Inserisci linea orizzontale" ; - Text [ spanish ] = "Insertar l韓ea horizontal" ; + Text [ spanish ] = "Insertar regla horizontal" ; Text [ french ] = "Insertion de ligne horizontale" ; Text [ dutch ] = "Horizontale lijn invoegen" ; Text [ portuguese ] = "Inserir linha horizontal" ; - Text[ chinese_simplified ] = "插入水平线"; + Text[ chinese_simplified ] = "鎻掑叆姘村钩绾"; Text[ russian ] = "埋蜞忤螯 泐痂珙眚嚯簋 腓龛"; Text[ polish ] = "Wstaw lini poziom"; - Text[ japanese ] = "悈暯慄偺憓擖"; - Text[ chinese_traditional ] = "础キ絬"; + Text[ japanese ] = "姘村钩绶氥伄鎸垮叆"; + Text[ chinese_traditional ] = "鎻掑叆姘村钩绶"; Text[ arabic ] = "畔亚 呜 幂揄"; Text[ greek ] = "旭矬柁赙 锺殒糸狎 泷犰燹"; - Text[ korean ] = "荐乞 急 火涝"; + Text[ korean ] = "臧搿 雸堦笀鞛 靷届瀰"; Text[ turkish ] = "Yatay 鏸zgi ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar l韓ea horizontal"; - Text[ finnish ] = "Lis滗 vaakakohdistin"; + Text[ catalan ] = "Insereix una l韓ia horitzontal"; + Text[ finnish ] = "Lis滗 vaakaviivain"; + Text[ thai ] = "喙佮笚喔｀竵喙勦浮喙夃笟喔｀福喔椸副喔斷箒喔權抚喔權腑喔"; }; + + + + + + + + + + + + + + diff --git a/sw/source/ui/misc/linenum.src b/sw/source/ui/misc/linenum.src index 38af4c8ce37d..b8c7df4d7338 100644 --- a/sw/source/ui/misc/linenum.src +++ b/sw/source/ui/misc/linenum.src @@ -2,9 +2,9 @@ * * $RCSfile: linenum.src,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:23:55 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -95,20 +95,21 @@ TabPage TP_LINENUMBERING Text [ italian ] = "Att~iva numerazione" ; Text [ spanish ] = "Mostrar ~numeraci髇" ; Text [ french ] = "Activer la ~num閞otation" ; - Text [ dutch ] = "~Nummering inschakelen" ; + Text [ dutch ] = "~Nummering activeren" ; Text [ portuguese ] = "Activar ~numera玢o" ; - Text[ chinese_simplified ] = "显示编号(~S)"; + Text[ chinese_simplified ] = "鏄剧ず缂栧彿(~S)"; Text[ russian ] = "玛膻麒螯 眢戾疣鲨"; Text[ polish ] = "W彻cz numeracj"; - Text[ japanese ] = "斣崋晅偗傪递偵偡傞(~S)"; - Text[ chinese_traditional ] = "陪ボ絪腹(~S)"; + Text[ japanese ] = "鐣彿浠樸亼銈掋偑銉炽伀銇欍倠(~S)"; + Text[ chinese_traditional ] = "椤ず绶ㄨ櫉(~S)"; Text[ arabic ] = "刨迩 轻恃揄"; Text[ greek ] = "彭羼泔痫哏箸 狁哞扃箸"; - Text[ korean ] = "锅龋概扁扁 利侩(~S)"; + Text[ korean ] = "氩堩樃 毵り赴旮 響滌嫓(~S)"; Text[ turkish ] = "~Numaralamay etkinle⺶ir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Mostrar ~numeraci髇"; + Text[ catalan ] = "Mostra ~numeraci"; Text[ finnish ] = "~N鋣t numerointi"; + Text[ thai ] = "喙亊喔笖喔囙弗喔赤笖喔编笟喔曕副喔о箑喔ム競"; }; FixedText FT_CHAR_STYLE { @@ -122,21 +123,22 @@ TabPage TP_LINENUMBERING Text [ danish ] = "Tegntypografi" ; Text [ italian ] = "~Modello di carattere" ; Text [ spanish ] = "Est~ilo de caracteres" ; - Text [ french ] = "Style de ~caract鑢es" ; + Text [ french ] = "Style de caract鑢es" ; Text [ dutch ] = "~Tekenopmaakprofiel" ; Text [ portuguese ] = "~Estilos de caracteres" ; - Text[ chinese_simplified ] = "字符样式(~C)"; - Text[ russian ] = "羊桦 珥嚓钼"; + Text[ chinese_simplified ] = "瀛楃鏍峰紡(~C)"; + Text[ russian ] = "羊桦 耔焘铍"; Text[ polish ] = "Styl znaku"; - Text[ japanese ] = "暥帤嚼操(~C)"; - Text[ chinese_traditional ] = "じ妓Α(~C)"; + Text[ japanese ] = "鏂囧瓧銈广偪銈ゃ儷(~C)"; + Text[ chinese_traditional ] = "瀛楀厓妯ｅ紡(~C)"; Text[ arabic ] = "溷 轻猛演"; Text[ greek ] = "郁蹼 麽襻牯揆"; - Text[ korean ] = "巩磊 蜡屈(~C)"; + Text[ korean ] = "氍胳瀽 鞀ろ儉鞚(~C)"; Text[ turkish ] = "~Karakter bi鏸mi"; Text[ language_user1 ] = "All \"Vorlage\"/Styles are always written with capital S. 10.5.00EM"; - Text[ catalan ] = "Est~ilo de caracteres"; - Text[ finnish ] = "~Merkist鰊 tyyli"; + Text[ catalan ] = "Est~il de car郼ters"; + Text[ finnish ] = "~Merkkityyli"; + Text[ thai ] = "喔ム副喔佮俯喔撪赴~喔曕副喔о腑喔编竵喔傕福喔"; }; ListBox LB_CHAR_STYLE { @@ -161,18 +163,19 @@ TabPage TP_LINENUMBERING Text [ french ] = "~Format" ; Text [ dutch ] = "~Opmaak" ; Text [ portuguese ] = "~Formato" ; - Text[ chinese_simplified ] = "格式(~O)"; + Text[ chinese_simplified ] = "鏍煎紡(~O)"; Text[ russian ] = "灶痨囹"; Text[ polish ] = "Format"; - Text[ japanese ] = "彂幃(~O)"; - Text[ chinese_traditional ] = "Α(~O)"; + Text[ japanese ] = "鏇稿紡(~O)"; + Text[ chinese_traditional ] = "鏍煎紡(~O)"; Text[ arabic ] = "轻输禹"; Text[ greek ] = "田駘鲛"; - Text[ korean ] = "辑侥(~O)"; + Text[ korean ] = "靹滌嫕(~O)"; Text[ turkish ] = "~Format"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Formato"; - Text[ finnish ] = "~Muotoile"; + Text[ catalan ] = "F~ormat"; + Text[ finnish ] = "M~uotoilu"; + Text[ thai ] = "喔｀腹~喔涏箒喔氞笟"; }; ListBox LB_FORMAT { @@ -191,23 +194,24 @@ TabPage TP_LINENUMBERING Text [ portuguese_brazilian ] = "Position" ; Text [ swedish ] = "~Position" ; Text [ danish ] = "Placering" ; - Text [ italian ] = "~Posizione" ; + Text [ italian ] = "Posizione" ; Text [ spanish ] = "~Posici髇" ; - Text [ french ] = "~Position" ; + Text [ french ] = "Position" ; Text [ dutch ] = "~Positie" ; Text [ portuguese ] = "~Posi玢o" ; - Text[ chinese_simplified ] = "位置"; - Text[ russian ] = "项玷鲨"; + Text[ chinese_simplified ] = "浣嶇疆"; + Text[ russian ] = "项腩驽龛"; Text[ polish ] = "Pozycja"; - Text[ japanese ] = "埵抲"; - Text[ chinese_traditional ] = "竚"; + Text[ japanese ] = "浣嶇疆"; + Text[ chinese_traditional ] = "浣嶇疆"; Text[ arabic ] = "轻沔众"; Text[ greek ] = "容箸"; - Text[ korean ] = "困摹"; + Text[ korean ] = "鞙勳箻"; Text[ turkish ] = "Konum"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Posici髇"; + Text[ catalan ] = "~Posici"; Text[ finnish ] = "Sijainti"; + Text[ thai ] = "喔曕赋喙佮斧喔權箞喔"; }; ListBox LB_POS { @@ -247,8 +251,8 @@ TabPage TP_LINENUMBERING { < "Till v鋘ster" ; > ; < "Till h鰃er" ; > ; - < "Innanf鰎" ; > ; - < "Utanf鰎" ; > ; + < "Inre" ; > ; + < "Yttre" ; > ; }; stringlist [ danish ] = { @@ -275,8 +279,8 @@ TabPage TP_LINENUMBERING { < " gauche" ; > ; < " droite" ; > ; - < "A l'int閞ieur" ; > ; - < "A l'ext閞ieur" ; > ; + < " l'int閞ieur" ; > ; + < " l'ext閞ieur" ; > ; }; stringlist [ dutch ] = { @@ -294,10 +298,10 @@ TabPage TP_LINENUMBERING }; StringList [ chinese_simplified ] = { - < "左" ; > ; - < "右" ; > ; - < "内" ; > ; - < "外" ; > ; + < "宸" ; > ; + < "鍙" ; > ; + < "鍐" ; > ; + < "澶" ; > ; }; StringList [ russian ] = { @@ -315,17 +319,17 @@ TabPage TP_LINENUMBERING }; StringList [ japanese ] = { - < "嵍" ; > ; - < "塃" ; > ; - < "撪懁" ; > ; - < "奜懁" ; > ; + < "宸" ; > ; + < "鍙" ; > ; + < "鍐呭伌" ; > ; + < "澶栧伌" ; > ; }; StringList [ chinese_traditional ] = { - < "オ" ; > ; - < "" ; > ; - < "ず" ; > ; - < "" ; > ; + < "宸" ; > ; + < "鍙" ; > ; + < "鍏" ; > ; + < "澶" ; > ; }; StringList [ arabic ] = { @@ -343,10 +347,10 @@ TabPage TP_LINENUMBERING }; StringList [ korean ] = { - < "哭率" ; > ; - < "坷弗率" ; > ; - < "郴何" ; > ; - < "寇何" ; > ; + < "鞕检" ; > ; + < "鞓るジ飒" ; > ; + < "雮措秬" ; > ; + < "鞕鸽秬" ; > ; }; StringList [ turkish ] = { @@ -364,8 +368,8 @@ TabPage TP_LINENUMBERING }; StringList [ catalan ] = { - < "Izquierda" ; > ; - < "Derecha" ; > ; + < "Esquerra" ; > ; + < "Dreta" ; > ; < "Interior" ; > ; < "Exterior" ; > ; }; @@ -376,6 +380,13 @@ TabPage TP_LINENUMBERING < "Sisempi" ; > ; < "ulompi" ; > ; }; + StringList [ thai ] = + { + < "喔嬥箟喔侧涪" ; > ; + < "喔傕抚喔" ; > ; + < "喔斷箟喔侧笝喙冟笝" ; > ; + < "喔斷箟喔侧笝喔權腑喔" ; > ; + }; }; FixedText FT_OFFSET { @@ -389,21 +400,22 @@ TabPage TP_LINENUMBERING Text [ danish ] = "Afstand" ; Text [ italian ] = "Distan~za" ; Text [ spanish ] = "E~spacio" ; - Text [ french ] = "~蒫art" ; + Text [ french ] = "蒫art" ; Text [ dutch ] = "~Afstand" ; Text [ portuguese ] = "Es~pa鏰mento" ; - Text[ chinese_simplified ] = "间隔"; - Text[ russian ] = "朽耨蝾龛"; + Text[ chinese_simplified ] = "闂撮殧"; + Text[ russian ] = "朽耨蝾~龛"; Text[ polish ] = "Odst阷"; - Text[ japanese ] = "娫妘"; + Text[ japanese ] = "浣欑櫧"; Text[ language_user1 ] = " "; - Text[ chinese_traditional ] = "丁筳"; + Text[ chinese_traditional ] = "闁撻殧"; Text[ arabic ] = "轻嗜勤"; Text[ greek ] = "~琉翎箸"; - Text[ korean ] = "埃拜"; + Text[ korean ] = "臧勱博"; Text[ turkish ] = "~Uzakl齥"; - Text[ catalan ] = "E~spacio"; - Text[ finnish ] = "Objektiv鋖it"; + Text[ catalan ] = "Espaiat"; + Text[ finnish ] = "V鋖it"; + Text[ thai ] = "喔｀赴喔⑧赴喔箞喔侧竾"; }; MetricField MF_OFFSET { @@ -433,22 +445,23 @@ TabPage TP_LINENUMBERING Text [ swedish ] = "~Intervall" ; Text [ danish ] = "Interval" ; Text [ italian ] = "I~ntervallo" ; - Text [ spanish ] = "~Intervalo" ; + Text [ spanish ] = "Intervalo" ; Text [ french ] = "~Intervalle" ; Text [ dutch ] = "~Interval" ; Text [ portuguese ] = "~Intervalo" ; - Text[ chinese_simplified ] = "区间"; + Text[ chinese_simplified ] = "鍖洪棿"; Text[ russian ] = "软蝈疴嚯"; Text[ polish ] = "Przedzia"; - Text[ japanese ] = "斣崋晅偗偺娫妘"; - Text[ chinese_traditional ] = "跋丁"; + Text[ japanese ] = "鐣彿浠樸亼銇枔闅"; + Text[ chinese_traditional ] = "鍗闁"; Text[ arabic ] = "轻萸蔗"; Text[ greek ] = "拈荏翮灬"; - Text[ korean ] = "备埃"; + Text[ korean ] = "氩堩樃 毵り赴旮 臧勱博"; Text[ turkish ] = "~Aral齥"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Intervalo"; + Text[ catalan ] = "Interval"; Text[ finnish ] = "V鋖i"; + Text[ thai ] = "喔娻箞喔о竾"; }; NumericField NF_NUM_INVERVAL { @@ -480,18 +493,19 @@ TabPage TP_LINENUMBERING Text [ french ] = "lignes" ; Text [ dutch ] = "Regels" ; Text [ portuguese ] = "Linhas" ; - Text[ chinese_simplified ] = "行"; + Text[ chinese_simplified ] = "琛"; Text[ russian ] = "羊痤觇"; Text[ polish ] = "Wiersze"; - Text[ japanese ] = "峴"; - Text[ chinese_traditional ] = "︽"; + Text[ japanese ] = "琛"; + Text[ chinese_traditional ] = "琛"; Text[ arabic ] = "糜匮"; Text[ greek ] = "民犰燧"; - Text[ korean ] = "青"; + Text[ korean ] = "頄"; Text[ turkish ] = "Sat齬"; Text[ language_user1 ] = " "; - Text[ catalan ] = "L韓eas"; - Text[ finnish ] = "viivat"; + Text[ catalan ] = "L韓ies"; + Text[ finnish ] = "rivit"; + Text[ thai ] = "喔氞福喔｀笚喔编笖"; }; FixedLine FL_DISPLAY { @@ -502,24 +516,25 @@ TabPage TP_LINENUMBERING Text [ english_us ] = "View" ; Text [ portuguese_brazilian ] = "Anzeige" ; Text [ swedish ] = "Visa" ; - Text [ danish ] = "Vis" ; + Text [ danish ] = "Visning" ; Text [ italian ] = "Visualizzazione" ; Text [ spanish ] = "Visualizaci髇" ; Text [ french ] = "Affichage" ; Text [ dutch ] = "Weergave" ; - Text [ portuguese ] = "Vista" ; - Text[ chinese_simplified ] = "显示"; + Text [ portuguese ] = "Visualiza玢o" ; + Text[ chinese_simplified ] = "鏄剧ず"; Text[ russian ] = "项赅"; Text[ polish ] = "Wy渨ietlenie"; - Text[ japanese ] = "昞\帵"; - Text[ chinese_traditional ] = "陪ボ"; + Text[ japanese ] = "琛ㄧず"; + Text[ chinese_traditional ] = "椤ず"; Text[ arabic ] = "轻谘"; Text[ greek ] = "旭镡镫"; - Text[ korean ] = "焊扁"; + Text[ korean ] = "氤搓赴"; Text[ turkish ] = "G鰎黱黰"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Visualizaci髇"; + Text[ catalan ] = "Visualitzaci"; Text[ finnish ] = "N鋣t"; + Text[ thai ] = "喔∴父喔∴浮喔竾"; }; FixedText FT_DIVISOR { @@ -534,20 +549,21 @@ TabPage TP_LINENUMBERING Text [ danish ] = "Tekst" ; Text [ italian ] = "T~esto" ; Text [ spanish ] = "Te~xto" ; - Text [ french ] = "~Texte" ; + Text [ french ] = "Texte" ; Text [ dutch ] = "~Tekst" ; - 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 ] = "M~etin"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Te~xto"; + Text[ catalan ] = "Text"; Text[ finnish ] = "Teksti"; + Text[ thai ] = "喔傕箟喔竸喔о覆喔"; }; Edit ED_DIVISOR { @@ -569,21 +585,22 @@ TabPage TP_LINENUMBERING Text [ danish ] = "Alle" ; Text [ italian ] = "~Ogni" ; Text [ spanish ] = "Ca~da" ; - Text [ french ] = "~Toutes les" ; + Text [ french ] = "Toutes les" ; Text [ dutch ] = "~Alle" ; Text [ portuguese ] = "Tu~do" ; - Text[ chinese_simplified ] = "每"; + Text[ chinese_simplified ] = "姣"; Text[ russian ] = "埋"; Text[ polish ] = "Co"; - Text[ japanese ] = "娫妘"; - Text[ chinese_traditional ] = "–"; + Text[ japanese ] = "闁撻殧"; + Text[ chinese_traditional ] = "姣"; Text[ arabic ] = "哚"; Text[ language_user1 ] = " "; Text[ greek ] = "受桢"; - Text[ korean ] = "葛电"; + Text[ korean ] = "臧勱博"; Text[ turkish ] = "~T黰"; - Text[ catalan ] = "Ca~da"; + Text[ catalan ] = "Cada"; Text[ finnish ] = "Toistov鋖i"; + Text[ thai ] = "喔椸父喔 喙"; }; NumericField NF_DIV_INTERVAL { @@ -616,18 +633,19 @@ TabPage TP_LINENUMBERING Text [ french ] = "lignes" ; Text [ dutch ] = "Regels" ; Text [ portuguese ] = "Linhas" ; - Text[ chinese_simplified ] = "行"; + Text[ chinese_simplified ] = "琛"; Text[ russian ] = "羊痤觇"; Text[ polish ] = "Wiersze"; - Text[ japanese ] = "峴"; - Text[ chinese_traditional ] = "︽"; + Text[ japanese ] = "琛"; + Text[ chinese_traditional ] = "琛"; Text[ arabic ] = "糜匮"; Text[ greek ] = "民犰燧"; - Text[ korean ] = "青"; + Text[ korean ] = "頄"; Text[ turkish ] = "Sat齬"; Text[ language_user1 ] = " "; - Text[ catalan ] = "L韓eas"; - Text[ finnish ] = "Viivat"; + Text[ catalan ] = "L韓ies"; + Text[ finnish ] = "Rivit"; + Text[ thai ] = "喔氞福喔｀笚喔编笖"; }; FixedLine FL_DIVISOR { @@ -642,20 +660,21 @@ TabPage TP_LINENUMBERING Text [ italian ] = "Separatore" ; Text [ spanish ] = "Separador" ; Text [ french ] = "S閜arateur" ; - Text [ dutch ] = "Deelteken" ; + Text [ dutch ] = "Scheidingsteken" ; Text [ portuguese ] = "Separador" ; - Text[ chinese_simplified ] = "分隔符"; + Text[ chinese_simplified ] = "鍒嗛殧绗"; Text[ russian ] = "朽玟咫栩咫"; Text[ polish ] = "Separator"; - Text[ japanese ] = "巇愗傝"; - Text[ chinese_traditional ] = "だ筳才"; + Text[ japanese ] = "鍖哄垏銈"; + Text[ chinese_traditional ] = "鍒嗛殧绗"; Text[ arabic ] = "轻萸蔗"; Text[ greek ] = "拈衢褫翮"; - Text[ korean ] = "备盒磊"; + Text[ korean ] = "甑秳 旮绊樃"; Text[ turkish ] = "Ay齬ma ireti"; Text[ language_user1 ] = " "; Text[ catalan ] = "Separador"; Text[ finnish ] = "Erotin"; + Text[ thai ] = "喔曕副喔о箒喔⑧竵"; }; CheckBox CB_COUNT_EMPTYLINES { @@ -668,23 +687,24 @@ TabPage TP_LINENUMBERING Text [ portuguese_brazilian ] = "Leerzeilen" ; Text [ swedish ] = "T~omma rader" ; Text [ danish ] = "Tomme r鎘ker" ; - Text [ italian ] = "~Righe vuote" ; + Text [ italian ] = "Righe vuote" ; Text [ spanish ] = "L韓eas en ~blanco" ; Text [ french ] = "~Lignes inutilis閑s" ; Text [ dutch ] = "~Tussenregels" ; Text [ portuguese ] = "Linhas em ~branco" ; - Text[ chinese_simplified ] = "空行"; + Text[ chinese_simplified ] = "绌鸿"; Text[ russian ] = "象耱 耱痤觇"; Text[ polish ] = "Spacje"; - Text[ japanese ] = "嬻敀偺峴"; - Text[ chinese_traditional ] = "︽"; + Text[ japanese ] = "绌虹櫧銇"; + Text[ chinese_traditional ] = "绌鸿"; Text[ arabic ] = "轻糜匮 轻萸眼"; Text[ greek ] = "叔磔 泷犰燧"; - Text[ korean ] = "后 临"; + Text[ korean ] = "牍 欷"; Text[ turkish ] = "B~o sat齬lar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "L韓eas en ~blanco"; + Text[ catalan ] = "L韓ies en ~blanc"; Text[ finnish ] = "Tyhj鋞 rivit"; + Text[ thai ] = "喔氞福喔｀笚喔编笖喔о箞喔侧竾"; }; CheckBox CB_COUNT_FRAMELINES { @@ -698,22 +718,23 @@ TabPage TP_LINENUMBERING Text [ swedish ] = "Rader i te~xtram" ; Text [ danish ] = "R鎘ker i tekstboks" ; Text [ italian ] = "Rig~he nella cornice di testo" ; - Text [ spanish ] = "L韓eas en ma~rco de texto" ; + Text [ spanish ] = "L韓eas en marco de texto" ; Text [ french ] = "Lignes dans le cadre texte" ; Text [ dutch ] = "~Regels in tekstkaders" ; Text [ portuguese ] = "Linhas na ~moldura do texto" ; - Text[ chinese_simplified ] = "文本框内的行"; - Text[ russian ] = "羊痤觇 蝈犟蝾忸 疣礻"; + Text[ chinese_simplified ] = "鏂囨湰妗嗗唴鐨勮"; + Text[ russian ] = "羊痤觇 忸 怵彗赍"; Text[ polish ] = "Wi~ersze w ramce tekstowej"; - Text[ japanese ] = "梅侥榞撪偺峴"; - Text[ chinese_traditional ] = "ゅよ遏ず︽"; + Text[ japanese ] = "銉嗐偔銈广儓鏋犲唴銇"; + Text[ chinese_traditional ] = "鏂囧瓧鏂瑰鍏х殑琛"; Text[ arabic ] = "糜匮 蓓 咔涎 轻湔"; Text[ greek ] = "民犰燧 箦 痣徇箝 赍殪蓓秕"; - Text[ korean ] = "咆胶飘 橇饭烙狼 青"; + Text[ korean ] = "韰嶌姢韸 頂勲爤鞛勳潣 欷"; Text[ turkish ] = "Metin kutusu i鏸ndeki sa~t齬lar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "L韓eas en ma~rco de texto"; + Text[ catalan ] = "L韓ies en ma~rc de text"; Text[ finnish ] = "Tekstikehikko"; + Text[ thai ] = "喔氞福喔｀笚喔编笖喙冟笝喔佮福喔笟喔傕箟喔竸喔о覆喔"; }; CheckBox CB_RESTART_PAGE { @@ -724,24 +745,25 @@ TabPage TP_LINENUMBERING TabStop = TRUE; Text[ english_us ] = "~Restart every new page"; Text[ portuguese ] = "~Reiniciar no in韈io de p醙ina"; - Text[ russian ] = "~襄疱玎矬耜 磬鬣豚 耱疣龛鳆"; + Text[ russian ] = "~襄疱玎矬耜 赅驿铋 眍忸 耱疣龛鳆"; Text[ greek ] = "硼犴尻赀~礴箸 篝珥 狁鬓 翮 箦脒溽"; Text[ dutch ] = "~Opnieuw starten bij paginabegin"; Text[ french ] = "~Reprendre au d閎ut des pages"; Text[ spanish ] = "~Reiniciar al comienzo de p醙ina"; - Text[ italian ] = "~Riavvia a inizio pagina"; + Text[ italian ] = "Riavvia a inizio pagina"; Text[ danish ] = "Genstart p hver ny side"; Text[ swedish ] = "~B鰎ja om p varje ny sida"; Text[ polish ] = "Ponowne uruchomienie na pocz箃ku strony"; Text[ portuguese_brazilian ] = "~Restart each new page"; - Text[ japanese ] = "瓦凹迋矀苽蓚P偐傜(~R)"; - Text[ korean ] = "率 霉 何盒俊辑 促矫 矫累(~R)"; - Text[ chinese_simplified ] = "在页首重新开始(~R)"; - Text[ chinese_traditional ] = "眖穝秨﹍(~R)"; + Text[ japanese ] = "銉氥兗銈搞仈銇ㄣ伀锛戙亱銈(~R)"; + Text[ korean ] = "韼橃澊歆 觳 攵攵勳棎靹 雼れ嫓 鞁滌瀾(~R)"; + Text[ chinese_simplified ] = "鍦ㄩ〉鐨勮捣濮嬩綅缃噸鏂板紑濮(~R)"; + Text[ chinese_traditional ] = "寰為爜鐨勮捣濮嬩綅缃噸鏂伴枊濮(~R)"; Text[ turkish ] = "~Restart each new page"; Text[ arabic ] = "炮窍 轻认 阡 哚 蛰蜕 滔硐"; - Text[ catalan ] = "~Reiniciar al comienzo de p醙ina"; + Text[ catalan ] = "~Reinicia a l'inici de p鄃ina"; Text[ finnish ] = "~Aloita jokainen uusi sivu uudelleen"; + Text[ thai ] = "喙~喔｀复喙堗浮喔椸父喔 喙 喔笝喙夃覆喙冟斧喔∴箞喔傅喔佮竸喔｀副喙夃竾"; }; FixedLine FL_COUNT { @@ -758,18 +780,19 @@ TabPage TP_LINENUMBERING Text [ french ] = "Compter" ; Text [ dutch ] = "Tellen" ; Text [ portuguese ] = "Contar" ; - Text[ chinese_simplified ] = "计数"; - Text[ russian ] = "喻栩囹"; + Text[ chinese_simplified ] = "璁℃暟"; + Text[ russian ] = "痒栩囹"; Text[ polish ] = "Policz"; - Text[ japanese ] = "悢偊傞"; - Text[ chinese_traditional ] = "璸计"; + Text[ japanese ] = "鏁般亪銈"; + Text[ chinese_traditional ] = "瑷堟暩"; Text[ arabic ] = "谙"; Text[ greek ] = "梳翎燧赳珞"; - Text[ korean ] = "荐甫 技扁"; + Text[ korean ] = "靾橂ゼ 靹戈赴"; Text[ turkish ] = "Say"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Contar"; - Text[ finnish ] = "Laske"; + Text[ catalan ] = "Compte"; + Text[ finnish ] = "Lukum滗r"; + Text[ thai ] = "喔權副喔"; }; Text [ english_us ] = "Line Numbering" ; Text [ portuguese_brazilian ] = "Zeilennumerierung" ; @@ -780,20 +803,36 @@ TabPage TP_LINENUMBERING Text [ french ] = "Num閞otation des lignes" ; Text [ dutch ] = "Regelnummering" ; Text [ portuguese ] = "Numera玢o de linhas" ; - Text[ chinese_simplified ] = "行编号"; + Text[ chinese_simplified ] = "琛岀紪鍙"; Text[ russian ] = "腕戾疣鲨 耱痤"; Text[ polish ] = "Numeracja wierszy"; - Text[ japanese ] = "峴斣崋晅偗"; - Text[ chinese_traditional ] = "︽絪腹"; + Text[ japanese ] = "琛岀暘鍙蜂粯銇"; + Text[ chinese_traditional ] = "琛岀法铏"; Text[ arabic ] = "恃揄 轻糜匮"; Text[ greek ] = "榴哞扃箸 泷犰忐"; - Text[ korean ] = "青 锅龋概扁扁"; + Text[ korean ] = "欷 氩堩樃 毵り赴旮"; Text[ turkish ] = "Sat齬 numaralamas"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇 de l韓eas"; + Text[ catalan ] = "Numeraci de l韓ies"; Text[ finnish ] = "Rivien numerointi"; + Text[ thai ] = "喔ム赋喔斷副喔氞笗喔编抚喙喔ム競喔氞福喔｀笚喔编笖"; }; + + + + + + + + + + + + + + + diff --git a/sw/source/ui/misc/num.src b/sw/source/ui/misc/num.src index ac23a6f4d384..e19bc1788124 100644 --- a/sw/source/ui/misc/num.src +++ b/sw/source/ui/misc/num.src @@ -2,9 +2,9 @@ * * $RCSfile: num.src,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: kz $ $Date: 2002-11-27 16:59:40 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -141,7 +141,7 @@ TabPage TP_NUM_POSITION Text[ chinese_traditional ] = "浣嶇疆鍜岄枔闅"; Text[ arabic ] = "轻沔挹 媲徙忧萆"; Text[ greek ] = "容箸 赆 狃翎箸"; - Text[ korean ] = "鞙勳箻鞕 臧勱博"; + Text[ korean ] = "鞙勳箻 氚 臧勱博"; Text[ language_user1 ] = " "; Text[ turkish ] = "Konum ve aral齥"; Text[ catalan ] = "Posici i espai"; @@ -200,7 +200,7 @@ TabPage TP_NUM_POSITION Text[ arabic ] = "溆软"; Text[ language_user1 ] = " "; Text[ greek ] = "喻弭殛"; - Text[ korean ] = "牍勲(~V)"; + Text[ korean ] = "牍勲頃橃棳(~V)"; Text[ turkish ] = "Orant齦"; Text[ catalan ] = "Relati~u"; Text[ finnish ] = "~Suhteellinen"; @@ -240,7 +240,7 @@ TabPage TP_NUM_POSITION Text [ portuguese_brazilian ] = "Einr~?kung" ; Text [ portuguese ] = "~Dist鈔cia do texto" ; Text[ chinese_simplified ] = "鑷虫枃瀛楃殑璺濈(~X)"; - Text[ russian ] = "朽耨蝾龛 铗 蝈犟蜞"; + Text[ russian ] = "朽耨蝾~龛 铗 蝈犟蜞"; Text[ polish ] = "Odst阷 od tekstu"; Text[ japanese ] = "銉嗐偔銈广儓銇俱仹銇枔闅(~X)"; Text[ chinese_traditional ] = "鑷虫枃瀛楃殑璺濈(~X)"; @@ -293,7 +293,7 @@ TabPage TP_NUM_POSITION Text[ chinese_traditional ] = "绶ㄨ櫉鍜屽収鏂囦箣闁撶殑鏈灏戦枔闅(~M)"; Text[ arabic ] = "棉 阌禽 软 轻艳 <-> 轻湔"; Text[ greek ] = "烹荀轶翮 狃翎箸 榴殍~禳 <-> 叔哽屙"; - Text[ korean ] = "斓滌唽臧勱博 氩堩樃 <-> 韰嶌姢韸(~M)"; + Text[ korean ] = "氩堩樃鞕 韰嶌姢韸 靷澊鞚 斓滌唽 臧勱博(~M)"; Text[ turkish ] = "Asgari numara <-> metin aral"; Text[ language_user1 ] = " "; Text[ catalan ] = "Dist鄋cia m韓ima N鷐ero <-> Text"; @@ -334,7 +334,7 @@ TabPage TP_NUM_POSITION Text [ portuguese_brazilian ] = "Ausri~chtung der Numerierung" ; Text [ portuguese ] = "A~linhamento da numera玢o" ; Text[ chinese_simplified ] = "缂栧彿瀵归綈(~A)"; - Text[ russian ] = "蔓疣忭桠囗桢 眢戾疣鲨"; + Text[ russian ] = "聗噔龛忄龛 眢戾疣鲨"; Text[ polish ] = "Wyr體nanie numeracji"; Text[ japanese ] = "鐣彿浠樸亼銇厤缃(~A)"; Text[ language_user1 ] = " "; @@ -521,7 +521,7 @@ TabPage TP_NUM_POSITION Text[ chinese_traditional ] = "妯欐簴(~D)"; Text[ arabic ] = "砬禹"; Text[ greek ] = "旭镥痖腼戕"; - Text[ korean ] = "旮半掣 臧(~D)"; + Text[ korean ] = "旮半掣臧(~D)"; Text[ turkish ] = "Standart"; Text[ catalan ] = "~Valor per defecte"; Text[ finnish ] = "~Oletus"; @@ -656,7 +656,7 @@ TabDialog DLG_SVXTEST_NUM_BULLET Text[ chinese_traditional ] = "鍦栧舰"; Text[ arabic ] = "真"; Text[ greek ] = "民狯殛"; - Text[ korean ] = "攴鸽灅頂"; + Text[ korean ] = "攴鸽"; Text[ turkish ] = "Grafikler"; Text[ language_user1 ] = " "; Text[ catalan ] = "Imatges"; @@ -748,7 +748,7 @@ TabDialog DLG_SVXTEST_NUM_BULLET Text [ french ] = "Supprimer" ; Text [ swedish ] = "T~a bort" ; Text [ dutch ] = "Ve~rwijderen" ; - Text [ spanish ] = "~Eliminar" ; + Text [ spanish ] = "~Borrar" ; Text [ english_us ] = "~Remove" ; Text[ chinese_simplified ] = "鍒犻櫎(~R)"; Text[ russian ] = "愉嚯栩"; @@ -757,7 +757,7 @@ TabDialog DLG_SVXTEST_NUM_BULLET Text[ chinese_traditional ] = "鍒櫎(~R)"; Text[ arabic ] = "乓轻"; Text[ greek ] = "拈徙襻鲛"; - Text[ korean ] = "靷牅(~R)"; + Text[ korean ] = "鞝滉卑(~R)"; Text[ turkish ] = "Kald齬"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Suprimeix"; @@ -787,3 +787,8 @@ TabDialog DLG_SVXTEST_NUM_BULLET Text[ thai ] = "喔ム赋喔斷副喔氞笗喔编抚喙喔ム競/喔副喔嵿弗喔编竵喔┼笓喙屶箒喔笖喔囙斧喔编抚喔傕箟喔涪喙堗腑喔"; }; + + + + + diff --git a/sw/source/ui/misc/numberingtypelistbox.src b/sw/source/ui/misc/numberingtypelistbox.src index 4cb04d228ed4..d3263511f7a7 100644 --- a/sw/source/ui/misc/numberingtypelistbox.src +++ b/sw/source/ui/misc/numberingtypelistbox.src @@ -2,9 +2,9 @@ * * $RCSfile: numberingtypelistbox.src,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: kz $ $Date: 2001-07-14 03:07:27 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -129,7 +129,7 @@ Resource STRRES_NUMTYPES < "a, .., aa, .., aaa, ..." ; 10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ; < "需耋眍" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ; < "灭圄桕" ; 8/*SVX_NUM_BITMAP */; > ; - < "徨" ; 5/*SVX_NUM_NUMBER_NONE */; > ; + < "湾" ; 5/*SVX_NUM_NUMBER_NONE */; > ; }; ItemList [ greek ] = { @@ -250,16 +250,16 @@ Resource STRRES_NUMTYPES }; ItemList [ japanese ] = { - < "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 */; > ; - < "側偟" ; 5/*SVX_NUM_NUMBER_NONE */; > ; + < "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 */; > ; + < "銇仐" ; 5/*SVX_NUM_NUMBER_NONE */; > ; }; ItemList [ korean ] = { @@ -270,9 +270,9 @@ Resource STRRES_NUMTYPES < "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 */; > ; - < "绝澜" ; 5/*SVX_NUM_NUMBER_NONE */; > ; + < "旮毹鸽Μ 旮绊樃" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ; + < "攴鸽" ; 8/*SVX_NUM_BITMAP */; > ; + < "鞐嗢潓" ; 5/*SVX_NUM_NUMBER_NONE */; > ; }; ItemList [ chinese_simplified ] = { @@ -283,9 +283,9 @@ Resource STRRES_NUMTYPES < "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 */; > ; - < "无" ; 5/*SVX_NUM_NUMBER_NONE */; > ; + < "椤圭洰绗﹀彿" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ; + < "鍥惧舰" ; 8/*SVX_NUM_BITMAP */; > ; + < "鏃" ; 5/*SVX_NUM_NUMBER_NONE */; > ; }; ItemList [ chinese_traditional ] = { @@ -296,9 +296,9 @@ Resource STRRES_NUMTYPES < "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 */; > ; - < "礚" ; 5/*SVX_NUM_NUMBER_NONE */; > ; + < "闋呯洰绗﹁櫉" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ; + < "鍦栧舰" ; 8/*SVX_NUM_BITMAP */; > ; + < "鐒" ; 5/*SVX_NUM_NUMBER_NONE */; > ; }; ItemList [ arabic ] = { @@ -348,9 +348,9 @@ Resource STRRES_NUMTYPES < "i, ii, iii, ..." ; 3/*SVX_NUM_ROMAN_LOWER */; > ; < "A, .., AA, .., AAA, ..." ; 9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ; < "a, .., aa, .., aaa, ..." ; 10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ; - < "Vi馿ta" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ; - < "Imagen" ; 8/*SVX_NUM_BITMAP */; > ; - < "Ninguna" ; 5/*SVX_NUM_NUMBER_NONE */; > ; + < "Pic" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ; + < "Imatge" ; 8/*SVX_NUM_BITMAP */; > ; + < "Cap" ; 5/*SVX_NUM_NUMBER_NONE */; > ; }; ItemList [ finnish ] = { @@ -362,9 +362,22 @@ Resource STRRES_NUMTYPES < "A, .., AA, .., AAA, ..." ; 9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ; < "a, .., aa, .., aaa, ..." ; 10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ; < "Luettelomerkki" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ; - < "Kuva" ; 8/*SVX_NUM_BITMAP */; > ; + < "Grafiikka" ; 8/*SVX_NUM_BITMAP */; > ; < "Ei mit滗n" ; 5/*SVX_NUM_NUMBER_NONE */; > ; }; + ItemList [ 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 */; > ; + < "喔, .., 喔佮竵, .., 喔佮竵喔, ..." ; 5/*SVX_NUM_NUMBER_NONE */; > ; + }; }; }; @@ -373,3 +386,15 @@ Resource STRRES_NUMTYPES + + + + + + + + + + + + diff --git a/sw/source/ui/misc/outline.src b/sw/source/ui/misc/outline.src index 2b8a84fbae62..15c5c87c11f5 100644 --- a/sw/source/ui/misc/outline.src +++ b/sw/source/ui/misc/outline.src @@ -2,9 +2,9 @@ * * $RCSfile: outline.src,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: os $ $Date: 2002-01-10 15:09:04 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,11 +80,11 @@ ModalDialog DLG_NUM_NAMES Text[ dutch ] = "Opslaan als"; Text[ spanish ] = "Guardar como"; Text[ english_us ] = "Save As"; - Text[ chinese_simplified ] = "另存为"; + Text[ chinese_simplified ] = "鍙﹀瓨涓"; Text[ russian ] = "杨躔囗栩 赅"; Text[ polish ] = "Zapisz jako"; - Text[ japanese ] = "柤慜傪晅偗偰曐懚"; - Text[ chinese_traditional ] = "穝郎"; + Text[ japanese ] = "鍚嶅墠銈掍粯銇戙仸淇濆瓨"; + Text[ chinese_traditional ] = "鍙﹀瓨鏂版獢"; Text[ arabic ] = "洼 哕"; Text = "Speichern als" ; Text [ ENGLISH ] = "Save as" ; @@ -123,18 +123,19 @@ ModalDialog DLG_NUM_NAMES Text [ dutch ] = "Vorm" ; Text [ portuguese_brazilian ] = "Form" ; Text [ portuguese ] = "Formato" ; - Text[ chinese_simplified ] = "格式"; + Text[ chinese_simplified ] = "鏍煎紡"; Text[ russian ] = "灶痨囹"; Text[ polish ] = "Format"; - Text[ japanese ] = "彂幃"; + Text[ japanese ] = "鏇稿紡"; Text[ language_user1 ] = " "; - Text[ chinese_traditional ] = "Α"; + Text[ chinese_traditional ] = "鏍煎紡"; Text[ arabic ] = "轻输禹"; Text[ greek ] = "田聆"; - Text[ korean ] = "辑侥"; + Text[ korean ] = "靹滌嫕"; Text[ turkish ] = "Format"; Text[ catalan ] = "Forma"; - Text[ finnish ] = "Muotoile"; + Text[ finnish ] = "Muotoilu"; + Text[ thai ] = "喔｀腹喔涏箒喔氞笟"; }; ListBox LB_FORM { @@ -277,27 +278,27 @@ ModalDialog DLG_NUM_NAMES }; StringList [ chinese_simplified ] = { - < "未命名 1" ; > ; - < "未命名 2" ; > ; - < "未命名 3" ; > ; - < "未命名 4" ; > ; - < "未命名 5" ; > ; - < "未命名 6" ; > ; - < "未命名 7" ; > ; - < "未命名 8" ; > ; - < "未命名 9" ; > ; + < "鏈懡鍚 1" ; > ; + < "鏈懡鍚 2" ; > ; + < "鏈懡鍚 3" ; > ; + < "鏈懡鍚 4" ; > ; + < "鏈懡鍚 5" ; > ; + < "鏈懡鍚 6" ; > ; + < "鏈懡鍚 7" ; > ; + < "鏈懡鍚 8" ; > ; + < "鏈懡鍚 9" ; > ; }; StringList [ russian ] = { - < "铃 桁屙 1" ; > ; - < "铃 桁屙 2" ; > ; - < "铃 桁屙 3" ; > ; - < "铃 桁屙 4" ; > ; - < "铃 桁屙 5" ; > ; - < "铃 桁屙 6" ; > ; - < "铃 桁屙 7" ; > ; - < "铃 桁屙 8" ; > ; - < "铃 桁屙 9" ; > ; + < "念牦戾眚 1" ; > ; + < "念牦戾眚 2" ; > ; + < "念牦戾眚 3" ; > ; + < "念牦戾眚 4" ; > ; + < "念牦戾眚 5" ; > ; + < "念牦戾眚 6" ; > ; + < "念牦戾眚 7" ; > ; + < "念牦戾眚 8" ; > ; + < "念牦戾眚 9" ; > ; }; StringList [ polish ] = { @@ -313,27 +314,27 @@ ModalDialog DLG_NUM_NAMES }; StringList [ japanese ] = { - < "柍戣 1" ; > ; - < "柍戣 2" ; > ; - < "柍戣 3" ; > ; - < "柍戣 4" ; > ; - < "柍戣 5" ; > ; - < "柍戣 6" ; > ; - < "柍戣 7" ; > ; - < "柍戣 8" ; > ; - < "柍戣 9" ; > ; + < "鐒￠ 1" ; > ; + < "鐒￠ 2" ; > ; + < "鐒￠ 3" ; > ; + < "鐒￠ 4" ; > ; + < "鐒￠ 5" ; > ; + < "鐒￠ 6" ; > ; + < "鐒￠ 7" ; > ; + < "鐒￠ 8" ; > ; + < "鐒￠ 9" ; > ; }; StringList [ chinese_traditional ] = { - < "ゼ㏑ 1" ; > ; - < "ゼ㏑ 2" ; > ; - < "ゼ㏑ 3" ; > ; - < "ゼ㏑ 4" ; > ; - < "ゼ㏑ 5" ; > ; - < "ゼ㏑ 6" ; > ; - < "ゼ㏑ 7" ; > ; - < "ゼ㏑ 8" ; > ; - < "ゼ㏑ 9" ; > ; + < "鏈懡鍚 1" ; > ; + < "鏈懡鍚 2" ; > ; + < "鏈懡鍚 3" ; > ; + < "鏈懡鍚 4" ; > ; + < "鏈懡鍚 5" ; > ; + < "鏈懡鍚 6" ; > ; + < "鏈懡鍚 7" ; > ; + < "鏈懡鍚 8" ; > ; + < "鏈懡鍚 9" ; > ; }; StringList [ arabic ] = { @@ -361,15 +362,15 @@ ModalDialog DLG_NUM_NAMES }; StringList [ korean ] = { - < "力格绝澜 1" ; > ; - < "力格绝澜2" ; > ; - < "力格绝澜3" ; > ; - < "力格绝澜4" ; > ; - < "力格绝澜5" ; > ; - < "力格绝澜6" ; > ; - < "力格绝澜7" ; > ; - < "力格绝澜8" ; > ; - < "力格绝澜9" ; > ; + < "鞝滊 鞐嗢潓 1" ; > ; + < "鞝滊 鞐嗢潓2" ; > ; + < "鞝滊 鞐嗢潓3" ; > ; + < "鞝滊 鞐嗢潓4" ; > ; + < "鞝滊 鞐嗢潓5" ; > ; + < "鞝滊 鞐嗢潓6" ; > ; + < "鞝滊 鞐嗢潓7" ; > ; + < "鞝滊 鞐嗢潓8" ; > ; + < "鞝滊 鞐嗢潓9" ; > ; }; StringList [ turkish ] = { @@ -397,15 +398,15 @@ ModalDialog DLG_NUM_NAMES }; StringList [ catalan ] = { - < "Sin nombre 1" ; > ; - < "Sin nombre 2" ; > ; - < "Sin nombre 3" ; > ; - < "Sin nombre 4" ; > ; - < "Sin nombre 5" ; > ; - < "Sin nombre 6" ; > ; - < "Sin nombre 7" ; > ; - < "Sin nombre 8" ; > ; - < "Sin nombre 9" ; > ; + < "Sense nom 1" ; > ; + < "Sense nom 2" ; > ; + < "Sense nom 3" ; > ; + < "Sense nom 4" ; > ; + < "Sense nom 5" ; > ; + < "Sense nom 6" ; > ; + < "Sense nom 7" ; > ; + < "Sense nom 8" ; > ; + < "Sense nom 9" ; > ; }; StringList [ finnish ] = { @@ -419,6 +420,18 @@ ModalDialog DLG_NUM_NAMES < "Nimet鰊 8" ; > ; < "Nimet鰊 9" ; > ; }; + StringList [ thai ] = + { + < "喙勦浮喙堗浮喔掂笂喔粪箞喔 1" ; > ; + < "喙勦浮喙堗浮喔掂笂喔粪箞喔 2" ; > ; + < "喙勦浮喙堗浮喔掂笂喔粪箞喔 3" ; > ; + < "喙勦浮喙堗浮喔掂笂喔粪箞喔 4" ; > ; + < "喙勦浮喙堗浮喔掂笂喔粪箞喔 5" ; > ; + < "喙勦浮喙堗浮喔掂笂喔粪箞喔 6" ; > ; + < "喙勦浮喙堗浮喔掂笂喔粪箞喔 7" ; > ; + < "喙勦浮喙堗浮喔掂笂喔粪箞喔 8" ; > ; + < "喙勦浮喙堗浮喔掂笂喔粪箞喔 9" ; > ; + }; }; Edit ED_FORM { @@ -430,11 +443,12 @@ ModalDialog DLG_NUM_NAMES }; Text = "Speichern als" ; Text[ greek ] = "琉镨揸艴箸 "; - Text[ korean ] = "促弗 捞抚栏肺 历厘"; + Text[ korean ] = "雼るジ 鞚措鞙茧 鞝鞛"; Text[ turkish ] = "Farkl kaydet..."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Guardar como"; + Text[ catalan ] = "Anomena i desa"; Text[ finnish ] = "Tallenna nimell"; + Text[ thai ] = "喔氞副喔權笚喔多竵喙喔涏箛喔"; }; /**************************************************************************/ /* */ @@ -478,18 +492,19 @@ TabDialog DLG_TAB_OUTLINE Text [ french ] = "Num閞otation" ; Text [ dutch ] = "Nummering" ; Text [ portuguese ] = "Numera玢o" ; - Text[ chinese_simplified ] = "编号"; + Text[ chinese_simplified ] = "缂栧彿"; Text[ russian ] = "腕戾疣鲨"; Text[ polish ] = "Numeracja"; - Text[ japanese ] = "斣崋晅偗"; - Text[ chinese_traditional ] = "絪腹"; + Text[ japanese ] = "鐣彿浠樸亼"; + Text[ chinese_traditional ] = "绶ㄨ櫉"; Text[ arabic ] = "轻恃揄"; Text[ greek ] = "榴哞扃箸"; - Text[ korean ] = "锅龋概扁扁"; + Text[ korean ] = "氩堩樃 毵り赴旮"; Text[ turkish ] = "Numaralama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇"; + Text[ catalan ] = "Numeraci"; Text[ finnish ] = "Numerointi"; + Text[ thai ] = "喔ム赋喔斷副喔氞笗喔编抚喙喔ム競"; }; PageItem { @@ -505,18 +520,19 @@ TabDialog DLG_TAB_OUTLINE Text [ french ] = "Position" ; Text [ dutch ] = "Positie" ; Text [ portuguese ] = "Posi玢o" ; - Text[ chinese_simplified ] = "位置"; + Text[ chinese_simplified ] = "浣嶇疆"; Text[ russian ] = "项玷鲨"; Text[ polish ] = "Pozycja"; - Text[ japanese ] = "埵抲"; - Text[ chinese_traditional ] = "竚"; + Text[ japanese ] = "浣嶇疆"; + Text[ chinese_traditional ] = "浣嶇疆"; Text[ arabic ] = "轻沔挹"; Text[ greek ] = "容箸"; - Text[ korean ] = "困摹"; + Text[ korean ] = "鞙勳箻"; Text[ turkish ] = "Konum"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Posici髇"; + Text[ catalan ] = "Posici"; Text[ finnish ] = "Sijainti"; + Text[ thai ] = "喔曕赋喙佮斧喔權箞喔"; }; }; }; @@ -533,18 +549,19 @@ TabDialog DLG_TAB_OUTLINE Text [ danish ] = "Form" ; Text [ portuguese_brazilian ] = "~Form" ; Text [ portuguese ] = "Forma~to" ; - Text[ chinese_simplified ] = "格式(~F)"; + Text[ chinese_simplified ] = "鏍煎紡(~F)"; Text[ russian ] = "灶痨囹"; Text[ polish ] = "Format"; - Text[ japanese ] = "太把(~F)"; + Text[ japanese ] = "銉曘偐銉笺儬(~F)"; Text[ language_user1 ] = " "; - Text[ chinese_traditional ] = "Α(~F)"; + Text[ chinese_traditional ] = "鏍煎紡(~F)"; Text[ arabic ] = "轻输禹"; Text[ greek ] = "田駘鲛"; - Text[ korean ] = "辑侥(~F)"; + Text[ korean ] = "靹滌嫕(~F)"; Text[ turkish ] = "Format"; - Text[ catalan ] = "~Forma"; + Text[ catalan ] = "~Formata"; Text[ finnish ] = "~Muotoile"; + Text[ thai ] = "~喔｀腹喔涏箒喔氞笟"; }; Menu MN_FORM { @@ -567,17 +584,18 @@ TabDialog DLG_TAB_OUTLINE Text [ spanish ] = "Sin nombre 1" ; Text [ english_us ] = "Untitled 1" ; HelpID = HID_NUM_OUTL_NAMED_NUMS ; - Text[ chinese_simplified ] = "未命名 1"; - Text[ russian ] = "铃 桁屙 1"; + Text[ chinese_simplified ] = "鏈懡鍚 1"; + Text[ russian ] = "念牦戾眚 1"; Text[ polish ] = "Bez nazwy 1"; - Text[ japanese ] = "柍戣 1"; - Text[ chinese_traditional ] = "ゼ㏑ 1"; + Text[ japanese ] = "鐒￠ 1"; + Text[ chinese_traditional ] = "鏈懡鍚 1"; Text[ arabic ] = "认驿 阡媲 1"; Text[ greek ] = "倪鼯 镬 1"; - Text[ korean ] = "力格绝澜 1"; + Text[ korean ] = "鞝滊 鞐嗢潓 1"; Text[ turkish ] = "Ads齴 1"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sin nombre 1"; + Text[ catalan ] = "Sense nom 1"; + Text[ thai ] = "喙勦浮喙堗浮喔掂笂喔粪箞喔 1"; }; MenuItem { @@ -596,17 +614,18 @@ TabDialog DLG_TAB_OUTLINE Text [ spanish ] = "Sin nombre 2" ; Text [ english_us ] = "Untitled 2" ; HelpID = HID_NUM_OUTL_NAMED_NUMS ; - Text[ chinese_simplified ] = "未命名 2"; - Text[ russian ] = "铃 桁屙 2"; + Text[ chinese_simplified ] = "鏈懡鍚 2"; + Text[ russian ] = "念牦戾眚 2"; Text[ polish ] = "Bez nazwy 2"; - Text[ japanese ] = "柍戣 2"; - Text[ chinese_traditional ] = "ゼ㏑ 2"; + Text[ japanese ] = "鐒￠ 2"; + Text[ chinese_traditional ] = "鏈懡鍚 2"; Text[ arabic ] = "认驿 阡媲 2"; Text[ greek ] = "倪鼯 镬 2"; - Text[ korean ] = "力格绝澜2"; + Text[ korean ] = "鞝滊 鞐嗢潓2"; Text[ turkish ] = "Ads齴 2"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sin nombre 2"; + Text[ catalan ] = "Sense nom 2"; + Text[ thai ] = "喙勦浮喙堗浮喔掂笂喔粪箞喔 2"; }; MenuItem { @@ -625,17 +644,18 @@ TabDialog DLG_TAB_OUTLINE Text [ spanish ] = "Sin nombre 3" ; Text [ english_us ] = "Untitled 3" ; HelpID = HID_NUM_OUTL_NAMED_NUMS ; - Text[ chinese_simplified ] = "未命名 3"; - Text[ russian ] = "铃 桁屙 3"; + Text[ chinese_simplified ] = "鏈懡鍚 3"; + Text[ russian ] = "念牦戾眚 3"; Text[ polish ] = "Bez nazwy 3"; - Text[ japanese ] = "柍戣 3"; - Text[ chinese_traditional ] = "ゼ㏑ 3"; + Text[ japanese ] = "鐒￠ 3"; + Text[ chinese_traditional ] = "鏈懡鍚 3"; Text[ arabic ] = "认驿 阡媲 3"; Text[ greek ] = "倪鼯 镬 3"; - Text[ korean ] = "力格绝澜3"; + Text[ korean ] = "鞝滊 鞐嗢潓3"; Text[ turkish ] = "Ads齴 3"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sin nombre 3"; + Text[ catalan ] = "Sense nom 3"; + Text[ thai ] = "喙勦浮喙堗浮喔掂笂喔粪箞喔 3"; }; MenuItem { @@ -654,17 +674,18 @@ TabDialog DLG_TAB_OUTLINE Text [ spanish ] = "Sin nombre 4" ; Text [ english_us ] = "Untitled 4" ; HelpID = HID_NUM_OUTL_NAMED_NUMS ; - Text[ chinese_simplified ] = "未命名 4"; - Text[ russian ] = "铃 桁屙 4"; + Text[ chinese_simplified ] = "鏈懡鍚 4"; + Text[ russian ] = "念牦戾眚 4"; Text[ polish ] = "Bez nazwy 4"; - Text[ japanese ] = "柍戣 4"; - Text[ chinese_traditional ] = "ゼ㏑ 4"; + Text[ japanese ] = "鐒￠ 4"; + Text[ chinese_traditional ] = "鏈懡鍚 4"; Text[ arabic ] = "认驿 阡媲 4"; Text[ greek ] = "倪鼯 镬 4"; - Text[ korean ] = "力格绝澜4"; + Text[ korean ] = "鞝滊 鞐嗢潓4"; Text[ turkish ] = "Ads齴 4"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sin nombre 4"; + Text[ catalan ] = "Sense nom 4"; + Text[ thai ] = "喙勦浮喙堗浮喔掂笂喔粪箞喔 4"; }; MenuItem { @@ -683,17 +704,18 @@ TabDialog DLG_TAB_OUTLINE Text [ spanish ] = "Sin nombre 5" ; Text [ english_us ] = "Untitled 5" ; HelpID = HID_NUM_OUTL_NAMED_NUMS ; - Text[ chinese_simplified ] = "未命名 5"; - Text[ russian ] = "铃 桁屙 5"; + Text[ chinese_simplified ] = "鏈懡鍚 5"; + Text[ russian ] = "念牦戾眚 5"; Text[ polish ] = "Bez nazwy 5"; - Text[ japanese ] = "柍戣 5"; - Text[ chinese_traditional ] = "ゼ㏑ 5"; + Text[ japanese ] = "鐒￠ 5"; + Text[ chinese_traditional ] = "鏈懡鍚 5"; Text[ arabic ] = "认驿 阡媲 5"; Text[ greek ] = "倪鼯 镬 5"; - Text[ korean ] = "力格绝澜5"; + Text[ korean ] = "鞝滊 鞐嗢潓5"; Text[ turkish ] = "Ads齴 5"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sin nombre 5"; + Text[ catalan ] = "Sense nom 5"; + Text[ thai ] = "喙勦浮喙堗浮喔掂笂喔粪箞喔 5"; }; MenuItem { @@ -712,17 +734,18 @@ TabDialog DLG_TAB_OUTLINE Text [ spanish ] = "Sin nombre 6" ; Text [ english_us ] = "Untitled 6" ; HelpID = HID_NUM_OUTL_NAMED_NUMS ; - Text[ chinese_simplified ] = "未命名 6"; - Text[ russian ] = "铃 桁屙 6"; + Text[ chinese_simplified ] = "鏈懡鍚 6"; + Text[ russian ] = "念牦戾眚 6"; Text[ polish ] = "Bez nazwy 6"; - Text[ japanese ] = "柍戣 6"; - Text[ chinese_traditional ] = "ゼ㏑ 6"; + Text[ japanese ] = "鐒￠ 6"; + Text[ chinese_traditional ] = "鏈懡鍚 6"; Text[ arabic ] = "认驿 阡媲 6"; Text[ greek ] = "倪鼯 镬 6"; - Text[ korean ] = "力格绝澜6"; + Text[ korean ] = "鞝滊 鞐嗢潓6"; Text[ turkish ] = "Ads齴 6"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sin nombre 6"; + Text[ catalan ] = "Sense nom 6"; + Text[ thai ] = "喙勦浮喙堗浮喔掂笂喔粪箞喔 6"; }; MenuItem { @@ -741,17 +764,18 @@ TabDialog DLG_TAB_OUTLINE Text [ spanish ] = "Sin nombre 7" ; Text [ english_us ] = "Untitled 7" ; HelpID = HID_NUM_OUTL_NAMED_NUMS ; - Text[ chinese_simplified ] = "未命名 7"; - Text[ russian ] = "铃 桁屙 7"; + Text[ chinese_simplified ] = "鏈懡鍚 7"; + Text[ russian ] = "念牦戾眚 7"; Text[ polish ] = "Bez nazwy 7"; - Text[ japanese ] = "柍戣 7"; - Text[ chinese_traditional ] = "ゼ㏑ 7"; + Text[ japanese ] = "鐒￠ 7"; + Text[ chinese_traditional ] = "鏈懡鍚 7"; Text[ arabic ] = "认驿 阡媲 7"; Text[ greek ] = "倪鼯 镬 7"; - Text[ korean ] = "力格绝澜7"; + Text[ korean ] = "鞝滊 鞐嗢潓7"; Text[ turkish ] = "Ads齴 7"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sin nombre 7"; + Text[ catalan ] = "Sense nom 7"; + Text[ thai ] = "喙勦浮喙堗浮喔掂笂喔粪箞喔 7"; }; MenuItem { @@ -770,17 +794,18 @@ TabDialog DLG_TAB_OUTLINE Text [ spanish ] = "Sin nombre 8" ; Text [ english_us ] = "Untitled 8" ; HelpID = HID_NUM_OUTL_NAMED_NUMS ; - Text[ chinese_simplified ] = "未命名 8"; - Text[ russian ] = "铃 桁屙 8"; + Text[ chinese_simplified ] = "鏈懡鍚 8"; + Text[ russian ] = "念牦戾眚 8"; Text[ polish ] = "Bez nazwy 8"; - Text[ japanese ] = "柍戣 8"; - Text[ chinese_traditional ] = "ゼ㏑ 8"; + Text[ japanese ] = "鐒￠ 8"; + Text[ chinese_traditional ] = "鏈懡鍚 8"; Text[ arabic ] = "认驿 阡媲 8"; Text[ greek ] = "倪鼯 镬 8"; - Text[ korean ] = "力格绝澜8"; + Text[ korean ] = "鞝滊 鞐嗢潓8"; Text[ turkish ] = "Ads齴 8"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sin nombre 8"; + Text[ catalan ] = "Sense nom 8"; + Text[ thai ] = "喙勦浮喙堗浮喔掂笂喔粪箞喔 8"; }; MenuItem { @@ -799,17 +824,18 @@ TabDialog DLG_TAB_OUTLINE Text [ spanish ] = "Sin nombre 9" ; Text [ english_us ] = "Untitled 9" ; HelpID = HID_NUM_OUTL_NAMED_NUMS ; - Text[ chinese_simplified ] = "未命名 9"; - Text[ russian ] = "铃 桁屙 9"; + Text[ chinese_simplified ] = "鏈懡鍚 9"; + Text[ russian ] = "念牦戾眚 9"; Text[ polish ] = "Bez nazwy 9"; - Text[ japanese ] = "柍戣 9"; - Text[ chinese_traditional ] = "ゼ㏑ 9"; + Text[ japanese ] = "鐒￠ 9"; + Text[ chinese_traditional ] = "鏈懡鍚 9"; Text[ arabic ] = "认驿 阡媲 9"; Text[ greek ] = "倪鼯 镬 9"; - Text[ korean ] = "力格绝澜9"; + Text[ korean ] = "鞝滊 鞐嗢潓9"; Text[ turkish ] = "Ads齴 9"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sin nombre 9"; + Text[ catalan ] = "Sense nom 9"; + Text[ thai ] = "喙勦浮喙堗浮喔掂笂喔粪箞喔 9"; }; MenuItem { @@ -822,7 +848,7 @@ TabDialog DLG_TAB_OUTLINE Text[ italian ] = "Salva con nome..."; Text[ portuguese_brazilian ] = "Gravar ~como..."; Text[ portuguese ] = "Guardar ~como..."; - Text[ danish ] = "Gem som..."; + Text[ danish ] = "Gem ~som..."; Text[ french ] = "Enregistrer comme..."; Text[ swedish ] = "Spara so~m..."; Text[ dutch ] = "Ops~laan als..."; @@ -830,32 +856,34 @@ TabDialog DLG_TAB_OUTLINE Text[ english_us ] = "Save ~As..."; Text[ russian ] = "杨躔囗栩 赅..."; Text[ polish ] = "Zapisz jako..."; - Text[ japanese ] = "柤慜傪晅偗偰曐懚(~A)..."; - Text[ chinese_simplified ] = "另存为(~A)..."; + Text[ japanese ] = "鍚嶅墠銈掍粯銇戙仸淇濆瓨(~A)..."; + Text[ chinese_simplified ] = "鍙﹀瓨涓(~A)..."; Text = "Speichern ~als..." ; Text[ arabic ] = "...洼 哕"; HelpID = HID_NUM_OUTL_NUM_SAVEAS ; Text[ greek ] = "~琉镨揸艴箸 ..."; - Text[ korean ] = "促弗 捞抚栏肺 历厘(~A)..."; - Text[ chinese_traditional ] = "纗穝郎(~A)..."; + Text[ korean ] = "雼るジ 鞚措鞙茧 鞝鞛(~A)..."; + Text[ chinese_traditional ] = "鍎插瓨鏂版獢(~A)..."; Text[ turkish ] = "Farkl kaydet..."; Text[ language_user1 ] = " "; - Text[ catalan ] = "G~uardar como..."; - Text[ finnish ] = "~Tallenna nimell"; + Text[ catalan ] = "Anomena i ~desa..."; + Text[ finnish ] = "Tallenna ni~mell..."; + Text[ thai ] = "喔氞副喔權笚喔多竵喙~喔涏箛喔..."; }; }; }; - Text[ chinese_simplified ] = "章编号"; - Text[ russian ] = "腕戾疣鲨 汶噔"; + Text[ chinese_simplified ] = "绔犺妭缂栧彿"; + Text[ russian ] = "羊痼牝箴 眢戾疣鲨"; Text[ polish ] = "Numeracja rozdzia丑w"; - Text[ japanese ] = "復斣崋晅偗"; - Text[ chinese_traditional ] = "彻絪腹"; + Text[ japanese ] = "绔犵暘鍙蜂粯銇"; + Text[ chinese_traditional ] = "绔犵瘈绶ㄨ櫉"; Text[ arabic ] = "恃揄 轻菡驷"; Text[ greek ] = "榴哞扃箸 赍鲠脶啭"; - Text[ korean ] = "厘 锅龋概扁扁"; + Text[ korean ] = "鞛 氩堩樃 毵り赴旮"; Text[ turkish ] = "B鰈黰 numaralama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇 de cap韙ulos"; + Text[ catalan ] = "Numeraci de cap韙ols"; + Text[ thai ] = "喔ム赋喔斷副喔氞笗喔编抚喙喔ム競喙喔勦箟喔侧福喙堗覆喔"; }; /**************************************************************************/ /* */ @@ -886,24 +914,25 @@ TabPage TP_OUTLINE_NUM Text [ italian ] = "Livello" ; Text [ portuguese_brazilian ] = "N?vel" ; Text [ portuguese ] = "N韛el" ; - Text [ finnish ] = "Taso " ; + Text [ finnish ] = "Taso" ; Text [ danish ] = "Niveau" ; Text [ french ] = "Niveau" ; Text [ swedish ] = "Niv" ; Text [ dutch ] = "Niveau" ; Text [ spanish ] = "Nivel" ; Text [ english_us ] = "Level" ; - Text[ chinese_simplified ] = "级"; + Text[ chinese_simplified ] = "绾"; Text[ russian ] = "羽钼屙"; Text[ polish ] = "Poziom"; - Text[ japanese ] = "谕拶"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "銉儥銉"; + Text[ chinese_traditional ] = "绱"; Text[ arabic ] = "轻阌舒"; Text[ greek ] = "硼唣邃"; - Text[ korean ] = "荐霖"; + Text[ korean ] = "靾橃"; Text[ turkish ] = "D鼁ey"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nivel"; + Text[ catalan ] = "Nivell"; + Text[ thai ] = "喔｀赴喔斷副喔"; }; FixedText FT_COLL { @@ -924,17 +953,18 @@ TabPage TP_OUTLINE_NUM Text [ english_us ] = "~Paragraph Style" ; Group = TRUE ; Left = TRUE ; - Text[ chinese_simplified ] = "段落样式(~P)"; + Text[ chinese_simplified ] = "娈佃惤鏍峰紡(~P)"; Text[ russian ] = "羊桦 噌玎鲟"; Text[ polish ] = "Styl akapitu"; - Text[ japanese ] = "抜棊嚼操乮~P)"; - Text[ chinese_traditional ] = "琿辅妓Α(~P)"; + Text[ japanese ] = "娈佃惤銈广偪銈ゃ儷锛垀P)"; + Text[ chinese_traditional ] = "娈佃惤妯ｅ紡(~P)"; Text[ arabic ] = "溷 轻蒉焉"; Text[ language_user1 ] = "All \"Vorlage\"/Styles are always written with capital S. 10.5.00EM"; Text[ greek ] = "旭躔 疳襻泷荟秕"; - Text[ korean ] = "窜遏 蜡屈(~P)"; + Text[ korean ] = "雼澖 鞀ろ儉鞚(~P)"; Text[ turkish ] = "Paragraf blonu"; - Text[ catalan ] = "Estilo de ~p醨rafo"; + Text[ catalan ] = "Estil de ~par鄃raf"; + Text[ thai ] = "喔ム副喔佮俯喔撪赴~喔⑧箞喔斧喔權箟喔"; }; ListBox LB_COLL { @@ -959,23 +989,24 @@ TabPage TP_OUTLINE_NUM Text [ portuguese ] = "~N鷐ero" ; Text [ finnish ] = "~Luku" ; Text [ danish ] = "Nummer" ; - Text [ french ] = "~Num閞o" ; + Text [ french ] = "Num閞o" ; Text [ swedish ] = "~Nummer" ; Text [ dutch ] = "~Nummer" ; - Text [ spanish ] = "~N鷐ero" ; + Text [ spanish ] = "N鷐ero" ; Text [ english_us ] = "~Number" ; Left = TRUE ; - Text[ chinese_simplified ] = "编号(~N)"; + Text[ chinese_simplified ] = "缂栧彿(~N)"; Text[ russian ] = "皖戾"; Text[ polish ] = "Numer"; - 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 ] = "Numara"; Text[ language_user1 ] = " "; Text[ catalan ] = "~N鷐ero"; + Text[ thai ] = "~喔曕副喔о箑喔ム競"; }; ListBox LB_NUMBER { @@ -994,25 +1025,26 @@ TabPage TP_OUTLINE_NUM Text [ ENGLISH ] = "Character style" ; Text [ english_us ] = "~Character Style" ; Text [ swedish ] = "Teckenf~ormatmall" ; - Text [ danish ] = "Tegntypografi" ; + Text [ danish ] = "Te~gntypografi" ; Text [ italian ] = "Modello di carattere" ; - Text [ spanish ] = "E~stilo de car醕ter" ; - Text [ french ] = "St~yle de caract鑢es" ; + Text [ spanish ] = "E~stilo de caracteres" ; + Text [ french ] = "Style de caract鑢es" ; Text [ dutch ] = "~Tekenopmaakprofiel" ; Text [ portuguese_brazilian ] = "Zeichenv~orlage" ; Text [ portuguese ] = "~Estilo de caracteres:" ; - Text[ chinese_simplified ] = "字符样式(~C)"; - Text[ russian ] = "羊桦 珥嚓钼"; + Text[ chinese_simplified ] = "瀛楃鏍峰紡(~C)"; + Text[ russian ] = "羊桦 耔焘铍"; Text[ polish ] = "Styl znaku"; - Text[ japanese ] = "暥帤嚼操(~C)"; - Text[ chinese_traditional ] = "じ妓Α(~C)"; + Text[ japanese ] = "鏂囧瓧銈广偪銈ゃ儷(~C)"; + Text[ chinese_traditional ] = "瀛楀厓妯ｅ紡(~C)"; Text[ arabic ] = "溷 轻猛演"; Text[ greek ] = "郁蹼 麽襻牯揆"; - Text[ korean ] = "巩磊 蜡屈(~C)"; + Text[ korean ] = "氍胳瀽 鞀ろ儉鞚(~C)"; Text[ turkish ] = "Karakter blonu"; Text[ language_user1 ] = "All \"Vorlage\"/Styles are always written with capital S. 10.5.00EM"; - Text[ catalan ] = "E~stilo de car醕ter"; - Text[ finnish ] = "~Merkist鰊 tyyli"; + Text[ catalan ] = "E~stil de car郼ter"; + Text[ finnish ] = "~Merkkityyli"; + Text[ thai ] = "喔ム副喔佮俯喔撪赴~喔曕副喔о腑喔编竵喔傕福喔"; }; ListBox LB_CHARFMT { @@ -1032,23 +1064,24 @@ TabPage TP_OUTLINE_NUM Text [ portuguese_brazilian ] = "~Completar" ; Text [ portuguese ] = "Co~mpleto" ; Text [ finnish ] = "~N鋣t alatasot" ; - Text [ danish ] = "Fuldst鎛dig" ; + Text [ danish ] = "F~uldst鎛dig" ; Text [ french ] = "C~omplet" ; - Text [ swedish ] = "~Fullst鋘dig" ; + Text [ swedish ] = "F~ullst鋘dig" ; Text [ dutch ] = "~Volledig" ; Text [ spanish ] = "~Completo" ; Text [ english_us ] = "Sho~w sublevels" ; - Text[ chinese_simplified ] = "完整的(~W)"; - Text[ russian ] = "项腠铖螯"; + Text[ chinese_simplified ] = "瀹屾暣鐨(~W)"; + Text[ russian ] = "埋 箴钼龛"; Text[ polish ] = "Poka wszystkie poziomy"; - Text[ japanese ] = "憤復悢(~W)"; - Text[ chinese_traditional ] = "Ч俱(~W)"; + Text[ japanese ] = "绶忕珷鏁(~W)"; + Text[ chinese_traditional ] = "瀹屾暣鐨(~W)"; Text[ arabic ] = "咔汜"; Text[ greek ] = "想镪腌聩燧盹"; - Text[ korean ] = "肯寒窍霸(~W)"; + Text[ korean ] = "頃橃渼 靾橃 響滌嫓(~W)"; Text[ turkish ] = "T黰 d鼁eyler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Completo"; + Text[ catalan ] = "Mostr~a subnivells"; + Text[ thai ] = "喙佮釜喔攡喔囙福喔班笖喔编笟喔⑧箞喔涪"; }; NumericField NF_ALL_LEVEL { @@ -1083,17 +1116,18 @@ TabPage TP_OUTLINE_NUM Text [ spanish ] = "Separador" ; Text [ english_us ] = "Separator" ; Left = TRUE ; - Text[ chinese_simplified ] = "分隔符"; + Text[ chinese_simplified ] = "鍒嗛殧绗"; Text[ russian ] = "朽玟咫栩咫"; Text[ polish ] = "Separator"; - Text[ japanese ] = "嬫愗傝婰崋"; - Text[ chinese_traditional ] = "だ筳才"; + Text[ japanese ] = "鍖哄垏銈婅鍙"; + Text[ chinese_traditional ] = "鍒嗛殧绗"; Text[ arabic ] = "萸蔗"; Text[ greek ] = "彭殛"; - Text[ korean ] = "备盒磊"; + Text[ korean ] = "甑秳 旮绊樃"; Text[ turkish ] = "Ay齬ma ireti"; Text[ language_user1 ] = " "; Text[ catalan ] = "Separador"; + Text[ thai ] = "喔曕副喔о箒喔⑧竵"; }; FixedText FT_PREFIX { @@ -1102,7 +1136,7 @@ TabPage TP_OUTLINE_NUM Text = "~davor" ; Text [ ENGLISH ] = "before" ; Text [ norwegian ] = "f鴕" ; - Text [ italian ] = "~Davanti" ; + Text [ italian ] = "Davanti" ; Text [ portuguese_brazilian ] = "antes" ; Text [ portuguese ] = "an~tes" ; Text [ finnish ] = "~Ennen" ; @@ -1113,17 +1147,18 @@ TabPage TP_OUTLINE_NUM Text [ spanish ] = "~delante" ; Text [ english_us ] = "~Before" ; Left = TRUE ; - Text[ chinese_simplified ] = "之前(~B)"; - Text[ russian ] = "漕"; + Text[ chinese_simplified ] = "涔嬪墠(~B)"; + Text[ russian ] = "念"; Text[ polish ] = "przed"; - Text[ japanese ] = "斣崋慜(~B)"; - Text[ chinese_traditional ] = "ぇ玡(~B)"; + Text[ japanese ] = "鐣彿鍓(~B)"; + Text[ chinese_traditional ] = "涔嬪墠(~B)"; Text[ arabic ] = "奕徨"; Text[ greek ] = "瘃轫 狃"; - Text[ korean ] = "傈俊(~B)"; + Text[ korean ] = "氩堩樃 鞎(~B)"; Text[ turkish ] = "Ba. ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~delante"; + Text[ catalan ] = "~Abans"; + Text[ thai ] = "~喔佮箞喔笝"; }; Edit ED_PREFIX { @@ -1141,7 +1176,7 @@ TabPage TP_OUTLINE_NUM Text = "dah~inter" ; Text [ ENGLISH ] = "behind" ; Text [ norwegian ] = "bak" ; - Text [ italian ] = "D~ietro" ; + Text [ italian ] = "Dietro" ; Text [ portuguese_brazilian ] = "atr?s" ; Text [ portuguese ] = "~Atr醩" ; Text [ finnish ] = "~J鋖keen" ; @@ -1152,17 +1187,18 @@ TabPage TP_OUTLINE_NUM Text [ spanish ] = "d~etr醩" ; Text [ english_us ] = "~After" ; Left = TRUE ; - Text[ chinese_simplified ] = "之后(~A)"; - Text[ russian ] = "镱耠"; + Text[ chinese_simplified ] = "涔嬪悗(~A)"; + Text[ russian ] = "项耠"; Text[ polish ] = "za"; - 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 ] = "Son. ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "d~etr醩"; + Text[ catalan ] = "D~espr閟"; + Text[ thai ] = "~喔弗喔编竾喔堗覆喔"; }; Edit ED_SUFFIX { @@ -1180,28 +1216,29 @@ TabPage TP_OUTLINE_NUM Text = "~Beginn bei" ; Text [ English ] = "~Start at" ; Text [ norwegian ] = "~Start p" ; - Text [ italian ] = "~Inizia con" ; + Text [ italian ] = "Inizia con" ; Text [ portuguese_brazilian ] = "~Come?ar em" ; Text [ portuguese ] = "~Come鏰r em" ; - Text [ finnish ] = "~Aloita kohdasta" ; + Text [ finnish ] = "~Aloitus" ; Text [ danish ] = "Begynd med" ; Text [ french ] = "Commencer avec" ; Text [ swedish ] = "~B鰎ja med" ; Text [ dutch ] = "~Begin met" ; - Text [ spanish ] = "Comen~zar en" ; + Text [ spanish ] = "Comenzar en" ; Text [ english_us ] = "~Start at" ; Left = TRUE ; - Text[ chinese_simplified ] = "开始从(~S)"; + Text[ chinese_simplified ] = "寮濮嬩粠(~S)"; Text[ russian ] = "袜鬣螯 "; Text[ polish ] = "Zacznij od"; - Text[ japanese ] = "奐巒復斣崋(~S)"; - Text[ chinese_traditional ] = "秨﹍眖(~S)"; + Text[ japanese ] = "闁嬪绔犵暘鍙(~S)"; + Text[ chinese_traditional ] = "闁嬪寰(~S)"; Text[ arabic ] = "认琉 溶"; Text[ greek ] = "容箸 尻赀礴箸"; - Text[ korean ] = "俊辑 矫累(~S)"; + Text[ korean ] = "鞁滌瀾 氩堩樃(~S)"; Text[ turkish ] = "Baang:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Comen~zar en"; + Text[ catalan ] = "~Inicia a"; + Text[ thai ] = "喙~喔｀复喙堗浮喔椸傅喙"; }; NumericField ED_START { @@ -1236,17 +1273,18 @@ TabPage TP_OUTLINE_NUM Text [ spanish ] = "Numeraci髇" ; Text [ english_us ] = "Numbering" ; Group = TRUE ; - Text[ chinese_simplified ] = "编号"; + Text[ chinese_simplified ] = "缂栧彿"; Text[ russian ] = "腕戾疣鲨"; Text[ polish ] = "Numeracja"; - Text[ japanese ] = "斣崋晅偗"; - Text[ chinese_traditional ] = "絪腹"; + Text[ japanese ] = "鐣彿浠樸亼"; + Text[ chinese_traditional ] = "绶ㄨ櫉"; Text[ arabic ] = "轻恃揄"; Text[ greek ] = "榴哞扃箸"; - Text[ korean ] = "锅龋概扁扁"; + Text[ korean ] = "氩堩樃 毵り赴旮"; Text[ turkish ] = "Numaralama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇"; + Text[ catalan ] = "Numeraci"; + Text[ thai ] = "喔ム赋喔斷副喔氞笗喔编抚喙喔ム競"; }; Window WIN_PREVIEW { @@ -1261,24 +1299,25 @@ TabPage TP_OUTLINE_NUM TEXT [ italian ] = "(nessuno)" ; TEXT [ portuguese_brazilian ] = "(nenhum)" ; TEXT [ portuguese ] = "(nenhum)" ; - TEXT [ finnish ] = "(Ei mit滗n)" ; + TEXT [ finnish ] = "(ei mit滗n)" ; TEXT [ danish ] = "(ingen)" ; TEXT [ french ] = "(aucun(e))" ; TEXT [ swedish ] = "(ingen)" ; TEXT [ dutch ] = "(geen)" ; TEXT [ spanish ] = "(ninguna)" ; TEXT [ english_us ] = "(none)" ; - TEXT[ chinese_simplified ] = "(无)"; - TEXT[ russian ] = "(徨)"; + TEXT[ chinese_simplified ] = "(鏃)"; + TEXT[ russian ] = "(礤)"; TEXT[ polish ] = "(brak)"; - TEXT[ japanese ] = "(側偟)"; - TEXT[ chinese_traditional ] = "(礚)"; + TEXT[ japanese ] = "(銇仐)"; + TEXT[ chinese_traditional ] = "(鐒)"; TEXT[ arabic ] = "(认驿)"; TEXT[ greek ] = "(赆磔磲)"; - TEXT[ korean ] = "(绝澜)"; + TEXT[ korean ] = "(鞐嗢潓)"; TEXT[ turkish ] = "(Yok)"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "(ninguna)"; + TEXT[ catalan ] = "(cap)"; + TEXT[ thai ] = "(喙勦浮喙堗浮喔)"; }; }; @@ -1286,3 +1325,20 @@ TabPage TP_OUTLINE_NUM + + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/misc/pgfnote.src b/sw/source/ui/misc/pgfnote.src index 88d76fd80c23..71cf0d837cc4 100644 --- a/sw/source/ui/misc/pgfnote.src +++ b/sw/source/ui/misc/pgfnote.src @@ -2,9 +2,9 @@ * * $RCSfile: pgfnote.src,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:29:02 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,7 +77,7 @@ TabPage TP_FOOTNOTE_PAGE Text [ italian ] = "Altezza massima come pagina" ; Text [ portuguese_brazilian ] = "Altura de p?gina no m ximo" ; Text [ portuguese ] = "N鉶 superior 醨ea da p醙ina" ; - Text [ finnish ] = "~Ei sivualuetta suurempi" ; + Text [ finnish ] = "E~i sivualuetta suurempi" ; Text [ danish ] = "Op til maksimal sideh鴍de" ; Text [ french ] = "Hauteur maximale de la p~age" ; Text [ swedish ] = "H鰆d maximalt som ~sida" ; @@ -86,17 +86,18 @@ TabPage TP_FOOTNOTE_PAGE Text [ english_us ] = "~Not larger than page area" ; TabStop = TRUE ; Group = TRUE ; - Text[ chinese_simplified ] = "最高不超过页高(~N)"; - Text[ russian ] = "湾犷朦 恹耦螓 耱疣龛鳆"; + Text[ chinese_simplified ] = "鏈楂樹笉瓒呰繃椤甸珮(~N)"; + Text[ russian ] = "湾 犷朦 恹耦螓 耱疣龛鳆"; Text[ polish ] = "Nie wy縠j ni na obszarze strony"; - 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 ] = "En fazla sayfa y黭sekli餴nde"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Altura m醻xima como p醙ina"; + Text[ catalan ] = "Al鏰da m鄜xima de p鄃ina"; + Text[ thai ] = "喙剘喔∴箞喙冟斧喔嵿箞喔佮抚喙堗覆喔炧阜喙夃笝喔椸傅喙堗斧喔權箟喔"; }; RadioButton RB_MAXHEIGHT { @@ -108,24 +109,25 @@ TabPage TP_FOOTNOTE_PAGE Text [ italian ] = "Altezza massima nota a pi pagina" ; Text [ portuguese_brazilian ] = "Max. ~Height of Footnote" ; Text [ portuguese ] = "~Altura m醲ima da nota de rodap" ; - Text [ finnish ] = "~Alaviitteen korkeus enint滗n" ; + Text [ finnish ] = "Ala~viitteen korkeus enint滗n" ; Text [ danish ] = "Maks. h鴍de fodnote" ; - Text [ french ] = "Hauteur max. du ~pied de page" ; + Text [ french ] = "Hauteur maximale de la note" ; Text [ swedish ] = "Fotnotens ma~ximala h鰆d" ; Text [ dutch ] = "~Maximum hoogte" ; Text [ spanish ] = "Altura m醲. de ~nota al pie" ; Text [ english_us ] = "Maximum footnote ~height" ; - Text[ chinese_simplified ] = "注脚的最高度(~H)"; + Text[ chinese_simplified ] = "娉ㄨ剼鐨勬渶楂樺害(~H)"; Text[ russian ] = "锑犟. 恹耦蜞 耥铖觇"; Text[ polish ] = "~Maks. wysoko滄 przypis體 doln."; - Text[ japanese ] = "媟拲偺嵟崅偺崅偝(~H)"; - Text[ chinese_traditional ] = "爹竲程蔼(~H)"; + Text[ japanese ] = "鑴氭敞銇渶楂樸伄楂樸仌(~H)"; + Text[ chinese_traditional ] = "瑷昏叧鐨勬渶楂(~H)"; Text[ arabic ] = "轻茄瘦勤 轻棉侦 後颓皂 轻虞犴"; Text[ greek ] = "梯汩篝 矧 躔矬珈暹珧"; - Text[ korean ] = "阿林 弥措 臭捞(~H)"; + Text[ korean ] = "臧侅＜ 斓滊寑 雴掛澊(~H)"; Text[ turkish ] = "Azami dipnot y黭sekli餴"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Altura m醲. de ~nota al pie"; + Text[ catalan ] = "Al鏰da m鄕. de ~nota al peu"; + Text[ thai ] = "喔勦抚喔侧浮~喔腹喔囙箑喔娻复喔囙腑喔｀福喔栢笚喔掂箞喔∴覆喔佮笚喔掂箞喔父喔"; }; MetricField ED_MAXHEIGHT { @@ -156,7 +158,7 @@ TabPage TP_FOOTNOTE_PAGE Text [ italian ] = "~Distanza dal corpo del testo" ; Text [ portuguese_brazilian ] = "~Dist?ncia do Corpo do Texto" ; Text [ portuguese ] = "~Dist鈔cia at corpo do texto" ; - Text [ finnish ] = "Et鋓syys tekstiin" ; + Text [ finnish ] = "Et鋓syys tekstist" ; Text [ danish ] = "Afstand til br鴇tekst" ; Text [ french ] = "~蒫art du corps de texte" ; Text [ swedish ] = "~Avst錸d till br鰀text" ; @@ -164,17 +166,18 @@ TabPage TP_FOOTNOTE_PAGE Text [ spanish ] = "~Distancia al cuerpo del texto" ; Text [ english_us ] = "Space to text" ; Left = TRUE ; - Text[ chinese_simplified ] = "至正文的距离(~D)"; - Text[ russian ] = "朽耨蝾龛 铗 蝈犟蜞"; + Text[ chinese_simplified ] = "鑷冲唴鏂囩殑璺濈"; + Text[ russian ] = "朽耨蝾龛 ~漕 蝈犟蜞"; Text[ polish ] = "Odstep do obszaru tekstowego"; - Text[ japanese ] = "杮暥傑偱偺娫妘(~D)"; - Text[ chinese_traditional ] = "ずゅ禯置(~D)"; + Text[ japanese ] = "鏈枃銇俱仹銇枔闅"; + Text[ chinese_traditional ] = "鑷冲収鏂囩殑璺濈"; Text[ arabic ] = "轻阌禽 褪 轻湔"; Text[ greek ] = "~琉翎箸 狃 麸 簋灬 赍殪蓓秕"; - Text[ korean ] = "夯巩俊 措茄 埃拜"; + Text[ korean ] = "韰嶌姢韸胳檧鞚 臧勱博"; Text[ turkish ] = "Metinden uzakl齥"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Distancia al cuerpo del texto"; + Text[ catalan ] = "Espai per al text"; + Text[ thai ] = "喔｀赴喔⑧赴喔箞喔侧竾喔栢付喔囙競喙夃腑喔勦抚喔侧浮"; }; MetricField ED_DIST { @@ -205,22 +208,23 @@ TabPage TP_FOOTNOTE_PAGE Text [ portuguese ] = "羠ea da nota de rodap" ; Text [ finnish ] = "Alaviitealue" ; Text [ danish ] = "Fodnoteomr錮e" ; - Text [ french ] = "Plage note de bas de page" ; + Text [ french ] = "Section notes de bas de page" ; Text [ swedish ] = "Fotnotsomr錮e" ; Text [ dutch ] = "Voetnotenbereik" ; Text [ spanish ] = "羠ea de la nota al pie" ; Text [ english_us ] = "Footnote area" ; - Text[ chinese_simplified ] = "注脚区域"; + Text[ chinese_simplified ] = "娉ㄨ剼鍖哄煙"; Text[ russian ] = "吾豚耱 耥铖铌"; Text[ polish ] = "Zakres przypis體 dolnych"; - Text[ japanese ] = "媟拲斖埻"; - Text[ chinese_traditional ] = "爹竲絛瞅"; + Text[ japanese ] = "鑴氭敞绡勫洸"; + Text[ chinese_traditional ] = "瑷昏叧绡勫湇"; Text[ arabic ] = "湄寝 轻颓皂 轻虞犴"; Text[ greek ] = "绣耖秣 躔矬珈暹珧"; - Text[ korean ] = "阿林 康开"; + Text[ korean ] = "臧侅＜ 鞓侅棴"; Text[ turkish ] = "Dipnot b鰈黰"; Text[ language_user1 ] = " "; - Text[ catalan ] = "羠ea de la nota al pie"; + Text[ catalan ] = "纑ea de la nota al peu"; + Text[ thai ] = "喔炧阜喙夃笝喔椸傅喙堗箑喔娻复喔囙腑喔｀福喔"; }; FixedText FT_LINEPOS { @@ -234,22 +238,23 @@ TabPage TP_FOOTNOTE_PAGE Text [ portuguese_brazilian ] = "~Position" ; Text [ swedish ] = "~Position" ; Text [ danish ] = "Placering" ; - Text [ italian ] = "~Posizione" ; + Text [ italian ] = "Posizione" ; Text [ spanish ] = "~Posici髇" ; - Text [ french ] = "~Position" ; + Text [ french ] = "Position" ; Text [ dutch ] = "~Positie" ; - Text[ chinese_simplified ] = "位置(~P)"; - Text[ russian ] = "项玷鲨"; + Text[ chinese_simplified ] = "浣嶇疆(~P)"; + Text[ russian ] = "项腩驽龛"; Text[ polish ] = "Pozycja"; - 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 ] = "Konum"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Posici髇"; + Text[ catalan ] = "~Posici"; Text[ finnish ] = "~Sijainti"; + Text[ thai ] = "~喔曕赋喙佮斧喔權箞喔"; }; ListBox DLB_LINEPOS { @@ -339,9 +344,9 @@ TabPage TP_FOOTNOTE_PAGE }; StringList [ chinese_simplified ] = { - < "左" ; Default ; > ; - < "居中" ; Default ; > ; - < "右" ; Default ; > ; + < "宸" ; Default ; > ; + < "灞呬腑" ; Default ; > ; + < "鍙" ; Default ; > ; }; StringList [ russian ] = { @@ -357,15 +362,15 @@ TabPage TP_FOOTNOTE_PAGE }; StringList [ japanese ] = { - < "嵍" ; Default ; > ; - < "拞墰" ; Default ; > ; - < "塃" ; Default ; > ; + < "宸" ; Default ; > ; + < "涓ぎ" ; Default ; > ; + < "鍙" ; Default ; > ; }; StringList [ chinese_traditional ] = { - < "オ" ; Default ; > ; - < "竚い" ; Default ; > ; - < "" ; Default ; > ; + < "宸" ; Default ; > ; + < "缃腑" ; Default ; > ; + < "鍙" ; Default ; > ; }; StringList [ arabic ] = { @@ -381,9 +386,9 @@ TabPage TP_FOOTNOTE_PAGE }; StringList [ korean ] = { - < "哭率" ; Default ; > ; - < "啊款单" ; Default ; > ; - < "坷弗率" ; Default ; > ; + < "鞕检" ; Default ; > ; + < "臧鞖措嵃" ; Default ; > ; + < "鞓るジ飒" ; Default ; > ; }; StringList [ turkish ] = { @@ -399,10 +404,16 @@ TabPage TP_FOOTNOTE_PAGE }; StringList [ catalan ] = { - < "A la izquierda" ; Default ; > ; - < "Centrado" ; Default ; > ; - < "Derecha" ; Default ; > ; + < "Esquerra" ; Default ; > ; + < "Centrat" ; Default ; > ; + < "Dreta" ; Default ; > ; }; + StringList [ thai ] = + { + < "喔嬥箟喔侧涪" ; Default ; > ; + < "喔曕福喔囙竵喔ム覆喔" ; Default ; > ; + < "喔傕抚喔" ; Default ; > ; + }; }; FixedText FT_LINETYPE { @@ -418,21 +429,22 @@ TabPage TP_FOOTNOTE_PAGE Text [ swedish ] = "Styr~ka" ; Text [ danish ] = "Styrke" ; Text [ italian ] = "~Spessore" ; - Text [ spanish ] = "~Grosor" ; + Text [ spanish ] = "~Espesor" ; Text [ french ] = "~蓀aisseur" ; Text [ dutch ] = "~Sterkte" ; - Text[ chinese_simplified ] = "线条粗细(~W)"; + Text[ chinese_simplified ] = "绾挎潯绮楃粏(~W)"; Text[ russian ] = "翌膣桧 腓龛"; Text[ polish ] = "Grubo滄"; - Text[ japanese ] = "慄偺懢偝(~W)"; - Text[ chinese_traditional ] = "絬兵彩灿(~W)"; + Text[ japanese ] = "绶氥伄澶仌(~W)"; + Text[ chinese_traditional ] = "绶氭绮楃窗(~W)"; Text[ arabic ] = "吁泮 轻呜"; Text[ greek ] = "熊黠 泷犰燹"; - Text[ korean ] = "滴膊(~W)"; + Text[ korean ] = "甑店赴(~W)"; Text[ turkish ] = "莍zgi kal."; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Grosor"; - Text[ finnish ] = "~Paino"; + Text[ catalan ] = "~Pes"; + Text[ finnish ] = "Pa~ksuus"; + Text[ thai ] = "~喔權箟喔赤斧喔權副喔"; }; ListBox DLB_LINETYPE { @@ -460,18 +472,19 @@ TabPage TP_FOOTNOTE_PAGE Text [ spanish ] = "~Longitud" ; Text [ french ] = "~Longueur" ; Text [ dutch ] = "L~engte" ; - Text[ chinese_simplified ] = "长度(~L)"; + Text[ chinese_simplified ] = "闀垮害(~L)"; Text[ russian ] = "碾桧"; Text[ polish ] = "D硊go滄"; - 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 ] = "Uzunluk"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Longitud"; Text[ finnish ] = "~Pituus"; + Text[ thai ] = "喔勦抚喔侧浮~喔⑧覆喔"; }; MetricField ED_LINEWIDTH { @@ -499,25 +512,26 @@ TabPage TP_FOOTNOTE_PAGE Text [ italian ] = "Distanza dal contenuto delle note" ; Text [ portuguese_brazilian ] = "Dist?n~cia" ; Text [ portuguese ] = "E~spa鏰m. entre tra鏾 e texto" ; - Text [ finnish ] = "~Et鋓syys alaviitteiden sis鋖t鲻n" ; - Text [ danish ] = "Afstand til fodnoteindholdet" ; + Text [ finnish ] = "~Et鋓syys alaviitteiden sis鋖l鰏t" ; + Text [ danish ] = "A~fstand til fodnoteindholdet" ; Text [ french ] = "~蒫art entre trait et texte" ; Text [ swedish ] = "Avst錸~d till fotnotens inneh錶l" ; Text [ dutch ] = "~Afstand tot inhoud voetnoot" ; Text [ spanish ] = "~Espacio al contenido de la nota" ; Text [ english_us ] = "~Spacing to footnote contents" ; Left = TRUE ; - Text[ chinese_simplified ] = "至注脚文的间隔(~S)"; - Text[ russian ] = "朽耨蝾龛 铗 蝈犟蜞 耥铖觇"; + Text[ chinese_simplified ] = "鑷虫敞鑴氭枃鐨勯棿闅(~S)"; + Text[ russian ] = "朽耨蝾龛 漕 蝈犟蜞 耥铖觇"; Text[ polish ] = "Odst阷 od przypis體 dolnych"; - Text[ japanese ] = "媟拲傑偱偺娫妘(~S)"; - Text[ chinese_traditional ] = "爹竲ゅ丁筳(~S)"; + Text[ japanese ] = "鑴氭敞銇俱仹銇枔闅(~S)"; + Text[ chinese_traditional ] = "鑷宠ɑ鑵虫枃鐨勯枔闅(~S)"; Text[ arabic ] = "轻阌禽 褪 阃舒砬 轻颓皂 轻虞犴"; Text[ language_user1 ] = " "; Text[ greek ] = "琉~翎箸 狃 麸 疱耖鬻屙 躔矬珈暹珧"; - Text[ korean ] = "阿林 郴侩俊 措茄 埃拜(~S)"; + Text[ korean ] = "臧侅＜ 雮挫毄瓿检潣 臧勱博(~S)"; Text[ turkish ] = "Dipnot i鏴ri餴ne uzakl齥"; - Text[ catalan ] = "~Espacio al contenido de la nota"; + Text[ catalan ] = "~Espaiat continguts de la nota al peu"; + Text[ thai ] = "~喔｀赴喔⑧赴喔箞喔侧竾喔栢付喔囙箑喔權阜喙夃腑喔覆喙喔娻复喔囙腑喔｀福喔"; }; MetricField ED_LINEDIST { @@ -546,27 +560,41 @@ TabPage TP_FOOTNOTE_PAGE Text [ italian ] = "Linea di separazione" ; Text [ portuguese_brazilian ] = "Linha" ; Text [ portuguese ] = "Linha de separa玢o" ; - Text [ finnish ] = "Erotin" ; - Text [ danish ] = "Skillelinje" ; + Text [ finnish ] = "Erotinviiva" ; + Text [ danish ] = "Separator" ; Text [ french ] = "Trait de s閜aration" ; Text [ swedish ] = "Skiljelinje" ; Text [ dutch ] = "Scheidingslijn" ; Text [ spanish ] = "L韓ea de separaci髇" ; Text [ english_us ] = "Separator line" ; - Text[ chinese_simplified ] = "分隔线"; + Text[ chinese_simplified ] = "鍒嗛殧绾"; Text[ russian ] = "朽玟咫栩咫 腓龛"; Text[ polish ] = "Separator"; - Text[ japanese ] = "嫬奅慄傪堷偔"; - Text[ chinese_traditional ] = "だ筳絬"; + Text[ japanese ] = "澧冪晫绶"; + Text[ chinese_traditional ] = "鍒嗛殧绶"; Text[ arabic ] = "轻呜 轻萸蔗"; Text[ greek ] = "拈狩轶糸贽 泷犰燹"; - Text[ korean ] = "备盒急"; + Text[ korean ] = "甑秳靹"; Text[ turkish ] = "Ay齬ma 鏸zgisi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "L韓ea de separaci髇"; + Text[ catalan ] = "L韓ia de separaci"; + Text[ thai ] = "喔曕副喔о箒喔⑧竵喔氞福喔｀笚喔编笖"; }; }; + + + + + + + + + + + + + diff --git a/sw/source/ui/misc/pggrid.src b/sw/source/ui/misc/pggrid.src index 3bfd3771a2b5..3385845db4d2 100644 --- a/sw/source/ui/misc/pggrid.src +++ b/sw/source/ui/misc/pggrid.src @@ -2,9 +2,9 @@ * * $RCSfile: pggrid.src,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: kz $ $Date: 2002-06-13 13:31:46 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,25 +74,25 @@ TabPage TP_TEXTGRID_PAGE Text = "Raster" ; Text [ english_us ] = "Grid" ; Text[ portuguese ] = "Grid"; - Text[ russian ] = "Grid"; + Text[ russian ] = "彦蜿"; Text[ greek ] = "Grid"; - Text[ dutch ] = "Grid"; + Text[ dutch ] = "Raster"; Text[ french ] = "Grille"; Text[ spanish ] = "Cuadr韈ula"; - Text[ finnish ] = "Grid"; + Text[ finnish ] = "Ruudukko"; Text[ italian ] = "Griglia"; - Text[ danish ] = "Grid"; + Text[ danish ] = "Gitter"; Text[ swedish ] = "Raster"; Text[ polish ] = "Grid"; Text[ portuguese_brazilian ] = "Grid"; - Text[ japanese ] = "銈般儶銉冦儔绶"; - Text[ korean ] = "攴鸽Μ霌滌劆"; + Text[ japanese ] = "琛屾暟銇ㄦ枃瀛楁暟"; + Text[ korean ] = "攴鸽Μ霌"; Text[ chinese_simplified ] = "鏍煎瓙绾"; Text[ chinese_traditional ] = "鏍煎瓙绶"; Text[ turkish ] = "Grid"; Text[ arabic ] = "Grid"; - Text[ catalan ] = "Grid"; - Text[ thai ] = "Grid"; + Text[ catalan ] = "Captura/encaixa"; + Text[ thai ] = "喙喔箟喔權笗喔侧福喔侧竾"; }; RadioButton RB_NOGRID { @@ -101,19 +101,19 @@ TabPage TP_TEXTGRID_PAGE Text = "Kein Raster" ; Text [ english_us ] = "No grid" ; Text[ portuguese ] = "No grid"; - Text[ russian ] = "No grid"; + Text[ russian ] = "铃 皴蜿"; Text[ greek ] = "No grid"; - Text[ dutch ] = "No grid"; + Text[ dutch ] = "~Geen raster"; Text[ french ] = "Aucune grille"; Text[ spanish ] = "Sin cuadr韈ula"; - Text[ finnish ] = "No grid"; + Text[ finnish ] = "Ei ruudukkoa"; Text[ italian ] = "Nessuna griglia"; - Text[ danish ] = "No grid"; + Text[ danish ] = "Intet gitter"; Text[ swedish ] = "Inget raster"; Text[ polish ] = "No grid"; Text[ portuguese_brazilian ] = "No grid"; - Text[ japanese ] = "銈般儶銉冦儔绶氥仾銇"; - Text[ korean ] = "攴鸽Μ霌滌劆 鞐嗢潓"; + Text[ japanese ] = "妯欐簴銇枃瀛楁暟銈掍娇銇"; + Text[ korean ] = "攴鸽Μ霌 鞐嗢潓"; Text[ chinese_simplified ] = "涓嶄娇鐢ㄦ牸瀛愮嚎"; Text[ chinese_traditional ] = "涓嶄娇鐢ㄦ牸瀛愮窔"; Text[ turkish ] = "No grid"; @@ -128,19 +128,19 @@ TabPage TP_TEXTGRID_PAGE Text = "Raster (nur Linien)" ; Text [ english_us ] = "Grid (lines only)" ; Text[ portuguese ] = "Grid (lines only)"; - Text[ russian ] = "Grid (lines only)"; + Text[ russian ] = "彦蜿 (蝾朦觐 腓龛)"; Text[ greek ] = "Grid (lines only)"; - Text[ dutch ] = "Grid (lines only)"; + Text[ dutch ] = "Raster (a~lleen lijnen)"; Text[ french ] = "Grille (uniquement les lignes)"; Text[ spanish ] = "Cuadr韈ula (s髄o l韓eas)"; - Text[ finnish ] = "Grid (lines only)"; + Text[ finnish ] = "Ruudukko (vain viivat)"; Text[ italian ] = "Griglia (solo linee)"; - Text[ danish ] = "Grid (lines only)"; + Text[ danish ] = "Gitter (kun linjer)"; Text[ swedish ] = "Raster (bara linjer)"; Text[ polish ] = "Grid (lines only)"; Text[ portuguese_brazilian ] = "Grid (lines only)"; - Text[ japanese ] = "銈般儶銉冦儔绶 (琛屻偘銉儍銉夌窔銇伩)"; - Text[ korean ] = "攴鸽Μ霌滌劆(欷 毵)"; + Text[ japanese ] = "琛屾暟銇犮亼銈掓寚瀹氥仚銈"; + Text[ korean ] = "攴鸽Μ霌 (欷 毵)"; Text[ chinese_simplified ] = "鏍煎瓙绾(浠呯嚎鏉)"; Text[ chinese_traditional ] = "鏍煎瓙绶(鍍呯窔姊)"; Text[ turkish ] = "Grid (lines only)"; @@ -155,19 +155,19 @@ TabPage TP_TEXTGRID_PAGE Text = "Raster (Linien und Zeichen)" ; Text [ english_us ] = "Grid (lines and characters)" ; Text[ portuguese ] = "Grid (lines and characters)"; - Text[ russian ] = "Grid (lines and characters)"; + Text[ russian ] = "彦蜿 (腓龛 耔焘铍)"; Text[ greek ] = "Grid (lines and characters)"; - Text[ dutch ] = "Grid (lines and characters)"; + Text[ dutch ] = "Raster (li~jnen en tekens)"; Text[ french ] = "Grille (lignes et caract鑢es)"; Text[ spanish ] = "Cuadr韈ula (l韓eas y caracteres)"; - Text[ finnish ] = "Grid (lines and characters)"; + Text[ finnish ] = "Ruudukko (viivat ja merkit)"; Text[ italian ] = "Griglia (linee e caratteri)"; - Text[ danish ] = "Grid (lines and characters)"; + Text[ danish ] = "Gitter (linier og tegn)"; Text[ swedish ] = "Raster (linjer och tecken)"; Text[ polish ] = "Grid (lines and characters)"; Text[ portuguese_brazilian ] = "Grid (lines and characters)"; - Text[ japanese ] = "銈般儶銉冦儔绶 (琛屻偘銉儍銉夌窔銇ㄦ枃瀛椼偘銉儍銉夌窔)"; - Text[ korean ] = "攴鸽Μ霌滌劆(欷勱臣 氍胳瀽)"; + Text[ japanese ] = "琛屾暟銇ㄦ枃瀛楁暟銈掓寚瀹氥仚銈"; + Text[ korean ] = "攴鸽Μ霌 (欷勱臣 氍胳瀽)"; Text[ chinese_simplified ] = "鏍煎瓙绾(绾挎潯鍜屽瓧绗)"; Text[ chinese_traditional ] = "鏍煎瓙绶(绶氭鍜屽瓧鍏)"; Text[ turkish ] = "Grid (lines and characters)"; @@ -187,19 +187,19 @@ TabPage TP_TEXTGRID_PAGE Text = "Rasterlayout" ; Text [ english_us ] = "Grid layout" ; Text[ portuguese ] = "Grid layout"; - Text[ russian ] = "Grid layout"; + Text[ russian ] = "朽珈弪赅 皴蜿"; Text[ greek ] = "Grid layout"; - Text[ dutch ] = "Grid layout"; + Text[ dutch ] = "Rasterlay-out"; Text[ french ] = "Quadrillage"; Text[ spanish ] = "Dise駉 de cuadr韈ula"; - Text[ finnish ] = "Grid layout"; + Text[ finnish ] = "Ruudukon asettelu"; Text[ italian ] = "Layout griglia"; - Text[ danish ] = "Grid layout"; + Text[ danish ] = "Gitterlayout"; Text[ swedish ] = "Rasterlayout"; Text[ polish ] = "Grid layout"; Text[ portuguese_brazilian ] = "Grid layout"; - Text[ japanese ] = "銈般儶銉冦儔绶氥伄瑷畾"; - Text[ korean ] = "攴鸽Μ霌滌劆 靹れ爼"; + Text[ japanese ] = "琛屾暟銇ㄦ枃瀛楁暟銇ō瀹"; + Text[ korean ] = "攴鸽Μ霌 霠堨澊鞎勳泝"; Text[ chinese_simplified ] = "鏍煎瓙绾跨増寮"; Text[ chinese_traditional ] = "鏍煎瓙绶氱増寮"; Text[ turkish ] = "Grid layout"; @@ -214,14 +214,14 @@ TabPage TP_TEXTGRID_PAGE Text = "Zeilen pro Seite" ; Text [ english_us ] = "Lines per page" ; Text[ portuguese ] = "Lines per page"; - Text[ russian ] = "Lines per page"; + Text[ russian ] = "髓龛 磬 耱疣龛鲶"; Text[ greek ] = "Lines per page"; - Text[ dutch ] = "Lines per page"; + Text[ dutch ] = "Te~kens per pagina"; Text[ french ] = "Lignes par page"; Text[ spanish ] = "L韓eas por p醙ina"; - Text[ finnish ] = "Lines per page"; + Text[ finnish ] = "Rivej sivulla"; Text[ italian ] = "Righe per pagina"; - Text[ danish ] = "Lines per page"; + Text[ danish ] = "R鎘ker pr. side"; Text[ swedish ] = "Rader per sida"; Text[ polish ] = "Lines per page"; Text[ portuguese_brazilian ] = "Lines per page"; @@ -257,19 +257,19 @@ TabPage TP_TEXTGRID_PAGE Text = "Max. Basistextgr鲞e" ; Text [ english_us ] = "Max. base text size" ; Text[ portuguese ] = "Base text size"; - Text[ russian ] = "Base text size"; + Text[ russian ] = "朽珈屦 铖眍忭钽 蝈犟蜞"; Text[ greek ] = "Base text size"; - Text[ dutch ] = "Base text size"; + Text[ dutch ] = "~Basistekstgrootte"; Text[ french ] = "Taille max. du texte de base"; - Text[ spanish ] = "Tama駉 m醲. texto base"; - Text[ finnish ] = "Base text size"; + Text[ spanish ] = "Tama駉 m醲. del texto de base"; + Text[ finnish ] = "Leip鋞ekstin koko"; Text[ italian ] = "Dimensioni max. testo base"; - Text[ danish ] = "Base text size"; + Text[ danish ] = "Basistekstst鴕relse"; Text[ swedish ] = "Max. storlek bastext"; Text[ polish ] = "Base text size"; Text[ portuguese_brazilian ] = "Base text size"; Text[ japanese ] = "瀵捐薄鏂囧瓧鍒椼伄鏈澶с偟銈ゃ偤"; - Text[ korean ] = "旮半掣 韰嶌姢韸 韥赴"; + Text[ korean ] = "雽靸 氍胳瀽鞐 斓滊寑 韥赴"; Text[ chinese_simplified ] = "鏈澶х殑涓绘枃瀛楀ぇ灏"; Text[ chinese_traditional ] = "鏈澶х殑涓绘枃瀛楀ぇ灏"; Text[ turkish ] = "Base text size"; @@ -301,14 +301,14 @@ TabPage TP_TEXTGRID_PAGE Text = "Zeichen pro Zeile" ; Text [ english_us ] = "Characters per line" ; Text[ portuguese ] = "Characters per line"; - Text[ russian ] = "Characters per line"; + Text[ russian ] = "谚焘铍钼 磬 耱疣龛鲶"; Text[ greek ] = "Characters per line"; - Text[ dutch ] = "Characters per line"; + Text[ dutch ] = "~Tekens per regel"; Text[ french ] = "Caract鑢es par ligne"; Text[ spanish ] = "Caracteres por l韓ea"; - Text[ finnish ] = "Characters per line"; + Text[ finnish ] = "Merkkej rivill"; Text[ italian ] = "Caratteri per riga"; - Text[ danish ] = "Characters per line"; + Text[ danish ] = "Tegn pr. r鎘ke"; Text[ swedish ] = "Tecken per rad"; Text[ polish ] = "Characters per line"; Text[ portuguese_brazilian ] = "Characters per line"; @@ -344,19 +344,19 @@ TabPage TP_TEXTGRID_PAGE Text = "Max. Ruby-Textgr鲞e" ; Text [ english_us ] = "Max. Ruby text size" ; Text[ portuguese ] = "Ruby text size"; - Text[ russian ] = "Ruby text size"; + Text[ russian ] = "朽珈屦 蝈犟蜞 蝠囗耜痂秭梃"; Text[ greek ] = "Ruby text size"; - Text[ dutch ] = "Ruby text size"; + Text[ dutch ] = "Rub~y-tekstgrootte"; Text[ french ] = "Taille max. du texte Ruby"; Text[ spanish ] = "Tama駉 m醲. texto Ruby"; - Text[ finnish ] = "Ruby text size"; + Text[ finnish ] = "Ruby-tekstin koko"; Text[ italian ] = "Dimens. max. testo Ruby"; - Text[ danish ] = "Ruby text size"; + Text[ danish ] = "Fonetisk tekst - Tekstst鴕relse"; Text[ swedish ] = "Max. storlek ruby-text"; Text[ polish ] = "Ruby text size"; Text[ portuguese_brazilian ] = "Ruby text size"; Text[ japanese ] = "銉儞鏂囧瓧銇渶澶с偟銈ゃ偤"; - Text[ korean ] = "耄箘 韰嶌姢韸 韥赴"; + Text[ korean ] = "斓滊寑 雿щ 氍胳瀽 韥赴"; Text[ chinese_simplified ] = "鏈澶х殑鎷奸煶鏂囧瓧澶у皬"; Text[ chinese_traditional ] = "鏈澶х殑娉ㄩ煶绗﹁櫉澶у皬"; Text[ turkish ] = "Ruby text size"; @@ -388,19 +388,19 @@ TabPage TP_TEXTGRID_PAGE Text = "Ruby-Text unter/links vom Basistext" ; Text [ english_us ] = "Ruby text below/left from base text" ; Text[ portuguese ] = "Ruby text below/left from base text"; - Text[ russian ] = "Ruby text below/left from base text"; + Text[ russian ] = "义犟 蝠囗耜痂秭梃 龛驽/脲忮 铖眍忭钽 蝈犟蜞"; Text[ greek ] = "Ruby text below/left from base text"; - Text[ dutch ] = "Ruby text below/left from base text"; + Text[ dutch ] = "R~uby-tekst onder/links van basistekst"; Text[ french ] = "Texte Ruby en bas/ gauche du texte de base"; - Text[ spanish ] = "Texto Ruby debajo/a la izquierda del texto base"; - Text[ finnish ] = "Ruby text below/left from base text"; + Text[ spanish ] = "Texto Ruby debajo/a la izquierda del texto de base"; + Text[ finnish ] = "Leip鋞ekstin alapuolella tai vasemmalla oleva Ruby-teksti"; Text[ italian ] = "Testo Ruby in basso/a sinistra dal testo base"; - Text[ danish ] = "Ruby text below/left from base text"; + Text[ danish ] = "Fonetisk tekst. Under/til venstre for basistekst"; Text[ swedish ] = "Ruby-text nedanf鰎/till v鋘ster om bastext"; Text[ polish ] = "Ruby text below/left from base text"; Text[ portuguese_brazilian ] = "Ruby text below/left from base text"; - Text[ japanese ] = "銉儞鏂囧瓧銈掑璞℃枃瀛楀垪銇笅(妯浉銇)銇俱仧銇乏(绺︽浉銇)銇ō瀹氥仚銈"; - Text[ korean ] = "旮半掣 韰嶌姢韸鸽攵韯 耄箘 韰嶌姢韸鸽ゼ 鞎勲灅/鞕检"; + Text[ japanese ] = "銉儞銈掑璞℃枃瀛椼伄涓嬨伨銇熴伅宸︺伀琛ㄧず"; + Text[ korean ] = "雿щ 氍胳瀽毳 旮半掣 氍胳瀽鞚 鞎勲灅/鞕检鞐 氚办箻"; Text[ chinese_simplified ] = "鎷奸煶鏂囧瓧鍦ㄤ富鏂囧瓧鐨勫乏涓嬫柟"; Text[ chinese_traditional ] = "娉ㄩ煶绗﹁櫉鍦ㄤ富鏂囧瓧鐨勫乏涓嬫柟"; Text[ turkish ] = "Ruby text below/left from base text"; @@ -415,19 +415,19 @@ TabPage TP_TEXTGRID_PAGE Text = "Rasterdarstellung" ; Text [ english_us ] = "Grid display" ; Text[ portuguese ] = "Grid display"; - Text[ russian ] = "Grid display"; + Text[ russian ] = "悟钺疣驽龛 皴蜿"; Text[ greek ] = "Grid display"; - Text[ dutch ] = "Grid display"; - Text[ french ] = "Repr閟entation de la grille"; + Text[ dutch ] = "Rasterweergave"; + Text[ french ] = "Affichage de la grille"; Text[ spanish ] = "Representaci髇 de la cuadr韈ula"; - Text[ finnish ] = "Grid display"; + Text[ finnish ] = "Ruudukon n鋣tt鋗inen"; Text[ italian ] = "Vista griglia"; - Text[ danish ] = "Grid display"; + Text[ danish ] = "Gittervisning"; Text[ swedish ] = "Rastervisning"; Text[ polish ] = "Grid display"; Text[ portuguese_brazilian ] = "Grid display"; - Text[ japanese ] = "銈般儶銉冦儔绶氥伄琛ㄧず"; - Text[ korean ] = "攴鸽Μ霌滌劆 響滌嫓"; + Text[ japanese ] = "缃窔銇〃绀"; + Text[ korean ] = "攴鸽Μ霌 響滌嫓"; Text[ chinese_simplified ] = "鏄剧ず鏍煎瓙绾"; Text[ chinese_traditional ] = "椤ず鏍煎瓙绶"; Text[ turkish ] = "Grid display"; @@ -442,25 +442,25 @@ TabPage TP_TEXTGRID_PAGE Text = "Raster anzeigen" ; Text [ english_us ] = "Display grid" ; Text[ portuguese ] = "Display grid"; - Text[ russian ] = "Display grid"; + Text[ russian ] = "悟钺疣驵螯 皴蜿"; Text[ greek ] = "Display grid"; - Text[ dutch ] = "Display grid"; + Text[ dutch ] = "~Raster weergeven"; Text[ french ] = "Afficher la grille"; Text[ spanish ] = "Mostrar cuadr韈ula"; - Text[ finnish ] = "Display grid"; + Text[ finnish ] = "N鋣t ruudukko"; Text[ italian ] = "Mostra griglia"; - Text[ danish ] = "Display grid"; + Text[ danish ] = "Vis gitter"; Text[ swedish ] = "Visa raster"; Text[ polish ] = "Display grid"; Text[ portuguese_brazilian ] = "Display grid"; - Text[ japanese ] = "銈般儶銉冦儔绶氥倰琛ㄧず銇欍倠"; - Text[ korean ] = "攴鸽Μ霌滌劆 響滌嫓"; + Text[ japanese ] = "缃窔銈掕〃绀恒仚銈"; + Text[ korean ] = "攴鸽Μ霌 響滌嫓"; Text[ chinese_simplified ] = "鏄剧ず鏍煎瓙绾"; Text[ chinese_traditional ] = "椤ず鏍煎瓙绶"; Text[ turkish ] = "Display grid"; Text[ arabic ] = "Display grid"; - Text[ catalan ] = "Display grid"; - Text[ thai ] = "Display grid"; + Text[ catalan ] = "Visualitza la graella"; + Text[ thai ] = "喙佮釜喔斷竾喙喔箟喔權笗喔侧福喔侧竾"; }; CheckBox CB_PRINT { @@ -469,19 +469,19 @@ TabPage TP_TEXTGRID_PAGE Text = "Raster ausdrucken" ; Text [ english_us ] = "Print grid" ; Text[ portuguese ] = "Print grid"; - Text[ russian ] = "Print grid"; + Text[ russian ] = "襄鬣蜞螯 皴蜿"; Text[ greek ] = "Print grid"; - Text[ dutch ] = "Print grid"; + Text[ dutch ] = "R~aster afdrukken"; Text[ french ] = "Imprimer la grille"; Text[ spanish ] = "Imprimir cuadr韈ula"; - Text[ finnish ] = "Print grid"; + Text[ finnish ] = "Tulosta ruudukko"; Text[ italian ] = "Stampa griglia"; - Text[ danish ] = "Print grid"; + Text[ danish ] = "Udskriv gitter"; Text[ swedish ] = "Skriv ut raster"; Text[ polish ] = "Print grid"; Text[ portuguese_brazilian ] = "Print grid"; - Text[ japanese ] = "銈般儶銉冦儔绶氥倰鍗板埛銇欍倠"; - Text[ korean ] = "攴鸽Μ霌滌劆 鞚胳噭"; + Text[ japanese ] = "缃窔銈掑嵃鍒枫仚銈"; + Text[ korean ] = "攴鸽Μ霌 鞚胳噭"; Text[ chinese_simplified ] = "鎵撳嵃鏍煎瓙绾"; Text[ chinese_traditional ] = "鍒楀嵃鏍煎瓙绶"; Text[ turkish ] = "Print grid"; @@ -496,19 +496,19 @@ TabPage TP_TEXTGRID_PAGE Text = "Rasterfarbe" ; Text [ english_us ] = "Grid color" ; Text[ portuguese ] = "Grid color"; - Text[ russian ] = "Grid color"; + Text[ russian ] = "肘弪 皴蜿"; Text[ greek ] = "Grid color"; - Text[ dutch ] = "Grid color"; + Text[ dutch ] = "Rast~erkleur"; Text[ french ] = "Couleur de la grille"; Text[ spanish ] = "Color de la cuadr韈ula"; - Text[ finnish ] = "Grid color"; + Text[ finnish ] = "Ruudukon v鋜i"; Text[ italian ] = "Colore griglia"; - Text[ danish ] = "Grid color"; + Text[ danish ] = "Gitterfarve"; Text[ swedish ] = "Rasterf鋜g"; Text[ polish ] = "Grid color"; Text[ portuguese_brazilian ] = "Grid color"; - Text[ japanese ] = "銈般儶銉冦儔绶氥伄鑹"; - Text[ korean ] = "攴鸽Μ霌滌劆 靸"; + Text[ japanese ] = "缃窔銇壊"; + Text[ korean ] = "攴鸽Μ霌 靸夓儊"; Text[ chinese_simplified ] = "鏍煎瓙绾跨殑棰滆壊"; Text[ chinese_traditional ] = "鏍煎瓙绶氱殑椤旇壊"; Text[ turkish ] = "Grid color"; @@ -537,3 +537,5 @@ TabPage TP_TEXTGRID_PAGE + + diff --git a/sw/source/ui/misc/redlndlg.src b/sw/source/ui/misc/redlndlg.src index 293ad4909fd6..fd6cd95ce386 100644 --- a/sw/source/ui/misc/redlndlg.src +++ b/sw/source/ui/misc/redlndlg.src @@ -2,9 +2,9 @@ * * $RCSfile: redlndlg.src,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: kz $ $Date: 2002-11-27 16:49:33 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -124,10 +124,10 @@ ModalDialog DLG_MOD_REDLINE_ACCEPT Text[ portuguese_brazilian ] = "Accept or reject AutoFormat changes"; Text[ portuguese ] = "AutoFormato: aceitar ou rejeitar modifica珲es"; Text[ danish ] = "Accepter eller forkast AutoFormat 鎛dringer"; - Text[ french ] = "Revoir les modifications de l'AutoFormat"; + Text[ french ] = "AutoFormat : Accepter ou rejeter les modifications"; Text[ swedish ] = "Acceptera eller ignorera AutoFormat-鋘dringar"; Text[ dutch ] = "AutoOpmaak: Wijzigingen accepteren of verwerpen"; - Text[ spanish ] = "AutoFormato: Aceptar o rechazar cambios"; + Text[ spanish ] = "Aceptar o rechazar modificaciones del Formateado autom醫ico"; Text[ english_us ] = "Accept or Reject AutoFormat Changes"; Text[ chinese_simplified ] = "鑷姩鏍煎紡: 鎺ュ彈鎴栬呰垗寮冩洿鏀瑰唴瀹"; Text[ russian ] = "棱蝾纛痨囹: 镳桧螯 桦 铗觌铐栩 桤戾礤龛"; @@ -159,19 +159,19 @@ Menu MN_REDLINE_POPUP Text [ swedish ] = "Redigera kommentar..." ; Text [ danish ] = "Rediger kommentar..." ; Text [ italian ] = "Modifica commento..." ; - Text [ spanish ] = "Modificar comentario..." ; + Text [ spanish ] = "Editar comentario..." ; Text [ french ] = "蒬iter le commentaire..." ; Text [ dutch ] = "Opmerkingen bewerken..." ; Text [ portuguese ] = "Editar coment醨io..." ; Text[ chinese_simplified ] = "缂栬緫娉ㄨВ..."; - Text[ russian ] = "橡噔赅 觐祆屙蜞痂邂..."; + Text[ russian ] = "橡噔赅 觐祆屙蜞痂..."; Text[ polish ] = "Edytuj komentarz..."; Text[ japanese ] = "銈炽儭銉炽儓銇法闆..."; Text[ language_user1 ] = " "; Text[ chinese_traditional ] = "绶ㄨ集瑷昏В..."; Text[ arabic ] = "释秧 轻授犴..."; Text[ greek ] = "硼孱羼汜筮 篦镫唢..."; - Text[ korean ] = "欤检劃 韼胳..."; + Text[ korean ] = "靹る獏 韼胳..."; Text[ turkish ] = "A琮klamalar d鼁enle..."; Text[ catalan ] = "Edita el comentari..."; Text[ finnish ] = "Muokkaa huomautusta..."; @@ -211,7 +211,7 @@ Menu MN_REDLINE_POPUP Text[ chinese_traditional ] = "鍕曚綔"; Text[ arabic ] = "盘亚"; Text[ greek ] = "彭蓠沐獒"; - Text[ korean ] = "霃欖瀾"; + Text[ korean ] = "鞛戨彊"; Text[ turkish ] = "蔺lem"; Text[ catalan ] = "Acci"; Text[ finnish ] = "Toiminto"; @@ -270,7 +270,7 @@ Menu MN_REDLINE_POPUP Text[ chinese_traditional ] = "鏃ユ湡"; Text[ arabic ] = "轻是秧"; Text[ greek ] = "庆羼镬珥哚"; - Text[ korean ] = "鞚检瀽"; + Text[ korean ] = "雮犾"; Text[ turkish ] = "Tarih"; Text[ language_user1 ] = " "; Text[ catalan ] = "Data"; @@ -294,7 +294,7 @@ Menu MN_REDLINE_POPUP Text [ dutch ] = "Beschrijving" ; Text [ portuguese ] = "Descri玢o" ; Text[ chinese_simplified ] = "璇存槑"; - Text[ russian ] = "物桉囗桢"; + Text[ russian ] = "暑祆屙蜞痂"; Text[ polish ] = "Opis"; Text[ japanese ] = "銈炽儭銉炽儓"; Text[ chinese_traditional ] = "鎻忚堪"; @@ -324,7 +324,7 @@ Menu MN_REDLINE_POPUP Text [ dutch ] = "Documentpositie" ; Text [ portuguese ] = "Posi玢o no documento" ; Text[ chinese_simplified ] = "鏂囨。浣嶇疆"; - Text[ russian ] = "项玷鲨 漕牦戾眚"; + Text[ russian ] = "朽耧铍铈屙桢 漕牦戾眚"; Text[ polish ] = "Pozycja dokumentu"; Text[ japanese ] = "銉夈偔銉ャ儭銉炽儓銇綅缃"; Text[ chinese_traditional ] = "鏂囦欢浣嶇疆"; @@ -355,7 +355,7 @@ Menu MN_REDLINE_POPUP Text[ chinese_traditional ] = "鎺掑簭"; Text[ arabic ] = "菅"; Text[ greek ] = "葬铋睃扃箸"; - Text[ korean ] = "攵勲"; + Text[ korean ] = "鞝曤牞 旮办"; Text[ turkish ] = "S齬ala"; Text[ language_user1 ] = " "; Text[ catalan ] = "Ordena per"; @@ -364,3 +364,8 @@ Menu MN_REDLINE_POPUP }; }; }; + + + + + diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index 4942124887a2..c83687f2a797 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: srtdlg.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: ama $ $Date: 2002-05-08 13:30:39 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -171,22 +171,26 @@ void lcl_ClearLstBoxAndDelUserData( ListBox& rLstBox ) BOOL lcl_GetSelTbl( SwWrtShell &rSh, USHORT& rX, USHORT& rY ) { - BOOL bRet = FALSE; const SwTableNode* pTblNd = rSh.IsCrsrInTbl(); - if( pTblNd ) + if( !pTblNd ) + return FALSE; + + _FndBox aFndBox( 0, 0 ); + + // suche alle Boxen / Lines { SwSelBoxes aSelBoxes; ::GetTblSel( rSh, aSelBoxes ); - _FndBox aFndBox( aSelBoxes ); - - rX = aFndBox.GetLines().Count(); - if( rX ) - { - rY = aFndBox.GetLines()[0]->GetBoxes().Count(); - bRet = TRUE; - } + _FndPara aPara( aSelBoxes, &aFndBox ); + const SwTable& rTbl = pTblNd->GetTable(); + ((SwTableLines&)rTbl.GetTabLines()).ForEach( &_FndLineCopyCol, &aPara ); } - return bRet; + rX = aFndBox.GetLines().Count(); + if( !rX ) + return FALSE; + + rY = aFndBox.GetLines()[0]->GetBoxes().Count(); + return TRUE; } /*-------------------------------------------------------------------- @@ -527,3 +531,8 @@ IMPL_LINK( SwSortDlg, LanguageHdl, ListBox*, pLBox ) return 0; } + + + + + diff --git a/sw/source/ui/misc/srtdlg.src b/sw/source/ui/misc/srtdlg.src index cd0d78ca7b7a..c102a1101b7c 100644 --- a/sw/source/ui/misc/srtdlg.src +++ b/sw/source/ui/misc/srtdlg.src @@ -2,9 +2,9 @@ * * $RCSfile: srtdlg.src,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:31:19 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -113,7 +113,7 @@ ModalDialog DLG_SORTING Text [ italian ] = "Colonna" ; Text [ portuguese_brazilian ] = "Coluna" ; Text [ portuguese ] = "Coluna" ; - Text [ finnish ] = "Sarake " ; + Text [ finnish ] = "Sarake" ; Text [ danish ] = "Kolonne" ; Text [ french ] = "Colonne" ; Text [ swedish ] = "Kolumn" ; @@ -121,17 +121,18 @@ ModalDialog DLG_SORTING Text [ spanish ] = "Columna" ; Text [ english_us ] = "Column" ; Left = TRUE ; - Text[ chinese_simplified ] = "列"; - Text[ russian ] = "暑腩黻"; + Text[ chinese_simplified ] = "鍒"; + Text[ russian ] = "羊铍徨"; Text[ polish ] = "Kolumna"; - Text[ japanese ] = "楍"; - Text[ chinese_traditional ] = "逆"; + Text[ japanese ] = "鍒"; + Text[ chinese_traditional ] = "娆"; Text[ arabic ] = "阢嫦"; Text[ greek ] = "郁揠"; - Text[ korean ] = "凯"; + Text[ korean ] = "雼"; Text[ turkish ] = "S黷un"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Columna"; + Text[ catalan ] = "COLUMN"; + Text[ thai ] = "喔勦腑喔ム副喔∴笝喙"; }; FixedText FT_KEYTYP { @@ -146,23 +147,24 @@ ModalDialog DLG_SORTING Text [ portuguese ] = "Tipo de chave" ; Text [ finnish ] = "Avainlaji" ; Text [ danish ] = "N鴊letype" ; - Text [ french ] = "Type de crit鑢e" ; + Text [ french ] = "Type de cl" ; Text [ swedish ] = "Nyckeltyp" ; Text [ dutch ] = "Sleuteltype" ; Text [ spanish ] = "Tipo de clave" ; Text [ english_us ] = "Key type" ; Left = TRUE ; - Text[ chinese_simplified ] = "关键字类型"; + Text[ chinese_simplified ] = "鍏抽敭瀛楃被鍨"; Text[ russian ] = "诣 觌"; Text[ polish ] = "Typ klucza"; - Text[ japanese ] = "钒偺庬椶"; + Text[ japanese ] = "銈兗銇ó椤"; Text[ language_user1 ] = " "; - Text[ chinese_traditional ] = "闽龄摸"; + Text[ chinese_traditional ] = "闂滈嵉瀛楅鍨"; Text[ arabic ] = "滏 轻爿是"; Text[ greek ] = "札痫 觌彘溟稞"; - Text[ korean ] = "虐 蜡屈"; + Text[ korean ] = "韨 鞙犿槙"; Text[ turkish ] = "Anahtar tipi"; Text[ catalan ] = "Tipo de clave"; + Text[ thai ] = "喔娻笝喔脆笖喔勦傅喔⑧箤"; }; FixedText FT_DIR { @@ -181,17 +183,18 @@ ModalDialog DLG_SORTING Text [ dutch ] = "Volgorde" ; Text [ spanish ] = "Orden" ; Text [ english_us ] = "Order" ; - Text[ chinese_simplified ] = "顺序"; + Text[ chinese_simplified ] = "椤哄簭"; Text[ russian ] = "项漕"; Text[ polish ] = "Kolejno滄"; - Text[ japanese ] = "弴彉"; + Text[ japanese ] = "闋嗗簭"; Text[ language_user1 ] = " "; - Text[ chinese_traditional ] = "抖"; + Text[ chinese_traditional ] = "闋嗗簭"; Text[ arabic ] = "轻恃薯"; Text[ greek ] = "渝轳"; - Text[ korean ] = "鉴辑"; + Text[ korean ] = "靾滌劀"; Text[ turkish ] = "S齬a"; - Text[ catalan ] = "Orden"; + Text[ catalan ] = "Ordre"; + Text[ thai ] = "喔ム赋喔斷副喔"; }; CheckBox CB_KEY1 { @@ -212,17 +215,18 @@ ModalDialog DLG_SORTING Text [ spanish ] = "Clave ~1" ; Text [ english_us ] = "Key ~1" ; Check = TRUE ; - Text[ chinese_simplified ] = "关键字 ~1"; + Text[ chinese_simplified ] = "鍏抽敭瀛 ~1"; Text[ russian ] = "孰 ~1"; Text[ polish ] = "Klucz ~1"; - Text[ japanese ] = "钒 1"; + Text[ japanese ] = "銈兗 1"; Text[ language_user1 ] = " "; - Text[ chinese_traditional ] = "闽龄 ~1"; + Text[ chinese_traditional ] = "闂滈嵉瀛 ~1"; Text[ arabic ] = "爿是 1"; Text[ greek ] = "孰彘溥 ~1"; - Text[ korean ] = "虐 1"; + Text[ korean ] = "韨 1"; Text[ turkish ] = "Anahtar ~1"; Text[ catalan ] = "Clave ~1"; + Text[ thai ] = "喔勦傅喔⑧箤 ~1"; }; NumericField ED_KEY1 { @@ -247,24 +251,25 @@ ModalDialog DLG_SORTING Text[ ENGLISH ] = "Numeric"; Text[ english_us ] = "Numeric"; Text[ portuguese ] = "num閞ico"; - Text[ russian ] = "鲨麴钼铋"; + Text[ russian ] = "骤麴钼铋"; Text[ greek ] = "狁殍扃糸贶"; Text[ dutch ] = "numeriek"; Text[ french ] = "Num閞ique"; - Text[ spanish ] = "num閞ica"; - Text[ italian ] = "numerica"; - Text[ danish ] = "numeric"; - Text[ swedish ] = "numerisk"; + Text[ spanish ] = "Num閞ico"; + Text[ italian ] = "Numerico"; + Text[ danish ] = "Numerisk"; + Text[ swedish ] = "Numeriskt"; Text[ polish ] = "numeryczny"; Text[ portuguese_brazilian ] = "numeric"; - Text[ japanese ] = "悢帤"; - Text[ korean ] = "锅龋"; - Text[ chinese_simplified ] = "数字"; - Text[ chinese_traditional ] = "计"; + Text[ japanese ] = "鏁板瓧"; + Text[ korean ] = "靾瀽"; + Text[ chinese_simplified ] = "鏁板瓧"; + Text[ chinese_traditional ] = "鏁稿瓧"; Text[ turkish ] = "numeric"; Text[ arabic ] = "numeric"; - Text[ finnish ] = "numeerinen"; + Text[ finnish ] = "Numeerinen"; Text[ catalan ] = "numeric"; + Text[ thai ] = "喔曕副喔о箑喔ム競"; }; ListBox DLB_KEY1 { @@ -282,29 +287,30 @@ ModalDialog DLG_SORTING Text = "~Aufsteigend" ; Text [ ENGLISH ] = "~Ascending" ; Text [ norwegian ] = "St~igende" ; - Text [ italian ] = "~Crescente" ; + Text [ italian ] = "Crescente" ; Text [ portuguese_brazilian ] = "~Ascendente" ; Text [ portuguese ] = "~Ascendente" ; Text [ finnish ] = "~Nouseva" ; Text [ danish ] = "Stigende" ; - Text [ french ] = "~Croissant" ; + Text [ french ] = "Croissant" ; Text [ swedish ] = "Stig~ande" ; Text [ dutch ] = "~Oplopend" ; Text [ spanish ] = "~Ascendente" ; Text [ english_us ] = "~Ascending" ; TabStop = TRUE ; Check = TRUE ; - Text[ chinese_simplified ] = "向上(~A)"; + Text[ chinese_simplified ] = "鍚戜笂(~A)"; Text[ russian ] = "项 忸琊囫蜞龛"; Text[ polish ] = "Rosn筩o"; - 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 ] = "Ar~tan"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Ascendente"; + Text[ thai ] = "喔堗覆喔亊喔權箟喔涪喙勦笡喔∴覆喔"; }; RadioButton RB_DN { @@ -313,28 +319,29 @@ ModalDialog DLG_SORTING Text = "A~bsteigend" ; Text [ ENGLISH ] = "~Descending" ; Text [ norwegian ] = "~Synkende" ; - Text [ italian ] = "~Decrescente" ; + Text [ italian ] = "Decrescente" ; Text [ portuguese_brazilian ] = "~Descendente" ; Text [ portuguese ] = "~Descendente" ; Text [ finnish ] = "~Laskeva" ; Text [ danish ] = "Faldende" ; - Text [ french ] = "~D閏roissant" ; + Text [ french ] = "D閏roissant" ; Text [ swedish ] = "Fallan~de" ; Text [ dutch ] = "~Aflopend" ; Text [ spanish ] = "~Descendente" ; Text [ english_us ] = "~Descending" ; TabStop = TRUE ; - Text[ chinese_simplified ] = "向下(~D)"; + Text[ chinese_simplified ] = "鍚戜笅(~D)"; Text[ russian ] = "项 筢囗棹"; Text[ polish ] = "Malej筩o"; - Text[ japanese ] = "崀弴(~D)"; - Text[ chinese_traditional ] = "(~D)"; + Text[ japanese ] = "闄嶉爢(~D)"; + Text[ chinese_traditional ] = "鍚戜笅(~D)"; Text[ arabic ] = "输且犴"; Text[ greek ] = "骤唔秕筢"; - Text[ korean ] = "郴覆瞒鉴(~D)"; + Text[ korean ] = "雮措彀垳(~D)"; Text[ turkish ] = "A~zalan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Descendente"; + Text[ catalan ] = "~Descendent"; + Text[ thai ] = "喔堗覆喔亊喔∴覆喔佮箘喔涏笝喙夃腑喔"; }; CheckBox CB_KEY2 { @@ -354,17 +361,18 @@ ModalDialog DLG_SORTING Text [ dutch ] = "Sleutel ~2" ; Text [ spanish ] = "Clave ~2" ; Text [ english_us ] = "Key ~2" ; - Text[ chinese_simplified ] = "关键字 ~2"; + Text[ chinese_simplified ] = "鍏抽敭瀛 ~2"; Text[ russian ] = "孰 ~2"; Text[ polish ] = "Klucz 2"; - Text[ japanese ] = "钒 2"; + Text[ japanese ] = "銈兗 2"; Text[ language_user1 ] = " "; - Text[ chinese_traditional ] = "闽龄 ~2"; + Text[ chinese_traditional ] = "闂滈嵉瀛 ~2"; Text[ arabic ] = "爿是 2"; Text[ greek ] = "孰彘溥 ~2"; - Text[ korean ] = "虐 2"; + Text[ korean ] = "韨 2"; Text[ turkish ] = "Anahtar ~2"; Text[ catalan ] = "Clave ~2"; + Text[ thai ] = "喔勦傅喔⑧箤 ~2"; }; NumericField ED_KEY2 { @@ -398,29 +406,30 @@ ModalDialog DLG_SORTING Text = "A~ufsteigend" ; Text [ ENGLISH ] = "~Ascending" ; Text [ norwegian ] = "St~igende" ; - Text [ italian ] = "~Crescente" ; + Text [ italian ] = "Crescente" ; Text [ portuguese_brazilian ] = "~Ascendente" ; Text [ portuguese ] = "~Ascendente" ; Text [ finnish ] = "Nouseva" ; Text [ danish ] = "Stigende" ; - Text [ french ] = "~Croissant" ; + Text [ french ] = "Croissant" ; Text [ swedish ] = "Sti~gande" ; Text [ dutch ] = "~Oplopend" ; Text [ spanish ] = "A~scendente" ; Text [ english_us ] = "Ascending" ; TabStop = TRUE ; Check = TRUE ; - Text[ chinese_simplified ] = "向上"; + Text[ chinese_simplified ] = "鍚戜笂"; Text[ russian ] = "项 忸琊囫蜞龛"; Text[ polish ] = "Rosn筩o"; - Text[ japanese ] = "徃弴"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "鏄囬爢"; + Text[ chinese_traditional ] = "鍚戜笂"; Text[ arabic ] = "收勤享"; Text[ greek ] = "笼铒躞"; - Text[ korean ] = "坷抚瞒鉴"; + Text[ korean ] = "鞓る彀垳"; Text[ turkish ] = "Arta~n"; Text[ language_user1 ] = " "; - Text[ catalan ] = "A~scendente"; + Text[ catalan ] = "~Ascendent"; + Text[ thai ] = "喔堗覆喔佮笝喙夃腑喔⑧箘喔涏浮喔侧竵"; }; RadioButton RB_DN2 { @@ -429,28 +438,29 @@ ModalDialog DLG_SORTING Text = "Ab~steigend" ; Text [ ENGLISH ] = "~Descending" ; Text [ norwegian ] = "~Synkende" ; - Text [ italian ] = "~Decrescente" ; + Text [ italian ] = "Decrescente" ; Text [ portuguese_brazilian ] = "~Descendente" ; Text [ portuguese ] = "~Descendente" ; Text [ finnish ] = "Laskeva" ; Text [ danish ] = "Faldende" ; - Text [ french ] = "~D閏roissant" ; + Text [ french ] = "D閏roissant" ; Text [ swedish ] = "Fa~llande" ; Text [ dutch ] = "~Aflopend" ; Text [ spanish ] = "Desc~endente" ; Text [ english_us ] = "Descending" ; TabStop = TRUE ; - Text[ chinese_simplified ] = "向下"; + Text[ chinese_simplified ] = "鍚戜笅"; Text[ russian ] = "项 筢囗棹"; Text[ polish ] = "Malej筩o"; - Text[ japanese ] = "崀弴"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "闄嶉爢"; + Text[ chinese_traditional ] = "鍚戜笅"; Text[ arabic ] = "输且犴"; Text[ greek ] = "骤唔秕筢"; - Text[ korean ] = "郴覆瞒鉴"; + Text[ korean ] = "雮措彀垳"; Text[ turkish ] = "A~rtan"; Text[ language_user1 ] = " "; Text[ catalan ] = "Desc~endente"; + Text[ thai ] = "喔堗覆喔佮浮喔侧竵喙勦笡喔權箟喔涪"; }; CheckBox CB_KEY3 { @@ -465,22 +475,23 @@ ModalDialog DLG_SORTING Text [ portuguese ] = "Tecla ~3" ; Text [ finnish ] = "Avain ~3" ; Text [ danish ] = "N鴊le 3" ; - Text [ french ] = "Crit鑢e ~3" ; + Text [ french ] = "Cl 3" ; Text [ swedish ] = "Nyckel ~3" ; Text [ dutch ] = "Sleutel ~3" ; Text [ spanish ] = "Clave ~3" ; Text [ english_us ] = "Key ~3" ; - Text[ chinese_simplified ] = "关键字 ~3"; + Text[ chinese_simplified ] = "鍏抽敭瀛 ~3"; Text[ russian ] = "孰 ~3"; Text[ polish ] = "Klucz 3"; - Text[ japanese ] = "钒 3"; + Text[ japanese ] = "銈兗 3"; Text[ language_user1 ] = " "; - Text[ chinese_traditional ] = "闽龄 ~3"; + Text[ chinese_traditional ] = "闂滈嵉瀛 ~3"; Text[ arabic ] = "爿是 3"; Text[ greek ] = "孰彘溥 ~3"; - Text[ korean ] = "虐 3"; + Text[ korean ] = "韨 3"; Text[ turkish ] = "Anahtar ~3"; Text[ catalan ] = "Clave ~3"; + Text[ thai ] = "喔勦傅喔⑧箤 ~3"; }; NumericField ED_KEY3 { @@ -514,29 +525,30 @@ ModalDialog DLG_SORTING Text = "Aufstei~gend" ; Text [ ENGLISH ] = "~Ascending" ; Text [ norwegian ] = "St~igende" ; - Text [ italian ] = "~Crescente" ; + Text [ italian ] = "Crescente" ; Text [ portuguese_brazilian ] = "~Ascendente" ; Text [ portuguese ] = "~Ascendente" ; Text [ finnish ] = "Nouseva" ; Text [ danish ] = "Stigende" ; - Text [ french ] = "~Croissant" ; + Text [ french ] = "Croissant" ; Text [ swedish ] = "Stiga~nde" ; Text [ dutch ] = "~Oplopend" ; Text [ spanish ] = "Ascende~nte" ; Text [ english_us ] = "Ascending" ; TabStop = TRUE ; Check = TRUE ; - Text[ chinese_simplified ] = "向上"; + Text[ chinese_simplified ] = "鍚戜笂"; Text[ russian ] = "项 忸琊囫蜞龛"; Text[ polish ] = "Rosn筩o"; - Text[ japanese ] = "徃弴"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "鏄囬爢"; + Text[ chinese_traditional ] = "鍚戜笂"; Text[ arabic ] = "收勤享"; Text[ greek ] = "笼铒躞"; - Text[ korean ] = "坷抚瞒鉴"; + Text[ korean ] = "鞓る彀垳"; Text[ turkish ] = "Artan"; Text[ language_user1 ] = " "; Text[ catalan ] = "Ascende~nte"; + Text[ thai ] = "喔堗覆喔佮笝喙夃腑喔⑧箘喔涏浮喔侧竵"; }; RadioButton RB_DN3 { @@ -545,28 +557,29 @@ ModalDialog DLG_SORTING Text = "Absteigen~d" ; Text [ ENGLISH ] = "~Descending" ; Text [ norwegian ] = "~Synkende" ; - Text [ italian ] = "~Decrescente" ; + Text [ italian ] = "Decrescente" ; Text [ portuguese_brazilian ] = "~Descendente" ; Text [ portuguese ] = "~Descendente" ; Text [ finnish ] = "Laskeva" ; Text [ danish ] = "Faldende" ; - Text [ french ] = "~D閏roissant" ; + Text [ french ] = "D閏roissant" ; Text [ swedish ] = "Falland~e" ; Text [ dutch ] = "~Aflopend" ; Text [ spanish ] = "Des~cendente" ; Text [ english_us ] = "Descending" ; TabStop = TRUE ; - Text[ chinese_simplified ] = "向下"; + Text[ chinese_simplified ] = "鍚戜笅"; Text[ russian ] = "项 筢囗棹"; Text[ polish ] = "Malej筩o"; - Text[ japanese ] = "崀弴"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "闄嶉爢"; + Text[ chinese_traditional ] = "鍚戜笅"; Text[ arabic ] = "输且犴"; Text[ greek ] = "骤唔秕筢"; - Text[ korean ] = "郴覆瞒鉴"; + Text[ korean ] = "雮措彀垳"; Text[ turkish ] = "Aza~lan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Des~cendente"; + Text[ catalan ] = "Desce~ndent"; + Text[ thai ] = "喔堗覆喔佮浮喔侧竵喙勦笡喔權箟喔涪"; }; FixedLine FL_SORT_2 { @@ -578,24 +591,25 @@ ModalDialog DLG_SORTING Text [ italian ] = "Criteri" ; Text [ portuguese_brazilian ] = "Regra" ; Text [ portuguese ] = "Regra" ; - Text [ finnish ] = "Lajitteluperusteet" ; - Text [ danish ] = "Kriterier" ; + Text [ finnish ] = "Lajitteluperuste" ; + Text [ danish ] = "Regel" ; Text [ french ] = "R鑗le" ; Text [ swedish ] = "Regel" ; Text [ dutch ] = "Criteria" ; Text [ spanish ] = "Criterios" ; Text [ english_us ] = "Sort criteria" ; - Text[ chinese_simplified ] = "排序规则"; + Text[ chinese_simplified ] = "鎺掑簭瑙勫垯"; Text[ russian ] = "项漕 耦痱桊钼觇"; Text[ polish ] = "Regu砤"; - Text[ japanese ] = "忦審"; + Text[ japanese ] = "鏉′欢"; Text[ language_user1 ] = " "; - Text[ chinese_traditional ] = "逼砏玥"; + Text[ chinese_traditional ] = "鎺掑簭瑕忓墖"; Text[ arabic ] = "轻捩勤"; Text[ greek ] = "梳睃磲"; - Text[ korean ] = "沥纺 扁霖"; + Text[ korean ] = "鞝曤牞 旮办"; Text[ turkish ] = "Kural"; Text[ catalan ] = "Sort criteria"; + Text[ thai ] = "喙喔佮笓喔戉箤喔佮覆喔｀箑喔｀傅喔⑧竾"; }; RadioButton RB_COL { @@ -615,17 +629,18 @@ ModalDialog DLG_SORTING Text [ spanish ] = "Co~lumnas" ; Text [ english_us ] = "Col~umns" ; TabStop = TRUE ; - Text[ chinese_simplified ] = "列(~U)"; - Text[ russian ] = "暑腩黻"; + Text[ chinese_simplified ] = "鍒(~U)"; + Text[ russian ] = "羊铍狯"; Text[ polish ] = "~Kolumny"; - Text[ japanese ] = "楍(~U)"; - Text[ chinese_traditional ] = "逆(~U)"; + Text[ japanese ] = "鍒(~U)"; + Text[ chinese_traditional ] = "娆(~U)"; Text[ arabic ] = "泌阆"; Text[ greek ] = "郁揠弪"; - Text[ korean ] = "凯(~U)"; + Text[ korean ] = "鞐(~U)"; Text[ turkish ] = "S~黷un"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Co~lumnas"; + Text[ catalan ] = "Co~lumnes"; + Text[ thai ] = "喔勦腑喔ム副喔喔權箤"; }; RadioButton RB_ROW { @@ -639,24 +654,25 @@ ModalDialog DLG_SORTING Text [ portuguese ] = "~Linhas" ; Text [ finnish ] = "~Rivit" ; Text [ danish ] = "R鎘ker" ; - Text [ french ] = "~Lignes" ; + Text [ french ] = "Lignes" ; Text [ swedish ] = "~Rader" ; Text [ dutch ] = "~Rijen" ; Text [ spanish ] = "~Filas" ; Text [ english_us ] = "~Rows" ; TabStop = TRUE ; Check = TRUE ; - Text[ chinese_simplified ] = "行(~R)"; + Text[ chinese_simplified ] = "琛(~R)"; Text[ russian ] = "羊痤觇"; Text[ polish ] = "Wiersze"; - Text[ japanese ] = "峴(~R)"; - Text[ chinese_traditional ] = "︽(~R)"; + Text[ japanese ] = "琛(~R)"; + Text[ chinese_traditional ] = "琛(~R)"; Text[ arabic ] = "蛰孑"; Text[ greek ] = "民犰燧"; - Text[ korean ] = "青(~R)"; + Text[ korean ] = "頄(~R)"; Text[ turkish ] = "~Sat齬"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Filas"; + Text[ catalan ] = "~Files"; + Text[ thai ] = "喙亊喔栢抚"; }; FixedLine FL_DIR { @@ -675,17 +691,18 @@ ModalDialog DLG_SORTING Text [ dutch ] = "Richting" ; Text [ spanish ] = "Direcci髇" ; Text [ english_us ] = "Direction" ; - Text[ chinese_simplified ] = "方向"; + Text[ chinese_simplified ] = "鏂瑰悜"; Text[ russian ] = "袜镳噔脲龛"; Text[ polish ] = "Kierunek"; - Text[ japanese ] = "曽岦"; - Text[ chinese_traditional ] = "よ"; + Text[ japanese ] = "鏂瑰悜"; + Text[ chinese_traditional ] = "鏂瑰悜"; Text[ arabic ] = "轻鞘糖"; Text[ greek ] = "旭矬犴狒镫轶禳"; - Text[ korean ] = "规氢"; + Text[ korean ] = "氚╉枼"; Text[ turkish ] = "Y鰊"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Direction"; + Text[ catalan ] = "Direcci"; + Text[ thai ] = "喔椸复喔ㄠ笚喔侧竾"; }; RadioButton RB_TAB { @@ -697,26 +714,27 @@ ModalDialog DLG_SORTING Text [ italian ] = "~Tabulazione" ; Text [ portuguese_brazilian ] = "~Tabula??o" ; Text [ portuguese ] = "~Tabula珲es" ; - Text [ finnish ] = "~Sarkaimet" ; + Text [ finnish ] = "Sarkaimet" ; Text [ danish ] = "Tabulator" ; - Text [ french ] = "~Tabulation" ; + Text [ french ] = "Tabulation" ; Text [ swedish ] = "~Tabulator" ; Text [ dutch ] = "Ta~b" ; - Text [ spanish ] = "~Tabulaci髇" ; + Text [ spanish ] = "~Tabulador" ; Text [ english_us ] = "~Tabs" ; TabStop = TRUE ; Check = TRUE ; - Text[ chinese_simplified ] = "制表符(~T)"; + Text[ chinese_simplified ] = "鍒惰〃绗(~T)"; Text[ russian ] = "亦狍鲨"; Text[ polish ] = "Tabulator"; - Text[ japanese ] = "捞(~T)"; - Text[ chinese_traditional ] = "籹才(~T)"; + Text[ japanese ] = "銈裤儢(~T)"; + Text[ chinese_traditional ] = "瀹氫綅閸(~T)"; Text[ arabic ] = "卺倾 滔驷"; Text[ greek ] = "郁珉镨蒴珧"; - Text[ korean ] = "徘(~T)"; + Text[ korean ] = "韮(~T)"; Text[ turkish ] = "~Sekmeler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Tabulaci髇"; + Text[ catalan ] = "~Pestanya"; + Text[ thai ] = "~喔｀赴喔⑧赴喔佮副喙夃笝"; }; RadioButton RB_TABCH { @@ -730,23 +748,24 @@ ModalDialog DLG_SORTING Text [ portuguese ] = "~Caracteres" ; Text [ finnish ] = "~Merkki" ; Text [ danish ] = "Tegn" ; - Text [ french ] = "Caract鑢e" ; + Text [ french ] = "Caract鑢es" ; Text [ swedish ] = "Te~cken" ; Text [ dutch ] = "~Teken" ; Text [ spanish ] = "Ca~r醕ter" ; Text [ english_us ] = "~Character" ; TabStop = TRUE ; - Text[ chinese_simplified ] = "字符(~C)"; - Text[ russian ] = "琼嚓"; + Text[ chinese_simplified ] = "瀛楃(~C)"; + Text[ russian ] = "谚焘铍"; Text[ polish ] = "Znak"; - Text[ japanese ] = "婰崋(~C)"; - Text[ chinese_traditional ] = "じ(~C)"; + Text[ japanese ] = "瑷樺彿(~C)"; + Text[ chinese_traditional ] = "瀛楀厓(~C)"; Text[ arabic ] = "猛演"; Text[ greek ] = "揍襻牯揆弪"; - Text[ korean ] = "巩磊(~C)"; + Text[ korean ] = "氍胳瀽(~C)"; Text[ turkish ] = "~Karakter"; Text[ language_user1 ] = " "; Text[ catalan ] = "Ca~r醕ter"; + Text[ thai ] = "~喔曕副喔о腑喔编竵喔傕福喔"; }; Edit ED_TABCH { @@ -773,17 +792,18 @@ ModalDialog DLG_SORTING Text [ dutch ] = "Scheidingsteken" ; Text [ spanish ] = "Separador" ; Text [ english_us ] = "Separator" ; - Text[ chinese_simplified ] = "分隔符"; + Text[ chinese_simplified ] = "鍒嗛殧绗"; Text[ russian ] = "朽玟咫栩咫"; Text[ polish ] = "Separator"; - Text[ japanese ] = "嬫愗傝婰崋"; - Text[ chinese_traditional ] = "だ筳才"; + Text[ japanese ] = "鍖哄垏銈婅鍙"; + Text[ chinese_traditional ] = "鍒嗛殧绗"; Text[ arabic ] = "轻萸蔗"; Text[ greek ] = "拈狩轶糸挈"; - Text[ korean ] = "备盒磊"; + Text[ korean ] = "甑秳 旮绊樃"; Text[ turkish ] = "Ay齬ma ireti"; Text[ language_user1 ] = " "; Text[ catalan ] = "Separator"; + Text[ thai ] = "喔曕副喔о箒喔⑧竵"; }; String STR_ROW { @@ -800,17 +820,18 @@ ModalDialog DLG_SORTING Text [ dutch ] = "Rij" ; Text [ spanish ] = "Filas" ; Text [ english_us ] = "Rows" ; - Text[ chinese_simplified ] = "行"; + Text[ chinese_simplified ] = "琛"; Text[ russian ] = "羊痤赅"; Text[ polish ] = "Wiersz"; - Text[ japanese ] = "峴"; - Text[ chinese_traditional ] = "︽"; + Text[ japanese ] = "琛"; + Text[ chinese_traditional ] = "琛"; Text[ arabic ] = "蛰"; Text[ greek ] = "民犰燧"; - Text[ korean ] = "青"; + Text[ korean ] = "頄"; Text[ turkish ] = "Sat齬"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Filas"; + Text[ catalan ] = "fila"; + Text[ thai ] = "喙佮笘喔"; }; String STR_COL { @@ -820,24 +841,25 @@ ModalDialog DLG_SORTING Text [ italian ] = "Colonna" ; Text [ portuguese_brazilian ] = "Coluna" ; Text [ portuguese ] = "Coluna" ; - Text [ finnish ] = "Sarake " ; + Text [ finnish ] = "Sarake" ; Text [ danish ] = "Kolonne" ; Text [ french ] = "Colonne" ; Text [ swedish ] = "Kolumn" ; Text [ dutch ] = "Kolom" ; Text [ spanish ] = "Columna" ; Text [ english_us ] = "Column" ; - Text[ chinese_simplified ] = "列"; - Text[ russian ] = "暑腩黻"; + Text[ chinese_simplified ] = "鍒"; + Text[ russian ] = "羊铍徨"; Text[ polish ] = "Kolumna"; - Text[ japanese ] = "楍"; - Text[ chinese_traditional ] = "逆"; + Text[ japanese ] = "鍒"; + Text[ chinese_traditional ] = "娆"; Text[ arabic ] = "阢嫦"; Text[ greek ] = "郁揠"; - Text[ korean ] = "凯"; + Text[ korean ] = "鞐"; Text[ turkish ] = "S黷un"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Columna"; + Text[ catalan ] = "COLUMN"; + Text[ thai ] = "喔勦腑喔ム副喔∴笝喙"; }; PushButton PB_DELIM { @@ -860,18 +882,19 @@ ModalDialog DLG_SORTING Text[ french ] = "Langue"; Text[ spanish ] = "Idioma"; Text[ italian ] = "Lingua"; - Text[ danish ] = "Language"; + Text[ danish ] = "Sprog"; Text[ swedish ] = "Spr錵"; Text[ polish ] = "J陑yk"; Text[ portuguese_brazilian ] = "Language"; - Text[ japanese ] = "尵岅"; - Text[ korean ] = "攫绢"; - Text[ chinese_simplified ] = "语言"; - Text[ chinese_traditional ] = "粂ē"; + Text[ japanese ] = "瑷瑾"; + Text[ korean ] = "鞏胳柎"; + Text[ chinese_simplified ] = "璇█"; + Text[ chinese_traditional ] = "瑾炶█"; Text[ turkish ] = "Language"; Text[ arabic ] = "Language"; Text[ finnish ] = "Kieli"; Text[ catalan ] = "Language"; + Text[ thai ] = "喔犩覆喔┼覆"; }; ListBox LB_LANG { @@ -892,21 +915,22 @@ ModalDialog DLG_SORTING Text[ russian ] = "袜耱痤殛"; Text[ greek ] = "氧桁唧彘"; Text[ dutch ] = "Instelling"; - Text[ french ] = "Param鑤re"; + Text[ french ] = "Param閠rage"; Text[ spanish ] = "Configuraci髇"; Text[ italian ] = "Impostazioni"; - Text[ danish ] = "Options"; + Text[ danish ] = "Indstilling"; Text[ swedish ] = "Inst鋖lning"; Text[ polish ] = "Ustawienie"; Text[ portuguese_brazilian ] = "Options"; - Text[ japanese ] = "徻嵶愝掕"; - Text[ korean ] = "汲沥"; - Text[ chinese_simplified ] = "设定"; - Text[ chinese_traditional ] = "砞﹚"; + Text[ japanese ] = "瑭崇窗瑷畾"; + Text[ korean ] = "靹れ爼"; + Text[ chinese_simplified ] = "璁惧畾"; + Text[ chinese_traditional ] = "瑷畾"; Text[ turkish ] = "Options"; Text[ arabic ] = "Options"; Text[ finnish ] = "Asetus"; - Text[ catalan ] = "Options"; + Text[ catalan ] = "Configuraci"; + Text[ thai ] = "喔佮赋喔笝喔"; }; CheckBox CB_CASE { @@ -917,37 +941,39 @@ ModalDialog DLG_SORTING Text [ ENGLISH ] = "Case sensitive" ; Text[ english_us ] = "Match case"; Text[ portuguese ] = "Compara玢o exacta"; - Text[ russian ] = "翌黜铄 耩噔礤龛"; + Text[ russian ] = "喻栩囹 疱汨耱"; Text[ greek ] = "陵耖忮唑 簖汴耖箸"; - Text[ dutch ] = "Exact hetzelfde"; + Text[ dutch ] = "Exacte vergelijking"; Text[ french ] = "Comparaison exacte"; Text[ spanish ] = "Comparaci髇 exacta"; Text[ italian ] = "Paragone esatto"; - Text[ danish ] = "Case sensitive"; + Text[ danish ] = "Eksakt sammenligning"; Text[ swedish ] = "Exakt j鋗f鰎else"; Text[ polish ] = "Dok砤dne por體nanie"; Text[ portuguese_brazilian ] = "Case sensitive"; - Text[ japanese ] = "戝暥帤偲彫暥帤傪嬫暿偡傞"; - Text[ korean ] = "沥犬茄 厚背"; - Text[ chinese_simplified ] = "精确区分大小写"; - Text[ chinese_traditional ] = "弘絋跋だ糶"; + Text[ japanese ] = "澶ф枃瀛椼仺灏忔枃瀛椼倰鍖哄垾銇欍倠"; + Text[ korean ] = "雽氍胳瀽 氚 靻岆鞛愲ゼ 甑秳"; + Text[ chinese_simplified ] = "绮剧‘鍖哄垎瀛楁瘝澶у皬鍐"; + Text[ chinese_traditional ] = "绮剧⒑鍗鍒嗗瓧姣嶅ぇ灏忓"; Text[ turkish ] = "Case sensitive"; Text[ arabic ] = "Case sensitive"; - Text[ finnish ] = "Exacter Vergleich"; + Text[ finnish ] = "Sama kirjainkoko"; Text[ catalan ] = "Case sensitive"; + Text[ thai ] = "喔堗副喔氞竸喔灌箞喔曕副喔о笧喔脆浮喔炧箤"; }; - Text[ chinese_simplified ] = "排序"; + Text[ chinese_simplified ] = "鎺掑簭"; Text[ russian ] = "杨痱桊钼赅"; Text[ polish ] = "Sortuj"; - Text[ japanese ] = "暲傋懼偊"; - Text[ chinese_traditional ] = "逼"; + Text[ japanese ] = "涓︺伖鏇裤亪"; + Text[ chinese_traditional ] = "鎺掑簭"; Text[ arabic ] = "菅"; Text[ greek ] = "葬铋睃扃箸"; - Text[ korean ] = "沥纺"; + Text[ korean ] = "鞝曤牞"; Text[ turkish ] = "S齬ala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ordenar"; + Text[ catalan ] = "Ordena"; + Text[ thai ] = "喙喔｀傅喔⑧竾"; }; InfoBox MSG_SRTERR { @@ -966,19 +992,36 @@ InfoBox MSG_SRTERR MESSAGE [ dutch ] = "Selectie kan niet worden gesorteerd" ; MESSAGE [ spanish ] = "No se pudo ordenar la selecci髇" ; MESSAGE [ english_us ] = "Cannot sort selection" ; - MESSAGE[ chinese_simplified ] = "无法排序选择的内容。"; - MESSAGE[ russian ] = "杨痱桊钼赅 铗犷疣 礤忸珈铈磬"; + MESSAGE[ chinese_simplified ] = "鏃犳硶鎺掑簭閫変腑鐨勫唴瀹广"; + MESSAGE[ russian ] = "湾忸珈铈眍 耦痱桊钼囹 恹狃囗眍"; MESSAGE[ polish ] = "Nie mo縩a sortowa selekcji"; - MESSAGE[ japanese ] = "慖戰斖埻偼暲傋懼偊偱偒傑偣傫丅"; - MESSAGE[ chinese_traditional ] = "礚猭逼匡ず甧"; + MESSAGE[ japanese ] = "閬告姙绡勫洸銇甫銇规浛銇堛仹銇嶃伨銇涖倱銆"; + MESSAGE[ chinese_traditional ] = "鐒℃硶鎺掑簭閬稿彇鐨勫収瀹广"; MESSAGE[ arabic ] = "授醒 菅 轻释享"; MESSAGE[ greek ] = " 翎铋睃扃箸 翮 屦殡镢掾 溴 摁犴 漉磲艮"; - MESSAGE[ korean ] = "急琶阑 沥纺且 荐 绝菌嚼聪促."; + MESSAGE[ korean ] = "靹犿儩鞚 鞝曤牞頃 靾 鞐嗢姷雼堧嫟."; MESSAGE[ turkish ] = "Se鏸m s齬alanamad"; MESSAGE[ language_user1 ] = " "; MESSAGE[ catalan ] = "No se pudo ordenar la selecci髇"; + MESSAGE[ thai ] = "喙勦浮喙堗釜喔侧浮喔侧福喔栢箑喔｀傅喔⑧竾喔佮覆喔｀箑喔ム阜喔竵"; }; + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/ribbar/inputwin.src b/sw/source/ui/ribbar/inputwin.src index 76d3df5ac9ed..4315c6b59f9a 100644 --- a/sw/source/ui/ribbar/inputwin.src +++ b/sw/source/ui/ribbar/inputwin.src @@ -2,9 +2,9 @@ * * $RCSfile: inputwin.src,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: kz $ $Date: 2001-07-13 22:00:10 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -94,18 +94,19 @@ ToolBox RID_TBX_FORMULA Text [ spanish ] = "F髍mula" ; Text [ english_us ] = "Formula" ; /* ### ACHTUNG: Neuer Text in Resource? Formel ausw鋒len : Formel ausw鮤len */ - Text[ chinese_simplified ] = "公式"; + Text[ chinese_simplified ] = "鍏紡"; Text[ russian ] = "灶痨箅"; Text[ polish ] = "Formu砤"; - Text[ japanese ] = "悢幃"; - Text[ chinese_traditional ] = "そΑ"; + Text[ japanese ] = "鏁板紡"; + Text[ chinese_traditional ] = "鍏紡"; Text[ arabic ] = "枕凵"; Text[ dutch ] = "Formule"; - Text[ chinese_simplified ] = "公式"; + Text[ chinese_simplified ] = "鍏紡"; Text[ greek ] = "札痫"; - Text[ korean ] = "荐侥"; + Text[ korean ] = "靾橃嫕"; Text[ turkish ] = "Form黮"; Text[ catalan ] = "F髍mula"; + Text[ thai ] = "喔腹喔曕福喔勦赋喔權抚喔"; }; ToolBoxItem { @@ -125,18 +126,19 @@ ToolBox RID_TBX_FORMULA Text [ spanish ] = "Cancelar" ; Text [ english_us ] = "Cancel" ; /* ### ACHTUNG: Neuer Text in Resource? Formel nicht 黚enehmen : Formel nicht 砨enehmen */ - Text[ chinese_simplified ] = "取消"; - Text[ russian ] = "悟戾磬"; + Text[ chinese_simplified ] = "鍙栨秷"; + Text[ russian ] = "悟戾龛螯"; Text[ polish ] = "Anuluj"; - Text[ japanese ] = "番菥"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "銈儯銉炽偦銉"; + Text[ chinese_traditional ] = "鍙栨秷"; Text[ arabic ] = "裴矍 轻勉"; Text[ dutch ] = "Annuleren"; - Text[ chinese_simplified ] = "取消"; + Text[ chinese_simplified ] = "鍙栨秷"; Text[ greek ] = "陵"; - Text[ korean ] = "秒家"; + Text[ korean ] = "旆唽"; Text[ turkish ] = "輕tal"; - Text[ catalan ] = "Cancelar"; + Text[ catalan ] = "Cancel.la"; + Text[ thai ] = "喔⑧竵喙喔ム复喔"; }; ToolBoxItem { @@ -157,18 +159,19 @@ ToolBox RID_TBX_FORMULA Text [ spanish ] = "Aplicar" ; Text [ english_us ] = "Apply" ; /* ### ACHTUNG: Neuer Text in Resource? Formel einf黦en : Formel einf砱en */ - Text[ chinese_simplified ] = "使用"; + Text[ chinese_simplified ] = "閲囩敤"; Text[ russian ] = "橡桁屙栩"; Text[ polish ] = "Zastosuj"; - Text[ japanese ] = "揔梡"; - Text[ chinese_traditional ] = "ㄏノ"; + Text[ japanese ] = "閬╃敤"; + Text[ chinese_traditional ] = "鎺＄敤"; Text[ arabic ] = "畔吻"; Text[ dutch ] = "Overnemen"; - Text[ chinese_simplified ] = "使用"; + Text[ chinese_simplified ] = "閲囩敤"; Text[ greek ] = "碰狁祜戕"; - Text[ korean ] = "利侩"; + Text[ korean ] = "鞝侅毄"; Text[ turkish ] = "Uygula"; - Text[ catalan ] = "Aplicar"; + Text[ catalan ] = "Aplica"; + Text[ thai ] = "喙冟笂喙"; }; }; Edit ED_POS @@ -197,7 +200,7 @@ Menu MN_CALC_POPUP HelpID = HID_MN_CALC_SUM ; Text = "~Summe" ; Text [ English ] = "~Sum" ; - Text [ dutch ] = "~Soml" ; + Text [ dutch ] = "~Som" ; Text [ spanish ] = "~Suma" ; Text [ english_us ] = "Sum" ; Text [ norwegian ] = "~Sum" ; @@ -208,18 +211,19 @@ Menu MN_CALC_POPUP Text [ danish ] = "Sum" ; Text [ french ] = "~Somme" ; Text [ swedish ] = "~Summa" ; - Text[ chinese_simplified ] = "总计"; + Text[ chinese_simplified ] = "鎬昏"; Text[ russian ] = "洋祆"; Text[ polish ] = "Suma"; - Text[ japanese ] = "崌寁"; - Text[ chinese_traditional ] = "璸"; + Text[ japanese ] = "鍚堣▓"; + Text[ chinese_traditional ] = "灏忚▓"; Text[ arabic ] = "轻闾沔"; - Text[ dutch ] = "~Soml"; - Text[ chinese_simplified ] = "总计"; + Text[ dutch ] = "~Som"; + Text[ chinese_simplified ] = "鎬昏"; Text[ greek ] = "㈣耧閪箪"; - Text[ korean ] = "钦拌"; + Text[ korean ] = "頃╆硠"; Text[ turkish ] = "Toplam"; - Text[ catalan ] = "~Suma"; + Text[ catalan ] = "Suma"; + Text[ thai ] = "喔溹弗喔｀抚喔"; }; MenuItem { @@ -236,19 +240,20 @@ Menu MN_CALC_POPUP Text [ danish ] = "Rund" ; Text [ portuguese ] = "A~rredondar" ; Text [ portuguese_brazilian ] = "Run~den" ; - Text[ chinese_simplified ] = "转换成整数"; + Text[ chinese_simplified ] = "杞崲鎴愭暣鏁"; Text[ russian ] = "侮痼汶栩"; Text[ polish ] = "Zaokr筭laj"; - Text[ japanese ] = "巐幪屲擖"; - Text[ chinese_traditional ] = "锣传Θ俱计"; + Text[ japanese ] = "鍥涙崹浜斿叆"; + Text[ chinese_traditional ] = "杞夋彌鎴愭暣鏁"; Text[ arabic ] = "兽秧"; Text[ dutch ] = "~Afronden"; - Text[ chinese_simplified ] = "转换成整数"; + Text[ chinese_simplified ] = "杞崲鎴愭暣鏁"; Text[ greek ] = "觺赳镢沲腼痫哏箸"; - Text[ korean ] = "馆棵覆"; + Text[ korean ] = "氚橃槵毽"; Text[ turkish ] = "Yuvarla"; - Text[ catalan ] = "R~edondear"; + Text[ catalan ] = "Arrodoneix"; Text[ finnish ] = "Py鰎ist"; + Text[ thai ] = "喔｀腑喔"; }; MenuItem { @@ -267,18 +272,19 @@ Menu MN_CALC_POPUP Text [ danish ] = "Procent" ; Text [ french ] = "~Pourcentage" ; Text [ swedish ] = "~Procent" ; - Text[ chinese_simplified ] = "百分比(~P)"; + Text[ chinese_simplified ] = "鐧惧垎姣"; Text[ russian ] = "橡铞屙螓"; Text[ polish ] = "Procent"; - Text[ japanese ] = "蔬熬菽"; - Text[ chinese_traditional ] = "κだゑ(~P)"; + Text[ japanese ] = "銉戙兗銈汇兂銉"; + Text[ chinese_traditional ] = "鐧惧垎姣"; Text[ arabic ] = "惹徙瞧"; Text[ dutch ] = "Pro~cent"; - Text[ chinese_simplified ] = "百分比(~P)"; + Text[ chinese_simplified ] = "鐧惧垎姣"; Text[ greek ] = "~酗箫篝 (%)"; - Text[ korean ] = "归盒啦"; + Text[ korean ] = "氚彪秳鞙"; Text[ turkish ] = "Y鼁de"; - Text[ catalan ] = "~Porcentaje"; + Text[ catalan ] = "Percentatge"; + Text[ thai ] = "喙喔涏腑喔｀箤喙喔嬥箛喔權笗喙"; }; MenuItem { @@ -297,19 +303,20 @@ Menu MN_CALC_POPUP Text [ danish ] = "Kvadratrod" ; Text [ french ] = "~Racine carr閑" ; Text [ swedish ] = "~Kvadratrot" ; - Text[ chinese_simplified ] = "平方根(~R)"; + Text[ chinese_simplified ] = "骞虫柟鏍"; Text[ russian ] = "暑疱睃"; Text[ polish ] = "Pierwiastek"; - Text[ japanese ] = "暯曽崻"; - Text[ chinese_traditional ] = "キよ(~R)"; + Text[ japanese ] = "骞虫柟鏍"; + Text[ chinese_traditional ] = "骞虫柟鏍"; Text[ arabic ] = "绦"; Text[ dutch ] = "~Vierkantswortel"; - Text[ chinese_simplified ] = "平方根(~R)"; + Text[ chinese_simplified ] = "骞虫柟鏍"; Text[ language_user1 ] = "(哪) ; - - - - - -"; Text[ greek ] = "藻赳徙~殛 襁驷"; - Text[ korean ] = "辟"; + Text[ korean ] = "攴"; Text[ turkish ] = "Karek鰇"; - Text[ catalan ] = "~Ra韟"; + Text[ catalan ] = "Arrel quadrada"; + Text[ thai ] = "喔｀覆喔佮笚喔掂箞喔腑喔"; }; MenuItem { @@ -318,28 +325,29 @@ Menu MN_CALC_POPUP Text = "Poten~ziere" ; Text [ English ] = "Po~wer" ; Text [ dutch ] = "~Machtsverheffen" ; - Text [ spanish ] = "Po~tenciando" ; + Text [ spanish ] = "Po~tencia" ; Text [ english_us ] = "Power" ; Text [ norwegian ] = "Po~tens" ; Text [ italian ] = "Elevare a potenza" ; Text [ portuguese_brazilian ] = "Po~t?ncia" ; Text [ portuguese ] = "Elevar a po~t阯cia" ; - Text [ finnish ] = "Potenssi" ; + Text [ finnish ] = "Potenssim滗ritys" ; Text [ danish ] = "Opl鴉t i potens" ; Text [ french ] = "Pu~issance" ; Text [ swedish ] = "~Upph鰆a" ; - Text[ chinese_simplified ] = "乘幂(~W)"; + Text[ chinese_simplified ] = "涔樺箓"; Text[ russian ] = "羊屣屙"; Text[ polish ] = "Pot阦uj"; - Text[ japanese ] = "椵忔"; - Text[ chinese_traditional ] = "经(~W)"; + Text[ japanese ] = "绱箺"; + Text[ chinese_traditional ] = "涔樺啰"; Text[ arabic ] = "捩"; Text[ dutch ] = "~Machtsverheffen"; - Text[ chinese_simplified ] = "乘幂(~W)"; + Text[ chinese_simplified ] = "涔樺箓"; Text[ greek ] = "绝~ 箦 潺磲扃"; - Text[ korean ] = "力蚌"; + Text[ korean ] = "鞝滉潮"; Text[ turkish ] = "Kuvvet 琮kar"; - Text[ catalan ] = "Po~tenciando"; + Text[ catalan ] = "Po~tencia"; + Text[ thai ] = "喔⑧竵喔佮赋喔ム副喔"; }; MenuItem { @@ -379,18 +387,19 @@ Menu MN_CALC_POPUP Text [ danish ] = "Listeseparator" ; Text [ french ] = "S閜arateur de lis~te" ; Text [ swedish ] = "List~avgr鋘sare" ; - Text[ chinese_simplified ] = "列表分隔符(~S)"; + Text[ chinese_simplified ] = "鍒楄〃鍒嗛殧绗"; Text[ russian ] = "朽玟咫栩咫 耧桉赅"; Text[ polish ] = "Separator list"; - Text[ japanese ] = "亟膫虌鎼貍鑻L崋"; - Text[ chinese_traditional ] = "睲虫だ筳才(~S)"; + Text[ japanese ] = "銉偣銉堛伄鍖哄垏銈婅鍙"; + Text[ chinese_traditional ] = "娓呭柈鍒嗛殧绗"; Text[ arabic ] = "萸蔗 轻耷沏"; Text[ dutch ] = "Lijst~scheidingsteken"; - Text[ chinese_simplified ] = "列表分隔符(~S)"; + Text[ chinese_simplified ] = "鍒楄〃鍒嗛殧绗"; Text[ greek ] = "拈狩轶糸贶 ~脒篝狎"; - Text[ korean ] = "格废 备盒磊"; + Text[ korean ] = "氇╇ 甑秳 旮绊樃"; Text[ turkish ] = "~Liste 鲳eleri ay齬齝齭"; - Text[ catalan ] = "~Separador de lista"; + Text[ catalan ] = "Separador de llista"; + Text[ thai ] = "喔｀覆喔⑧竵喔侧福喔曕副喔о箒喔⑧竵"; }; MenuItem { @@ -405,22 +414,23 @@ Menu MN_CALC_POPUP Text [ italian ] = "~Uguale" ; Text [ portuguese_brazilian ] = "~Igual" ; Text [ portuguese ] = "~Igual" ; - Text [ finnish ] = "yht鋝uuri" ; + Text [ finnish ] = "yht suuri" ; Text [ danish ] = "Lig med" ; Text [ french ] = "~蒰al" ; Text [ swedish ] = "~Lika med" ; - Text[ chinese_simplified ] = "等于(~E)"; + Text[ chinese_simplified ] = "绛変簬"; Text[ russian ] = "朽忭"; Text[ polish ] = "R體ny"; - Text[ japanese ] = "摍偟偄"; - Text[ chinese_traditional ] = "单(~E)"; + Text[ japanese ] = "绛夈仐銇"; + Text[ chinese_traditional ] = "绛夋柤"; Text[ arabic ] = "碛擎"; Text[ dutch ] = "~Gelijk aan"; - Text[ chinese_simplified ] = "等于(~E)"; + Text[ chinese_simplified ] = "绛変簬"; Text[ greek ] = "簙箫"; - Text[ korean ] = "悼老"; + Text[ korean ] = "霃欖澕"; Text[ turkish ] = "E㱮ttir"; - Text[ catalan ] = "~Igual"; + Text[ catalan ] = "Igual"; + Text[ thai ] = "喙喔椸箞喔侧竵喔编笝"; }; MenuItem { @@ -435,22 +445,23 @@ Menu MN_CALC_POPUP Text [ italian ] = "Non uguale" ; Text [ portuguese_brazilian ] = "~N?o Igual" ; Text [ portuguese ] = "~Desigual" ; - Text [ finnish ] = "Ei yht鋝uuri" ; + Text [ finnish ] = "Eri suuri" ; Text [ danish ] = "Forskellig fra" ; Text [ french ] = "D~iff閞ent" ; Text [ swedish ] = "~Inte lika med" ; - Text[ chinese_simplified ] = "不等于(~N)"; + Text[ chinese_simplified ] = "涓嶇瓑浜"; Text[ russian ] = "湾 疣忭"; Text[ polish ] = "Nie r體ny"; - Text[ japanese ] = "摍偟偔側偄"; - Text[ chinese_traditional ] = "ぃ单(~N)"; + Text[ japanese ] = "绛夈仐銇忋仾銇"; + Text[ chinese_traditional ] = "涓嶇瓑鏂"; Text[ arabic ] = "崆 碛擎"; Text[ dutch ] = "~Niet gelijk aan"; - Text[ chinese_simplified ] = "不等于(~N)"; + Text[ chinese_simplified ] = "涓嶇瓑浜"; Text[ greek ] = "~拈荟锺"; - Text[ korean ] = "悼老窍瘤 臼澜"; + Text[ korean ] = "霃欖澕頃橃 鞎婌潓"; Text[ turkish ] = "E㱮t de餴l"; Text[ catalan ] = "~No igual"; + Text[ thai ] = "喙勦浮喙堗箑喔椸箞喔侧竵喔编笝"; }; MenuItem { @@ -465,22 +476,23 @@ Menu MN_CALC_POPUP Text [ italian ] = "Minore o uguale" ; Text [ portuguese_brazilian ] = "Me~nor ou Igual" ; Text [ portuguese ] = "Me~nor ou igual" ; - Text [ finnish ] = "Pienempi tai yht鋝uuri kuin" ; + Text [ finnish ] = "Pienempi tai yht suuri kuin" ; Text [ danish ] = "Mindre end eller lig med" ; Text [ french ] = "I~nf閞ieur ou 間al " ; Text [ swedish ] = "Mi~ndre 鋘 eller lika med" ; - Text[ chinese_simplified ] = "小于或等于(~Q)"; + Text[ chinese_simplified ] = "灏忎簬鎴栫瓑浜"; Text[ russian ] = "体睃 桦 疣忭"; Text[ polish ] = "Mniejszy lub r體ny"; - Text[ japanese ] = "埲壓(~L)"; - Text[ chinese_traditional ] = "┪单(~Q)"; + Text[ japanese ] = "浠ヤ笅"; + Text[ chinese_traditional ] = "灏忔柤鎴栫瓑鏂"; Text[ arabic ] = "谜垩 沅 面 碛擎"; Text[ dutch ] = "~Kleiner dan of gelijk aan"; - Text[ chinese_simplified ] = "小于或等于(~Q)"; + Text[ chinese_simplified ] = "灏忎簬鎴栫瓑浜"; Text[ greek ] = "涕~犟羼 唧"; - Text[ korean ] = "捞窍"; + Text[ korean ] = "鞚错晿"; Text[ turkish ] = "K黭 ya da e㱮ttir"; - Text[ catalan ] = "Me~nor o igual"; + Text[ catalan ] = "Menor que o igual"; + Text[ thai ] = "喔權箟喔涪喔佮抚喙堗覆喔福喔粪腑喙喔椸箞喔侧竵喔编笟"; }; MenuItem { @@ -496,22 +508,23 @@ Menu MN_CALC_POPUP Text [ italian ] = "~Maggiore uguale" ; Text [ portuguese_brazilian ] = "~Maior ou Igual" ; Text [ portuguese ] = "M~aior ou igual" ; - Text [ finnish ] = "Suurempi tai yht鋝uuri kuin" ; + Text [ finnish ] = "Suurempi tai yht suuri kuin" ; Text [ danish ] = "St鴕re end lig med" ; Text [ french ] = "~Sup閞ieur ou 間al" ; Text [ swedish ] = "St~鰎re 鋘 eller lika med" ; - Text[ chinese_simplified ] = "大于或等于(~G)"; + Text[ chinese_simplified ] = "澶т簬鎴栫瓑浜"; Text[ russian ] = "令朦 桦 疣忭"; Text[ polish ] = "Wi阫szy lub r體ny"; - Text[ japanese ] = "埲忋(~G)"; - Text[ chinese_traditional ] = "┪单(~G)"; + Text[ japanese ] = "浠ヤ笂"; + Text[ chinese_traditional ] = "澶ф柤鎴栫瓑鏂"; Text[ arabic ] = "眠妊 沅 面 碛擎"; Text[ dutch ] = "G~roter dan of gelijk aan"; - Text[ chinese_simplified ] = "大于或等于(~G)"; + Text[ chinese_simplified ] = "澶т簬鎴栫瓑浜"; Text[ greek ] = "体~汜臊翦耧 唧"; - Text[ korean ] = "捞惑"; + Text[ korean ] = "鞚挫儊"; Text[ turkish ] = "B鼀黭 ya da e㱮ttir"; - Text[ catalan ] = "M~ayor o igual"; + Text[ catalan ] = "Major que o igual"; + Text[ thai ] = "喔∴覆喔佮竵喔о箞喔侧斧喔｀阜喔箑喔椸箞喔侧竵喔编笟"; }; MenuItem { @@ -530,18 +543,19 @@ Menu MN_CALC_POPUP Text [ danish ] = "Mindre end" ; Text [ french ] = "In~f閞ieur" ; Text [ swedish ] = "~Mindre 鋘" ; - Text[ chinese_simplified ] = "小于(~L)"; + Text[ chinese_simplified ] = "灏忎簬"; Text[ russian ] = "体睃"; Text[ polish ] = "Mniejszy"; - Text[ japanese ] = "傛傝彫偝偄(~L)"; - Text[ chinese_traditional ] = "(~L)"; + Text[ japanese ] = "銈堛倞灏忋仌銇"; + Text[ chinese_traditional ] = "灏忔柤"; Text[ arabic ] = "谜垩"; Text[ dutch ] = "K~leiner"; - Text[ chinese_simplified ] = "小于(~L)"; + Text[ chinese_simplified ] = "灏忎簬"; Text[ greek ] = "虀殛顸翦耧"; - Text[ korean ] = "固父"; + Text[ korean ] = "氙鸽"; Text[ turkish ] = "K黭t黵"; - Text[ catalan ] = "M~enor"; + Text[ catalan ] = "Menys"; + Text[ thai ] = "喔權箟喔涪喔佮抚喙堗覆"; }; MenuItem { @@ -561,18 +575,19 @@ Menu MN_CALC_POPUP Text [ danish ] = "St鴕re end" ; Text [ french ] = "S~up閞ieur" ; Text [ swedish ] = "~St鰎re 鋘" ; - Text[ chinese_simplified ] = "大于(~R)"; + Text[ chinese_simplified ] = "澶т簬"; Text[ russian ] = "令朦"; Text[ polish ] = "Wi阫szy"; - Text[ japanese ] = "傛傝戝偒偄(~R)"; - Text[ chinese_traditional ] = "(~R)"; + Text[ japanese ] = "銈堛倞澶с亶銇"; + Text[ chinese_traditional ] = "澶ф柤"; Text[ arabic ] = "眠妊"; Text[ dutch ] = "Gro~ter"; - Text[ chinese_simplified ] = "大于(~R)"; + Text[ chinese_simplified ] = "澶т簬"; Text[ greek ] = "体汜臊翦~耧"; - Text[ korean ] = "檬苞"; + Text[ korean ] = "氤措嫟 韥"; Text[ turkish ] = "B鼀黭t黵"; - Text[ catalan ] = "~Mayor"; + Text[ catalan ] = "~Major"; + Text[ thai ] = "喔∴覆喔佮竵喔о箞喔"; }; MenuItem { @@ -588,25 +603,26 @@ Menu MN_CALC_POPUP Text [ spanish ] = "~O l骻ico" ; Text [ english_us ] = "Boolean Or" ; Text [ norwegian ] = "Logisk ~Eller" ; - Text [ italian ] = "Logica ~O" ; + Text [ italian ] = "~O logico" ; Text [ portuguese_brazilian ] = "Ou l?ico ~" ; Text [ portuguese ] = "~OU l骻ico" ; - Text [ finnish ] = "Boolen ehto Or (tai)" ; + Text [ finnish ] = "Boolen ehto TAI" ; Text [ danish ] = "Logisk ELLER" ; Text [ french ] = "~OU logique" ; Text [ swedish ] = "Logiskt ~Eller" ; - Text[ chinese_simplified ] = "逻辑的 ~Or"; - Text[ russian ] = "祟汨麇耜铄 入"; + Text[ chinese_simplified ] = "閫昏緫鐨 Or"; + Text[ russian ] = "祟汨麇耜铄 人"; Text[ polish ] = "Funkcja logiczna LUB"; - Text[ japanese ] = "榑棟幃(~Or)"; - Text[ chinese_traditional ] = "呸胯 ~Or"; + Text[ japanese ] = "璜栫悊寮"; + Text[ chinese_traditional ] = "閭忚集鐨 Or"; Text[ arabic ] = "面 沅剞砩"; Text[ dutch ] = "Logisch ~Of"; - Text[ chinese_simplified ] = "逻辑的 ~Or"; + Text[ chinese_simplified ] = "閫昏緫鐨 Or"; Text[ greek ] = "藻脲篝掾 ~Or 麸 Boole"; - Text[ korean ] = "阂府攫 Or"; + Text[ korean ] = "攵堧Μ鞏 Or"; Text[ turkish ] = "Mant齥sal Veya"; - Text[ catalan ] = "~O l骻ico"; + Text[ catalan ] = "~O l騡ic"; + Text[ thai ] = "喔氞腹喔ム傅喔權斧喔｀阜喔"; }; MenuItem { @@ -621,22 +637,23 @@ Menu MN_CALC_POPUP Text [ italian ] = "Logica O esclusiva" ; Text [ portuguese_brazilian ] = "Xou l?ico" ; Text [ portuguese ] = "OU l骻ico e~xclusivo" ; - Text [ finnish ] = "Boolen ehto Xor (xtai)" ; + Text [ finnish ] = "Boolen ehto XTAI" ; Text [ danish ] = "Logisk eksklusiv ELLER" ; Text [ french ] = "Ou logique e~xclusif" ; Text [ swedish ] = "Logiskt E~xklusivt Eller" ; - Text[ chinese_simplified ] = "逻辑的除外的 Or"; - Text[ russian ] = "祟汨麇耜铄 疣玟咫栩咫铄 \"桦鑌""; + Text[ chinese_simplified ] = "閫昏緫鐨勯櫎澶栫殑 Or"; + Text[ russian ] = "祟汨麇耜铄 桉觌帼 人"; Text[ polish ] = "Wy彻czna funkcja logiczna LUB"; - Text[ japanese ] = "榑棟幃(~xOr)"; - Text[ chinese_traditional ] = "呸胯埃 Or"; + Text[ japanese ] = "鎺掍粬鐨勮珫鐞嗗拰(EXOR)"; + Text[ chinese_traditional ] = "閭忚集鐨勯櫎澶栫殑 Or"; Text[ arabic ] = "面 沅剞砩 吻丈"; Text[ dutch ] = "Logisch e~xclusief Of"; - Text[ chinese_simplified ] = "逻辑的除外的 Or"; + Text[ chinese_simplified ] = "閫昏緫鐨勯櫎澶栫殑 Or"; Text[ greek ] = "藻脲篝掾 ~Xor 麸 Boole"; - Text[ korean ] = "阂府攫 Xor"; + Text[ korean ] = "攵堧Μ鞏 Xor"; Text[ turkish ] = "Mant齥sal ~tek Veya"; - Text[ catalan ] = "O l骻ico e~xclusivo"; + Text[ catalan ] = "O l騡ic e~xclusiu"; + Text[ thai ] = "喔氞腹喔ム傅喔 Xor"; }; MenuItem { @@ -648,25 +665,26 @@ Menu MN_CALC_POPUP Text [ spanish ] = "~Y l骻ico" ; Text [ english_us ] = "Boolean And" ; Text [ norwegian ] = "Logisk ~Og" ; - Text [ italian ] = "Logica ~E" ; + Text [ italian ] = "~E logico" ; Text [ portuguese_brazilian ] = "E ~l?ico" ; Text [ portuguese ] = "~E l骻ico" ; - Text [ finnish ] = "Boolen ehto And (ja)" ; + Text [ finnish ] = "Boolen ehto JA" ; Text [ danish ] = "Logisk OG" ; Text [ french ] = "~ET logique" ; Text [ swedish ] = "Logiskt ~Och" ; - Text[ chinese_simplified ] = "逻辑的 ~And"; + Text[ chinese_simplified ] = "閫昏緫鐨 And"; Text[ russian ] = "祟汨麇耜铄 ~"; Text[ polish ] = "Funkcja logiczna ORAZ"; - Text[ japanese ] = "榑棟幃(~And)"; - Text[ chinese_traditional ] = "呸胯 ~And"; + Text[ japanese ] = "璜栫悊寮(And)"; + Text[ chinese_traditional ] = "閭忚集鐨 And"; Text[ arabic ] = " 沅剞砩"; Text[ dutch ] = "Logisch ~En"; - Text[ chinese_simplified ] = "逻辑的 ~And"; + Text[ chinese_simplified ] = "閫昏緫鐨 And"; Text[ greek ] = "藻脲篝掾 ~And 麸 Boole"; - Text[ korean ] = "阂府攫 And"; + Text[ korean ] = "攵堧Μ鞏 And"; Text[ turkish ] = "Mant齥sal ~Ve"; - Text[ catalan ] = "~Y l骻ico"; + Text[ catalan ] = "~Y l騡ic"; + Text[ thai ] = "喔氞腹喔ム傅喔權箒喔ム赴"; }; MenuItem { @@ -681,37 +699,39 @@ Menu MN_CALC_POPUP Text [ italian ] = "Logica Non" ; Text [ portuguese_brazilian ] = "N?o L?~ico" ; Text [ portuguese ] = "~N肙 l骻ico" ; - Text [ finnish ] = "Boolen ehto Not (ei)" ; + Text [ finnish ] = "Boolen ehto EI" ; Text [ danish ] = "Logisk IKKE" ; Text [ french ] = "NON log~ique" ; Text [ swedish ] = "Logiskt I~nte" ; - Text[ chinese_simplified ] = "逻辑的 Not"; - Text[ russian ] = "祟汨麇耜铄 湾"; + Text[ chinese_simplified ] = "閫昏緫鐨 Not"; + Text[ russian ] = "祟汨麇耜铄 团"; Text[ polish ] = "Funkcja logiczna NIE"; - Text[ japanese ] = "榑棟幃(Not)"; - Text[ chinese_traditional ] = "呸胯 Not"; + Text[ japanese ] = "璜栫悊寮(Not)"; + Text[ chinese_traditional ] = "閭忚集鐨 Not"; Text[ arabic ] = "崆 沅剞砩"; Text[ dutch ] = "Log~isch Niet"; - Text[ chinese_simplified ] = "逻辑的 Not"; + Text[ chinese_simplified ] = "閫昏緫鐨 Not"; Text[ greek ] = "藻脲~篝掾 Not 麸 Boole"; - Text[ korean ] = "阂府攫 Not"; + Text[ korean ] = "攵堧Μ鞏 Not"; Text[ turkish ] = "Mat齥~al De餴l"; - Text[ catalan ] = "~No l骻ico"; + Text[ catalan ] = "~No l騡ic"; + Text[ thai ] = "喔氞腹喔ム傅喔權箘喔∴箞"; }; }; }; - Text[ chinese_simplified ] = "运算符(~O)"; + Text[ chinese_simplified ] = "杩愮畻绗"; Text[ russian ] = "物屦囹铕"; Text[ polish ] = "Operatory"; - Text[ japanese ] = "墘嶼巕"; - Text[ chinese_traditional ] = "笲衡才(~O)"; + Text[ japanese ] = "婕旂畻瀛"; + Text[ chinese_traditional ] = "閬嬬畻绗"; Text[ arabic ] = "阪倾 轻试垌"; Text[ dutch ] = "O~peratoren"; - Text[ chinese_simplified ] = "运算符(~O)"; + Text[ chinese_simplified ] = "杩愮畻绗"; Text[ greek ] = "~藻脲篝蒡"; - Text[ korean ] = "楷魂磊"; + Text[ korean ] = "鞐办偘鞛"; Text[ turkish ] = "蔺le鏻er"; - Text[ catalan ] = "~Operadores"; + Text[ catalan ] = "Operadors"; + Text[ thai ] = "喔曕副喔о笡喔忇复喔氞副喔曕复喔佮覆喔"; }; MenuItem { @@ -751,18 +771,19 @@ Menu MN_CALC_POPUP Text [ danish ] = "Middel" ; Text [ french ] = "~Moyenne" ; Text [ swedish ] = "M~edelv鋜de" ; - Text[ chinese_simplified ] = "平均值(~M)"; + Text[ chinese_simplified ] = "骞冲潎鍊"; Text[ russian ] = "佯邃礤 珥圜屙桢"; Text[ polish ] = "宺ednia warto滄"; - Text[ japanese ] = "暯嬒抣"; - Text[ chinese_traditional ] = "キА(~M)"; + Text[ japanese ] = "骞冲潎鍊"; + Text[ chinese_traditional ] = "骞冲潎鍊"; Text[ arabic ] = "轻阙厢"; Text[ dutch ] = "~Gemiddelde waarde"; - Text[ chinese_simplified ] = "平均值(~M)"; + Text[ chinese_simplified ] = "骞冲潎鍊"; Text[ greek ] = "~梯箸 糸燹"; - Text[ korean ] = "乞闭"; + Text[ korean ] = "韽夑窢臧"; Text[ turkish ] = "Ortalama de餰r"; - Text[ catalan ] = "Pro~medio"; + Text[ catalan ] = "Mitja"; + Text[ thai ] = "喔勦箞喔侧箑喔夃弗喔掂箞喔"; }; MenuItem { @@ -781,18 +802,19 @@ Menu MN_CALC_POPUP Text [ danish ] = "Minimumv鎟di" ; Text [ french ] = "~Minimum" ; Text [ swedish ] = "M~inimum" ; - Text[ chinese_simplified ] = "最小值(~N)"; + Text[ chinese_simplified ] = "鏈灏忓"; Text[ russian ] = "惕龛爨朦眍 珥圜屙桢"; Text[ polish ] = "Minimum"; - Text[ japanese ] = "嵟彫抣"; - Text[ chinese_traditional ] = "程(~N)"; + Text[ japanese ] = "鏈灏忓"; + Text[ chinese_traditional ] = "鏈灏忓"; Text[ arabic ] = "孟潇 揄闵"; Text[ dutch ] = "M~inimumwaarde"; - Text[ chinese_simplified ] = "最小值(~N)"; + Text[ chinese_simplified ] = "鏈灏忓"; Text[ greek ] = "烹荀轶翮 糸~燹"; - Text[ korean ] = "弥家"; + Text[ korean ] = "斓滌唽"; Text[ turkish ] = "Asgari de餰r"; - Text[ catalan ] = "Valor m韣nimo"; + Text[ catalan ] = "Valor m韣nim"; + Text[ thai ] = "喔權箟喔涪喔椸傅喙堗釜喔膏笖"; }; MenuItem { @@ -811,33 +833,35 @@ Menu MN_CALC_POPUP Text [ danish ] = "Maksimumv鎟di" ; Text [ french ] = "Ma~ximum" ; Text [ swedish ] = "M~aximum" ; - Text[ chinese_simplified ] = "最大值(~X)"; + Text[ chinese_simplified ] = "鏈澶у"; Text[ russian ] = "锑犟桁嚯铄 珥圜屙桢"; Text[ polish ] = "Maksimum"; - Text[ japanese ] = "嵟戝抣"; - Text[ chinese_traditional ] = "程(~X)"; + Text[ japanese ] = "鏈澶у"; + Text[ chinese_traditional ] = "鏈澶у"; Text[ arabic ] = "棉侦 揄闵"; Text[ dutch ] = "~Maximumwaarde"; - Text[ chinese_simplified ] = "最大值(~X)"; + Text[ chinese_simplified ] = "鏈澶у"; Text[ greek ] = "梯~汩篝 糸燹"; - Text[ korean ] = "弥措"; + Text[ korean ] = "斓滊寑臧"; Text[ turkish ] = "Azami de餰r"; - Text[ catalan ] = "Valor m醻ximo"; + Text[ catalan ] = "Valor m鄜xim"; + Text[ thai ] = "喔∴覆喔佮笚喔掂箞喔父喔"; }; }; }; - Text[ chinese_simplified ] = "统计功能(~T)"; + Text[ chinese_simplified ] = "缁熻鍔熻兘"; Text[ russian ] = "羊囹桉蜩麇耜桢 趔黻鲨"; Text[ polish ] = "Funkcje statystyczne"; - Text[ japanese ] = "摑寁娭悢"; - Text[ chinese_traditional ] = "参璸\(~T)"; + Text[ japanese ] = "绲辫▓闁㈡暟"; + Text[ chinese_traditional ] = "绲辫▓鍔熻兘"; Text[ arabic ] = "锨崆 磐涨祈"; Text[ dutch ] = "~Statistische functies"; - Text[ chinese_simplified ] = "统计功能(~T)"; + Text[ chinese_simplified ] = "缁熻鍔熻兘"; Text[ greek ] = "觺翎糸篝殛蒡 篚磲耵摅彘"; - Text[ korean ] = "烹拌 窃荐"; + Text[ korean ] = "韱店硠 頃垬"; Text[ turkish ] = "輘tatistik ievleri"; - Text[ catalan ] = "F~unciones estad韘ticas"; + Text[ catalan ] = "F~uncions estad韘tiques"; + Text[ thai ] = "喔熰副喔囙竵喙屶笂喔编箞喔權笚喔侧竾喔笘喔脆笗喔"; }; MenuItem { @@ -852,7 +876,7 @@ Menu MN_CALC_POPUP Text [ italian ] = "Funzioni" ; Text [ portuguese_brazilian ] = "~Fun??s" ; Text [ portuguese ] = "~Fun珲es" ; - Text [ finnish ] = "Toiminnot" ; + Text [ finnish ] = "Funktiot" ; Text [ danish ] = "Funktioner" ; Text [ french ] = "~Fonctions" ; Text [ swedish ] = "~Funktioner" ; @@ -875,19 +899,20 @@ Menu MN_CALC_POPUP Text [ french ] = "~Sinus" ; Text [ dutch ] = "~Sinus" ; Text [ portuguese ] = "~Seno" ; - Text[ chinese_simplified ] = "正弦(~S)"; + Text[ chinese_simplified ] = "姝ｅ鸡"; Text[ russian ] = "谚眢"; Text[ polish ] = "Sinus"; - Text[ japanese ] = "徊"; - Text[ chinese_traditional ] = "タ┒(~S)"; + Text[ japanese ] = "銈点偆銉"; + Text[ chinese_traditional ] = "姝ｅ鸡"; Text[ arabic ] = "添 轻仪骓"; Text[ dutch ] = "~Sinus"; - Text[ chinese_simplified ] = "正弦(~S)"; + Text[ chinese_simplified ] = "姝ｅ鸡"; Text[ greek ] = "~庆唪镯"; - Text[ korean ] = "荤牢"; + Text[ korean ] = "靷澑"; Text[ turkish ] = "Sin黶"; - Text[ catalan ] = "~Seno"; + Text[ catalan ] = "Sinus"; Text[ finnish ] = "Sini"; + Text[ thai ] = "Sine"; }; MenuItem { @@ -904,19 +929,20 @@ Menu MN_CALC_POPUP Text [ french ] = "~Cosinus" ; Text [ dutch ] = "~Cosinus" ; Text [ portuguese ] = "~Coseno" ; - Text[ chinese_simplified ] = "余弦(~C)"; + Text[ chinese_simplified ] = "浣欏鸡"; Text[ russian ] = "暑耔眢"; Text[ polish ] = "Cosinus"; - Text[ japanese ] = "夯草"; - Text[ chinese_traditional ] = "緇┒(~C)"; + Text[ japanese ] = "銈炽偟銈ゃ兂"; + Text[ chinese_traditional ] = "椁樺鸡"; Text[ arabic ] = "添 抒倾"; Text[ dutch ] = "~Cosinus"; - Text[ chinese_simplified ] = "余弦(~C)"; + Text[ chinese_simplified ] = "浣欏鸡"; Text[ greek ] = "~吁礴爝麸盹"; - Text[ korean ] = "内荤牢"; + Text[ korean ] = "旖旍偓鞚"; Text[ turkish ] = "Kosin黶"; - Text[ catalan ] = "~Coseno"; + Text[ catalan ] = "Cosinus"; Text[ finnish ] = "Kosini"; + Text[ thai ] = "Cosine"; }; MenuItem { @@ -933,19 +959,20 @@ Menu MN_CALC_POPUP Text [ french ] = "~Tangente" ; Text [ dutch ] = "~Tangens" ; Text [ portuguese ] = "~Tangente" ; - Text[ chinese_simplified ] = "正切(~T)"; + Text[ chinese_simplified ] = "姝ｅ垏"; Text[ russian ] = "亦磴屙"; Text[ polish ] = "Tangens"; - Text[ japanese ] = "垒嫁"; - Text[ chinese_traditional ] = "タち(~T)"; + Text[ japanese ] = "銈裤兂銈搞偋銉炽儓"; + Text[ chinese_traditional ] = "姝ｅ垏"; Text[ arabic ] = "籴"; Text[ dutch ] = "~Tangens"; - Text[ chinese_simplified ] = "正切(~T)"; + Text[ chinese_simplified ] = "姝ｅ垏"; Text[ greek ] = "碰狃~麸燧礴"; - Text[ korean ] = "藕哩飘"; + Text[ korean ] = "韮勳牋韸"; Text[ turkish ] = "Tanjant"; - Text[ catalan ] = "~Tangente"; + Text[ catalan ] = "Tangent"; Text[ finnish ] = "Tangentti"; + Text[ thai ] = "Tangent"; }; MenuItem { @@ -958,23 +985,24 @@ Menu MN_CALC_POPUP Text [ swedish ] = "~arcussinus" ; Text [ danish ] = "Arcus sinus" ; Text [ italian ] = "~Arcoseno" ; - Text [ spanish ] = "Seno de ~arco" ; + Text [ spanish ] = "~Arcoseno" ; Text [ french ] = "~Arc sinus" ; Text [ dutch ] = "~Boogsinus" ; Text [ portuguese ] = "~Arco seno" ; - Text[ chinese_simplified ] = "反正弦"; + Text[ chinese_simplified ] = "鍙嶆寮"; Text[ russian ] = "鲤犟桧篑"; Text[ polish ] = "Arcus sinus"; - Text[ japanese ] = "卑富草"; - Text[ chinese_traditional ] = "はタ┒"; + Text[ japanese ] = "銈€兗銈偟銈ゃ兂"; + Text[ chinese_traditional ] = "鍙嶆寮"; Text[ arabic ] = "戕侨 轻添"; Text[ dutch ] = "~Boogsinus"; - Text[ chinese_simplified ] = "反正弦"; + Text[ chinese_simplified ] = "鍙嶆寮"; Text[ greek ] = "~渣铒 珈轸秕"; - Text[ korean ] = "酒农荤牢"; + Text[ korean ] = "鞎勴伂靷澑"; Text[ turkish ] = "Arksin黶"; - Text[ catalan ] = "Seno de ~arco"; + Text[ catalan ] = "Arcsinus"; Text[ finnish ] = "Arkussini"; + Text[ thai ] = "Arcsine"; }; MenuItem { @@ -987,23 +1015,24 @@ Menu MN_CALC_POPUP Text [ swedish ] = "a~rcuscosinus" ; Text [ danish ] = "Arcus cosinus" ; Text [ italian ] = "A~rcocoseno" ; - Text [ spanish ] = "Coseno de a~rco" ; + Text [ spanish ] = "~Arcocoseno" ; Text [ french ] = "~Arc cosinus" ; Text [ dutch ] = "B~oogcosinus" ; Text [ portuguese ] = "Arco cose~no" ; - Text[ chinese_simplified ] = "反余弦"; + Text[ chinese_simplified ] = "鍙嶄綑寮"; Text[ russian ] = "鲤觋铖桧篑"; Text[ polish ] = "Arcus cosinus"; - Text[ japanese ] = "卑负徊"; - Text[ chinese_traditional ] = "は緇┒"; + Text[ japanese ] = "銈€兗銈偝銈点偆銉"; + Text[ chinese_traditional ] = "鍙嶉寮"; Text[ arabic ] = "戕侨 添 轻抒倾"; Text[ dutch ] = "B~oogcosinus"; - Text[ chinese_simplified ] = "反余弦"; + Text[ chinese_simplified ] = "鍙嶄綑寮"; Text[ greek ] = "渣~铒 篚礴扉酎盹"; - Text[ korean ] = "酒农 内荤牢"; + Text[ korean ] = "鞎勴伂 旖旍偓鞚"; Text[ turkish ] = "Arkkosin黶"; - Text[ catalan ] = "Coseno de a~rco"; + Text[ catalan ] = "Arccosinus"; Text[ finnish ] = "Arkuskosini"; + Text[ thai ] = "Arccosine"; }; MenuItem { @@ -1020,35 +1049,37 @@ Menu MN_CALC_POPUP Text [ french ] = "Arc tan~gente" ; Text [ dutch ] = "Boogtan~gens" ; Text [ portuguese ] = "~Arco tangente" ; - Text[ chinese_simplified ] = "反正切"; + Text[ chinese_simplified ] = "鍙嶆鍒"; Text[ russian ] = "鲤牝囗沐眈"; Text[ polish ] = "Arcus tangens"; - Text[ japanese ] = "卑咐菁蕺菽"; - Text[ chinese_traditional ] = "はタち"; + Text[ japanese ] = "銈€兗銈偪銉炽偢銈с兂銉"; + Text[ chinese_traditional ] = "鍙嶆鍒"; Text[ arabic ] = "戕侨 轻籴"; Text[ dutch ] = "Boogtan~gens"; - Text[ chinese_simplified ] = "反正切"; + Text[ chinese_simplified ] = "鍙嶆鍒"; Text[ greek ] = "渣铒 鍉鲠痿镬蓓珧"; - Text[ korean ] = "酒农 藕哩飘"; + Text[ korean ] = "鞎勴伂 韮勳牋韸"; Text[ turkish ] = "Arktanjant"; - Text[ catalan ] = "~Arcotangente"; + Text[ catalan ] = "Arctangent"; Text[ finnish ] = "Arkustangentti"; + Text[ thai ] = "Arctangent"; }; }; }; - Text[ chinese_simplified ] = "函数(~F)"; + Text[ chinese_simplified ] = "鍑芥暟"; Text[ russian ] = "泽黻鲨"; Text[ polish ] = "Funkcje"; - Text[ japanese ] = "娭悢"; - Text[ chinese_traditional ] = "ㄧ计(~F)"; + Text[ japanese ] = "闁㈡暟"; + Text[ chinese_traditional ] = "鍑芥暩"; Text[ arabic ] = "锨崆"; Text[ dutch ] = "~Functies"; - Text[ chinese_simplified ] = "函数(~F)"; + Text[ chinese_simplified ] = "鍑芥暟"; Text[ language_user1 ] = "(哪) ; - - - - - -"; Text[ greek ] = "~吁磲耵摅彘"; - Text[ korean ] = "窃荐"; + Text[ korean ] = "頃垬"; Text[ turkish ] = "蔺levler"; - Text[ catalan ] = "~Funciones"; + Text[ catalan ] = "Funcions"; + Text[ thai ] = "喔熰副喔囙竵喙屶笂喔编箞喔"; }; }; }; @@ -1067,19 +1098,20 @@ String STR_FORMULA Text [ danish ] = "Tekstformel" ; Text [ french ] = "Formule texte" ; Text [ swedish ] = "Textformel" ; - Text[ chinese_simplified ] = "文本表格"; - Text[ russian ] = "灶痨箅 蝈犟蜞"; + Text[ chinese_simplified ] = "鏂囨湰琛ㄦ牸"; + Text[ russian ] = "义犟蝾忄 纛痨箅"; Text[ polish ] = "Formu砤 tekstu"; - Text[ japanese ] = "梅侥宍幃"; - Text[ chinese_traditional ] = "ゅ"; + Text[ japanese ] = "銉嗐偔銈广儓褰㈠紡"; + Text[ chinese_traditional ] = "鏂囧瓧琛ㄦ牸"; Text[ arabic ] = "枕凵 轻湔"; Text[ dutch ] = "Tekstformule"; - Text[ chinese_simplified ] = "文本表格"; + Text[ chinese_simplified ] = "鏂囨湰琛ㄦ牸"; Text[ language_user1 ] = "(哪) ; - - - - - -"; Text[ greek ] = "札痫 赍殪蓓秕"; - Text[ korean ] = "咆胶飘 荐侥"; + Text[ korean ] = "韰嶌姢韸 靾橃嫕"; Text[ turkish ] = "Metin formul"; - Text[ catalan ] = "F髍mula de texto"; + Text[ catalan ] = "F髍mula de text"; + Text[ thai ] = "喔傕箟喔竸喔о覆喔∴釜喔灌笗喔｀竸喔赤笝喔о笓"; }; #define TB_INPUT \ ToolBoxItem\ @@ -1100,18 +1132,19 @@ String STR_FORMULA Text [ spanish ] = "F髍mula" ; \ Text [ english_us ] = "Formula" ; \ /* ### ACHTUNG: Neuer Text in Resource? Formel ausw鋒len : Formel ausw鮤len */\ - Text[ chinese_simplified ] = "公式";\ + Text[ chinese_simplified ] = "鍏紡";\ Text[ russian ] = "灶痨箅";\ Text[ polish ] = "Formu砤";\ - Text[ japanese ] = "悢幃";\ - Text[ chinese_traditional ] = "そΑ";\ + Text[ japanese ] = "鏁板紡";\ + Text[ chinese_traditional ] = "鍏紡";\ Text[ arabic ] = "枕凵";\ Text[ dutch ] = "Formule";\ - Text[ chinese_simplified ] = "公式";\ + Text[ chinese_simplified ] = "鍏紡";\ Text[ greek ] = "札痫";\ - Text[ korean ] = "荐侥";\ + Text[ korean ] = "靾橃嫕";\ Text[ turkish ] = "Form黮";\ Text[ catalan ] = "F髍mula";\ + Text[ thai ] = "喔腹喔曕福喔勦赋喔權抚喔";\ };\ ToolBoxItem\ {\ @@ -1131,18 +1164,19 @@ String STR_FORMULA Text [ spanish ] = "Cancelar" ; \ Text [ english_us ] = "Cancel" ; \ /* ### ACHTUNG: Neuer Text in Resource? Formel nicht 黚enehmen : Formel nicht 砨enehmen */\ - Text[ chinese_simplified ] = "取消";\ - Text[ russian ] = "悟戾磬";\ + Text[ chinese_simplified ] = "鍙栨秷";\ + Text[ russian ] = "悟戾龛螯";\ Text[ polish ] = "Anuluj";\ - Text[ japanese ] = "番菥";\ - Text[ chinese_traditional ] = "";\ + Text[ japanese ] = "銈儯銉炽偦銉";\ + Text[ chinese_traditional ] = "鍙栨秷";\ Text[ arabic ] = "裴矍 轻勉";\ Text[ dutch ] = "Annuleren";\ - Text[ chinese_simplified ] = "取消";\ + Text[ chinese_simplified ] = "鍙栨秷";\ Text[ greek ] = "陵";\ - Text[ korean ] = "秒家";\ + Text[ korean ] = "旆唽";\ Text[ turkish ] = "輕tal";\ - Text[ catalan ] = "Cancelar";\ + Text[ catalan ] = "Cancel.la";\ + Text[ thai ] = "喔⑧竵喙喔ム复喔";\ };\ ToolBoxItem\ {\ @@ -1163,21 +1197,35 @@ String STR_FORMULA Text [ spanish ] = "Aplicar" ; \ Text [ english_us ] = "Apply" ; \ /* ### ACHTUNG: Neuer Text in Resource? Formel einf黦en : Formel einf砱en */\ - Text[ chinese_simplified ] = "应用";\ + Text[ chinese_simplified ] = "閲囩敤";\ Text[ russian ] = "橡桁屙栩";\ Text[ polish ] = "Zastosuj";\ - Text[ japanese ] = "揔梡";\ - Text[ chinese_traditional ] = "ㄏノ";\ + Text[ japanese ] = "閬╃敤";\ + Text[ chinese_traditional ] = "鎺＄敤";\ Text[ arabic ] = "畔吻";\ Text[ dutch ] = "Overnemen";\ - Text[ chinese_simplified ] = "应用";\ + Text[ chinese_simplified ] = "閲囩敤";\ Text[ greek ] = "碰狁祜戕";\ - Text[ korean ] = "利侩";\ + Text[ korean ] = "鞝侅毄";\ Text[ turkish ] = "Uygula";\ - Text[ catalan ] = "Aplicar";\ + Text[ catalan ] = "Aplica";\ + Text[ thai ] = "喙冟笂喙";\ }; + + + + + + + + + + + + + diff --git a/sw/source/ui/ribbar/tblctrl.src b/sw/source/ui/ribbar/tblctrl.src index d782db7160bf..280558637552 100644 --- a/sw/source/ui/ribbar/tblctrl.src +++ b/sw/source/ui/ribbar/tblctrl.src @@ -2,9 +2,9 @@ * * $RCSfile: tblctrl.src,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: os $ $Date: 2002-08-29 07:14:28 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -102,7 +102,7 @@ FloatingWindow RID_TBL_OPT_CTRL }; Text [ english_us ] = "Optimize" ; Text [ italian ] = "Ottimizza" ; - Text [ spanish ] = "Optimar" ; + Text [ spanish ] = "Optimizar" ; Text [ french ] = "Optimiser" ; Text [ dutch ] = "Optimaliseren" ; Text [ swedish ] = "Optimera" ; @@ -124,3 +124,13 @@ FloatingWindow RID_TBL_OPT_CTRL Text[ thai ] = "喔椸赋喙冟斧喙夃箑喔浮喔侧赴喔椸傅喙堗釜喔膏笖"; }; + + + + + + + + + + diff --git a/sw/source/ui/ribbar/tbxanchr.src b/sw/source/ui/ribbar/tbxanchr.src index 4b722aa75fd8..2ec1e6579a9a 100644 --- a/sw/source/ui/ribbar/tbxanchr.src +++ b/sw/source/ui/ribbar/tbxanchr.src @@ -2,9 +2,9 @@ * * $RCSfile: tbxanchr.src,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:19:19 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,18 +81,19 @@ Menu MN_ANCHOR_POPUP Text [ spanish ] = "P醙ina" ; Text [ french ] = " la page" ; Text [ dutch ] = "Pagina" ; - Text[ chinese_simplified ] = "页"; + Text[ chinese_simplified ] = "椤"; Text[ russian ] = "羊疣龛鲟"; Text[ polish ] = "Strona"; - Text[ japanese ] = "瓦凹"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "銉氥兗銈"; + Text[ chinese_traditional ] = "闋"; Text[ arabic ] = "蛰蜕"; Text[ greek ] = "渝脒溽"; - Text[ korean ] = "其捞瘤"; + Text[ korean ] = "韼橃澊歆"; Text[ turkish ] = "Sayfa"; Text[ language_user1 ] = " "; - Text[ catalan ] = "P醙ina"; + Text[ catalan ] = "P鄃ina"; Text[ finnish ] = "Sivu"; + Text[ thai ] = "喔笝喙夃覆"; }; MenuItem { @@ -110,18 +111,19 @@ Menu MN_ANCHOR_POPUP Text [ spanish ] = "P醨rafo" ; Text [ french ] = "Paragraphe" ; Text [ dutch ] = "Alinea" ; - Text[ chinese_simplified ] = "段落"; + Text[ chinese_simplified ] = "娈佃惤"; Text[ russian ] = "泪玎"; Text[ polish ] = "Akapit"; - Text[ japanese ] = "抜棊"; - Text[ chinese_traditional ] = "琿辅"; + Text[ japanese ] = "娈佃惤"; + Text[ chinese_traditional ] = "娈佃惤"; Text[ arabic ] = "蒉焉"; Text[ greek ] = "嗅褴泷狯矧"; - Text[ korean ] = "窜遏"; + Text[ korean ] = "雼澖"; Text[ turkish ] = "Paragrafa"; Text[ language_user1 ] = " "; - Text[ catalan ] = "P醨rafo"; + Text[ catalan ] = "Par鄃raf"; Text[ finnish ] = "Kappale"; + Text[ thai ] = "喔⑧箞喔斧喔權箟喔"; }; MenuItem { @@ -130,7 +132,7 @@ Menu MN_ANCHOR_POPUP Identifier = FN_TOOL_ANKER_AT_CHAR ; Text = "Am Zeichen" ; Text [ ENGLISH ] = "At character" ; - Text [ english_us ] = "At Character" ; + Text [ english_us ] = "To Character" ; Text [ portuguese_brazilian ] = "Am Zeichen" ; Text [ swedish ] = "Vid tecken" ; Text [ danish ] = "Til tegn" ; @@ -139,18 +141,19 @@ Menu MN_ANCHOR_POPUP Text [ french ] = "Au caract鑢e" ; Text [ dutch ] = "Aan teken" ; Text [ portuguese ] = "No car醕ter" ; - Text[ chinese_simplified ] = "在字符上"; - Text[ russian ] = " 珥嚓"; + Text[ chinese_simplified ] = "鍦ㄥ瓧绗︿笂"; + Text[ russian ] = " 耔焘铍"; Text[ polish ] = "Przy znaku"; - Text[ japanese ] = "暥帤偵"; - Text[ chinese_traditional ] = "じ"; + Text[ japanese ] = "鏂囧瓧銇"; + Text[ chinese_traditional ] = "鍦ㄥ瓧鍏冧笂"; Text[ arabic ] = "卺 轻脱"; Text[ greek ] = "郁镯 麽襻牯揆"; - Text[ korean ] = "巩磊俊"; + Text[ korean ] = "氍胳瀽鞐"; Text[ turkish ] = "Karaktere"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Al car醕ter"; - Text[ finnish ] = "膖-merkki"; + Text[ catalan ] = "Al car郼ter"; + Text[ finnish ] = "Merkkiin"; + Text[ thai ] = "喔椸傅喙堗笗喔编抚喔副喔佮競喔｀赴"; }; MenuItem { @@ -168,18 +171,19 @@ Menu MN_ANCHOR_POPUP Text [ spanish ] = "Como car醕ter" ; Text [ french ] = "Comme caract鑢e" ; Text [ dutch ] = "Als teken" ; - Text[ chinese_simplified ] = "当作字符"; - Text[ russian ] = "枢 珥嚓"; + Text[ chinese_simplified ] = "褰撲綔瀛楃"; + Text[ russian ] = "枢 耔焘铍"; Text[ polish ] = "Jako znak"; - Text[ japanese ] = "暥帤偲偟偰"; - Text[ chinese_traditional ] = "讽じ"; + Text[ japanese ] = "鏂囧瓧銇ㄣ仐銇"; + Text[ chinese_traditional ] = "鐣朵綔瀛楀厓"; Text[ arabic ] = "咄演"; Text[ greek ] = "衮 麽襻牯揆狎"; - Text[ korean ] = "巩磊肺"; + Text[ korean ] = "氍胳瀽搿"; Text[ turkish ] = "Karakter olarak"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Como car醕ter"; + Text[ catalan ] = "Com a car郼ter"; Text[ finnish ] = "Merkkin"; + Text[ thai ] = "喙喔涏箛喔權笗喔编抚喔副喔佮競喔｀赴"; }; MenuItem { @@ -197,18 +201,19 @@ Menu MN_ANCHOR_POPUP Text [ spanish ] = "Marco" ; Text [ french ] = "Cadre" ; Text [ dutch ] = "Kader" ; - Text[ chinese_simplified ] = "框"; + Text[ chinese_simplified ] = "妗"; Text[ russian ] = "朽礻"; Text[ polish ] = "Ramka"; - Text[ japanese ] = "榞"; - Text[ chinese_traditional ] = "ゅよ遏"; + Text[ japanese ] = "鏋"; + Text[ chinese_traditional ] = "鏂囧瓧鏂瑰"; Text[ arabic ] = "咔涎"; Text[ greek ] = "绣襁泷犰灬"; - Text[ korean ] = "橇饭烙"; + Text[ korean ] = "頂勲爤鞛"; Text[ turkish ] = "莈r鏴ve"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Marco"; + Text[ catalan ] = "Marc"; Text[ finnish ] = "Kehys"; + Text[ thai ] = "喔佮福喔笟"; }; }; }; @@ -216,3 +221,13 @@ Menu MN_ANCHOR_POPUP + + + + + + + + + + diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx index 4972090a78d5..8e4dea4bcfa9 100644 --- a/sw/source/ui/ribbar/workctrl.cxx +++ b/sw/source/ui/ribbar/workctrl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: workctrl.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: os $ $Date: 2002-12-02 08:38:25 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -707,6 +707,7 @@ SwZoomBox_Impl::SwZoomBox_Impl( Window* pParent, USHORT nSlot, SfxBindings& rBin rBindings(rBind), bRelease(TRUE) { + EnableAutocomplete( FALSE ); USHORT aZoomValues[] = { 25, 50, 75, 100, 150, 200 }; for(USHORT i = 0; i < sizeof(aZoomValues)/sizeof(USHORT); i++) @@ -731,13 +732,14 @@ void SwZoomBox_Impl::Select() String sEntry(GetText()); sEntry.EraseAllChars( '%' ); USHORT nZoom = (USHORT)sEntry.ToInt32(); - if(nZoom > MINZOOM && nZoom < MAXZOOM) - { - SfxUInt16Item aItem( nSlotId, nZoom ); - rBindings.GetDispatcher()->Execute( - nSlotId, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); - ReleaseFocus(); - } + if(nZoom < MINZOOM) + nZoom = MINZOOM; + if(nZoom > MAXZOOM) + nZoom = MAXZOOM; + SfxUInt16Item aItem( nSlotId, nZoom ); + rBindings.GetDispatcher()->Execute( + nSlotId, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); + ReleaseFocus(); } } /* -----------------02.12.2002 07:49----------------- diff --git a/sw/source/ui/ribbar/workctrl.src b/sw/source/ui/ribbar/workctrl.src index 37b0a18999d8..890a11e0e901 100644 --- a/sw/source/ui/ribbar/workctrl.src +++ b/sw/source/ui/ribbar/workctrl.src @@ -2,9 +2,9 @@ * * $RCSfile: workctrl.src,v $ * - * $Revision: 1.40 $ + * $Revision: 1.41 $ * - * last change: $Author: os $ $Date: 2002-11-27 08:58:28 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -323,7 +323,7 @@ Menu RID_INSERT_FIELD_CTRL Text [ portuguese_brazilian ] = "Seitennummer" ; Text [ portuguese ] = "N鷐ero de p醙ina" ; Text[ chinese_simplified ] = "椤电爜"; - Text[ russian ] = "皖戾 耱疣龛鳆"; + Text[ russian ] = "皖戾疣 耱疣龛"; Text[ polish ] = "Numer strony"; Text[ japanese ] = "銉氥兗銈哥暘鍙"; Text[ chinese_traditional ] = "闋佺⒓"; @@ -333,7 +333,7 @@ Menu RID_INSERT_FIELD_CTRL Text[ turkish ] = "Sayfa numaras"; Text[ language_user1 ] = " "; Text[ catalan ] = "N鷐eros de p鄃ina"; - Text[ finnish ] = "Sivunumerot"; + Text[ finnish ] = "Sivunumero"; Text[ thai ] = "喙喔ム競喔笝喙夃覆"; }; MenuItem @@ -342,7 +342,7 @@ Menu RID_INSERT_FIELD_CTRL HelpID = FN_INSERT_FLD_PGCOUNT ; Text = "Seitenanzahl" ; Text [ English ] = "Pagecount" ; - Text [ dutch ] = "Aantal pagina磗" ; + Text [ dutch ] = "Aantal pagina's" ; Text [ english_us ] = "Page Count" ; Text [ italian ] = "Numero di pagine" ; Text [ spanish ] = "Contar p醙inas" ; @@ -373,7 +373,7 @@ Menu RID_INSERT_FIELD_CTRL Text [ English ] = "Topic" ; Text [ english_us ] = "Subject" ; Text [ italian ] = "Argomento" ; - Text [ spanish ] = "Tema" ; + Text [ spanish ] = "Asunto" ; Text [ french ] = "Sujet" ; Text [ dutch ] = "Onderwerp" ; Text [ swedish ] = "膍ne" ; @@ -410,7 +410,7 @@ Menu RID_INSERT_FIELD_CTRL Text [ portuguese_brazilian ] = "Titel" ; Text [ portuguese ] = "T韙ulo" ; Text[ chinese_simplified ] = "鏍囬"; - Text[ russian ] = "青汶噔桢"; + Text[ russian ] = "青泐腩忸"; Text[ polish ] = "Tytu"; Text[ japanese ] = "銈裤偆銉堛儷"; Text[ chinese_traditional ] = "妯欓"; @@ -450,7 +450,7 @@ Menu RID_INSERT_FIELD_CTRL Text[ turkish ] = "Yazan"; Text[ language_user1 ] = " "; Text[ catalan ] = "Autor"; - Text[ finnish ] = "Laatija"; + Text[ finnish ] = "Tekij"; Text[ thai ] = "喔溹腹喙夃箑喔傕傅喔⑧笝"; }; MenuItem @@ -566,7 +566,7 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN Text[ chinese_traditional ] = "琛ㄦ牸"; Text[ arabic ] = "滔驷"; Text[ greek ] = "羞磲赆"; - Text[ korean ] = "鞁滍姼"; + Text[ korean ] = "響"; Text[ turkish ] = "Tablo"; Text[ language_user1 ] = " "; Text[ catalan ] = "Taula"; @@ -587,7 +587,7 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN Text [ dutch ] = "Tekstkader" ; Text [ portuguese ] = "Moldura de texto" ; Text[ chinese_simplified ] = "鏂囨湰妗"; - Text[ russian ] = "义犟蝾忄 疣礻"; + Text[ russian ] = "吗彗赅"; Text[ polish ] = "Ramka tekstu"; Text[ japanese ] = "銉嗐偔銈广儓鏋"; Text[ chinese_traditional ] = "鏂囧瓧鏂瑰"; @@ -624,7 +624,7 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN Text[ turkish ] = "Sayfa"; Text[ language_user1 ] = " "; Text[ catalan ] = "P鄃ina"; - Text[ finnish ] = "Sivu "; + Text[ finnish ] = "Sivu"; Text[ thai ] = "喔笝喙夃覆"; }; String ST_DRW @@ -641,12 +641,12 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN Text [ dutch ] = "Tekenobject" ; Text [ portuguese ] = "Desenho" ; Text[ chinese_simplified ] = "缁樺浘瀵硅薄"; - Text[ russian ] = "灭圄梓羼觇 钺牝"; + Text[ russian ] = "需耋眍"; Text[ polish ] = "Obiekt graficzny"; Text[ japanese ] = "鍥冲舰鎻忕敾銈儢銈搞偋銈儓"; Text[ english_us ] = "Drawing"; Text[ portuguese ] = "Desenho"; - Text[ russian ] = "灭圄梓羼觇 钺牝"; + Text[ russian ] = "需耋眍"; Text[ dutch ] = "Tekenobject"; Text[ french ] = "Objet de dessin"; Text[ spanish ] = "Objeto de dibujo"; @@ -691,7 +691,7 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN Text[ turkish ] = "Komut alan"; Text[ language_user1 ] = " "; Text[ catalan ] = "Control"; - Text[ finnish ] = "Ohjain"; + Text[ finnish ] = "Ohjausobjekti"; Text[ thai ] = "喔勦抚喔氞竸喔膏浮"; }; String ST_REG @@ -703,22 +703,22 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN Text [ swedish ] = "Omr錮e" ; Text [ danish ] = "Omr錮e" ; Text [ italian ] = "Sezione" ; - Text [ spanish ] = "羠ea" ; + Text [ spanish ] = "Secci髇" ; Text [ french ] = "Section" ; Text [ dutch ] = "Bereik" ; Text [ portuguese ] = "Sec玢o" ; Text[ chinese_simplified ] = "鍖哄煙"; - Text[ russian ] = "吾豚耱"; + Text[ russian ] = "朽玟咫"; Text[ polish ] = "Sekcja"; Text[ japanese ] = "绡勫洸"; Text[ chinese_traditional ] = "鍗鍩"; Text[ arabic ] = "湄寝"; Text[ greek ] = "彭玺"; - Text[ korean ] = "鞓侅棴"; + Text[ korean ] = "甑棴"; Text[ turkish ] = "B鰈黰"; Text[ language_user1 ] = " "; Text[ catalan ] = "Secci"; - Text[ finnish ] = "Osio"; + Text[ finnish ] = "Osa"; Text[ thai ] = "喔箞喔о笝"; }; String ST_BKM @@ -735,7 +735,7 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN Text [ dutch ] = "Tekstmarkering" ; Text [ portuguese ] = "Marcador de texto" ; Text[ chinese_simplified ] = "涔︾"; - Text[ russian ] = "义犟蝾忄 镱戾蜿"; + Text[ russian ] = "青觌噤赅"; Text[ polish ] = "Zak砤dka"; Text[ japanese ] = "銉嗐偔銈广儓銉炪兗銈"; Text[ chinese_traditional ] = "鍏ф枃妯欑堡"; @@ -745,7 +745,7 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN Text[ turkish ] = "Metin ireti"; Text[ language_user1 ] = " "; Text[ catalan ] = "Adre鏰 d'inter鑣"; - Text[ finnish ] = "Kirjanmerkit"; + Text[ finnish ] = "Kirjanmerkki"; Text[ thai ] = "喔椸傅喙堗竸喔编箞喔"; }; String ST_GRF @@ -762,17 +762,17 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN Text [ dutch ] = "Afbeelding" ; Text [ portuguese ] = "Imagem" ; Text[ chinese_simplified ] = "鍥惧舰"; - Text[ russian ] = "需耋眍"; + Text[ russian ] = "灭圄梓羼觇 钺牝"; Text[ polish ] = "Grafika"; Text[ japanese ] = "鍥"; Text[ chinese_traditional ] = "鍦栧舰"; Text[ arabic ] = "真焉"; Text[ greek ] = "民狯殛"; - Text[ korean ] = "攴鸽灅頂"; + Text[ korean ] = "攴鸽"; Text[ turkish ] = "Grafik"; Text[ language_user1 ] = " "; Text[ catalan ] = "Gr鄁ics"; - Text[ finnish ] = "Kuvat"; + Text[ finnish ] = "Grafiikka"; Text[ thai ] = "喔佮福喔侧笩喔脆竸"; }; String ST_OLE @@ -789,7 +789,7 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN Text [ dutch ] = "OLE-object" ; Text [ portuguese ] = "Objecto OLE" ; Text[ chinese_simplified ] = "OLE 瀵硅薄"; - Text[ russian ] = "吾牝 OLE"; + Text[ russian ] = "OLE 钺牝"; Text[ polish ] = "Obiekt OLE"; Text[ japanese ] = "OLE 銈儢銈搞偋銈儓"; Text[ chinese_traditional ] = "OLE - 鐗╀欢"; @@ -817,7 +817,7 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN Text [ dutch ] = "Kop" ; Text [ portuguese ] = "T韙ulo" ; Text[ chinese_simplified ] = "鏍囬"; - Text[ russian ] = "青泐腩忸"; + Text[ russian ] = "青泐腩怅"; Text[ polish ] = "Tytu"; Text[ japanese ] = "瑕嬪嚭銇"; Text[ chinese_traditional ] = "妯欓"; @@ -872,7 +872,7 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN Text [ dutch ] = "Voetnoot" ; Text [ portuguese ] = "Nota de rodap" ; Text[ chinese_simplified ] = "娉ㄨ剼"; - Text[ russian ] = "秧铖觇"; + Text[ russian ] = "秧铖赅"; Text[ polish ] = "Przypis dolny"; Text[ japanese ] = "鑴氭敞"; Text[ chinese_traditional ] = "瑷昏叧"; @@ -899,13 +899,13 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN Text [ dutch ] = "Merktekens" ; Text [ portuguese ] = "Marca" ; Text[ chinese_simplified ] = "鏍囪"; - Text[ russian ] = "项戾蜿"; + Text[ russian ] = "袜镱扈磬龛"; Text[ polish ] = "Znacznik"; Text[ japanese ] = "瑕氥亪姝€倎"; Text[ chinese_traditional ] = "鎻愰啋"; Text[ arabic ] = "卺倾 市唔"; Text[ greek ] = "震屙椠扉箸"; - Text[ korean ] = "響滌嫓鞛"; + Text[ korean ] = "氙鸽Μ 鞎岆"; Text[ turkish ] = "An齧sat齝"; Text[ language_user1 ] = " "; Text[ catalan ] = "Recordatori"; @@ -936,7 +936,7 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN Text[ turkish ] = "Not"; Text[ language_user1 ] = " "; Text[ catalan ] = "Nota"; - Text[ finnish ] = "Huomautus:"; + Text[ finnish ] = "Huomautus"; Text[ thai ] = "喔氞副喔權笚喔多竵喔⑧箞喔"; }; String ST_SRCH_REP @@ -953,13 +953,13 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN Text [ dutch ] = "Zoeken herhalen" ; Text [ portuguese ] = "Repetir procura" ; Text[ chinese_simplified ] = "閲嶅鎼滃"; - Text[ russian ] = "项怛铕 镱桉赅"; + Text[ russian ] = "项怛铕栩 镱桉"; Text[ polish ] = "Powt髍z wyszukiwanie"; Text[ japanese ] = "鍐嶆绱"; Text[ chinese_traditional ] = "閲嶈鎼滃皨"; Text[ arabic ] = "蔬亚 轻韧"; Text[ greek ] = "硼犴茈瑛 犴徭摁珞珧"; - Text[ korean ] = "彀娟赴 氚橂车"; + Text[ korean ] = "雼れ嫓 瓴靸"; Text[ turkish ] = "Aramay yinele"; Text[ language_user1 ] = " "; Text[ catalan ] = "Repeteix la cerca"; @@ -1207,7 +1207,7 @@ String STR_IMGBTN_DRW_DOWN Text [ dutch ] = "Volgend tekenobject" ; Text [ portuguese ] = "Objecto de desenho seguinte" ; Text[ chinese_simplified ] = "涓嬩竴涓粯鍥惧璞"; - Text[ russian ] = "央邃簋 沭圄梓羼觇 钺牝"; + Text[ russian ] = "央邃簋 痂耋眍"; Text[ polish ] = "Nast阷ny obiekt graficzny"; Text[ japanese ] = "娆°伄鏂囧瓧銈儢銈搞偋銈儓"; Text[ chinese_traditional ] = "涓嬩竴鍊嬬躬鍦栫墿浠"; @@ -1245,7 +1245,7 @@ String STR_IMGBTN_CTRL_DOWN Text[ turkish ] = "Sonraki komut alan"; Text[ language_user1 ] = " "; Text[ catalan ] = "Control seg黣nt"; - Text[ finnish ] = "Seuraava ohjain"; + Text[ finnish ] = "Seuraava ohjausobjekti"; Text[ thai ] = "喔曕副喔о竸喔о笟喔勦父喔∴笘喔编笖喙勦笡"; }; String STR_IMGBTN_REG_DOWN @@ -1258,22 +1258,22 @@ String STR_IMGBTN_REG_DOWN Text [ swedish ] = "N鋝ta omr錮e" ; Text [ danish ] = "N鎠te omr錮e" ; Text [ italian ] = "Area successiva" ; - Text [ spanish ] = "羠ea siguiente" ; + Text [ spanish ] = "Secci髇 siguiente" ; Text [ french ] = "Section suivante" ; Text [ dutch ] = "Volgend bereik" ; Text [ portuguese ] = "Sec玢o seguinte" ; Text[ chinese_simplified ] = "涓嬩竴涓尯鍩"; - Text[ russian ] = "央邃簋 钺豚耱"; + Text[ russian ] = "央邃簋 疣玟咫"; Text[ polish ] = "Nast阷na sekcja"; Text[ japanese ] = "娆°伄绡勫洸"; Text[ chinese_traditional ] = "涓嬩竴鍊嬪崁鍩"; Text[ arabic ] = "轻湄寝 轻是犴"; Text[ greek ] = "硼屙 屙玺"; - Text[ korean ] = "雼れ潓 鞓侅棴"; + Text[ korean ] = "雼れ潓 甑棴"; Text[ turkish ] = "Sonraki b鰈黰"; Text[ language_user1 ] = " "; Text[ catalan ] = "Secci seg黣nt"; - Text[ finnish ] = "Seuraava osio"; + Text[ finnish ] = "Seuraava osa"; Text[ thai ] = "喔箞喔о笝喔栢副喔斷箘喔"; }; String STR_IMGBTN_BKM_DOWN @@ -1291,7 +1291,7 @@ String STR_IMGBTN_BKM_DOWN Text [ dutch ] = "Volgende tekstmarkering" ; Text [ portuguese ] = "Marcador de texto seguinte" ; Text[ chinese_simplified ] = "涓嬩竴涓功绛"; - Text[ russian ] = "央邃簋 蝈犟蝾忄 镱戾蜿"; + Text[ russian ] = "央邃簋 玎觌噤赅"; Text[ polish ] = "Nast阷na zak砤dka"; Text[ japanese ] = "娆°伄銉嗐偔銈广儓銉炪兗銈"; Text[ chinese_traditional ] = "涓嬩竴鍊嬫浉绫"; @@ -1319,7 +1319,7 @@ String STR_IMGBTN_GRF_DOWN Text [ dutch ] = "Volgende afbeelding" ; Text [ portuguese ] = "Imagem seguinte" ; Text[ chinese_simplified ] = "涓嬩竴涓浘褰"; - Text[ russian ] = "央邃簋 痂耋眍"; + Text[ russian ] = "央邃簋 沭圄梓羼觇 钺牝"; Text[ polish ] = "Nast阷na grafika"; Text[ japanese ] = "娆°伄鍥"; Text[ chinese_traditional ] = "涓嬩竴鍊嬪湒褰"; @@ -1348,7 +1348,7 @@ String STR_IMGBTN_OLE_DOWN Text [ dutch ] = "Volgend OLE-object" ; Text [ portuguese ] = "Objecto OLE seguinte" ; Text[ chinese_simplified ] = "涓嬩竴涓 OLE-瀵硅薄"; - Text[ russian ] = "央邃簋 钺牝 OLE"; + Text[ russian ] = "央邃簋 OLE 钺牝"; Text[ polish ] = "Nast阷ny obiekt OLE"; Text[ japanese ] = "娆°伄 OLE 銈儢銈搞偋銈儓"; Text[ chinese_traditional ] = "涓嬩竴鍊 OLE-鐗╀欢"; @@ -1401,7 +1401,7 @@ String STR_IMGBTN_SEL_DOWN Text [ italian ] = "Selezione successiva" ; Text [ spanish ] = "Selecci髇 siguiente" ; Text [ french ] = "S閘ection suivante" ; - Text [ dutch ] = "Volgende markering" ; + Text [ dutch ] = "Volgend merkteken" ; Text [ portuguese ] = "Selec玢o seguinte" ; Text[ chinese_simplified ] = "涓嬩竴涓夋嫨"; Text[ russian ] = "央邃簋 恹溴脲龛"; @@ -1460,13 +1460,13 @@ String STR_IMGBTN_MARK_DOWN Text [ dutch ] = "Volgend merkteken" ; Text [ portuguese ] = "Marca seguinte" ; Text[ chinese_simplified ] = "涓嬩竴涓爣璁"; - Text[ russian ] = "央邃簋 镱戾蜿"; + Text[ russian ] = "央邃簋 磬镱扈磬龛"; Text[ polish ] = "Nast阷ny znacznik"; Text[ japanese ] = "娆°伄瑕氥亪姝€倎"; Text[ chinese_traditional ] = "涓嬩竴鍊嬫彁閱"; Text[ arabic ] = "卺倾 轻市唔 轻是犴"; Text[ greek ] = "硼屙 躔屙椠扉箸"; - Text[ korean ] = "雼れ潓 響滌嫓鞛"; + Text[ korean ] = "雼れ潓 氙鸽Μ 鞎岆"; Text[ turkish ] = "Sonraki an齧sat齝"; Text[ language_user1 ] = " "; Text[ catalan ] = "Recordatori seg黣nt"; @@ -1538,7 +1538,7 @@ String STR_IMGBTN_INDEX_ENTRY_DOWN Text[ danish ] = "N鎠te indekselement"; Text[ french ] = "Entr閑 d'index suivante"; Text[ swedish ] = "N鋝ta f鰎teckningspost"; - Text[ dutch ] = "Volgend index item"; + Text[ dutch ] = "Volgend indexitem"; Text[ spanish ] = "Entrada de 韓dice siguiente"; Text[ english_us ] = "Next index entry"; Text[ chinese_simplified ] = "涓嬩竴涓洰褰曟潯鐩"; @@ -1583,7 +1583,7 @@ String STR_IMGBTN_TBL_UP Text[ chinese_traditional ] = "涓婁竴鍊嬭〃鏍"; Text[ arabic ] = "轻滔驷 轻忧绒"; Text[ greek ] = "旭镧泔屙矧 疬磲赆"; - Text[ korean ] = "鞚挫爠 鞁滍姼"; + Text[ korean ] = "鞚挫爠 響"; Text[ turkish ] = "謓ceki tablo"; Text[ language_user1 ] = " "; Text[ catalan ] = "Taula anterior"; @@ -1658,7 +1658,7 @@ String STR_IMGBTN_DRW_UP Text [ dutch ] = "Vorig tekenobject" ; Text [ portuguese ] = "Objecto de desenho anterior" ; Text[ chinese_simplified ] = "涓婁竴涓粯鍥惧璞"; - Text[ russian ] = "橡邃簌栝 沭圄梓羼觇 钺牝"; + Text[ russian ] = "橡邃簌栝 痂耋眍"; Text[ polish ] = "Poprzedni obiekt graficzny"; Text[ japanese ] = "鍓嶃伄鏂囧瓧銈儢銈搞偋銈儓"; Text[ chinese_traditional ] = "涓婁竴鍊嬬躬鍦栫墿浠"; @@ -1681,7 +1681,7 @@ String STR_IMGBTN_CTRL_UP Text [ danish ] = "Forrige kontrolelement" ; Text [ italian ] = "Campo di controllo precedente" ; Text [ spanish ] = "Campo de control anterior" ; - Text [ french ] = "El閙ent de contr鬺e pr閏閐ent" ; + Text [ french ] = "蒷閙ent de contr鬺e pr閏閐ent" ; Text [ dutch ] = "Vorig controleveld" ; Text [ portuguese ] = "Controlo anterior" ; Text[ chinese_simplified ] = "涓婁竴涓帶鍒"; @@ -1695,7 +1695,7 @@ String STR_IMGBTN_CTRL_UP Text[ turkish ] = "謓ceki komut alan"; Text[ language_user1 ] = " "; Text[ catalan ] = "Control anterior"; - Text[ finnish ] = "Edellinen ohjain"; + Text[ finnish ] = "Edellinen ohjausobjekti"; Text[ thai ] = "喔曕副喔о竸喔о笟喔勦父喔∴腑喔编笝喔佮箞喔笝"; }; String STR_IMGBTN_REG_UP @@ -1707,22 +1707,22 @@ String STR_IMGBTN_REG_UP Text [ swedish ] = "F鰎eg錯nde omr錮e" ; Text [ danish ] = "Forrige omr錮e" ; Text [ italian ] = "Area precedente" ; - Text [ spanish ] = "羠ea anterior" ; + Text [ spanish ] = "Secci髇 anterior" ; Text [ french ] = "Section pr閏閐ente" ; Text [ dutch ] = "Vorig bereik" ; Text [ portuguese ] = "Sec玢o anterior" ; Text[ chinese_simplified ] = "涓婁竴涓尯鍩"; - Text[ russian ] = "橡邃簌 钺豚耱"; + Text[ russian ] = "橡邃簌栝 疣玟咫"; Text[ polish ] = "Poprzednia sekcja"; Text[ japanese ] = "鍓嶃伄绡勫洸"; Text[ chinese_traditional ] = "涓婁竴鍊嬪崁鍩"; Text[ arabic ] = "轻湄寝 轻忧绒"; Text[ greek ] = "旭镧泔屙 屙玺"; - Text[ korean ] = "鞚挫爠 鞓侅棴"; + Text[ korean ] = "鞚挫爠 甑棴"; Text[ turkish ] = "謓ceki B鰈黰"; Text[ language_user1 ] = " "; Text[ catalan ] = "Secci anterior"; - Text[ finnish ] = "Edellinen osio"; + Text[ finnish ] = "Edellinen osa"; Text[ thai ] = "喔箞喔о笝喔佮箞喔笝"; }; String STR_IMGBTN_BKM_UP @@ -1739,7 +1739,7 @@ String STR_IMGBTN_BKM_UP Text [ dutch ] = "Vorige tekstmarkering" ; Text [ portuguese ] = "Marcador de texto anterior" ; Text[ chinese_simplified ] = "涓婁竴涓功绛"; - Text[ russian ] = "橡邃簌 蝈犟蝾忄 镱戾蜿"; + Text[ russian ] = "橡邃簌 玎觌噤赅"; Text[ polish ] = "Poprzednia zak砤dka"; Text[ japanese ] = "鍓嶃伄銉嗐偔銈广儓銉炪兗銈"; Text[ chinese_traditional ] = "涓婁竴鍊嬫浉绫"; @@ -1766,7 +1766,7 @@ String STR_IMGBTN_GRF_UP Text [ dutch ] = "Vorige afbeelding" ; Text [ portuguese ] = "Imagem anterior" ; Text[ chinese_simplified ] = "涓婁竴涓浘褰"; - Text[ russian ] = "橡邃簌栝 痂耋眍"; + Text[ russian ] = "橡邃簌栝 沭圄梓羼觇 钺牝"; Text[ polish ] = "Poprzednia grafika"; Text[ japanese ] = "鍓嶃伄鍥"; Text[ chinese_traditional ] = "涓婁竴鍊嬪湒褰"; @@ -1794,7 +1794,7 @@ String STR_IMGBTN_OLE_UP Text [ dutch ] = "Vorig OLE-object" ; Text [ portuguese ] = "Objecto OLE anterior" ; Text[ chinese_simplified ] = "涓婁竴涓 OLE-瀵硅薄"; - Text[ russian ] = "橡邃簌栝 钺牝 OLE"; + Text[ russian ] = "橡邃簌栝 OLE 钺牝"; Text[ polish ] = "Poprzedni obiekt OLE"; Text[ japanese ] = "鍓嶃伄 OLE 銈儢銈搞偋銈儓"; Text[ chinese_traditional ] = "涓婁竴鍊 OLE-鐗╀欢"; @@ -1846,7 +1846,7 @@ String STR_IMGBTN_SEL_UP Text [ italian ] = "Selezione precedente" ; Text [ spanish ] = "Selecci髇 anterior" ; Text [ french ] = "S閘ection pr閏閐ente" ; - Text [ dutch ] = "Vorige markering" ; + Text [ dutch ] = "Vorig merkteken" ; Text [ portuguese ] = "Selec玢o anterior" ; Text[ chinese_simplified ] = "涓婁竴涓夋嫨"; Text[ russian ] = "橡邃簌邋 恹溴脲龛"; @@ -1904,13 +1904,13 @@ String STR_IMGBTN_MARK_UP Text [ dutch ] = "Vorig merkteken" ; Text [ portuguese ] = "Marca anterior" ; Text[ chinese_simplified ] = "涓婁竴涓爣璁"; - Text[ russian ] = "橡邃簌 镱戾蜿"; + Text[ russian ] = "橡邃簌邋 磬镱扈磬龛"; Text[ polish ] = "Poprzedni znacznik"; Text[ japanese ] = "鍓嶃伄瑕氥亪姝€倎"; Text[ chinese_traditional ] = "涓婁竴鍊嬫彁閱"; Text[ arabic ] = "卺倾 轻市唔 轻忧绒"; Text[ greek ] = "旭镧泔屙 躔屙椠扉箸"; - Text[ korean ] = "鞚挫爠 響滌嫓鞛"; + Text[ korean ] = "鞚挫爠 氙鸽Μ 鞎岆"; Text[ turkish ] = "謓ceki an齧sat齝"; Text[ language_user1 ] = " "; Text[ catalan ] = "Recordatori anterior"; @@ -1964,7 +1964,7 @@ String STR_IMGBTN_SRCH_REP_UP Text[ chinese_traditional ] = "绻肩簩鍚戝緦鎼滃皨"; Text[ arabic ] = "闶侨谏 轻韧 後吾"; Text[ greek ] = "吁磔鏖箸 犴徭摁珞珧 疬簌"; - Text[ korean ] = "瓿勳啀 霋る 瓴靸"; + Text[ korean ] = "霋る 瓿勳啀 瓴靸"; Text[ turkish ] = "Geriye do餽u ara"; Text[ language_user1 ] = " "; Text[ catalan ] = "Continua la cerca cap enrere"; @@ -1981,7 +1981,7 @@ String STR_IMGBTN_INDEX_ENTRY_UP Text[ danish ] = "Forrige indekselement"; Text[ french ] = "Entr閑 d'index pr閏閐ente"; Text[ swedish ] = "F鰎eg錯nde f鰎teckningspost"; - Text[ dutch ] = "Vorig index item"; + Text[ dutch ] = "Vorig indexitem"; Text[ spanish ] = "Entrada de 韓dice anterior"; Text[ english_us ] = "Previous index entry"; Text[ chinese_simplified ] = "涓婁竴涓洰褰曟潯鐩"; @@ -2058,7 +2058,7 @@ String STR_IMGBTN_TBLFML_ERR_UP Text [ English ] = "Previous wrong table formula" ; Text[ english_us ] = "Previous faulty table formula"; Text[ portuguese ] = "F髍mula de tabela anterior errada"; - Text[ russian ] = "湾镳噔桦 镳邃簌 纛痨箅 蜞犭桷"; + Text[ russian ] = "橡邃簌 礤镳噔桦 纛痨箅 蜞犭桷"; Text[ dutch ] = "Vorige foutieve tabellenformule"; Text[ french ] = "Formule de table erron閑 pr閏閐ente"; Text[ spanish ] = "F髍mula de tabla anterior err髇ea"; @@ -2072,7 +2072,7 @@ String STR_IMGBTN_TBLFML_ERR_UP Text[ chinese_traditional ] = "涓婁竴鍊嬮尟瑾ょ殑宸ヤ綔琛ㄥ叕寮"; Text[ arabic ] = "枕凵 轻滔驷 轻吻仄 轻忧绒"; Text[ greek ] = "旭镧泔屙矧 脶龛狍燧盹 酏痫 疬磲赆"; - Text[ korean ] = "韹毽 鞚挫爠 響 靾橃嫕"; + Text[ korean ] = "鞛橂霅 鞚挫爠 響 靾橃嫕"; Text[ turkish ] = "謓ceki hatal tablo form黮"; Text[ language_user1 ] = " "; Text[ catalan ] = "F髍mula de taula defectuosa anterior"; @@ -2085,7 +2085,7 @@ String STR_IMGBTN_TBLFML_ERR_DOWN Text [ English ] = "Next wrong table formula" ; Text[ english_us ] = "Next faulty table formula"; Text[ portuguese ] = "F髍mula de tabela seguinte errada"; - Text[ russian ] = "湾镳噔桦 耠邃簋 纛痨箅 蜞犭桷"; + Text[ russian ] = "央邃簋 礤镳噔桦 纛痨箅 蜞犭桷"; Text[ dutch ] = "Volgende foutieve tabellenformule"; Text[ french ] = "Formule de table erron閑 suivante"; Text[ spanish ] = "Siguiente f髍mula err髇ea de tabla"; @@ -2099,7 +2099,7 @@ String STR_IMGBTN_TBLFML_ERR_DOWN Text[ chinese_traditional ] = "涓嬩竴鍊嬮尟瑾ょ殑宸ヤ綔琛ㄥ叕寮"; Text[ arabic ] = "枕凵 轻滔驷 轻吻仄 轻是犴"; Text[ greek ] = "硼屙矧 脶龛狍燧盹 酏痫 疬磲赆"; - Text[ korean ] = "韹毽 雼れ潓 響 靾橃嫕"; + Text[ korean ] = "鞛橂霅 雼れ潓 響 靾橃嫕"; Text[ turkish ] = "Sonraki hatal tablo form黮"; Text[ language_user1 ] = " "; Text[ catalan ] = "F髍mula de taula defectuosa seg黣nt"; @@ -2142,7 +2142,7 @@ ImageButton BTN_NAVI Text[ chinese_traditional ] = "鐎忚"; Text[ arabic ] = "轻汜峭"; Text[ greek ] = "体翎赀礴箸"; - Text[ korean ] = "雱る箘瓴岇澊靺"; + Text[ korean ] = "韮愳儔"; Text[ turkish ] = "Dolaa"; Text[ language_user1 ] = " "; Text[ catalan ] = "Navegaci"; @@ -2161,3 +2161,8 @@ ComboBox RID_PVIEW_ZOOM_LB Hide = TRUE ; }; + + + + + diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index c39f8c84ac0d..407cf8d8a361 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: basesh.cxx,v $ * - * $Revision: 1.37 $ + * $Revision: 1.38 $ * - * last change: $Author: os $ $Date: 2002-12-12 16:37:01 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -479,7 +479,12 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq) if ( nId == SID_CUT ) pTransfer->Cut(); else + { + const BOOL bLockedView = rSh.IsViewLocked(); + rSh.LockView( TRUE ); //lock visible section pTransfer->Copy(); + rSh.LockView( bLockedView ); + } break; } return; @@ -568,6 +573,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq) DBG_ERROR("falscher Dispatcher"); return; } + rReq.Done(); } /*-------------------------------------------------------------------- diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/ui/shells/drwbassh.cxx index 02a3b673c5aa..fe3f03eb4347 100644 --- a/sw/source/ui/shells/drwbassh.cxx +++ b/sw/source/ui/shells/drwbassh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drwbassh.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: fme $ $Date: 2002-12-06 09:45:33 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -683,7 +683,17 @@ void SwDrawBaseShell::GetState(SfxItemSet& rSet) rSet.DisableItem( nWhich ); else { - rSet.Put(SfxAllEnumItem(nWhich, USHRT_MAX)); + SfxAllEnumItem aEnumItem(nWhich, USHRT_MAX); + const SdrMarkList& rMarkList = pSdrView->GetMarkList(); + //if only one object is selected it can only be vertically + // aligned because it is character bound + if( rMarkList.GetMarkCount() == 1 ) + { + aEnumItem.DisableValue(SID_OBJECT_ALIGN_LEFT); + aEnumItem.DisableValue(SID_OBJECT_ALIGN_CENTER); + aEnumItem.DisableValue(SID_OBJECT_ALIGN_RIGHT); + } + rSet.Put(aEnumItem); } break; case FN_NAME_GROUP : diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx index 496c6c6c3045..3af24cef05b3 100644 --- a/sw/source/ui/shells/drwtxtex.cxx +++ b/sw/source/ui/shells/drwtxtex.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drwtxtex.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: os $ $Date: 2002-12-12 17:13:40 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -195,6 +195,9 @@ #ifndef _SVTOOLS_CJKOPTIONS_HXX #include <svtools/cjkoptions.hxx> #endif +#ifndef _SVTOOLS_LANGUAGEOPTIONS_HXX +#include <svtools/languageoptions.hxx> +#endif #ifndef _DOC_HXX #include <doc.hxx> #endif @@ -666,43 +669,59 @@ ASK_ESCAPE: case SID_TEXTDIRECTION_LEFT_TO_RIGHT: case SID_TEXTDIRECTION_TOP_TO_BOTTOM: - if( pOutliner ) - bFlag = pOutliner->IsVertical() == - (SID_TEXTDIRECTION_TOP_TO_BOTTOM == nSlotId); + if ( !SvtLanguageOptions().IsVerticalTextEnabled() ) + { + rSet.DisableItem( nSlotId ); + nSlotId = 0; + } else { - com::sun::star::text::WritingMode eMode = (com::sun::star::text::WritingMode) - ( (const SvxWritingModeItem&) aEditAttr.Get( SDRATTR_TEXTDIRECTION ) ).GetValue(); - - if( nSlotId == SID_TEXTDIRECTION_LEFT_TO_RIGHT ) - { - bFlag = eMode == com::sun::star::text::WritingMode_LR_TB; - } + if( pOutliner ) + bFlag = pOutliner->IsVertical() == + (SID_TEXTDIRECTION_TOP_TO_BOTTOM == nSlotId); else { - bFlag = eMode != com::sun::star::text::WritingMode_TB_RL; + com::sun::star::text::WritingMode eMode = (com::sun::star::text::WritingMode) + ( (const SvxWritingModeItem&) aEditAttr.Get( SDRATTR_TEXTDIRECTION ) ).GetValue(); + + if( nSlotId == SID_TEXTDIRECTION_LEFT_TO_RIGHT ) + { + bFlag = eMode == com::sun::star::text::WritingMode_LR_TB; + } + else + { + bFlag = eMode != com::sun::star::text::WritingMode_TB_RL; + } } } break; case SID_ATTR_PARA_LEFT_TO_RIGHT: case SID_ATTR_PARA_RIGHT_TO_LEFT: { - if(pOutliner && pOutliner->IsVertical()) + if ( !SvtLanguageOptions().IsCTLFontEnabled() ) { rSet.DisableItem( nWhich ); nSlotId = 0; } else { - switch( ( ( (SvxFrameDirectionItem&) aEditAttr.Get( EE_PARA_WRITINGDIR ) ) ).GetValue() ) + if(pOutliner && pOutliner->IsVertical()) + { + rSet.DisableItem( nWhich ); + nSlotId = 0; + } + else { - case FRMDIR_HORI_LEFT_TOP: - bFlag = nWhich == SID_ATTR_PARA_LEFT_TO_RIGHT; - break; + switch( ( ( (SvxFrameDirectionItem&) aEditAttr.Get( EE_PARA_WRITINGDIR ) ) ).GetValue() ) + { + case FRMDIR_HORI_LEFT_TOP: + bFlag = nWhich == SID_ATTR_PARA_LEFT_TO_RIGHT; + break; - case FRMDIR_HORI_RIGHT_TOP: - bFlag = nWhich != SID_ATTR_PARA_LEFT_TO_RIGHT; - break; + case FRMDIR_HORI_RIGHT_TOP: + bFlag = nWhich != SID_ATTR_PARA_LEFT_TO_RIGHT; + break; + } } } } diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx index 6007393708ee..3249ae159bca 100644 --- a/sw/source/ui/shells/frmsh.cxx +++ b/sw/source/ui/shells/frmsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frmsh.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: hbrinkm $ $Date: 2002-08-30 08:57:47 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -867,12 +867,17 @@ SwFrameShell::SwFrameShell(SwView &rView) : { SetName(String::CreateFromAscii("Frame")); SetHelpId(SW_FRAMESHELL); - SwTransferable::CreateSelection( rView.GetWrtShell() ); + + /* #96392# Use this to announce it is the frame shell who creates the + selection. */ + SwTransferable::CreateSelection( rView.GetWrtShell(), (ViewShell *) this ); } SwFrameShell::~SwFrameShell() { - SwTransferable::ClearSelection( GetShell() ); + /* #96392# Only clear the selection if it was this frame shell who created + it. */ + SwTransferable::ClearSelection( GetShell(), (ViewShell *) this ); } /*-------------------------------------------------------------------- diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src index 56c92eaf2afc..19ba59fad4e7 100644 --- a/sw/source/ui/shells/shells.src +++ b/sw/source/ui/shells/shells.src @@ -2,9 +2,9 @@ * * $RCSfile: shells.src,v $ * - * $Revision: 1.35 $ + * $Revision: 1.36 $ * - * last change: $Author: os $ $Date: 2002-12-06 14:00:03 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,7 +79,7 @@ InfoBox MSG_NO_RULER Message [ french ] = "Il n'existe pas d'image pour le th鑝e 'Rulers' dans la Gallery." ; Message [ dutch ] = "Onder het gallery-onderwerp 'Rulers' komen geen afbeeldingen voor." ; Message[ chinese_simplified ] = "鍦ㄧ敾寤婁富棰'闀挎潯褰'鍐呮棤浠讳綍鍥惧舰銆"; - Message[ russian ] = " 蝈戾 汔脲疱 '髓礤殛' 沭圄梓羼觇 钺牝钼 礤 耋耱怏弪."; + Message[ russian ] = " 蝈戾 汔脲疱 '灭囗梓睇 腓龛' 沭圄梓羼觇 钺牝钼 礤 耋耱怏弪."; Message[ polish ] = "Nie ma 縜dnych grafik w temacie galerii \"Obramowania\""; Message[ japanese ] = "銈儯銉┿儶銉嗐兗銉炪伄銆屻儷銉笺儵銉笺嶃伀銆佸洺銇亗銈娿伨銇涖倱銆"; Message[ chinese_traditional ] = "鐣粖涓婚[闀锋褰鍏х劇浠讳綍鍦栧舰銆"; @@ -87,7 +87,7 @@ InfoBox MSG_NO_RULER Message[ dutch ] = "Onder het gallery-onderwerp 'Rulers' komen geen afbeeldingen voor."; Message[ chinese_simplified ] = "鍦ㄧ敾寤婁富棰'闀挎潯褰'鍐呮棤浠讳綍鍥惧舰銆"; Message[ greek ] = "腻 躔荞黠蹴 泷狯殛 篝 篚腚镢 戾 栎灬 'Rulers'."; - Message[ korean ] = "臧る煬毽- 欤检牅 '雸堦笀鞛'鞐 攴鸽灅頂届澊 鞐嗢姷雼堧嫟."; + Message[ korean ] = "臧る煬毽 欤检牅 '雸堦笀鞛'鞐 攴鸽鞚 鞐嗢姷雼堧嫟."; Message[ turkish ] = "'Rulers' galeri konusunda bit eem grafik mevcut de餴l."; Message[ language_user1 ] = " "; Message[ catalan ] = "No hi ha cap mapa de bits en la galeria de temes 'Rulers'."; @@ -104,7 +104,7 @@ String STR_GRFILTER_OPENERROR Text [ portuguese ] = "Imposs韛el abrir ficheiro gr醘ico." ; Text [ finnish ] = "Grafiikkatiedostoa ei voi avata." ; Text [ danish ] = "Det er ikke muligt at 錬ne grafikfilen" ; - Text [ french ] = "Ouverture du fichier graphique impossible" ; + Text [ french ] = "Impossible d'ouvrir le fichier graphique !" ; Text [ swedish ] = "Grafikfil kan inte 鰌pnas" ; Text [ dutch ] = "Grafisch bestand kan niet worden geopend" ; Text [ spanish ] = "No es posible abrir el archivo gr醘ico" ; @@ -118,7 +118,7 @@ String STR_GRFILTER_OPENERROR Text[ dutch ] = "Grafisch bestand kan niet worden geopend"; Text[ chinese_simplified ] = "鏃犳硶鎵撳紑鍥惧舰鏂囦欢"; Text[ greek ] = "腻 暹磲 漉磲酎 麸 茼镩沆 麸 狁麇唢 泷狯殛"; - Text[ korean ] = "攴鸽灅頂 韺岇澕鞚 鞐 靾 鞐嗢姷雼堧嫟."; + Text[ korean ] = "攴鸽 韺岇澕鞚 鞐 靾 鞐嗢姷雼堧嫟."; Text[ turkish ] = "Grafik dosyas a琮lam齳or"; Text[ language_user1 ] = " "; Text[ catalan ] = "No es pot obrir el fitxer de gr鄁ics"; @@ -134,7 +134,7 @@ String STR_GRFILTER_IOERROR Text [ portuguese ] = "Imposs韛el ler o ficheiro gr醘ico." ; Text [ finnish ] = "Grafiikkatiedostoa ei voi lukea." ; Text [ danish ] = "Det er ikke muligt at l鎠e grafikfilen" ; - Text [ french ] = "Lecture du fichier graphique impossible" ; + Text [ french ] = "Impossible de lire le fichier graphique !" ; Text [ swedish ] = "Grafikfil kan inte l鋝as" ; Text [ dutch ] = "Grafisch bestand is onleesbaar" ; Text [ spanish ] = "No es posible leer el archivo gr醘ico" ; @@ -148,7 +148,7 @@ String STR_GRFILTER_IOERROR Text[ dutch ] = "Grafisch bestand is onleesbaar"; Text[ chinese_simplified ] = "鏃犳硶璇诲彇鍥惧舰鏂囦欢"; Text[ greek ] = "腻 暹磲 漉磲艮 犴茔睐箸 麸 狁麇唢 泷狯殛"; - Text[ korean ] = "攴鸽灅頂 韺岇澕鞚 鞚届潉 靾 鞐嗢姷雼堧嫟."; + Text[ korean ] = "攴鸽 韺岇澕鞚 鞚届潉 靾 鞐嗢姷雼堧嫟."; Text[ turkish ] = "Grafik dosyas okunam齳or"; Text[ language_user1 ] = " "; Text[ catalan ] = "No es pot llegir el fitxer de gr鄁ics"; @@ -178,7 +178,7 @@ String STR_GRFILTER_FORMATERROR Text[ dutch ] = "Onbekende grafische-bestandsindeling"; Text[ chinese_simplified ] = "涓嶆槑鐨勫浘褰㈡牸寮"; Text[ greek ] = "€睐篝 祜聆 泷狯殛"; - Text[ korean ] = "鞎岆牑鞝搞鞛堨銆鞎婌潃 攴鸽灅頂 靹滌嫕"; + Text[ korean ] = "鞎 靾 鞐嗠姅 攴鸽 靹滌嫕"; Text[ turkish ] = "Bilinmeyen grafik format"; Text[ language_user1 ] = " "; Text[ catalan ] = "Format d'imatge desconegut"; @@ -298,7 +298,7 @@ String STR_INSERT_GRAPHIC Text[ dutch ] = "Afbeelding invoegen"; Text[ chinese_simplified ] = "鎻掑叆鍥惧舰"; Text[ greek ] = "旭矬柁赙 泷狯殛稞"; - Text[ korean ] = "攴鸽灅頂 靷届瀰"; + Text[ korean ] = "攴鸽 靷届瀰"; Text[ turkish ] = "Grafik ekle"; Text[ language_user1 ] = " "; Text[ catalan ] = "Insereix un gr鄁ic"; @@ -430,7 +430,7 @@ String STR_REDLINE_DELETED Text [ swedish ] = "Radering" ; Text [ danish ] = "Sletning" ; Text [ italian ] = "Elimina" ; - Text [ spanish ] = "Eliminaci髇" ; + Text [ spanish ] = "Borrar" ; Text [ french ] = "Suppression" ; Text [ dutch ] = "Gewist" ; Text [ portuguese ] = "Eliminado" ; @@ -461,7 +461,7 @@ String STR_REDLINE_AUTOFMT TEXT[ french ] = "AutoFormat"; TEXT[ swedish ] = "Autoformat"; TEXT[ dutch ] = "AutoOpmaak"; - TEXT[ spanish ] = "AutoFormato"; + TEXT[ spanish ] = "Formateado autom醫ico"; TEXT[ english_us ] = "AutoFormat"; TEXT[ chinese_simplified ] = "鑷姩鏍煎紡"; TEXT[ russian ] = "棱蝾纛痨囹"; @@ -489,7 +489,7 @@ String STR_REDLINE_FORMATED Text [ danish ] = "Formateret" ; Text [ italian ] = "Attribuzione" ; Text [ spanish ] = "Formateado" ; - Text [ french ] = "Mise en forme" ; + Text [ french ] = "Formatage" ; Text [ dutch ] = "Opmaak" ; Text [ portuguese ] = "Formatado" ; Text[ chinese_simplified ] = "灞炴"; @@ -522,7 +522,7 @@ String STR_REDLINE_TABLECHG Text [ dutch ] = "Tabelwijziging" ; Text [ portuguese ] = "Tabela modificada" ; Text[ chinese_simplified ] = "淇敼琛ㄦ牸"; - Text[ russian ] = "如戾礤龛 蜞犭桷"; + Text[ russian ] = "绣溧牝桊钼囗桢 蜞犭桷"; Text[ polish ] = "Zmiany w tabelach"; Text[ japanese ] = "銉嗐兗銉栥儷銇鏇"; Text[ chinese_traditional ] = "淇敼琛ㄦ牸"; @@ -530,7 +530,7 @@ String STR_REDLINE_TABLECHG Text[ dutch ] = "Tabelwijziging"; Text[ chinese_simplified ] = "淇敼琛ㄦ牸"; Text[ greek ] = "择镳镳镞珞 疬磲赆"; - Text[ korean ] = "響滉皜 氤瓴诫悩鞐堨姷雼堧嫟."; + Text[ korean ] = "響 氤瓴 靷暛"; Text[ turkish ] = "Tablo de餴㱮kli餴"; Text[ language_user1 ] = " "; Text[ catalan ] = "Canvis a la taula"; @@ -577,7 +577,7 @@ String STR_REDLINE_TITLE Text[ french ] = "AutoFormat"; Text[ swedish ] = "Autoformat"; Text[ dutch ] = "AutoOpmaak"; - Text[ spanish ] = "AutoFormato"; + Text[ spanish ] = "Formateado autom醫ico"; Text[ english_us ] = "AutoFormat"; Text[ chinese_simplified ] = "鑷姩鏍煎紡"; Text[ russian ] = "棱蝾纛痨囹"; @@ -606,7 +606,7 @@ String STR_REDLINE_MSG Text[ french ] = "L'AutoFormat a termin.\nVous pouvez choisir d'en accepter ou rejeter en une seule fois toutes les modifications, ou\n de vous faire afficher toutes les modifications pour les revoir."; Text[ swedish ] = "Autoformatet 鋜 f鋜digt.\nDu kan acceptera eller avb鰆a alla 鋘dringar\neller acceptera eller avb鰆a 鋘dringar en och en."; Text[ dutch ] = "AutoOpmaak voltooid.\nU kunt nu alle wijzigingen accepteren of verwerpen,\nof afzonderlijke wijzigingen accepteren of verwerpen."; - Text[ spanish ] = "El AutoFormato ha concluido.\nAhora puede aceptar o rechazar todos los cambios\na la vez o uno por uno."; + Text[ spanish ] = "El Formateado autom醫ico ha concluido.\nAhora puede aceptar o rechazar todas las modificaciones,\na la vez o una por una."; Text[ english_us ] = "AutoFormat completed.\nYou can accept or reject all changes,\nor accept or reject particular changes."; Text[ chinese_simplified ] = "宸茬粡瀹屾垚鑷姩鏍煎紡銆俓n鎮ㄧ幇鍦ㄨ兘澶熸帴鍙楁垨鎷掔粷鎵鏈夌殑鏇存敼锛屾垨鑰匼n鎺ュ彈鎴栨嫆缁濆崟涓洿鏀广"; Text[ russian ] = "棱蝾纛痨囹桊钼囗桢 玎觐眵屙.\n彦轺囫 恹 祛驽蝈 镳桧螯 桦 铗觌铐栩 耩噻 怦 桤戾礤龛, 桦 赅驿铄 镱 铗溴朦眍耱."; @@ -646,7 +646,7 @@ String STR_REDLINE_ACCEPT_ALL Text[ dutch ] = "~Alles accepteren"; Text[ chinese_simplified ] = "鍏ㄩ儴鎺ュ彈"; Text[ greek ] = "琉镤秣 "; - Text[ korean ] = "氇憪 鞝侅毄"; + Text[ korean ] = "氇憪 霃欖潣"; Text[ turkish ] = "T黰黱 kabul et"; Text[ language_user1 ] = " "; Text[ catalan ] = "Accepta-ho tot"; @@ -675,7 +675,7 @@ String STR_REDLINE_REJECT_ALL Text[ dutch ] = "~Alles verwerpen"; Text[ chinese_simplified ] = "鍏ㄩ儴鎷掔粷"; Text[ greek ] = "琉耖 "; - Text[ korean ] = "氇憪 旆唽"; + Text[ korean ] = "氇憪 瓯半秬"; Text[ turkish ] = "T黰黱 reddet"; Text[ language_user1 ] = " "; Text[ catalan ] = "Rebutja'ls tots"; @@ -690,7 +690,7 @@ String STR_REDLINE_EDIT Text[ portuguese_brazilian ] = "Review ~Changes"; Text[ portuguese ] = "Editar ~modifica珲es"; Text[ danish ] = "Rediger 鎛dringer"; - Text[ french ] = "~Revoir les modifications"; + Text[ french ] = "蓗diter les modifications"; Text[ swedish ] = "Redigera ~鋘dringar"; Text[ dutch ] = "Wijzigingen ~bewerken"; Text[ spanish ] = "Editar ~modificaciones"; @@ -735,7 +735,7 @@ QueryBox DLG_IMPORT_DBNAME Message[ dutch ] = "Moet de databasenaam als standaarddatabase voor het document worden overgenomen?"; Message[ chinese_simplified ] = "瑕佽鏂囦欢閲囩敤榛樿鐨勬暟鎹簱鍚嶇О锛"; Message[ greek ] = "容脲翦 磲 黢珞殪镳镩玷暹 麸 镬 翮 廛箸 溴滹燧睐 廛箸 溴滹燧睐 瘃镥痖腼戕 汩 麸 葶泷狯;"; - Message[ korean ] = "雿办澊韯半矤鞚挫姢 鞚措鞚 氍胳劀鞚 旮半掣 雿办澊韯半矤鞚挫姢搿 靷毄頃橁矤鞀惦媹旯?"; + Message[ korean ] = "雿办澊韯半矤鞚挫姢 鞚措鞚 氍胳劀鞚 旮半掣 雿办澊韯半矤鞚挫姢搿 靷毄頃橃嫓瓴犾姷雼堦箤?"; Message[ turkish ] = "Veritaban ad, belge i鏸n standart veritaban olarak kullan齦s齨 m?"; Message[ language_user1 ] = " "; Message[ catalan ] = "Voleu utilitzar el nom de la base de dades com a base de dades per defecte per al document?"; @@ -829,6 +829,30 @@ ToolBox RID_TEXT_TOOLBOX MN_TEXT_BACKGROUND MN_TEXT_DIALOGS(TRUE) }; + ItemList[arabic] = + { + MN_TEMPLATE + MN_FONT + MN_TEXT1_RTL(TRUE) + MN_TEXT1_BLOCK + MN_TEXT_RTL_LTR + MN_TEXT_LINESPACE + MN_TEXT2 + MN_TEXT_BACKGROUND + MN_TEXT_DIALOGS(TRUE) + }; + ItemList[hebrew] = + { + MN_TEMPLATE + MN_FONT + MN_TEXT1_RTL(TRUE) + MN_TEXT1_BLOCK + MN_TEXT_RTL_LTR + MN_TEXT_LINESPACE + MN_TEXT2 + MN_TEXT_BACKGROUND + MN_TEXT_DIALOGS(TRUE) + }; Scroll = TRUE ; }; String RID_TABLE_TOOLBOX @@ -1124,7 +1148,7 @@ String RID_GRAFIK_TOOLBOX Text[ dutch ] = "Objectbalk afbeeldingen"; Text[ chinese_simplified ] = "鍥惧舰瀵硅薄鏍"; Text[ greek ] = "民犰燹 泷狯殛 犴糸赍殪蓓"; - Text[ korean ] = "攴鸽灅頂 臧滌泊 氇潓"; + Text[ korean ] = "攴鸽 臧滌泊 氇潓"; Text[ turkish ] = "Grafik nesne 鐄bu饀"; Text[ language_user1 ] = " "; Text[ catalan ] = "Barra d'objectes gr鄁ics"; @@ -1740,26 +1764,26 @@ String RID_DRAW_TEXT_TOOLBOX { Text = "Textobjektleiste/Grafik" ; Text [ norwegian ] = "Tegne tekstmodus" ; - Text [ italian ] = "Barra degli oggetti di testo" ; + Text [ italian ] = "Barra degli oggetti di testo/immagini" ; Text [ portuguese_brazilian ] = "Modo desenhar texto" ; Text [ portuguese ] = "Barra de objectos de texto" ; Text [ finnish ] = "Tekstin muotoilurivi" ; Text [ danish ] = "Tekstobjektlinje" ; - Text [ french ] = "Barre d'objets de texte" ; - Text [ swedish ] = "Textobjektlist" ; + Text [ french ] = "Barre d'objets de texte/Image" ; + Text [ swedish ] = "Textobjektlist/grafik" ; Text [ dutch ] = "Tekstobjectbalk" ; - Text [ spanish ] = "Barra de objetos de texto" ; + Text [ spanish ] = "Barra de objetos de texto/im醙enes" ; Text [ english_us ] = "Text Object Bar/Graphics" ; - Text[ chinese_simplified ] = "鏂囧瓧瀵硅薄鏍"; + Text[ chinese_simplified ] = "鏂囧瓧瀵硅薄鏍/鍥惧舰"; Text[ russian ] = "暑眚尻耱磬 镟礤朦 蝈犟蜞"; Text[ polish ] = "Pasek obiekt體 tekstowych"; - Text[ japanese ] = "銉嗐偔銈广儓銈儢銈搞偋銈儓銉愩兗"; - Text[ chinese_traditional ] = "鏂囧瓧鐗╀欢鍒"; + Text[ japanese ] = "銉嗐偔銈广儓銈儢銈搞偋銈儓銉愩兗/鍥"; + Text[ chinese_traditional ] = "鏂囧瓧鐗╀欢鍒/鍦栧舰"; Text[ arabic ] = "匝碡 咔其鞘 轻湔"; Text[ dutch ] = "Tekstobjectbalk"; - Text[ chinese_simplified ] = "鏂囧瓧瀵硅薄鏍"; + Text[ chinese_simplified ] = "鏂囧瓧瀵硅薄鏍/鍥惧舰"; Text[ greek ] = "民犰燹 犴糸赍殪蓓 赍殪蓓秕"; - Text[ korean ] = "韰嶌姢韸 臧滌泊 氇潓"; + Text[ korean ] = "韰嶌姢韸 臧滌泊 氇潓/攴鸽"; Text[ turkish ] = "Metin nesne 鐄bu饀"; Text[ language_user1 ] = " "; Text[ catalan ] = "Barra d'objectes de text"; @@ -1813,6 +1837,72 @@ ToolBox RID_DRAW_TEXT_TOOLBOX MN_TEXT_DIALOGS(FALSE) }; + ItemList[arabic] = + { + MN_FONT + MN_TEXT1_RTL(FALSE) + MN_TEXT1_BLOCK + MN_TEXT_LINESPACE + ToolBoxItem + { + Type = TOOLBOXITEM_SEPARATOR ; + }; + ToolBoxItem + { + ITEM_TOOLBAR_ATTR_CHAR_COLOR + Hide = TRUE; + }; + MN_TEXT_RTL_LTR + ToolBoxItem + { + Type = TOOLBOXITEM_SEPARATOR ; + }; + ToolBoxItem + { + Identifier = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; + HelpID = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; + }; + ToolBoxItem + { + Identifier = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; + HelpID = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; + }; + + MN_TEXT_DIALOGS(FALSE) + }; + ItemList[hebrew] = + { + MN_FONT + MN_TEXT1_RTL(FALSE) + MN_TEXT1_BLOCK + MN_TEXT_LINESPACE + ToolBoxItem + { + Type = TOOLBOXITEM_SEPARATOR ; + }; + ToolBoxItem + { + ITEM_TOOLBAR_ATTR_CHAR_COLOR + Hide = TRUE; + }; + MN_TEXT_RTL_LTR + ToolBoxItem + { + Type = TOOLBOXITEM_SEPARATOR ; + }; + ToolBoxItem + { + Identifier = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; + HelpID = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; + }; + ToolBoxItem + { + Identifier = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; + HelpID = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; + }; + + MN_TEXT_DIALOGS(FALSE) + }; Scroll = TRUE ; }; String RID_NUM_TOOLBOX @@ -1993,7 +2083,7 @@ String STR_SHELLNAME_TABLE Text[ dutch ] = "Tabel"; Text[ chinese_simplified ] = "琛ㄦ牸"; Text[ greek ] = "羞磲赆"; - Text[ korean ] = "鞁滍姼"; + Text[ korean ] = "響"; Text[ turkish ] = "Tablo"; Text[ language_user1 ] = " "; Text[ catalan ] = "Taula"; @@ -2051,7 +2141,7 @@ String STR_SHELLNAME_GRAPHIC Text[ dutch ] = "Afbeelding"; Text[ chinese_simplified ] = "鍥惧舰"; Text[ greek ] = "民狯殛"; - Text[ korean ] = "攴鸽灅頂"; + Text[ korean ] = "攴鸽"; Text[ turkish ] = "Grafik"; Text[ language_user1 ] = " "; Text[ catalan ] = "Gr鄁ic"; @@ -2209,7 +2299,7 @@ String STR_SHELLNAME_DRAW_TEXT Text [ ENGLISH ] = "Draw text" ; Text [ english_us ] = "Draw text" ; Text [ italian ] = "Testo di disegno" ; - Text [ spanish ] = "Texto de dise駉" ; + Text [ spanish ] = "Texto de dibujo" ; Text [ french ] = "Texte dessin" ; Text [ dutch ] = "Tekentekst" ; Text [ swedish ] = "Teckningstext" ; @@ -2284,7 +2374,7 @@ String STR_SWBG_GRAPHIC Text[ dutch ] = "Afbeelding"; Text[ chinese_simplified ] = "鍥惧舰"; Text[ greek ] = "民狯殛"; - Text[ korean ] = "攴鸽灅頂"; + Text[ korean ] = "攴鸽"; Text[ turkish ] = "Grafik"; Text[ language_user1 ] = " "; Text[ catalan ] = "Gr鄁ics"; @@ -2371,7 +2461,7 @@ String STR_SWBG_TABLE Text[ dutch ] = "Tabel"; Text[ chinese_simplified ] = "琛ㄦ牸"; Text[ greek ] = "羞磲赆"; - Text[ korean ] = "鞁滍姼"; + Text[ korean ] = "響"; Text[ turkish ] = "Tablo"; Text[ language_user1 ] = " "; Text[ catalan ] = "Taula"; @@ -2578,3 +2668,8 @@ String STR_NAME_GROUP_DIALOG + + + + + diff --git a/sw/source/ui/shells/slotadd.cxx b/sw/source/ui/shells/slotadd.cxx index 561f5e26a318..1d0127cad543 100644 --- a/sw/source/ui/shells/slotadd.cxx +++ b/sw/source/ui/shells/slotadd.cxx @@ -2,9 +2,9 @@ * * $RCSfile: slotadd.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: os $ $Date: 2002-12-05 12:56:52 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,6 +68,9 @@ #include "uiparam.hxx" #include "cmdid.h" +#include <svtools/globalnameitem.hxx> + + #ifndef _SVT_IMAGEITM_HXX #include <svtools/imageitm.hxx> #endif diff --git a/sw/source/ui/shells/textdrw.cxx b/sw/source/ui/shells/textdrw.cxx index 6656272d43ad..a85e855a8129 100644 --- a/sw/source/ui/shells/textdrw.cxx +++ b/sw/source/ui/shells/textdrw.cxx @@ -2,9 +2,9 @@ * * $RCSfile: textdrw.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: oj $ $Date: 2002-12-02 14:16:43 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -104,6 +104,10 @@ #include <poolfmt.hrc> #endif +#ifndef _SV_SOUND_HXX +#include <vcl/sound.hxx> +#endif + #define C2U(cChar) rtl::OUString::createFromAscii(cChar) using namespace ::com::sun::star; using namespace ::rtl; @@ -169,9 +173,12 @@ void SwBaseShell::InsertURLButton(const String& rURL, const String& rTarget, con aTmp.setValue( &eButtonType, ::getCppuType((const form::FormButtonType*)0)); xPropSet->setPropertyValue( C2U("ButtonType"), aTmp ); - // #105638# OJ - aTmp <<= sal_True; - xPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DispatchURLInternal" )), aTmp ); + if ( Sound::IsSoundFile( rURL ) ) + { + // #105638# OJ + aTmp <<= sal_True; + xPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DispatchURLInternal" )), aTmp ); + } } if (rSh.IsObjSelected()) diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx index 93a42c0dfcf1..0618319283a5 100644 --- a/sw/source/ui/shells/textfld.cxx +++ b/sw/source/ui/shells/textfld.cxx @@ -2,9 +2,9 @@ * * $RCSfile: textfld.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: os $ $Date: 2002-11-13 09:20:18 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -751,7 +751,7 @@ void SwTextShell::StateField( SfxItemSet &rSet ) case FN_INSERT_FIELD: { SfxViewFrame* pVFrame = GetView().GetViewFrame(); - if (pVFrame->KnowsChildWindow(FN_INSERT_FIELD)) + if(pVFrame->KnowsChildWindow(FN_INSERT_FIELD) && !pVFrame->HasChildWindow(FN_INSERT_FIELD_DATA_ONLY) ) rSet.Put(SfxBoolItem( FN_INSERT_FIELD, pVFrame->HasChildWindow(nWhich))); else rSet.DisableItem(FN_INSERT_FIELD); diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index 838eb85265be..5fc82e9a1095 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: textsh.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: os $ $Date: 2002-12-05 12:56:53 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,6 +73,7 @@ #include <uiparam.hxx> #endif +#include <svtools/globalnameitem.hxx> #ifndef __RSC //autogen #include <tools/errinf.hxx> @@ -427,8 +428,20 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) case SID_INSERT_PLUGIN: case SID_INSERT_APPLET: case SID_INSERT_FLOATINGFRAME: - rSh.Insert( (SvInPlaceObjectRef*)0, 0, TRUE, nSlot); + { + SFX_REQUEST_ARG( rReq, pNameItem, SfxGlobalNameItem, SID_INSERT_OBJECT, sal_False ); + SvGlobalName *pName = NULL; + SvGlobalName aName; + if ( pNameItem ) + { + aName = pNameItem->GetValue(); + pName = &aName; + } + + DBG_ASSERT( !pNameItem || nSlot == SID_INSERT_OBJECT, "Superfluous argument!" ); + rSh.Insert( (SvInPlaceObjectRef*)0, pName, TRUE, nSlot); break; + } case SID_INSERT_DIAGRAM: { diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx index b3a58c980e51..110578fe22df 100644 --- a/sw/source/ui/shells/txtattr.cxx +++ b/sw/source/ui/shells/txtattr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtattr.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: os $ $Date: 2002-12-05 12:56:53 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,6 +81,9 @@ #ifndef _SFXITEMITER_HXX #include <svtools/itemiter.hxx> #endif +#ifndef _SVTOOLS_LANGUAGEOPTIONS_HXX +#include <svtools/languageoptions.hxx> +#endif #ifndef _SFX_BINDINGS_HXX //autogen #include <sfx2/bindings.hxx> #endif @@ -603,7 +606,7 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq) else { SfxItemSet aSet(GetPool(), RES_PARATR_DROP, RES_PARATR_DROP, - HINT_END, HINT_END); + HINT_END, HINT_END, 0); rSh.GetAttr(aSet); SwDropCapsDlg *pDlg = new SwDropCapsDlg(GetView().GetWindow(), aSet); if (pDlg->Execute() == RET_OK) @@ -796,25 +799,35 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet) case SID_ATTR_PARA_LEFT_TO_RIGHT : case SID_ATTR_PARA_RIGHT_TO_LEFT : { - // is the item set? - if(aCoreSet.GetItemState( RES_FRAMEDIR, FALSE ) >= SFX_ITEM_DEFAULT) + if ( !SvtLanguageOptions().IsCTLFontEnabled() ) { - SvxFrameDirection eFrmDir = (SvxFrameDirection) - ((const SvxFrameDirectionItem& )aCoreSet.Get(RES_FRAMEDIR)).GetValue(); - if (FRMDIR_ENVIRONMENT == eFrmDir) - { - eFrmDir = rSh.IsInRightToLeftText() ? - FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP; - } - bFlag = (SID_ATTR_PARA_LEFT_TO_RIGHT == nSlot && - FRMDIR_HORI_LEFT_TOP == eFrmDir) || - (SID_ATTR_PARA_RIGHT_TO_LEFT == nSlot && - FRMDIR_HORI_RIGHT_TOP == eFrmDir); + rSet.DisableItem( nSlot ); + nSlot = 0; } else { - rSet.InvalidateItem(nSlot); - nSlot = 0; + // is the item set? + USHORT nHtmlMode = GetHtmlMode(rSh.GetView().GetDocShell()); + if((!(nHtmlMode & HTMLMODE_ON) || (0 != (nHtmlMode & HTMLMODE_SOME_STYLES))) && + aCoreSet.GetItemState( RES_FRAMEDIR, FALSE ) >= SFX_ITEM_DEFAULT) + { + SvxFrameDirection eFrmDir = (SvxFrameDirection) + ((const SvxFrameDirectionItem& )aCoreSet.Get(RES_FRAMEDIR)).GetValue(); + if (FRMDIR_ENVIRONMENT == eFrmDir) + { + eFrmDir = rSh.IsInRightToLeftText() ? + FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP; + } + bFlag = (SID_ATTR_PARA_LEFT_TO_RIGHT == nSlot && + FRMDIR_HORI_LEFT_TOP == eFrmDir) || + (SID_ATTR_PARA_RIGHT_TO_LEFT == nSlot && + FRMDIR_HORI_RIGHT_TOP == eFrmDir); + } + else + { + rSet.InvalidateItem(nSlot); + nSlot = 0; + } } } break; diff --git a/sw/source/ui/table/chartins.cxx b/sw/source/ui/table/chartins.cxx index 50d8079ee6fd..a9680946c0a1 100644 --- a/sw/source/ui/table/chartins.cxx +++ b/sw/source/ui/table/chartins.cxx @@ -2,9 +2,9 @@ * * $RCSfile: chartins.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: os $ $Date: 2001-06-29 06:19:57 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -155,7 +155,8 @@ SwInsertChartDlg::SwInsertChartDlg( SfxBindings* pBindings, pOutItemSet(0), pChartData(0), bUpdateChartData(TRUE), - bChartInserted(FALSE) + bChartInserted(FALSE), + bChildOpen(FALSE) { FreeResource(); pSh->Push(); @@ -225,6 +226,23 @@ BOOL SwInsertChartDlg::Close() return SfxModelessDialog::Close(); } + +void SwInsertChartDlg::Activate() +{ + SfxModelessDialog::Activate(); + + if ( bChildOpen && pChartDlg ) + { + // #107337# The ChildWindow's "hidden" state is reset if the view is activated, + // so it is hidden again on activating if the child dialog is open. + + SfxViewFrame* pVFrame = pWrtShell->GetView().GetViewFrame(); + pVFrame->ShowChildWindow(SID_INSERT_DIAGRAM, FALSE); + + pChartDlg->GrabFocus(); // child dialog should have focus + } +} + /*------------------------------------------------------------------------ Beschreibung: ------------------------------------------------------------------------*/ @@ -253,7 +271,9 @@ IMPL_LINK( SwInsertChartDlg, NextHdl, Button *, pBtn ) pChartDlg->SetPosPixel(GetPosPixel()); SfxViewFrame* pVFrame = pWrtShell->GetView().GetViewFrame(); pVFrame->ShowChildWindow(SID_INSERT_DIAGRAM, FALSE); + bChildOpen = TRUE; USHORT nResult = pChartDlg->Execute(); + bChildOpen = FALSE; switch( nResult ) { case RET_OK: diff --git a/sw/source/ui/table/chartins.src b/sw/source/ui/table/chartins.src index 7c2d992c9f35..9892d35e7822 100644 --- a/sw/source/ui/table/chartins.src +++ b/sw/source/ui/table/chartins.src @@ -2,9 +2,9 @@ * * $RCSfile: chartins.src,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: os $ $Date: 2002-10-30 12:41:38 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -112,7 +112,7 @@ ModelessDialog DLG_INSERT_CHART Text [ ENGLISH_US ] = "A~rea" ; Text [ italian ] = "Area" ; Text [ spanish ] = "~羠ea" ; - Text [ french ] = "C~at間orie" ; + Text [ french ] = "Plage" ; Text [ dutch ] = "~Bereik" ; Text [ swedish ] = "~Omr錮e" ; Text [ danish ] = "Omr錮e" ; @@ -157,7 +157,7 @@ ModelessDialog DLG_INSERT_CHART Text [ portuguese_brazilian ] = "Erste ~Reihe als Beschriftung" ; Text [ portuguese ] = "Primeira ~linha como etiqueta" ; Text[ chinese_simplified ] = "绗竴琛屼綔涓烘爣棰(~F)"; - Text[ russian ] = "襄疴 耱痤赅 赅 镱滹桉"; + Text[ russian ] = "襄疴 耱痤赅 赅 磬玮囗桢"; Text[ polish ] = "Pierwszy wiersz jako etykieta"; Text[ japanese ] = "鏈鍒濄伄琛屻倰闋呯洰鍚嶃伀寮曠敤(~F)"; Text[ chinese_traditional ] = "绗竴琛屼綔鐐烘椤(~F)"; @@ -168,7 +168,7 @@ ModelessDialog DLG_INSERT_CHART Text[ korean ] = "觳矆歆 頄夓潉 旌§厴鞙茧(~F)"; Text[ turkish ] = "Ba齥lar ~birinci sat齬da"; Text[ catalan ] = "La ~primera fila com a llegenda"; - Text[ finnish ] = "~Ensimm鋓nen rivi kuvaotsikkona"; + Text[ finnish ] = "~Ensimm鋓nen rivi otsikkona"; Text[ thai ] = "喙佮笘喔о箒~喔｀竵喙喔涏箛喔權竸喔赤腑喔樴复喔氞覆喔⑧笭喔侧笧"; }; CheckBox CB_FIRST_COL @@ -189,7 +189,7 @@ ModelessDialog DLG_INSERT_CHART Text [ portuguese_brazilian ] = "Erste ~Spalte als Beschriftung" ; Text [ portuguese ] = "Primeira ~coluna como etiqueta" ; Text[ chinese_simplified ] = "绗竴鍒椾綔涓烘爣棰(~C)"; - Text[ russian ] = "襄疴 耱铍徨 赅 镱滹桉"; + Text[ russian ] = "襄疴 耱铍徨 赅 磬玮囗桢"; Text[ polish ] = "Pierwsza kolumna jako etykieta"; Text[ japanese ] = "鏈鍒濄伄鍒椼倰闋呯洰鍚嶃伀寮曠敤(~C)"; Text[ chinese_traditional ] = "绗竴娆勭暥浣滄椤(~C)"; @@ -200,7 +200,7 @@ ModelessDialog DLG_INSERT_CHART Text[ korean ] = "觳矆歆 鞐挫潉 旌§厴鞙茧(~C)"; Text[ turkish ] = "Ba齥lar ~birinci s黷unda"; Text[ catalan ] = "La primera ~columna com a llegenda"; - Text[ finnish ] = "~Ensimm鋓nen sarake kuvaotsikkona"; + Text[ finnish ] = "~Ensimm鋓nen sarake otsikkona"; Text[ thai ] = "~喔勦腑喔ム副喔∴笝喙屶箒喔｀竵喙喔涏箛喔權竸喔赤腑喔樴复喔氞覆喔⑧笭喔侧笧"; }; FixedText FT_TEXT @@ -210,26 +210,26 @@ ModelessDialog DLG_INSERT_CHART Text = "Falls die ausgew鋒lten Zellen nicht die gew黱schten Daten enthalten, w鋒len Sie jetzt den Bereich aus.\n\nBeziehen Sie die Zellen mit Spalten- bzw. Zeilenbeschriftungen mit ein, wenn Sie diese in Ihrer Grafik dargestellt haben m鯿hten." ; Text [ ENGLISH ] = "If the marked area does not represent the desired data, mark your data now.\nInclude the cells containing the column- and row identifier in case you want them to be included in your chart." ; - Text [ ENGLISH_US ] = "If the marked cells do not represent the desired data, mark the area now.\nInclude the cells containing the column and row labels if you want them to be included in your chart." ; + Text [ ENGLISH_US ] = "If the selected cells do not contain the desired data, select the data range now.\n\nInclude the cells containing column and row labels if you want them to be included in your chart." ; WordBreak = TRUE ; - Text [ italian ] = "Se le celle evidenziate non contengono i dati voluti, selezionate l'area.\n\nIncludete le celle contenenti i titoli delle colonne e delle righe se volete che compaiano nel diagramma." ; - Text [ spanish ] = "En caso de que las celdas marcadas no contengan los datos deseados, marque ahora el 醨ea.\n\nIncluya las celdas con los t韙ulos de las columnas y filas si desea que 閟tas aparezcan en el gr醘ico." ; - Text [ french ] = "Si les cellules marqu閑s ne contiennent pas les donn閑s souhait閑s, s閘ectionnez pr閟ent la plage. \n\nIncluez les cellules avec les intitul閟 de colonnes et de lignes pour les faire figurer dans le diagramme." ; - Text [ dutch ] = "Als de gemarkeerde cellen niet de gewenste gegevens bevatten markeert u nu het bereik.\n\nMarkeer eveneens de cellen met de kolom- resp. rijlabels als u deze in uw afbeelding wilt weergeven." ; - Text [ swedish ] = "Om de markerade cellerna inte inneh錶ler de 鰊skade data, markera d omr錮et nu.\n\nTa med de celler som inneh錶ler kolumn- och rad鰒erskrifter om dessa skall visas i grafiken." ; + Text [ italian ] = "Se le celle evidenziate non contengono i dati voluti, selezionate l'area.\n\nSelezionate le celle e, se volete includerle nel diagramma, anche le intestazioni di riga e colonna." ; + Text [ spanish ] = "Si las celdas seleccionadas no contienen los datos deseados, seleccione el 醨ea.\n\nIncluya los nombres de las columnas y filas si desea que aparezcan en el diagrama." ; + Text [ french ] = "Si les cellules s閘ectionn閑s ne contiennent pas les donn閑s souhait閑s, s閘ectionnez pr閟ent la plage.\n\nMarquez les 閠iquettes des colonnes et des lignes si vous souhaitez les faire figurer dans le diagramme." ; + Text [ dutch ] = "Als de gemarkeerde cellen niet de gewenste gegevens bevatten, markeert u nu het bereik.\n\nMarkeer eveneens de cellen met de kolom- of de rijlabels als u deze in uw afbeelding wilt weergeven." ; + Text [ swedish ] = "Om de markerade cellerna inte inneh錶ler de 鰊skade uppgifterna, markerar du dataomr錮et nu.\n\nTa med de celler som inneh錶ler kolumn- och radetiketter om du vill att de ska visas i diagrammet." ; Text [ danish ] = "Hvis de markerede celler ikke indeholder de 鴑skede data, marker det 鴑skede omr錮e nu.\n\nInkluder cellerne med kolonne- hhv.r鎘keetiketter, hvis de skal vises i din grafik." ; Text [ portuguese_brazilian ] = "Falls die markierten Zellen nicht die gew?schten Daten enthalten, markieren Sie jetzt den Bereich.\n\nBeziehen Sie die Zellen mit Spalten- bzw. Zeilenbezeichnern mit ein, wenn Sie diese in Ihrer Grafik dargestellt haben m?hten" ; Text [ portuguese ] = "Se as c閘ulas marcadas n鉶 inclu韗em os dados desejados, marque-os agora.\n\nInclua as c閘ulas contendo os t韙ulos das colunas e linhas se desejar v-las representadas no seu gr醘ico." ; Text[ chinese_simplified ] = "濡傛灉閫変腑鐨勫崟鍏冩牸娌℃湁鏁版嵁锛岄偅涔堣鎮ㄩ夋嫨鍖哄煙銆俓n\n鎮ㄥ彲浠ヤ篃閫変腑鍒楁爣棰樺拰琛屾爣棰橈紝濡傛杩欎簺璧勬枡涔熶細琚樉绀哄湪鍥捐〃鍐呫"; - Text[ russian ] = "篷腓 恹溴脲眄 麇殛 礤 耦溴疰囹 蝠遽箦禧 溧眄, 恹溴腓蝈 皴轺囫 滂囡噻铐 麇尻 眢骓 耦溴疰桁.\n\n蔓溴腓蝈 蜞赕 麇殛 磬玮囗扈 耱铍狯钼 桦 耱痤, 羼腓 铐 漕腈睇 猁螯 镳邃耱噔脲睇 磬 痂耋黻."; + Text[ russian ] = "篷腓 恹溴脲眄 麇殛 礤 耦溴疰囹 蝠遽箦禧 溧眄, 恹溴腓蝈 皴轺囫 滂囡噻铐 麇尻 眢骓 耦溴疰桁.\n\n蔓溴腓蝈 蜞赕 麇殛 耱铍狯钼 桦 耱痤, 羼腓 铐 漕腈睇 猁螯 镳邃耱噔脲睇 磬 滂嚆疣祆."; Text[ polish ] = "Je渓i zaznaczone kom髍ki nie zawieraj potrzebnych danych, zaznacz teraz ten obszar ponownie.\n\nZaznacz r體nie kom髍ki z etykietami wierszy lub kolumn , je渓i maj one zosta przedstawione w twojej grafice."; - Text[ japanese ] = "蹇呰銇儑銉笺偪銇屽惈銇俱倢銇︺亜銈嬬瘎鍥层亴閬告姙銇曘倢銇︺亜銇亜鍫村悎銇佷粖閬告姙銇椼仸銇忋仩銇曘亜銆俓n\n銈般儵銉曘伀闋呯洰鍚嶃倰琛ㄧず銇欍倠銇伅銆佽銇ㄥ垪銇爡鐩瑒銈掑惈銈併仧銈汇儷绡勫洸銈掗伕鎶炪仐銇俱仚銆"; - Text[ chinese_traditional ] = "濡傛灉閬稿彇鐨勫劜瀛樻牸娌掓湁璩囨枡锕愬氨璜嬫偍閬告搰鍗鍩熴俓n\n鎮ㄥ彲浠ラ伕涓垪妯欓鍜岃妯欓锛岄欐ǎ锛屽湒琛ㄤ篃鏈冮’绀哄嚭閫欎簺璩囨枡銆"; + Text[ japanese ] = "蹇呰銇儑銉笺偪銇屽惈銇俱倢銇︺亜銈嬬瘎鍥层亴閬告姙銇曘倢銇︺亜銇亜鍫村悎銇併儑銉笺偪绡勫洸銈掗伕鎶炪仐銇︺亸銇犮仌銇勩俓n\n銈般儵銉曘伀闋呯洰鍚嶃倰琛ㄧず銇欍倠銇伅銆佽銇ㄥ垪銇爡鐩瑒銈掑惈銈併仧銈汇儷绡勫洸銈掗伕鎶炪仐銇俱仚銆"; + Text[ chinese_traditional ] = "濡傛灉閬稿彇鐨勫劜瀛樻牸娌掓湁闇瑕佺殑璩囨枡锛岃珛鎮ㄧ従鍦ㄩ伕鍙栬硣鏂欑瘎鍦嶃俓n\n濡傛灉瑕佸湪鍦栬〃涓寘鍚湁鍒楁绫ゅ拰娆勬绫ょ殑鍎插瓨鏍硷紝浜﹀彲灏囧畠鍊戝寘鍚湪閬稿彇绡勫湇鍏с"; Text[ arabic ] = "判 咔涫 轻吾琼 轻阃舷 崆 释舒 卺 轻软卿鞘 轻阖徭壬 捭 仁拖硐 轻湄寝\n\n茹 蓓 嗅 轻吾琼恰 轻薯 释舒 卺 阡擎礓 蛰孑 面 泌阆伞 嫘徇 判"; - Text[ dutch ] = "Als de gemarkeerde cellen niet de gewenste gegevens bevatten markeert u nu het bereik.\n\nMarkeer eveneens de cellen met de kolom- resp. rijlabels als u deze in uw afbeelding wilt weergeven."; + Text[ dutch ] = "Als de gemarkeerde cellen niet de gewenste gegevens bevatten, markeert u nu het bereik.\n\nMarkeer eveneens de cellen met de kolom- of de rijlabels als u deze in uw afbeelding wilt weergeven."; Text[ chinese_simplified ] = "濡傛灉閫変腑鐨勫崟鍏冩牸娌℃湁鏁版嵁锛岄偅涔堣鎮ㄩ夋嫨鍖哄煙銆俓n\n鎮ㄥ彲浠ヤ篃閫変腑鍒楁爣棰樺拰琛屾爣棰橈紝濡傛杩欎簺璧勬枡涔熶細琚樉绀哄湪鍥捐〃鍐呫"; Text[ greek ] = "郁珥 疱襁痿 痫 翎 屦殡邈燧磲 赍腴 溴 疱耖蓣秕 翎 溴滹燧磲 痫 屦殍蹯暹翦, 屦殡蓊翦 弩暹 翮 簌篝 疱耖秣.\n\n 另 栎脲翦 磲 屐鲠黹篝稞 篝 泷狯殛 筢 赆 镩 屦殂襻鲚 豉 篝珉 赆 豉 泷犰忐, 酎翦 栳 瘃蒺彘 磲 篚祓羼殡琏栾 赆 狨糗 翎 溴滹燧磲 篝珥 疱耖秣 翮 屦殡镢掾 筢."; - Text[ korean ] = "毵堩伂響滌嫓霅 靺鞚 鞗愴晿電 雿办澊韯半ゼ 韽暔頃橁碃 鞛堨 鞎婌潉 瓴届毎, 歆旮 鞓侅棴鞚 毵堩伂響滌嫓頃橃嫮鞁滌槫.\n\n鞐 雮挫 頄 霛茧波鞚 鞛堧姅 靺霌れ潉 攴鸽灅頂届棎 雮橅儉雮搓碃鞛愴晿氅 鞚 靺霌れ潉 頃粯 韽暔鞁滍偆鞁嫓鞓."; + Text[ korean ] = "靹犿儩霅 靺鞚 鞗愴晿電 雿办澊韯半ゼ 韽暔頃橁碃 鞛堨 鞎婌潉 瓴届毎 歆旮 雿办澊韯 氩旍渼毳 靹犿儩頃橃嫮鞁滌槫.\n\n鞐 雮挫 頄 霠堨澊敫旍潉 攴鸽灅頂届棎 響滌嫓頃橂牑氅 鞐 氚 頄 霠堨澊敫旍澊 鞛堧姅 靺鞚 頃粯 韽暔鞁滍偆鞁嫓鞓."; Text[ turkish ] = "Se鏸len h點reler, istenen verileri i鏴rmiyorsa aral 㱮mdi se鏸n.\n\nGrafikte g鰎黱melerini istiyorsan齴, s黷un ya da sat齬 ba齥lar齨 i鏴ren h點releri de se鏸n"; Text[ catalan ] = "En cas que les cel.les marcades no tinguin les dades desitjades, marqueu ara l'鄏ea.\n\nHeu d'incloure les cel.les amb els noms de les columnes i files si voleu que apareguin al gr鄁ic."; Text[ finnish ] = "Jos merkityt solut eiv鋞 esit haluttuja tietoja, merkitse alue nyt.\nSis鋖lyt valintaan sarake- ja riviotsikot sis鋖t鋠鋞 solut, jos haluat niiden n鋕yv鋘 kaaviossa."; @@ -280,10 +280,10 @@ ModelessDialog DLG_INSERT_CHART Text[ dutch ] = "<< Vor~ige"; Text[ chinese_simplified ] = "<< 杩斿洖(~B)"; Text[ greek ] = "<< 羞簌"; - Text[ korean ] = "<<霋る(~B)"; + Text[ korean ] = "<< 霋る(~B)"; Text[ turkish ] = "<< G~eri"; Text[ catalan ] = "<< ~Enrere"; - Text[ finnish ] = "<< Edellinen"; + Text[ finnish ] = "<< ~Edellinen"; Text[ thai ] = "<< ~喔佮弗喔编笟喙勦笡"; }; PushButton BT_NEXT @@ -335,7 +335,7 @@ ModelessDialog DLG_INSERT_CHART Text [ portuguese ] = "~Criar" ; Text [ portuguese_brazilian ] = "~Fertigstellen" ; Text[ chinese_simplified ] = "瀹屾垚(~A)"; - Text[ russian ] = "妙蝾忸"; + Text[ russian ] = "杨玟囹"; Text[ polish ] = "Utw髍z"; Text[ japanese ] = "瀹屼簡(~A)"; Text[ chinese_traditional ] = "瀹屾垚(~A)"; @@ -350,7 +350,7 @@ ModelessDialog DLG_INSERT_CHART Text[ thai ] = "喔福喙夃覆~喔"; }; Text [ italian ] = "Formattazione automatica diagramma (1-4)" ; - Text [ spanish ] = "AutoFormato diagrama (1-4)" ; + Text [ spanish ] = "Formateado autom醫ico diagrama (1-4)" ; Text [ french ] = "AutoFormat de diagramme (1-4)" ; Text [ dutch ] = "AutoOpmaak diagram (1-4)" ; Text [ swedish ] = "Autoformat Diagram (1-4)" ; @@ -375,3 +375,15 @@ ModelessDialog DLG_INSERT_CHART + + + + + + + + + + + + diff --git a/sw/source/ui/table/colwd.src b/sw/source/ui/table/colwd.src index bb790ae46728..17f35aba157c 100644 --- a/sw/source/ui/table/colwd.src +++ b/sw/source/ui/table/colwd.src @@ -2,9 +2,9 @@ * * $RCSfile: colwd.src,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: vg $ $Date: 2001-07-14 20:18:23 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -110,28 +110,29 @@ ModalDialog DLG_COL_WIDTH 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 ] = "~Largeur" ; + Text [ french ] = "Largeur" ; Text [ swedish ] = "~Bredd" ; Text [ dutch ] = "B~reedte" ; - Text [ spanish ] = "A~ncho" ; + Text [ spanish ] = "Ancho" ; Text [ english_us ] = "~Width" ; Left = TRUE ; - Text[ chinese_simplified ] = "宽(~W)"; + Text[ chinese_simplified ] = "瀹藉害(~W)"; Text[ russian ] = "罔痂磬"; Text[ polish ] = "Szer."; - Text[ japanese ] = "暆(~W)"; - Text[ chinese_traditional ] = "糴(~W)"; + Text[ japanese ] = "骞(~W)"; + Text[ chinese_traditional ] = "瀵害(~W)"; Text[ arabic ] = "轻谘"; Text[ greek ] = "须荇矧"; - Text[ korean ] = "呈厚(~W)"; + Text[ korean ] = "雱堧箘(~W)"; Text[ turkish ] = "~Geniik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "A~ncho"; + Text[ catalan ] = "~Amplada"; + Text[ thai ] = "喔勦抚喔侧浮~喔佮抚喙夃覆喔"; }; MetricField ED_WIDTH { @@ -168,17 +169,18 @@ ModalDialog DLG_COL_WIDTH Text [ dutch ] = "Breedte" ; Text [ spanish ] = "Ancho" ; Text [ english_us ] = "Width" ; - Text[ chinese_simplified ] = "宽"; + Text[ chinese_simplified ] = "瀹藉害"; Text[ russian ] = "罔痂磬"; Text[ polish ] = "Szeroko滄"; - Text[ japanese ] = "暆"; - Text[ chinese_traditional ] = "糴"; + Text[ japanese ] = "骞"; + Text[ chinese_traditional ] = "瀵害"; Text[ arabic ] = "轻谘"; Text[ greek ] = "须荇矧"; - Text[ korean ] = "呈厚"; + Text[ korean ] = "雱堧箘"; Text[ turkish ] = "Geniik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ancho"; + Text[ catalan ] = "Llargada"; + Text[ thai ] = "喔勦抚喔侧浮喔佮抚喙夃覆喔"; }; FixedText FT_COL { @@ -192,23 +194,24 @@ ModalDialog DLG_COL_WIDTH Text [ portuguese ] = "~Coluna" ; Text [ finnish ] = "~Sarake" ; Text [ danish ] = "Kolonne" ; - Text [ french ] = "~Colonne" ; + Text [ french ] = "Colonne" ; Text [ swedish ] = "~Kolumn" ; Text [ dutch ] = "~Kolom" ; Text [ spanish ] = "Colu~mna" ; Text [ english_us ] = "~Column" ; Left = TRUE ; - Text[ chinese_simplified ] = "栏(~C)"; - Text[ russian ] = "暑腩黻"; + Text[ chinese_simplified ] = "鏍(~C)"; + Text[ russian ] = "羊铍徨"; Text[ polish ] = "Kolumna"; - Text[ japanese ] = "楍(~C)"; - Text[ chinese_traditional ] = "逆(~C)"; + Text[ japanese ] = "鍒(~C)"; + Text[ chinese_traditional ] = "娆(~C)"; Text[ arabic ] = "轻阢嫦"; Text[ greek ] = "郁揠"; - Text[ korean ] = "凯(~C)"; + Text[ korean ] = "鞐(~C)"; Text[ turkish ] = "~S黷un"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Colu~mna"; + Text[ catalan ] = "~Columna"; + Text[ thai ] = "~喔勦腑喔ム副喔∴笝喙"; }; NumericField ED_COL { @@ -222,19 +225,32 @@ ModalDialog DLG_COL_WIDTH Maximum = 99 ; Repeat = TRUE ; }; - Text[ chinese_simplified ] = "栏宽"; - Text[ russian ] = "罔痂磬 觐腩黻"; + Text[ chinese_simplified ] = "鏍忓"; + Text[ russian ] = "罔痂磬 耱铍狯"; Text[ polish ] = "Szeroko滄 kolumny"; - Text[ japanese ] = "楍暆"; - Text[ chinese_traditional ] = "逆糴"; + Text[ japanese ] = "鍒楀箙"; + Text[ chinese_traditional ] = "娆勫"; Text[ arabic ] = "谘 轻泌阆"; Text[ greek ] = "须荇矧 篝揠珧"; - Text[ korean ] = "凯 呈厚"; + Text[ korean ] = "鞐 雱堧箘"; Text[ turkish ] = "S黷un genii餴"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ancho de columna"; + Text[ catalan ] = "Amplada de la columna"; + Text[ thai ] = "喔勦抚喔侧浮喔佮抚喙夃覆喔囙竸喔弗喔编浮喔權箤"; }; + + + + + + + + + + + + diff --git a/sw/source/ui/table/convert.src b/sw/source/ui/table/convert.src index d936fcfdacc9..3902308eaee2 100644 --- a/sw/source/ui/table/convert.src +++ b/sw/source/ui/table/convert.src @@ -2,9 +2,9 @@ * * $RCSfile: convert.src,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: os $ $Date: 2002-01-10 14:09:30 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -95,25 +95,26 @@ ModalDialog DLG_CONV_TEXT_TABLE TEXT [ portuguese ] = "~Tabula玢o" ; TEXT [ finnish ] = "~Sarkaimet" ; TEXT [ danish ] = "Tabulator" ; - TEXT [ french ] = "~Tabulation" ; + TEXT [ french ] = "Tabulation" ; TEXT [ swedish ] = "~Tabulator" ; TEXT [ dutch ] = "~Tab" ; - TEXT [ spanish ] = "Tabu~laci髇" ; + TEXT [ spanish ] = "Tabulador" ; TEXT [ english_us ] = "~Tabs" ; TABSTOP = TRUE ; Group = TRUE ; Check = TRUE ; - TEXT[ chinese_simplified ] = "制表符(~T)"; - TEXT[ russian ] = "亦狍蝾"; + TEXT[ chinese_simplified ] = "鍒惰〃绗(~T)"; + TEXT[ russian ] = "亦狍鲨"; TEXT[ polish ] = "Tabulator"; - TEXT[ japanese ] = "捞(~T)"; - TEXT[ chinese_traditional ] = "籹才(~T)"; + TEXT[ japanese ] = "銈裤儢(~T)"; + TEXT[ chinese_traditional ] = "瀹氫綅閸(~T)"; TEXT[ arabic ] = "卺倾 滔驷"; TEXT[ greek ] = "觺翮腼栎翮"; - TEXT[ korean ] = "徘(~T)"; + TEXT[ korean ] = "韮(~T)"; TEXT[ turkish ] = "~Sekme"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Tabu~laci髇"; + TEXT[ catalan ] = "~Tabulacions"; + TEXT[ thai ] = "~喔｀赴喔⑧赴喔佮副喙夃笝"; }; RadioButton CB_SEMI { @@ -122,28 +123,29 @@ ModalDialog DLG_CONV_TEXT_TABLE TEXT = "~Semikolon" ; TEXT [ ENGLISH ] = "~Semicolon" ; TEXT [ norwegian ] = "~Semikolon" ; - TEXT [ italian ] = "~Punto e virgola" ; + TEXT [ italian ] = "Punto e virgola" ; TEXT [ portuguese_brazilian ] = "~Ponto e v?rgula" ; TEXT [ portuguese ] = "Ponto e v韗~gula" ; TEXT [ finnish ] = "~Puolipisteet" ; TEXT [ danish ] = "Semikolon" ; - TEXT [ french ] = "~Point virgule" ; + TEXT [ french ] = "Point-virgule" ; TEXT [ swedish ] = "~Semikolon" ; TEXT [ dutch ] = "~Puntkomma" ; TEXT [ spanish ] = "Punto y co~ma" ; TEXT [ english_us ] = "~Semicolons" ; TABSTOP = TRUE ; - TEXT[ chinese_simplified ] = "分号(~S)"; + TEXT[ chinese_simplified ] = "鍒嗗彿(~S)"; TEXT[ russian ] = "翌麝 玎蝾"; TEXT[ polish ] = "宺ednik"; - TEXT[ japanese ] = "拘痕(~S)"; - TEXT[ chinese_traditional ] = "だ腹(~S)"; + TEXT[ japanese ] = "銈汇儫銈炽儹銉(~S)"; + TEXT[ chinese_traditional ] = "鍒嗚櫉(~S)"; TEXT[ arabic ] = "轻萸蔗 轻沅捩厣"; TEXT[ greek ] = "㈨ 翦~脲哚"; - TEXT[ korean ] = "技固妮沸(~S)"; + TEXT[ korean ] = "靹鸽旖滊(~S)"; TEXT[ turkish ] = "N~oktal virg黮"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Punto y co~ma"; + TEXT[ catalan ] = "~Punts i coma"; + TEXT[ thai ] = "~喔副喔掄笭喔侧竸"; }; RadioButton CB_PARA { @@ -152,28 +154,29 @@ ModalDialog DLG_CONV_TEXT_TABLE TEXT = "~Absatz" ; TEXT [ ENGLISH ] = "~Paragraph" ; TEXT [ norwegian ] = "~Paragraf" ; - TEXT [ italian ] = "~Paragrafo" ; + TEXT [ italian ] = "Paragrafo" ; TEXT [ portuguese_brazilian ] = "~Par?grafo" ; TEXT [ portuguese ] = "~Par醙rafo" ; TEXT [ finnish ] = "~Kappale" ; TEXT [ danish ] = "Afsnit" ; - TEXT [ french ] = "~Paragraphe" ; + TEXT [ french ] = "Paragraphe" ; TEXT [ swedish ] = "Styc~ke" ; TEXT [ dutch ] = "~Alinea" ; TEXT [ spanish ] = "~P醨rafo" ; TEXT [ english_us ] = "~Paragraph" ; TABSTOP = TRUE ; - TEXT[ chinese_simplified ] = "段落(~P)"; + TEXT[ chinese_simplified ] = "娈佃惤(~P)"; TEXT[ russian ] = "泪玎"; TEXT[ polish ] = "Akapit"; - 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 ] = "~Paragraf"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "~P醨rafo"; + TEXT[ catalan ] = "~Par鄃raf"; + TEXT[ thai ] = "~喔⑧箞喔斧喔權箟喔"; }; RadioButton RB_OTHER { @@ -188,20 +191,21 @@ ModalDialog DLG_CONV_TEXT_TABLE Text [ danish ] = "Andre: " ; Text [ italian ] = "~Altri: " ; Text [ spanish ] = "~Otros: " ; - Text [ french ] = "~Autre(s):[_]" ; - Text [ dutch ] = "An~dere: " ; - Text[ chinese_simplified ] = "其他(~O)"; + Text [ french ] = "~Autres : " ; + Text [ dutch ] = "An~dere:" ; + Text[ chinese_simplified ] = "鍏朵粬(~O)"; Text[ russian ] = "酿筱桢: "; Text[ polish ] = "Inne: "; - Text[ japanese ] = "偦偺懠(~O)"; - Text[ chinese_traditional ] = "ㄤ(~O)"; + Text[ japanese ] = "銇濄伄浠(~O)"; + Text[ chinese_traditional ] = "鍏朵粬(~O)"; Text[ arabic ] = "垌 嗅: "; Text[ greek ] = "㈦脶: "; - Text[ korean ] = "扁鸥(~O)"; + Text[ korean ] = "旮绊儉(~O)"; Text[ turkish ] = "Di~餰r: "; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Otros: "; + Text[ catalan ] = "~Altres:"; Text[ finnish ] = "~Muu: "; + Text[ thai ] = "~喔阜喙堗笝 喙: "; }; Edit ED_OTHER { @@ -228,18 +232,19 @@ ModalDialog DLG_CONV_TEXT_TABLE Text [ french ] = "~Largeur identique pour toutes les colonnes" ; Text [ dutch ] = "~Alle kolommen dezelfde breedte" ; Text [ portuguese ] = "~Largura igual para todas as colunas" ; - Text[ chinese_simplified ] = "所有列的宽度相同"; - Text[ russian ] = "武桧嚓钼 痂磬 怦艴 觐腩眍"; + Text[ chinese_simplified ] = "鎵鏈夊垪鐨勫搴︾浉鍚"; + Text[ russian ] = "武桧嚓钼 痂磬 怦艴 耱铍狯钼"; Text[ polish ] = "~Jednakowa szeroko滄 wszystk. kolumn"; - Text[ japanese ] = "偡傋偰偺楍暆傪摨偠偵"; - Text[ chinese_traditional ] = "┮Τ逆糴"; + Text[ japanese ] = "鍒楀箙銈掑潎绛夈伀銇欍倠"; + Text[ chinese_traditional ] = "鎵鏈夋瑒瀵害鐩稿悓"; Text[ arabic ] = "漭 轻谘 徇 轻泌阆"; Text[ greek ] = "轰轱 ~痣荇矧 汩 弪 糸 篝揠弪"; - Text[ korean ] = "葛电 凯 呈厚 鞍霸"; + Text[ korean ] = "氇摖 鞐 雱堧箘 臧欔矊"; Text[ turkish ] = "T黰 s黷unlar a~yn geniikte"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Mismo an~cho para todas las columnas"; - Text[ finnish ] = "Yht鋝uuret sarakkeiden leveydet"; + Text[ catalan ] = "Amplada igual per a totes les columnes"; + Text[ finnish ] = "Yht suuret sarakeleveydet"; + Text[ thai ] = "喔勦抚喔侧浮喔佮抚喙夃覆喔囙箑喔椸箞喔侧竵喔编笝喔赋喔福喔编笟喔勦腑喔ム副喔∴笝喙屶笚喔编箟喔囙斧喔∴笖"; }; FixedLine FL_DELIM { @@ -251,25 +256,26 @@ ModalDialog DLG_CONV_TEXT_TABLE TEXT [ italian ] = "Separatore nel testo" ; TEXT [ portuguese_brazilian ] = "Delimitador" ; TEXT [ portuguese ] = "Separador" ; - TEXT [ finnish ] = "Erota teksti kohdasta" ; - TEXT [ danish ] = "Separatorer i tekst" ; + TEXT [ finnish ] = "Tekstin erottelu" ; + TEXT [ danish ] = "Skilletegn i tekst" ; TEXT [ french ] = "S閜arateur dans le texte" ; TEXT [ swedish ] = "Skiljetecken i text" ; TEXT [ dutch ] = "Scheidingsteken in tekst" ; - TEXT [ spanish ] = "Delimitador en texto" ; + TEXT [ spanish ] = "Separador en el texto" ; TEXT [ english_us ] = "Separate text at" ; Group = TRUE ; - TEXT[ chinese_simplified ] = "正文内的分隔符"; + TEXT[ chinese_simplified ] = "姝ｆ枃鍐呯殑鍒嗛殧绗"; TEXT[ russian ] = "朽玟咫栩咫 蝈犟蜞"; TEXT[ polish ] = "Separator w tek渃ie"; - TEXT[ japanese ] = "梅侥撪偺嬫愗傝婰崋"; - TEXT[ chinese_traditional ] = "ずゅだ筳才"; + TEXT[ japanese ] = "銉嗐偔銈广儓鍐呫伄鍖哄垏銈婅鍙"; + TEXT[ chinese_traditional ] = "鍏ф枃鐨勫垎闅旂"; TEXT[ arabic ] = "卺倾鞘 轻菡 蓓 轻湔"; TEXT[ greek ] = "彭殛 燧筢 篝 赍哽屙"; - TEXT[ korean ] = "咆胶飘 备盒 扁龋"; + TEXT[ korean ] = "韰嶌姢韸 甑秳 旮绊樃"; TEXT[ turkish ] = "Metin ay齬ma ireti"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Delimitador en texto"; + TEXT[ catalan ] = "Delimitador en text"; + TEXT[ thai ] = "喙佮涪喔佮競喙夃腑喔勦抚喔侧浮喔椸傅喙"; }; CheckBox CB_HEADER { @@ -282,23 +288,24 @@ ModalDialog DLG_CONV_TEXT_TABLE Text[ portuguese_brazilian ] = "Header"; Text[ portuguese ] = "~T韙ulo"; Text[ danish ] = "Overskrift"; - Text[ french ] = "T~itre"; + Text[ french ] = "Titre"; Text[ swedish ] = "講e~rskrift"; Text[ dutch ] = "~Kop"; Text[ spanish ] = "~Encabezado"; Text[ english_us ] = "Header"; - Text[ chinese_simplified ] = "标题"; + Text[ chinese_simplified ] = "鏍囬"; Text[ russian ] = "青泐腩忸"; Text[ polish ] = "Tytu"; - Text[ japanese ] = "尒弌偟"; - Text[ chinese_traditional ] = "夹肈"; + Text[ japanese ] = "瑕嬪嚭銇"; + Text[ chinese_traditional ] = "妯欓"; Text[ arabic ] = "轻阡媲"; Text[ greek ] = "硼殛鍉鲠脒溽"; - Text[ korean ] = "钎力"; + Text[ korean ] = "響滌牅"; Text[ turkish ] = "Bal齥"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Encabezado"; - Text[ finnish ] = "Yl鋙tsikko"; + Text[ catalan ] = "~Encap鏰lament"; + Text[ finnish ] = "Yl鋞unniste"; + Text[ thai ] = "喔箞喔о笝喔副喔"; }; CheckBox CB_REPEAT_HEADER { @@ -311,23 +318,24 @@ ModalDialog DLG_CONV_TEXT_TABLE Text[ portuguese_brazilian ] = "Repeat Header"; Text[ portuguese ] = "~Repetir em todas as p醙inas"; Text[ danish ] = "Gentag p hver side"; - Text[ french ] = "~R閜閠er sur chaque page"; + Text[ french ] = "R閜閠er sur chaque page"; Text[ swedish ] = "~Upprepa p varje sida"; Text[ dutch ] = "Op iedere pagina ~herhalen"; - Text[ spanish ] = "~Repetir en cada p醙ina"; + Text[ spanish ] = "Repetir en cada p醙ina"; Text[ english_us ] = "Re~peat header"; - Text[ chinese_simplified ] = "在每页上重复显示(~P)"; - Text[ russian ] = "项怛铕 磬 赅驿铋 耱疣龛鲥"; + Text[ chinese_simplified ] = "鍦ㄦ瘡椤典笂閲嶅鏄剧ず(~P)"; + Text[ russian ] = "项怛铕螯 玎泐腩忸"; Text[ polish ] = "Powt髍z na ~ka縟ej stronie"; - Text[ japanese ] = "奺瓦凹迋蓪J傝曉偟(~P)"; - Text[ chinese_traditional ] = "–狡陪ボ(~P)"; + Text[ japanese ] = "鍚勩儦銉笺偢銇拱銈婅繑銇(~P)"; + Text[ chinese_traditional ] = "鍦ㄦ瘡闋佷笂閲嶈椤ず(~P)"; Text[ arabic ] = "蔬亚 蓓 哚 蛰蜕"; Text[ greek ] = "澎~鲕黹箸 箦 贶桢 箦脒溽"; - Text[ korean ] = "葛电 率俊辑 馆汗(~P)"; + Text[ korean ] = "氇摖 韼橃澊歆鞐愳劀 氚橂车(~P)"; Text[ turkish ] = "輑k sat齬 her sayfada yi~nele"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Repetir en cada p醙ina"; - Text[ finnish ] = "~Toista yl鋙tsikko"; + Text[ catalan ] = "~Repeteix a cada p鄃ina"; + Text[ finnish ] = "~Toista yl鋞unniste"; + Text[ thai ] = "喔椸赋喔箞喔о笝喔副喔喔嬥箟喔"; }; CheckBox CB_DONT_SPLIT { @@ -340,23 +348,24 @@ ModalDialog DLG_CONV_TEXT_TABLE Text[ portuguese_brazilian ] = "Don't split table"; Text[ portuguese ] = "N鉶 ~dividir tabela"; Text[ danish ] = "Opdel tabel ikke"; - Text[ french ] = "Ne pas ~diviser le tableau"; + Text[ french ] = "Ne pas ~scinder le tableau"; Text[ swedish ] = "Dela i~nte tabell"; Text[ dutch ] = "Tabel niet ~splitsen"; Text[ spanish ] = "~No dividir tabla"; Text[ english_us ] = "Don't split table"; - Text[ chinese_simplified ] = "不分隔表格"; + Text[ chinese_simplified ] = "涓嶅垎闅旇〃鏍"; Text[ russian ] = "湾 疣玑桠囹 蜞犭桷"; Text[ polish ] = "Nie dziel tabeli"; - Text[ japanese ] = "昞\傪暘妱偟側偄"; - Text[ chinese_traditional ] = "ぃだ秨"; + Text[ japanese ] = "琛ㄣ倰鍒嗗壊銇椼仾銇"; + Text[ chinese_traditional ] = "涓嶅垎闁嬭〃鏍"; Text[ arabic ] = "谙 菡 轻滔驷"; Text[ greek ] = "槛 溟徇皴箸 麸 疬~磲赆"; - Text[ korean ] = "抛捞喉 盒府窍瘤 臼扁."; + Text[ korean ] = "響 雮橂垊歆 鞎婌潓"; Text[ turkish ] = "Tabloyu tek sayfaya ~sd齬"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~No dividir tabla"; + Text[ catalan ] = "No parteixis la taula"; Text[ finnish ] = "膌 jaa taulukkoa"; + Text[ thai ] = "喙勦浮喙堗箒喔⑧竵喔曕覆喔｀覆喔"; }; CheckBox CB_BORDER { @@ -374,18 +383,19 @@ ModalDialog DLG_CONV_TEXT_TABLE Text[ dutch ] = "~Omranding"; Text[ spanish ] = "~Borde"; Text[ english_us ] = "Border"; - Text[ chinese_simplified ] = "边框"; + Text[ chinese_simplified ] = "杈规"; Text[ russian ] = "吾疣祀屙桢"; Text[ polish ] = "Obramowanie"; - Text[ japanese ] = "奜榞"; - Text[ chinese_traditional ] = "娩"; + Text[ japanese ] = "鏋"; + Text[ chinese_traditional ] = "閭婃"; Text[ arabic ] = "轻拖嫦"; Text[ greek ] = "绣襁泷醻祆"; - Text[ korean ] = "寇胞急"; + Text[ korean ] = "韰岆憪毽"; Text[ turkish ] = "~Kenarl齥"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Borde"; + Text[ catalan ] = "Vora"; Text[ finnish ] = "Reuna"; + Text[ thai ] = "喙喔箟喔權競喔笟"; }; FixedLine FL_OPTIONS { @@ -402,18 +412,19 @@ ModalDialog DLG_CONV_TEXT_TABLE Text[ dutch ] = "Opties"; Text[ spanish ] = "Opciones"; Text[ english_us ] = "Options"; - Text[ chinese_simplified ] = "选项"; + Text[ chinese_simplified ] = "閫夐」"; Text[ russian ] = "相疣戾蝠"; Text[ polish ] = "Opcje"; - Text[ japanese ] = "堤呒"; - Text[ chinese_traditional ] = "匡兜"; + Text[ japanese ] = "銈儣銈枫儳銉"; + Text[ chinese_traditional ] = "閬搁爡"; Text[ arabic ] = "轻雾茄鞘"; Text[ greek ] = "硼殡镢蒡"; - Text[ korean ] = "可记"; + Text[ korean ] = "鞓奠厴"; Text[ turkish ] = "Se鏴nekler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Opciones"; + Text[ catalan ] = "Opcions"; Text[ finnish ] = "Asetukset"; + Text[ thai ] = "喔曕副喔о箑喔ム阜喔竵"; }; String STR_CONVERT_TEXT_TABLE { @@ -430,17 +441,18 @@ ModalDialog DLG_CONV_TEXT_TABLE TEXT [ dutch ] = "Tekst naar tabel converteren" ; TEXT [ spanish ] = "Convertir texto en tabla" ; TEXT [ english_us ] = "Convert Text to Table" ; - TEXT[ chinese_simplified ] = "文字转换成表格"; + TEXT[ chinese_simplified ] = "鏂囧瓧杞崲鎴愯〃鏍"; TEXT[ russian ] = "橡孱狃噻钼囹 蝈犟 蜞犭桷"; TEXT[ polish ] = "Konwertuj tekst na tabel"; - TEXT[ japanese ] = "梅侥傪昞\偵偡傞"; - TEXT[ chinese_traditional ] = "ゅ锣传Θ"; + TEXT[ japanese ] = "銉嗐偔銈广儓銈掕〃銇鎻涖仚銈"; + TEXT[ chinese_traditional ] = "鏂囧瓧杞夋彌鎴愯〃鏍"; TEXT[ arabic ] = "释骓 轻湔 裴 滔驷"; TEXT[ greek ] = "体翎赳镳 赍殪蓓秕 箦 疬磲赆"; - TEXT[ korean ] = "咆胶飘甫 钎肺 函券"; + TEXT[ korean ] = "韰嶌姢韸鸽ゼ 響滊 氤頇"; TEXT[ turkish ] = "Metni tabloya d鰊t黵"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Convertir texto en tabla"; + TEXT[ catalan ] = "Converteix el text en una taula"; + TEXT[ thai ] = "喙佮笡喔ム竾喔傕箟喔竸喔о覆喔∴箑喔涏箛喔權笗喔侧福喔侧竾"; }; OkButton BT_OK { @@ -473,37 +485,57 @@ ModalDialog DLG_CONV_TEXT_TABLE Text [ italian ] = "~Formattazione automatica..." ; Text [ portuguese_brazilian ] = "Formata??o Autom?tica..." ; Text [ portuguese ] = "Auto~Formato..." ; - Text [ finnish ] = "~Automaattinen muotoilu" ; + Text [ finnish ] = "~Automaattinen muotoilu..." ; Text [ danish ] = "AutoFormat..." ; Text [ french ] = "AutoFormat..." ; Text [ swedish ] = "AutoFormat..." ; Text [ dutch ] = "Auto~Opmaak..." ; - Text [ spanish ] = "Auto~Formato..." ; + Text [ spanish ] = "~Formateado autom醫ico..." ; Text [ english_us ] = "Auto~Format..." ; - Text[ chinese_simplified ] = "自动格式(~F)..."; + Text[ chinese_simplified ] = "鑷姩鏍煎紡(~F)..."; Text[ russian ] = "棱蝾纛痨囹..."; Text[ polish ] = "Autoformat..."; - Text[ japanese ] = "蛋奶席(~F)..."; - Text[ chinese_traditional ] = "笆Α(~F)..."; + Text[ japanese ] = "銈兗銉堛儠銈┿兗銉炪儍銉(~F)..."; + Text[ chinese_traditional ] = "鑷嫊鏍煎紡(~F)..."; Text[ arabic ] = "输禹 梳耷祈..."; Text[ greek ] = "刘麸田駘鲛..."; - Text[ korean ] = "磊悼辑侥(~F)..."; + Text[ korean ] = "鞛愲彊 靹滌嫕(~F)..."; Text[ turkish ] = "Otomatik ~formatlama..."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Auto~Formato..."; + Text[ catalan ] = "Auto~format..."; + Text[ thai ] = "~喔｀腹喔涏箒喔氞笟喔副喔曕箓喔權浮喔编笗喔..."; }; - TEXT[ chinese_simplified ] = "转换表格成文字"; + TEXT[ chinese_simplified ] = "杞崲琛ㄦ牸鎴愭枃瀛"; TEXT[ russian ] = "橡孱狃噻钼囹 蜞犭桷 蝈犟"; TEXT[ polish ] = "Konwertuj tabel na tekst"; - TEXT[ japanese ] = "昞\傪梅侥偵偡傞"; - TEXT[ chinese_traditional ] = "锣传Θゅ"; + TEXT[ japanese ] = "琛ㄣ倰銉嗐偔銈广儓銇鎻涖仚銈"; + TEXT[ chinese_traditional ] = "琛ㄦ牸杞夋彌鎴愭枃瀛"; TEXT[ arabic ] = "释骓 轻滔驷 裴 湔"; TEXT[ greek ] = "体翎赳镳 疬磲赆 箦 赍哽屙"; - TEXT[ korean ] = "钎甫 咆胶飘肺 函券"; + TEXT[ korean ] = "響滊ゼ 韰嶌姢韸鸽 氤頇"; TEXT[ turkish ] = "Tabloyu metne d鰊t黵"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Convertir tabla en texto"; + TEXT[ catalan ] = "Converteix la taula en un text"; + TEXT[ thai ] = "喙佮笡喔ム竾喔曕覆喔｀覆喔囙箑喔涏箛喔權競喙夃腑喔勦抚喔侧浮"; }; + + + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/table/insrc.src b/sw/source/ui/table/insrc.src index 2ee79394d07b..6a9fc8afe35d 100644 --- a/sw/source/ui/table/insrc.src +++ b/sw/source/ui/table/insrc.src @@ -2,9 +2,9 @@ * * $RCSfile: insrc.src,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: kz $ $Date: 2001-07-26 22:37:44 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -114,23 +114,24 @@ ModalDialog DLG_INS_ROW_COL Text [ portuguese ] = " ~frente" ; Text [ finnish ] = "~Ennen" ; Text [ danish ] = "foran" ; - Text [ french ] = "A~vant" ; + Text [ french ] = "Avant" ; Text [ swedish ] = "~framf鰎" ; Text [ dutch ] = "~ervoor" ; Text [ spanish ] = "De~lante" ; Text [ english_us ] = "~Before" ; TabStop = TRUE ; - Text[ chinese_simplified ] = "之前(~B)"; - Text[ russian ] = "镥疱"; + Text[ chinese_simplified ] = "涔嬪墠(~B)"; + Text[ russian ] = "漕"; Text[ polish ] = "prze~d"; - Text[ japanese ] = "慜(~B)"; - Text[ chinese_traditional ] = "ぇ玡(~B)"; + Text[ japanese ] = "鍓(~B)"; + Text[ chinese_traditional ] = "涔嬪墠(~B)"; Text[ arabic ] = "奕"; Text[ greek ] = "旭轫 狃"; - Text[ korean ] = "捞傈(~B)"; + Text[ korean ] = "鞎(~B)"; Text[ turkish ] = "鰊~黱e"; Text[ language_user1 ] = " "; - Text[ catalan ] = "De~lante"; + Text[ catalan ] = "A~bans de"; + Text[ thai ] = "~喔佮箞喔笝"; }; RadioButton CB_POS_AFTER { @@ -144,24 +145,25 @@ ModalDialog DLG_INS_ROW_COL Text [ portuguese ] = "~atr醩" ; Text [ finnish ] = "~J鋖keen" ; Text [ danish ] = "efter" ; - Text [ french ] = "~Apr鑣" ; + Text [ french ] = "Apr鑣" ; Text [ swedish ] = "~bakom" ; Text [ dutch ] = "e~rachter" ; - Text [ spanish ] = "de~tr醩" ; + Text [ spanish ] = "De~tr醩" ; Text [ english_us ] = "A~fter" ; TabStop = TRUE ; Check = TRUE ; - Text[ chinese_simplified ] = "之后(~F)"; + Text[ chinese_simplified ] = "涔嬪悗(~F)"; Text[ russian ] = "镱耠"; Text[ polish ] = "za"; - Text[ japanese ] = "屻(~F)"; - Text[ chinese_traditional ] = "ぇ(~F)"; + Text[ japanese ] = "寰(~F)"; + Text[ chinese_traditional ] = "涔嬪緦(~F)"; Text[ arabic ] = "融"; Text[ greek ] = "戾糗 狃"; - Text[ korean ] = "捞饶(~F)"; + Text[ korean ] = "霋(~F)"; Text[ turkish ] = "ar~kas齨a"; Text[ language_user1 ] = " "; - Text[ catalan ] = "de~tr醩"; + Text[ catalan ] = "da~rrera"; + Text[ thai ] = "喔珇喔ム副喔囙笀喔侧竵"; }; NumericField ED_COUNT { @@ -190,23 +192,24 @@ ModalDialog DLG_INS_ROW_COL Text [ portuguese_brazilian ] = "Inserir" ; Text [ portuguese ] = "Inserir" ; Text [ finnish ] = "Lis滗" ; - Text [ danish ] = "Inds鎡" ; + Text [ danish ] = "S鎡 ind" ; Text [ french ] = "Ins閞er" ; Text [ swedish ] = "Infoga" ; Text [ dutch ] = "Invoegen" ; Text [ spanish ] = "Insertar" ; Text [ english_us ] = "Insert" ; - Text[ chinese_simplified ] = "插入"; + Text[ chinese_simplified ] = "鎻掑叆"; Text[ russian ] = "埋蜞忤螯"; Text[ polish ] = "Wstaw"; - Text[ japanese ] = "憓擖"; - Text[ chinese_traditional ] = "础"; + Text[ japanese ] = "鎸垮叆"; + Text[ chinese_traditional ] = "鎻掑叆"; Text[ arabic ] = "畔亚"; Text[ greek ] = "砰筢泫戕"; - Text[ korean ] = "火涝"; + Text[ korean ] = "靷届瀰"; Text[ turkish ] = "Ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar"; + Text[ catalan ] = "Insereix"; + Text[ thai ] = "喙佮笚喔｀竵"; }; FixedLine FL_POS { @@ -218,22 +221,23 @@ ModalDialog DLG_INS_ROW_COL Text[ portuguese ] = "Posi玢o"; Text[ russian ] = "项腩驽龛"; Text[ greek ] = "start_num"; - Text[ dutch ] = "Functie"; - Text[ french ] = "Fonction"; + Text[ dutch ] = "Positie"; + Text[ french ] = "Position"; Text[ spanish ] = "Posici髇"; Text[ finnish ] = "Sijainti"; Text[ italian ] = "Posizione"; - Text[ danish ] = "Stilling"; + Text[ danish ] = "Placering"; Text[ swedish ] = "Position"; Text[ polish ] = "Pozycja"; Text[ portuguese_brazilian ] = "Position"; - Text[ japanese ] = "埵抲"; - Text[ korean ] = "流困"; - Text[ chinese_simplified ] = "start_num"; - Text[ chinese_traditional ] = "start_num"; + Text[ japanese ] = "浣嶇疆"; + Text[ korean ] = "鞙勳箻"; + Text[ chinese_simplified ] = "浣嶇疆"; + Text[ chinese_traditional ] = "浣嶇疆"; Text[ turkish ] = "蔺 unvan"; Text[ arabic ] = "Start_num"; - Text[ catalan ] = "Position"; + Text[ catalan ] = "Posici"; + Text[ thai ] = "喔曕赋喙佮斧喔權箞喔"; }; FixedText FT_COUNT { @@ -253,17 +257,18 @@ ModalDialog DLG_INS_ROW_COL Text [ spanish ] = "~Cantidad" ; Text [ english_us ] = "~Amount" ; Left = TRUE ; - Text[ chinese_simplified ] = "数目(~A)"; - Text[ russian ] = "阻耠"; + Text[ chinese_simplified ] = "鏁扮洰(~A)"; + Text[ russian ] = "觐-忸"; Text[ polish ] = "Liczba"; - 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 ] = "~Adet"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Cantidad"; + Text[ catalan ] = "~Quantitat"; + Text[ thai ] = "~喔堗赋喔權抚喔"; }; String STR_ROW { @@ -280,17 +285,18 @@ ModalDialog DLG_INS_ROW_COL Text [ dutch ] = " rijen" ; Text [ spanish ] = "Filas" ; Text [ english_us ] = " Rows" ; - Text[ chinese_simplified ] = "行"; + Text[ chinese_simplified ] = "琛"; Text[ russian ] = " 耱痤觇"; Text[ polish ] = " Wiersze"; - Text[ japanese ] = "峴"; - Text[ chinese_traditional ] = "︽"; + Text[ japanese ] = "琛"; + Text[ chinese_traditional ] = "琛"; Text[ arabic ] = " 蛰孑"; Text[ greek ] = " 民犰燧"; - Text[ korean ] = "青"; + Text[ korean ] = "頄"; Text[ turkish ] = "Sat齬"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Filas"; + Text[ catalan ] = " Files"; + Text[ thai ] = " 喙佮笘喔"; }; String STR_COL { @@ -307,29 +313,31 @@ ModalDialog DLG_INS_ROW_COL Text [ dutch ] = " kolommen" ; Text [ spanish ] = "Columnas" ; Text [ english_us ] = " Columns" ; - Text[ chinese_simplified ] = "栏"; - Text[ russian ] = " 觐腩黻"; + Text[ chinese_simplified ] = "鏍"; + Text[ russian ] = " 耱铍狯"; Text[ polish ] = " Kolumny"; - Text[ japanese ] = "楍"; - Text[ chinese_traditional ] = "逆"; + Text[ japanese ] = "鍒"; + Text[ chinese_traditional ] = "娆"; Text[ arabic ] = " 泌阆"; Text[ greek ] = " 郁揠弪"; - Text[ korean ] = "凯"; + Text[ korean ] = " 雼"; Text[ turkish ] = "S黷un"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Columnas"; + Text[ catalan ] = " Columnes"; + Text[ thai ] = " 喔勦腑喔ム副喔∴笝喙"; }; - Text[ chinese_simplified ] = "插入"; - Text[ russian ] = "埋蜞忤螯"; + Text[ chinese_simplified ] = "鎻掑叆"; + Text[ russian ] = "埋蜞怅"; Text[ polish ] = "Wstaw"; - Text[ japanese ] = "憓擖"; - Text[ chinese_traditional ] = "础"; + Text[ japanese ] = "鎸垮叆"; + Text[ chinese_traditional ] = "鎻掑叆"; Text[ arabic ] = "畔亚"; Text[ greek ] = "砰筢泫戕"; - Text[ korean ] = "火涝"; + Text[ korean ] = "靷届瀰"; Text[ turkish ] = "Ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar"; + Text[ catalan ] = "Insereix"; + Text[ thai ] = "喙佮笚喔｀竵"; }; @@ -337,3 +345,18 @@ ModalDialog DLG_INS_ROW_COL + + + + + + + + + + + + + + + diff --git a/sw/source/ui/table/instable.src b/sw/source/ui/table/instable.src index 89e6e9c0851e..5a35f465d80f 100644 --- a/sw/source/ui/table/instable.src +++ b/sw/source/ui/table/instable.src @@ -2,9 +2,9 @@ * * $RCSfile: instable.src,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: os $ $Date: 2002-07-03 13:41:14 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,7 +78,7 @@ ModalDialog DLG_INSERT_TABLE Text [ portuguese ] = "Inserir tabela" ; Text [ finnish ] = "Lis滗 taulukko" ; Text [ danish ] = "Inds鎡 tabel" ; - Text [ french ] = "Ins閞er un tableau" ; + Text [ french ] = "Insertion de tableau" ; Text [ swedish ] = "Infoga tabell" ; Text [ dutch ] = "Tabel invoegen" ; Text [ spanish ] = "Insertar tabla" ; @@ -106,18 +106,19 @@ ModalDialog DLG_INSERT_TABLE Text[ dutch ] = "Naam"; Text[ spanish ] = "Nombre"; Text[ english_us ] = "Name"; - Text[ chinese_simplified ] = "名称"; + Text[ chinese_simplified ] = "鍚嶇О"; Text[ russian ] = "褥"; Text[ polish ] = "Nazwa"; - Text[ japanese ] = "昞\偺柤慜"; - Text[ chinese_traditional ] = "嘿"; + Text[ japanese ] = "琛ㄣ伄鍚嶅墠"; + Text[ chinese_traditional ] = "鍚嶇ū"; Text[ arabic ] = "轻怯"; Text[ greek ] = "柬镬"; - Text[ korean ] = "捞抚"; + Text[ korean ] = "鞚措"; Text[ turkish ] = "Ad"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nombre"; + Text[ catalan ] = "Nom"; Text[ finnish ] = "Nimi"; + Text[ thai ] = "喔娻阜喙堗腑"; }; FixedText FT_COL { @@ -137,17 +138,18 @@ ModalDialog DLG_INSERT_TABLE Text [ spanish ] = "~Columnas" ; Text [ english_us ] = "~Columns" ; Left = TRUE ; - Text[ chinese_simplified ] = "列(~C)"; - Text[ russian ] = "暑腩黻"; + Text[ chinese_simplified ] = "鍒(~C)"; + Text[ russian ] = "羊铍狯"; Text[ polish ] = "Kolumny"; - Text[ japanese ] = "楍(~C)"; - Text[ chinese_traditional ] = "逆(~C)"; + Text[ japanese ] = "鍒(~C)"; + Text[ chinese_traditional ] = "娆(~C)"; Text[ arabic ] = "泌阆"; Text[ greek ] = "郁揠弪"; - Text[ korean ] = "凯(~C)"; + Text[ korean ] = "鞐(~C)"; Text[ turkish ] = "~S黷un"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Columnas"; + Text[ catalan ] = "~Columnes"; + Text[ thai ] = "~喔勦腑喔ム副喔∴笝喙"; }; NumericField ED_COL { @@ -171,28 +173,29 @@ ModalDialog DLG_INSERT_TABLE Text = "~Zeilen" ; Text [ ENGLISH ] = "~Rows" ; Text [ norwegian ] = "~Rows" ; - Text [ italian ] = "~Righe" ; + Text [ italian ] = "Righe" ; Text [ portuguese_brazilian ] = "Filei~ras" ; Text [ portuguese ] = "~Linhas" ; Text [ finnish ] = "~Rivit" ; Text [ danish ] = "R鎘ker" ; - Text [ french ] = "~Lignes" ; + Text [ french ] = "Lignes" ; Text [ swedish ] = "~Rader" ; Text [ dutch ] = "~Rijen" ; Text [ spanish ] = "~Filas" ; Text [ english_us ] = "~Rows" ; Left = TRUE ; - Text[ chinese_simplified ] = "行(~R)"; + Text[ chinese_simplified ] = "琛(~R)"; Text[ russian ] = "羊痤觇"; Text[ polish ] = "Wiersze"; - Text[ japanese ] = "峴(~R)"; - Text[ chinese_traditional ] = "(~R)"; + Text[ japanese ] = "琛(~R)"; + Text[ chinese_traditional ] = "鍒(~R)"; Text[ arabic ] = "蛰孑"; Text[ greek ] = "民犰燧"; - Text[ korean ] = "青(~R)"; + Text[ korean ] = "頄(~R)"; Text[ turkish ] = "Sa~t齬"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Filas"; + Text[ catalan ] = "~Files"; + Text[ thai ] = "喙亊喔栢抚"; }; NumericField ED_ROW { @@ -216,25 +219,26 @@ ModalDialog DLG_INSERT_TABLE Text = "Tabellengr鲞e" ; Text [ ENGLISH ] = "Size" ; Text[ english_us ] = "Size"; - Text[ portuguese ] = "Size"; + Text[ portuguese ] = "Tamanho da tabela"; Text[ russian ] = "朽珈屦 蜞犭桷"; Text[ greek ] = "Size"; - Text[ dutch ] = "Size"; + Text[ dutch ] = "Tabelgrootte"; Text[ french ] = "Taille"; Text[ spanish ] = "Tama駉 de tabla"; - Text[ finnish ] = "Size"; + Text[ finnish ] = "Koko"; Text[ italian ] = "Dimensioni tabella"; - Text[ danish ] = "Size"; + Text[ danish ] = "Tabelst鴕relse"; Text[ swedish ] = "Tabellstorlek"; Text[ polish ] = "Rozmiar tabeli"; Text[ portuguese_brazilian ] = "Size"; - Text[ japanese ] = "昞\偺徊睫"; - Text[ korean ] = "农扁"; - Text[ chinese_simplified ] = "表格的大小"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "琛ㄣ伄銈点偆銈"; + Text[ korean ] = "韥赴"; + Text[ chinese_simplified ] = "琛ㄦ牸鐨勫ぇ灏"; + Text[ chinese_traditional ] = "琛ㄦ牸澶у皬"; Text[ turkish ] = "Size"; Text[ arabic ] = "Size"; - Text[ catalan ] = "Size"; + Text[ catalan ] = "Mida"; + Text[ thai ] = "喔傕笝喔侧笖"; }; CheckBox CB_HEADER { @@ -247,23 +251,24 @@ ModalDialog DLG_INSERT_TABLE Text[ portuguese_brazilian ] = "Header"; Text[ portuguese ] = "~T韙ulo"; Text[ danish ] = "Overskrift"; - Text[ french ] = "T~itre"; + Text[ french ] = "Titre"; Text[ swedish ] = "~講erskrift"; Text[ dutch ] = "~Kop"; Text[ spanish ] = "~Encabezado"; Text[ english_us ] = "Header"; - Text[ chinese_simplified ] = "标题"; + Text[ chinese_simplified ] = "鏍囬"; Text[ russian ] = "青泐腩忸"; Text[ polish ] = "Tytu"; - Text[ japanese ] = "尒弌偟"; - Text[ chinese_traditional ] = "夹肈"; + Text[ japanese ] = "瑕嬪嚭銇"; + Text[ chinese_traditional ] = "妯欓"; Text[ arabic ] = "轻阡媲"; Text[ greek ] = "硼殛弼犭咪"; - Text[ korean ] = "钎力"; + Text[ korean ] = "鞝滊"; Text[ turkish ] = "Ba齥"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Encabezado"; - Text[ finnish ] = "Yl鋙tsikko"; + Text[ catalan ] = "~Encap鏰lament"; + Text[ finnish ] = "Yl鋞unniste"; + Text[ thai ] = "喔箞喔о笝喔副喔"; }; CheckBox CB_REPEAT_HEADER { @@ -279,20 +284,21 @@ ModalDialog DLG_INSERT_TABLE Text[ french ] = "R~閜閠er sur chaque page"; Text[ swedish ] = "~Upprepa p varje sida"; Text[ dutch ] = "Op iedere pagina ~herhalen"; - Text[ spanish ] = "~Repetir en cada p醙ina"; + Text[ spanish ] = "Repetir en cada p醙ina"; Text[ english_us ] = "Re~peat header"; - Text[ chinese_simplified ] = "在每页上重复显示(~P)"; - Text[ russian ] = "项怛铕 磬 赅驿铋 耱疣龛鲥"; + Text[ chinese_simplified ] = "鍦ㄦ瘡椤典笂閲嶅鏄剧ず(~P)"; + Text[ russian ] = "项怛铕螯 玎泐腩忸"; Text[ polish ] = "Powt髍z na ~ka縟ej stronie"; - Text[ japanese ] = "奺瓦凹迋蓪J傝曉偟(~P)"; - Text[ chinese_traditional ] = "–狡陪ボ(~P)"; + Text[ japanese ] = "鍚勩儦銉笺偢銇拱銈婅繑銇(~P)"; + Text[ chinese_traditional ] = "鍦ㄦ瘡闋佷笂閲嶈椤ず(~P)"; Text[ arabic ] = "蔬亚 蓓 哚 蛰蜕"; Text[ greek ] = "硼犴茈鐍 箦 贶桢 箦脒溽"; - Text[ korean ] = "葛电 率俊辑 馆汗(~P)"; + Text[ korean ] = "氇摖 韼橃澊歆鞐愳劀 氚橂车(~P)"; Text[ turkish ] = "輑k sat齬 her sayfada yi~nele"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Repetir en cada p醙ina"; - Text[ finnish ] = "~Toista yl鋙tsikko"; + Text[ catalan ] = "~Repeteix a cada p鄃ina"; + Text[ finnish ] = "~Toista yl鋞unniste"; + Text[ thai ] = "喔椸赋喔箞喔о笝喔副喔喔嬥箟喔"; }; CheckBox CB_DONT_SPLIT { @@ -305,23 +311,24 @@ ModalDialog DLG_INSERT_TABLE Text[ portuguese_brazilian ] = "Don't split table"; Text[ portuguese ] = "N鉶 ~dividir tabela"; Text[ danish ] = "Opdel tabel ikke"; - Text[ french ] = "Ne pas ~diviser le tableau"; + Text[ french ] = "Ne pas ~scinder le tableau"; Text[ swedish ] = "Dela i~nte tabell"; Text[ dutch ] = "Tabel niet ~splitsen"; Text[ spanish ] = "~No dividir tabla"; Text[ english_us ] = "Don't split table"; - Text[ chinese_simplified ] = "不分隔表格"; + Text[ chinese_simplified ] = "涓嶅垎闅旇〃鏍"; Text[ russian ] = "湾 疣玑桠囹 蜞犭桷"; Text[ polish ] = "Nie dziel tabeli"; - Text[ japanese ] = "昞\傪暘妱偟側偄"; - Text[ chinese_traditional ] = "ぃだ秨"; + Text[ japanese ] = "琛ㄣ倰鍒嗗壊銇椼仾銇"; + Text[ chinese_traditional ] = "涓嶅垎闁嬭〃鏍"; Text[ arabic ] = "谙 菡 轻滔驷"; Text[ greek ] = "歪 扃 溟衢皴桢 疬磲赆"; - Text[ korean ] = "抛捞喉 盒府窍瘤 臼扁"; + Text[ korean ] = "響 雮橂垊歆 鞎婌潓"; Text[ turkish ] = "Tabloyu tek sayfaya ~sd齬"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~No dividir tabla"; + Text[ catalan ] = "No parteixis la taula"; Text[ finnish ] = "膌 jaa taulukkoa"; + Text[ thai ] = "喙勦浮喙堗箒喔⑧竵喔曕覆喔｀覆喔"; }; CheckBox CB_BORDER { @@ -339,18 +346,50 @@ ModalDialog DLG_INSERT_TABLE Text[ dutch ] = "~Omranding"; Text[ spanish ] = "~Borde"; Text[ english_us ] = "Border"; - Text[ chinese_simplified ] = "边框"; + Text[ chinese_simplified ] = "杈规"; Text[ russian ] = "吾疣祀屙桢"; Text[ polish ] = "Obramowanie"; - Text[ japanese ] = "榞"; - Text[ chinese_traditional ] = "娩"; + Text[ japanese ] = "鏋"; + Text[ chinese_traditional ] = "閭婃"; Text[ arabic ] = "轻拖嫦"; Text[ greek ] = "绣襁泷犰灬"; - Text[ korean ] = "寇胞急"; + Text[ korean ] = "韰岆憪毽"; Text[ turkish ] = "~Kenarl齥"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Borde"; + Text[ catalan ] = "Vora"; Text[ finnish ] = "Reuna"; + Text[ thai ] = "喙喔箟喔權競喔笟"; + }; + PushButton BT_AUTOFORMAT + { + Pos = MAP_APPFONT ( 12 , 130 ) ; + Size = MAP_APPFONT ( 66 , 14 ) ; + TabStop = TRUE ; + Text = "~Autoformat..." ; + Text [ ENGLISH ] = "Autoformat..." ; + Text [ norwegian ] = "Autoformat..." ; + Text [ italian ] = "~Formatt. auto..." ; + Text [ portuguese_brazilian ] = "Formata??o Autom?tica..." ; + Text [ portuguese ] = "~AutoFormato..." ; + Text [ finnish ] = "Autom. ~muotoilu..." ; + Text [ danish ] = "AutoFormat..." ; + Text [ french ] = "~AutoFormat..." ; + Text [ swedish ] = "~Autoformat..." ; + Text [ dutch ] = "~AutoOpmaak..." ; + Text [ spanish ] = "~Formateado autom醫ico..." ; + Text [ english_us ] = "Auto~Format..." ; + Text[ chinese_simplified ] = "鑷姩鏍煎紡(~F)..."; + Text[ russian ] = "棱蝾纛痨囹..."; + Text[ polish ] = "Autoformat..."; + Text[ japanese ] = "銈兗銉堛儠銈┿兗銉炪儍銉(~F)..."; + Text[ chinese_traditional ] = "鑷嫊鏍煎紡(~F)..."; + Text[ arabic ] = "输禹 梳耷祈..."; + Text[ greek ] = "~刘麸田聆..."; + Text[ korean ] = "鞛愲彊 靹滌嫕(~F)..."; + Text[ turkish ] = "~Otom. formatlama..."; + Text[ language_user1 ] = " "; + Text[ catalan ] = "Auto~format..."; + Text[ thai ] = "~喔｀腹喔涏箒喔氞笟喔副喔曕箓喔權浮喔编笗喔..."; }; FixedLine FL_OPTIONS { @@ -367,18 +406,19 @@ ModalDialog DLG_INSERT_TABLE Text[ dutch ] = "Opties"; Text[ spanish ] = "Opciones"; Text[ english_us ] = "Options"; - Text[ chinese_simplified ] = "选项"; + Text[ chinese_simplified ] = "閫夐」"; Text[ russian ] = "相疣戾蝠"; Text[ polish ] = "Opcje"; - Text[ japanese ] = "堤呒"; - Text[ chinese_traditional ] = "匡兜"; + Text[ japanese ] = "銈儣銈枫儳銉"; + Text[ chinese_traditional ] = "閬搁爡"; Text[ arabic ] = "雾茄鞘"; Text[ greek ] = "硼殡镢蒡"; - Text[ korean ] = "可记"; + Text[ korean ] = "鞓奠厴"; Text[ turkish ] = "Se鏴nekler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Opciones"; + Text[ catalan ] = "Opcions"; Text[ finnish ] = "Asetukset"; + Text[ thai ] = "喔曕副喔о箑喔ム阜喔竵"; }; OKButton BT_OK { @@ -399,49 +439,34 @@ ModalDialog DLG_INSERT_TABLE Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; }; - PushButton BT_AUTOFORMAT - { - Pos = MAP_APPFONT ( 12 , 130 ) ; - Size = MAP_APPFONT ( 66 , 14 ) ; - TabStop = TRUE ; - Text = "~Autoformat..." ; - Text [ ENGLISH ] = "Autoformat..." ; - Text [ norwegian ] = "Autoformat..." ; - Text [ italian ] = "~Formatt. auto..." ; - Text [ portuguese_brazilian ] = "Formata??o Autom?tica..." ; - Text [ portuguese ] = "~AutoFormato..." ; - Text [ finnish ] = "~Automaattinen muotoilu" ; - Text [ danish ] = "AutoFormat..." ; - Text [ french ] = "~AutoFormat..." ; - Text [ swedish ] = "~Autoformat..." ; - Text [ dutch ] = "~AutoOpmaak..." ; - Text [ spanish ] = "Auto~Formato..." ; - Text [ english_us ] = "Auto~Format..." ; - Text[ chinese_simplified ] = "自动格式(~F)..."; - Text[ russian ] = "棱蝾纛痨囹..."; - Text[ polish ] = "Autoformat..."; - Text[ japanese ] = "蛋奶席(~F)..."; - Text[ chinese_traditional ] = "笆Α(~F)..."; - Text[ arabic ] = "输禹 梳耷祈..."; - Text[ greek ] = "~刘麸田聆..."; - Text[ korean ] = "磊悼辑侥(~F)..."; - Text[ turkish ] = "~Otom. formatlama..."; - Text[ language_user1 ] = " "; - Text[ catalan ] = "Auto~Formato..."; - }; - Text[ chinese_simplified ] = "插入表格"; - Text[ russian ] = "埋蜞忤螯 蜞犭桷"; + Text[ chinese_simplified ] = "鎻掑叆琛ㄦ牸"; + Text[ russian ] = "埋蜞怅 蜞犭桷"; Text[ polish ] = "Wstaw tabel"; - Text[ japanese ] = "昞\偺憓擖"; - Text[ chinese_traditional ] = "础"; + Text[ japanese ] = "琛ㄣ伄鎸垮叆"; + Text[ chinese_traditional ] = "鎻掑叆琛ㄦ牸"; Text[ arabic ] = "畔亚 滔驷"; Text[ greek ] = "砰筢泫戕 疬磲赆"; - Text[ korean ] = "抛捞喉 火涝"; + Text[ korean ] = "響 靷届瀰"; Text[ turkish ] = "Tablo ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar tabla"; + Text[ catalan ] = "Insereix una taula"; + Text[ thai ] = "喙佮笚喔｀竵喔曕覆喔｀覆喔"; }; + + + + + + + + + + + + + + diff --git a/sw/source/ui/table/mergetbl.src b/sw/source/ui/table/mergetbl.src index b538028e7d2c..c8ac4092bcc6 100644 --- a/sw/source/ui/table/mergetbl.src +++ b/sw/source/ui/table/mergetbl.src @@ -2,9 +2,9 @@ * * $RCSfile: mergetbl.src,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: vg $ $Date: 2001-07-14 20:22:57 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -106,18 +106,19 @@ ModalDialog DLG_MERGE_TABLE Text [ french ] = "Mode" ; Text [ dutch ] = "Modus" ; Text [ portuguese ] = "Modo" ; - Text[ chinese_simplified ] = "模式"; + Text[ chinese_simplified ] = "妯″紡"; Text[ russian ] = "绣骅"; Text[ polish ] = "Tryb"; - Text[ japanese ] = "影霓"; - Text[ chinese_traditional ] = "家Α"; + Text[ japanese ] = "銉€兗銉"; + Text[ chinese_traditional ] = "妯″紡"; Text[ arabic ] = "轻糜徭"; Text[ greek ] = "梳糗篝狍 脲轸秕胥哚"; - Text[ korean ] = "葛靛"; + Text[ korean ] = "氇摐"; Text[ turkish ] = "Kip"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Modo"; + Text[ catalan ] = "Mode"; Text[ finnish ] = "Tila"; + Text[ thai ] = "喙傕斧喔∴笖"; }; RadioButton RB_MERGE_PREV { @@ -132,22 +133,23 @@ ModalDialog DLG_MERGE_TABLE Text[ russian ] = "吾滂龛螯 镳邃簌彘 蜞犭桷彘"; Text[ dutch ] = "met de ~vorige tabel verbinden"; Text[ french ] = "Fusionner avec le tableau ~pr閏閐ent"; - Text[ spanish ] = "unir con la tabla ~anterior"; + Text[ spanish ] = "Unir con la tabla ~anterior"; Text[ italian ] = "Unisci alla tabella precedente"; Text[ danish ] = "flet med forrige tabel"; - Text[ swedish ] = "f鰎bind med den ~f鰎eg錯nde tabellen"; + Text[ swedish ] = "sammanfoga med den ~f鰎eg錯nde tabellen"; Text[ polish ] = "Po彻cz z poprzedni tabel"; Text[ portuguese_brazilian ] = "Join with ~previous table"; - Text[ japanese ] = "慜偺昞\偲寢崌(~P)"; - Text[ chinese_simplified ] = "和上一个表格合并(~P)"; - Text[ chinese_traditional ] = "㎝ㄖ(~P)"; + Text[ japanese ] = "鍓嶃伄琛ㄣ仺绲愬悎(~P)"; + Text[ chinese_simplified ] = "鍜屼笂涓涓〃鏍煎悎骞(~P)"; + Text[ chinese_traditional ] = "鍜屼笂涓鍊嬭〃鏍煎悎浣(~P)"; Text[ arabic ] = "轻讶 阙 轻滔驷 轻忧绒"; Text[ greek ] = "蓓 戾 瘃镧泔屙 疬磲赆"; - Text[ korean ] = "捞傈 抛捞喉俊 楷搬(~P)"; + Text[ korean ] = "鞚挫爠 響滌棎 鞐瓣舶(~P)"; Text[ turkish ] = "~謓ceki tablo ile birle⺶ir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "unir con la tabla ~anterior"; - Text[ finnish ] = "~Liit edelliseen taulukkoon"; + Text[ catalan ] = "Uneix a la taula ~anterior"; + Text[ finnish ] = "Liit ~edelliseen taulukkoon"; + Text[ thai ] = "喔｀箞喔о浮喔斷箟喔о涪喔曕覆喔｀覆喔噡喔佮箞喔笝"; }; RadioButton RB_MERGE_NEXT { @@ -160,22 +162,23 @@ ModalDialog DLG_MERGE_TABLE Text[ russian ] = "吾滂龛螯 耦 耠邃簋 蜞犭桷彘"; Text[ dutch ] = "Met de v~olgende tabel verbinden"; Text[ french ] = "Fusionner avec le tableau ~suivant"; - Text[ spanish ] = "unir con la tabla ~siguiente"; + Text[ spanish ] = "Unir con la tabla ~siguiente"; Text[ italian ] = "Unisci alla tabella successiva"; Text[ danish ] = "flet med efterf鴏gende tabel"; - Text[ swedish ] = "f鰎bind med den ~efterf鰈jande tabellen"; + Text[ swedish ] = "sammanfoga med den ~efterf鰈jande tabellen"; Text[ polish ] = "Po彻cz z nast阷n tabel"; Text[ portuguese_brazilian ] = "Join with ~next table"; - Text[ japanese ] = "師偺昞\偲寢崌(~N)"; - Text[ chinese_simplified ] = "和下一个表格合并(~N)"; - Text[ chinese_traditional ] = "㎝ㄖ(~N)"; + Text[ japanese ] = "娆°伄琛ㄣ仺绲愬悎(~N)"; + Text[ chinese_simplified ] = "鍜屼笅涓涓〃鏍煎悎骞(~N)"; + Text[ chinese_traditional ] = "鍜屼笅涓鍊嬭〃鏍煎悎浣(~N)"; Text[ arabic ] = "轻讶 阙 轻滔驷 轻是犴"; Text[ greek ] = "蓓 戾 屦屙 疬磲赆"; - Text[ korean ] = "促澜 抛捞喉俊 楷搬(~N)"; + Text[ korean ] = "雼れ潓 響滌棎 鞐瓣舶(~N)"; Text[ turkish ] = "S~onraki tablo ile birle⺶ir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "unir con la tabla ~siguiente"; - Text[ finnish ] = "~Liit seuraavaan taulukkoon"; + Text[ catalan ] = "uneix amb la taula ~seg黣nt"; + Text[ finnish ] = "Liit ~seuraavaan taulukkoon"; + Text[ thai ] = "喔｀箞喔о浮喔斷箟喔о涪喔曕覆喔｀覆喔噡喔栢副喔斷箘喔"; }; Text[ english_us ] = "Merge Tables"; Text[ portuguese ] = "Unir tabelas"; @@ -185,21 +188,36 @@ ModalDialog DLG_MERGE_TABLE Text[ spanish ] = "unir tablas"; Text[ italian ] = "Unisci tabelle"; Text[ danish ] = "Flet tabeller"; - Text[ swedish ] = "F鰎bind tabeller"; + Text[ swedish ] = "Sammanfoga tabeller"; Text[ polish ] = "Sprz阦aj tabele"; Text[ portuguese_brazilian ] = "Join tables"; - Text[ japanese ] = "昞\偺寢崌"; - Text[ chinese_simplified ] = "连接表格"; - Text[ chinese_traditional ] = "硈钡"; + Text[ japanese ] = "琛ㄣ伄绲愬悎"; + Text[ chinese_simplified ] = "杩炴帴琛ㄦ牸"; + Text[ chinese_traditional ] = "閫ｆ帴琛ㄦ牸"; Text[ arabic ] = "嬲 轻滔擎"; Text[ greek ] = "疙 痖碥犍"; - Text[ korean ] = "钎 楷搬"; + Text[ korean ] = "響 氤戫暕"; Text[ turkish ] = "Tablolar birle⺶ir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "unir tablas"; + Text[ catalan ] = "Fusiona les taules"; Text[ finnish ] = "Yhdist taulukot"; + Text[ thai ] = "喔溹釜喔侧笝喔曕覆喔｀覆喔"; }; + + + + + + + + + + + + + + diff --git a/sw/source/ui/table/rowht.src b/sw/source/ui/table/rowht.src index 004a3bb2cbac..a6ca47982a89 100644 --- a/sw/source/ui/table/rowht.src +++ b/sw/source/ui/table/rowht.src @@ -2,9 +2,9 @@ * * $RCSfile: rowht.src,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: vg $ $Date: 2001-07-14 20:24:04 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:32 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -132,22 +132,23 @@ ModalDialog DLG_ROW_HEIGHT Text [ swedish ] = "anpassa ~dynamiskt" ; Text [ danish ] = "tilpas dynamisk" ; Text [ italian ] = "Altezza autom~atica" ; - Text [ spanish ] = "~ajuste din醡ico" ; - Text [ french ] = "adaptation ~dynamique" ; + Text [ spanish ] = "~Ajuste din醡ico" ; + Text [ french ] = "Adaptation dynamique" ; Text [ dutch ] = "~dynamisch aanpassen" ; Text [ portuguese_brazilian ] = "~dynamisch anpassen" ; Text [ portuguese ] = "Ajuste ~din鈓ico" ; - Text[ chinese_simplified ] = "自动调整(~F)"; + Text[ chinese_simplified ] = "鑷姩璋冩暣(~F)"; Text[ russian ] = "项溽铕 疣珈屦"; Text[ polish ] = "Dostosuj dynamicznie"; - Text[ japanese ] = "憹壛傪擣傔傞(~F)"; - Text[ chinese_traditional ] = "笆程続秸俱(~F)"; + Text[ japanese ] = "澧楀姞銈掕獚銈併倠(~F)"; + Text[ chinese_traditional ] = "鑷嫊鏈閬╄鏁(~F)"; Text[ arabic ] = "汜橇闵 梳耷祈 後吞"; Text[ greek ] = "孽磲扉贽 瘃矬狁祜戕"; - Text[ korean ] = "农扁俊 嘎勉(~F)"; + Text[ korean ] = "韥赴鞐 毵烄钉(~F)"; Text[ turkish ] = "i~鏴rik boyuna uydur"; - Text[ catalan ] = "~ajuste din醡ico"; + Text[ catalan ] = "~Ajusta a la mida"; Text[ finnish ] = "~Sovita kokoon"; + Text[ thai ] = "~喔堗副喔斷笧喔笖喔掂競喔權覆喔"; }; FixedLine FL_HEIGHT { @@ -166,29 +167,42 @@ ModalDialog DLG_ROW_HEIGHT Text [ dutch ] = "Hoogte" ; Text [ spanish ] = "Altura" ; Text [ english_us ] = "Height" ; - Text[ chinese_simplified ] = "高"; + Text[ chinese_simplified ] = "楂樺害"; Text[ russian ] = "蔓耦蜞"; Text[ polish ] = "Wysoko滄"; - Text[ japanese ] = "崅偝"; - Text[ chinese_traditional ] = "蔼"; + Text[ japanese ] = "楂樸仌"; + Text[ chinese_traditional ] = "楂樺害"; Text[ arabic ] = "轻茄瘦勤"; Text[ greek ] = "绝矧"; - Text[ korean ] = "臭捞"; + Text[ korean ] = "雴掛澊"; Text[ turkish ] = "Y黭seklik"; - Text[ catalan ] = "Altura"; + Text[ catalan ] = "Al鏰da"; + Text[ thai ] = "喔勦抚喔侧浮喔腹喔"; }; - Text[ chinese_simplified ] = "行高"; + Text[ chinese_simplified ] = "琛岄珮"; Text[ russian ] = "蔓耦蜞 耱痤觇"; Text[ polish ] = "Wysoko滄 wierszy"; - Text[ japanese ] = "峴偺崅偝"; - Text[ chinese_traditional ] = "︽蔼"; + Text[ japanese ] = "琛屻伄楂樸仌"; + Text[ chinese_traditional ] = "琛岄珮"; Text[ arabic ] = "茄瘦勤 轻蛰"; Text[ greek ] = "绝矧 泷犰燹"; - Text[ korean ] = "青 臭捞"; + Text[ korean ] = "頄 雴掛澊"; Text[ turkish ] = "Sat齬 y黭sekli餴"; - Text[ catalan ] = "Altura de fila"; + Text[ catalan ] = "Al鏰da de fila"; + Text[ thai ] = "喔勦抚喔侧浮喔腹喔囙競喔竾喙佮笘喔"; }; + + + + + + + + + + + diff --git a/sw/source/ui/table/splittbl.src b/sw/source/ui/table/splittbl.src index b549734c6581..b2e6e8c33d25 100644 --- a/sw/source/ui/table/splittbl.src +++ b/sw/source/ui/table/splittbl.src @@ -2,9 +2,9 @@ * * $RCSfile: splittbl.src,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: vg $ $Date: 2001-07-14 20:26:26 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -106,18 +106,19 @@ ModalDialog DLG_SPLIT_TABLE Text [ french ] = "Mode" ; Text [ dutch ] = "Modus" ; Text [ portuguese ] = "Modo" ; - Text[ chinese_simplified ] = "模式"; + Text[ chinese_simplified ] = "妯″紡"; Text[ russian ] = "绣骅"; Text[ polish ] = "Tryb"; - Text[ japanese ] = "影霓"; - Text[ chinese_traditional ] = "家Α"; + Text[ japanese ] = "銉€兗銉"; + Text[ chinese_traditional ] = "妯″紡"; Text[ arabic ] = "轻嬷"; Text[ greek ] = "梳糗篝狍 脲轸秕胥哚"; - Text[ korean ] = "葛靛"; + Text[ korean ] = "氇摐"; Text[ turkish ] = "Kip"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Modo"; + Text[ catalan ] = "Mode"; Text[ finnish ] = "Tila"; + Text[ thai ] = "喙傕斧喔∴笖"; }; RadioButton RB_CNTNT { @@ -134,20 +135,21 @@ ModalDialog DLG_SPLIT_TABLE Text [ danish ] = "Kopier overskrift" ; Text [ italian ] = "~Copia intestazione" ; Text [ spanish ] = "~Copiar encabezado" ; - Text [ french ] = "~Copier titre" ; + Text [ french ] = "~Copier le titre" ; Text [ dutch ] = "~Kop kopi雛en" ; - Text[ chinese_simplified ] = "复制标题(~C)"; + Text[ chinese_simplified ] = "澶嶅埗鏍囬(~C)"; Text[ russian ] = "暑镨痤忄螯 玎泐腩忸"; Text[ polish ] = "Kopiuj tytu"; - Text[ japanese ] = "尒弌偟偺核甙(~C)"; - Text[ chinese_traditional ] = "狡籹夹肈(~C)"; + Text[ japanese ] = "瑕嬪嚭銇椼伄銈炽償銉(~C)"; + Text[ chinese_traditional ] = "瑜囪＝妯欓(~C)"; Text[ arabic ] = "溆 轻阡媲"; Text[ greek ] = "另糸泷狯 屦殛弼犭咪狎"; - Text[ korean ] = "力格 汗荤(~C)"; + Text[ korean ] = "鞝滊 氤奠偓(~C)"; Text[ turkish ] = "B~a kopyala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Copiar encabezado"; + Text[ catalan ] = "~Copia encap鏰lament"; Text[ finnish ] = "~Kopioi otsikko"; + Text[ thai ] = "~喔勦副喔斷弗喔竵喔副喔о競喙夃腑"; }; RadioButton RB_BOX_PARA { @@ -161,21 +163,22 @@ ModalDialog DLG_SPLIT_TABLE Text [ swedish ] = "~Egen 鰒erskrift, med formatmall" ; Text [ danish ] = "Egen overskrift, med typografi" ; Text [ italian ] = "~Propria intestazione con modello" ; - Text [ spanish ] = "~Encabezado propio, con estilos" ; + Text [ spanish ] = "~Encabezado propio (aplicar estilo)" ; Text [ french ] = "Titre personnalis, avec ~style" ; Text [ dutch ] = "~Eigen kop, met opmaakprofiel" ; - Text[ chinese_simplified ] = "自定标题，带样式(~U)"; - Text[ russian ] = "青泐腩忸 镱朦珙忄蝈 耦 耱桦屐"; + Text[ chinese_simplified ] = "鑷畾鏍囬锛屽甫鏍峰紡(~U)"; + Text[ russian ] = "青泐腩忸 镱朦珙忄蝈 (镳桁屙栩 耱桦)"; Text[ polish ] = "Tytu u縴tkownika, z szablonem"; - Text[ japanese ] = "嚼操晅偒瞻晦皰鑻`偺尒弌偟(~U)"; - Text[ chinese_traditional ] = "璹夹肈盿妓Α(~U)"; + Text[ japanese ] = "銈广偪銈ゃ儷浠樸亶銉︺兗銈躲兗瀹氱京銇鍑恒仐(~U)"; + Text[ chinese_traditional ] = "鑷▊妯欓锛屽付妯ｅ紡(~U)"; Text[ arabic ] = "阡媲 吻 (守软 轻溷)"; Text[ greek ] = "旭矬狁祜箪蓓 屦殛弼犭咪 (戾 篝蹼)"; - Text[ korean ] = "绊蜡 力格（辑侥 颇老 利侩）(~U)"; + Text[ korean ] = "鞀ろ儉鞚检澊 響滍暔霅 靷毄鞛 鞝曥潣 鞝滊(~U)"; Text[ turkish ] = "~謟el ba齥 (bi鏸m uygula)"; Text[ language_user1 ] = "All \"Vorlagen\" /Styles are written with a capital S.10.5.00EM"; - Text[ catalan ] = "~Encabezado propio, con estilos"; + Text[ catalan ] = "~Encap鏰lament propi, amb estils"; Text[ finnish ] = "~Mukautettu otsikko (k鋣t tyyli)"; + Text[ thai ] = "喔佮赋~喔笝喔斷斧喔编抚喔傕箟喔箑喔竾 (喙冟笂喙夃弗喔编竵喔┼笓喔)"; }; RadioButton RB_BOX_NOPARA { @@ -190,20 +193,21 @@ ModalDialog DLG_SPLIT_TABLE Text [ danish ] = "Egen overskrift" ; Text [ italian ] = "Propria ~intestazione" ; Text [ spanish ] = "Encabezado ~propio" ; - Text [ french ] = "Titre ~personnalis" ; + Text [ french ] = "Titre personnalis" ; Text [ dutch ] = "E~igen kop" ; - Text[ chinese_simplified ] = "自定标题(~S)"; + Text[ chinese_simplified ] = "鑷畾鏍囬(~S)"; Text[ russian ] = "青泐腩忸 镱朦珙忄蝈"; Text[ polish ] = "Tytu u縴tkownika"; - Text[ japanese ] = "瞻晦皰鑻`偺尒弌偟(~S)"; - Text[ chinese_traditional ] = "璹夹肈(~S)"; + Text[ japanese ] = "銉︺兗銈躲兗瀹氱京銇鍑恒仐(~S)"; + Text[ chinese_traditional ] = "鑷▊妯欓(~S)"; Text[ arabic ] = "阡媲 吻"; Text[ greek ] = "旭矬狁祜箪蓓 屦殛弼犭咪"; - Text[ korean ] = "荤侩磊 力格(~S)"; + Text[ korean ] = "靷毄鞛 鞝滊(~S)"; Text[ turkish ] = "謣zel ba齥"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado ~propio"; - Text[ finnish ] = "~Mukautettu otsikko"; + Text[ catalan ] = "Encap鏰lament ~propi"; + Text[ finnish ] = "Mukautettu otsikko"; + Text[ thai ] = "喔佮赋喔笝~喔斷斧喔编抚喔傕箟喔箑喔竾"; }; RadioButton RB_BORDER { @@ -218,20 +222,21 @@ ModalDialog DLG_SPLIT_TABLE Text [ danish ] = "Ingen overskrift" ; Text [ italian ] = "~Senza intestazione" ; Text [ spanish ] = "~Sin encabezado" ; - Text [ french ] = "~Pas de titre" ; + Text [ french ] = "Aucun titre" ; Text [ dutch ] = "~Geen kop" ; - Text[ chinese_simplified ] = "无标题(~N)"; + Text[ chinese_simplified ] = "鏃犳爣棰(~N)"; Text[ russian ] = "铃 玎泐腩怅"; Text[ polish ] = "Bez tytu硊"; - 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 ] = "~Ba齥 yok"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Sin encabezado"; + Text[ catalan ] = "~Sense encap鏰lement"; Text[ finnish ] = "~Ei otsikkoa"; + Text[ thai ] = "喙剘喔∴箞喔∴傅喔副喔о競喙夃腑"; }; Text [ english_us ] = "Split Table" ; Text [ portuguese_brazilian ] = "Tabelle auftrennen" ; @@ -239,23 +244,35 @@ ModalDialog DLG_SPLIT_TABLE Text [ danish ] = "Opdel tabel" ; Text [ italian ] = "Dividi tabella" ; Text [ spanish ] = "Dividir tabla" ; - Text [ french ] = "Scinder le tableau" ; - Text [ dutch ] = "Tabel splitsen" ; + Text [ french ] = "Scission de tableau" ; + Text [ dutch ] = "Tabel opsplitsen" ; Text [ portuguese ] = "Dividir tabela" ; - Text[ chinese_simplified ] = "分隔表格"; + Text[ chinese_simplified ] = "鍒嗛殧琛ㄦ牸"; Text[ russian ] = "朽玑栩 蜞犭桷"; Text[ polish ] = "Rozdziel tabel"; - Text[ japanese ] = "昞\偺暘妱"; - Text[ chinese_traditional ] = "だ秨"; + Text[ japanese ] = "琛ㄣ伄鍒嗗壊"; + Text[ chinese_traditional ] = "鍒嗛枊琛ㄦ牸"; Text[ arabic ] = "菡 轻滔驷"; Text[ greek ] = "拈徇皴箸 疬磲赆"; - Text[ korean ] = "钎 唱穿扁"; + Text[ korean ] = "響 雮橂垊旮"; Text[ turkish ] = "Tabloyu b鰈"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Dividir tabla"; + Text[ catalan ] = "Divideix la taula"; Text[ finnish ] = "Jaa taulukko"; + Text[ thai ] = "喙佮涪喔佮笗喔侧福喔侧竾"; }; + + + + + + + + + + + diff --git a/sw/source/ui/table/table.src b/sw/source/ui/table/table.src index 5a19f31deb26..6f4d0ecbb7db 100644 --- a/sw/source/ui/table/table.src +++ b/sw/source/ui/table/table.src @@ -2,9 +2,9 @@ * * $RCSfile: table.src,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: kz $ $Date: 2001-07-14 03:10:57 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:33 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,18 +75,27 @@ InfoBox MSG_ERR_TABLE_MERGE MESSAGE [ dutch ] = "De geselecteerde tabelcellen zijn te complex voor samenvoeging." ; MESSAGE [ spanish ] = "Las celdas seleccionadas de la tabla son demasiado complejas para enlazarlas." ; MESSAGE [ english_us ] = "Selected table cells are too complex to merge." ; - MESSAGE[ chinese_simplified ] = "所选择的表格单元格太综合而无法合并。"; - MESSAGE[ russian ] = "蔓溴脲眄 麇殛 蜞犭桷 耠桫觐 耠铈睇 潆 桴 钺滂礤龛 ."; + MESSAGE[ chinese_simplified ] = "鎵閫夋嫨鐨勮〃鏍煎崟鍏冩牸澶患鍚堣屾棤娉曞悎骞躲"; + MESSAGE[ russian ] = "蔓溴脲眄 麇殛 蜞犭桷 耠桫觐 耠铈睇 潆 钺滂礤龛."; MESSAGE[ polish ] = "Zaznaczone kom髍ki tabeli s zbyt komplekowe, aby je sprz阦a."; - MESSAGE[ japanese ] = "慖戰偝傟偨昞\偺举偼丄寢崌偡傞偵偼暋嶨夁偓傑偡丅"; - MESSAGE[ chinese_traditional ] = "┮匡拒纗び侯τ礚猭ㄖ"; + MESSAGE[ japanese ] = "閬告姙銇曘倢銇熻〃銇偦銉伅銆佺祼鍚堛仚銈嬨伀銇闆戦亷銇庛伨銇欍"; + MESSAGE[ chinese_traditional ] = "鎵閬告搰鐨勮〃鏍煎劜瀛樻牸澶稖鍚堣岀劇娉曞悎浣点"; MESSAGE[ arabic ] = "吾琼 轻滔驷 轻阃舷 阙尴 嵯烟 碛释磲 阙迩 轻讶."; MESSAGE[ greek ] = "葬 屦殡邈燧磲 赍腴 麸 疬磲赆 暹磲 躔羼怙腴贶 疱襁痣镪 汩 磲 氵礤 簖礓弩."; - MESSAGE[ korean ] = "急琶等 钎 伎篮 捍钦窍扁俊 呈公 汗棱钦聪促."; + MESSAGE[ korean ] = "響滌潣 靹犿儩霅 靺鞚 氤戫暕頃橁赴鞐 雱堧 氤奠灐頃╇媹雼."; MESSAGE[ turkish ] = "Se鏸len tablo h點releri birle⺶irilmek i鏸n fazla karmak."; - MESSAGE[ catalan ] = "Las celdas seleccionadas de la tabla son demasiado complejas para enlazarlas."; + MESSAGE[ catalan ] = "Les cel.les seleccionades de la taula s髇 massa complexes per poder-les enlla鏰r."; + MESSAGE[ thai ] = "喙喔ム阜喔竵喔曕覆喔｀覆喔囙箑喔嬥弗喔ム箤喔嬥副喔氞笅喙夃腑喔權箑喔佮复喔權箘喔涏箖喔權竵喔侧福喔溹釜喔侧笝"; }; + + + + + + + + diff --git a/sw/source/ui/table/tabledlg.src b/sw/source/ui/table/tabledlg.src index 3e72f0fe299c..d07106d01e83 100644 --- a/sw/source/ui/table/tabledlg.src +++ b/sw/source/ui/table/tabledlg.src @@ -2,9 +2,9 @@ * * $RCSfile: tabledlg.src,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: os $ $Date: 2002-06-17 12:14:26 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,7 +77,7 @@ Text [ spanish ] = "Flujo del texto" ; \ Text [ english_us ] = "Text Flow" ; \ Text[ chinese_simplified ] = "鎹㈣鍜屽垎椤"; \ - Text[ russian ] = "项腩驽龛 磬 耱疣龛鲥"; \ + Text[ russian ] = "袜 耱疣龛鲥"; \ Text[ polish ] = "Tekst"; \ Text[ japanese ] = "浣撹"; \ Text[ chinese_traditional ] = "鎻涜鍜屽垎闋"; \ @@ -86,7 +86,7 @@ Text[ korean ] = "韰嶌姢韸 頋愲"; \ Text[ turkish ] = "Metin ak"; \ Text[ language_user1 ] = " "; \ - Text[ catalan ] = "Flujo del texto"; \ + Text[ catalan ] = "Flux del text"; \ Text[ thai ] = "喔佮覆喔｀箘喔弗喔傕腑喔囙競喙夃腑喔勦抚喔侧浮"; /**************************************************************************/ @@ -141,10 +141,10 @@ TabDialog DLG_FORMAT_TABLE 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 ] = "喔曕覆喔｀覆喔"; }; PageItem @@ -179,7 +179,7 @@ TabDialog DLG_FORMAT_TABLE Text[ korean ] = "鞐"; Text[ turkish ] = "S黷un"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Columnas"; + Text[ catalan ] = "Columnes"; Text[ thai ] = "喔勦腑喔ム副喔∴笝喙"; }; PageItem @@ -196,7 +196,7 @@ TabDialog DLG_FORMAT_TABLE Text [ french ] = "Bordure" ; Text [ swedish ] = "Inramning" ; Text [ dutch ] = "Omranding" ; - Text [ spanish ] = "Borde" ; + Text [ spanish ] = "Bordes" ; Text [ english_us ] = "Borders" ; PageResID = TP_BORDER ; Text[ chinese_simplified ] = "杈规"; @@ -209,7 +209,7 @@ TabDialog DLG_FORMAT_TABLE Text[ korean ] = "韰岆憪毽"; Text[ turkish ] = "Kenarl齥"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Borde"; + Text[ catalan ] = "Vores"; Text[ thai ] = "喙喔箟喔權競喔笟"; }; PageItem @@ -239,13 +239,13 @@ TabDialog DLG_FORMAT_TABLE Text[ korean ] = "氚瓣步"; Text[ turkish ] = "Artalan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fondo"; + Text[ catalan ] = "Fons"; Text[ thai ] = "喔炧阜喙夃笝喔弗喔编竾"; }; }; }; Text[ chinese_simplified ] = "琛ㄦ牸鏍煎紡"; - Text[ russian ] = "灶痨囹 蜞犭桷"; + Text[ russian ] = "昔铕祀屙桢 蜞犭桷"; Text[ polish ] = "Format tabeli"; Text[ japanese ] = "琛ㄣ伄鏇稿紡"; Text[ chinese_traditional ] = "琛ㄦ牸鏍煎紡"; @@ -254,7 +254,7 @@ TabDialog DLG_FORMAT_TABLE Text[ korean ] = "響 靹滌嫕"; Text[ turkish ] = "Tablo format"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Formato de tabla"; + Text[ catalan ] = "Format de la taula"; Text[ thai ] = "喔｀腹喔涏箒喔氞笟喔曕覆喔｀覆喔"; }; /**************************************************************************/ @@ -293,7 +293,7 @@ TabPage TP_FORMAT_TABLE Text[ korean ] = "鞚措(~N)"; Text[ turkish ] = "~Ad"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Nombre"; + Text[ catalan ] = "~Nom"; Text[ finnish ] = "~Nimi"; Text[ thai ] = "~喔娻阜喙堗腑"; }; @@ -331,7 +331,7 @@ TabPage TP_FORMAT_TABLE Text[ korean ] = "雱堧箘(~I)"; Text[ turkish ] = "G~eniik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "A~ncho"; + Text[ catalan ] = "~Amplada"; Text[ thai ] = "喔勦抚喔侧浮喔亊喔о箟喔侧竾"; }; MetricField ED_WIDTH @@ -369,16 +369,16 @@ TabPage TP_FORMAT_TABLE Text [ portuguese_brazilian ] = "Relati~v" ; Text [ portuguese ] = "Relat~ivo" ; Text[ chinese_simplified ] = "鐩稿鐨(~V)"; - Text[ russian ] = "悟眍耔."; + Text[ russian ] = "悟眍耔蝈朦眍"; Text[ polish ] = "Wz~gl阣ny"; Text[ japanese ] = "銉戙兗銈汇兂銉堣〃绀(~V)"; Text[ chinese_traditional ] = "鐩稿皪鐨(~V)"; Text[ arabic ] = "溆软"; Text[ greek ] = "喻弭殛"; - Text[ korean ] = "牍勲(~V)"; + Text[ korean ] = "牍勲頃橃棳(~V)"; Text[ turkish ] = "G鰎eceli"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Relati~vo"; + Text[ catalan ] = "Relati~u"; Text[ finnish ] = "~Suhteellinen"; Text[ thai ] = "喔副喔∴笧喔编笚~喔樴箤"; }; @@ -406,10 +406,10 @@ TabPage TP_FORMAT_TABLE Text[ chinese_traditional ] = "灞"; Text[ arabic ] = "握瞧"; Text[ greek ] = "射辄翮翦"; - Text[ korean ] = "韸轨劚"; + Text[ korean ] = "霌彪 鞝曤炒"; Text[ turkish ] = "謟ellikler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Propiedades"; + Text[ catalan ] = "Propietats"; Text[ thai ] = "喔勦父喔撪釜喔∴笟喔编笗喔"; }; RadioButton RB_FULL @@ -420,7 +420,7 @@ TabPage TP_FORMAT_TABLE Text = "~Automatisch" ; Text [ ENGLISH ] = "~Automatic" ; Text [ italian ] = "Automatico" ; - Text [ finnish ] = "A~utomaattinen" ; + Text [ finnish ] = "Automaattinen" ; Text [ swedish ] = "~Automatiskt" ; Text [ dutch ] = "~Automatisch" ; Text [ english_us ] = "A~utomatic" ; @@ -439,7 +439,7 @@ TabPage TP_FORMAT_TABLE Text[ korean ] = "鞛愲彊(~U)"; Text[ turkish ] = "Otomatik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Au~tom醫ica"; + Text[ catalan ] = "Au~tom鄑ica"; Text[ thai ] = "喔副~喔曕箓喔權浮喔编笗喔"; }; RadioButton RB_LEFT @@ -452,7 +452,7 @@ TabPage TP_FORMAT_TABLE Text [ italian ] = "Sinistra" ; Text [ portuguese_brazilian ] = "~Esquerda" ; Text [ portuguese ] = "~Esquerda" ; - Text [ finnish ] = "~Vasen:" ; + Text [ finnish ] = "Vasen" ; Text [ danish ] = "Venstre" ; Text [ french ] = " gauche" ; Text [ swedish ] = "V鋘~ster" ; @@ -470,7 +470,7 @@ TabPage TP_FORMAT_TABLE Text[ korean ] = "鞕检(~L)"; Text[ turkish ] = "S~ola"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Izquierda"; + Text[ catalan ] = "~Esquerra"; Text[ thai ] = "~喔嬥箟喔侧涪"; }; RadioButton RB_FROM_LEFT @@ -482,7 +482,7 @@ TabPage TP_FORMAT_TABLE TabStop = TRUE ; Text[ english_us ] = "~From left"; Text[ portuguese ] = "~Esquerda"; - Text[ russian ] = "央邂"; + Text[ russian ] = "隋忸 镱脲"; Text[ greek ] = "A瘘 狁轶翦褴"; Text[ dutch ] = "~Van links"; Text[ french ] = "De gauche"; @@ -498,8 +498,8 @@ TabPage TP_FORMAT_TABLE Text[ chinese_traditional ] = "寰炲乏(~F)"; Text[ arabic ] = "沅 轻碛茄"; Text[ turkish ] = "S~oldan"; - Text[ catalan ] = "De iz~quierda"; - Text[ finnish ] = "~Vasemmalta"; + Text[ catalan ] = "~Des de l'esquerra"; + Text[ finnish ] = "Vasemmalta"; Text[ thai ] = "~喔堗覆喔佮笖喙夃覆喔權笅喙夃覆喔"; }; RadioButton RB_RIGHT @@ -512,7 +512,7 @@ TabPage TP_FORMAT_TABLE Text [ italian ] = "Destra" ; Text [ portuguese_brazilian ] = "~Direita" ; Text [ portuguese ] = "~Direita" ; - Text [ finnish ] = "~Oikea" ; + Text [ finnish ] = "Oikea" ; Text [ danish ] = "H鴍re" ; Text [ french ] = " droite" ; Text [ swedish ] = "H鰃e~r" ; @@ -530,7 +530,7 @@ TabPage TP_FORMAT_TABLE Text[ korean ] = "鞓るジ飒(~I)"; Text[ turkish ] = "Sa~餫"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Derecha"; + Text[ catalan ] = "D~reta"; Text[ thai ] = "喔倊喔о覆"; }; RadioButton RB_CENTER @@ -543,7 +543,7 @@ TabPage TP_FORMAT_TABLE Text [ italian ] = "~Centrato" ; Text [ portuguese_brazilian ] = "~Centralizado" ; Text [ portuguese ] = "~Centrado" ; - Text [ finnish ] = "~Keskit" ; + Text [ finnish ] = "Keskit" ; Text [ danish ] = "Centreret" ; Text [ french ] = "Centr" ; Text [ swedish ] = "~Centrerat" ; @@ -561,7 +561,7 @@ TabPage TP_FORMAT_TABLE Text[ korean ] = "臧鞖措嵃(~C)"; Text[ turkish ] = "~Ortala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Centrado"; + Text[ catalan ] = "~Centrat"; Text[ thai ] = "~喔曕福喔囙竵喔ム覆喔"; }; RadioButton RB_FREE @@ -591,7 +591,7 @@ TabPage TP_FORMAT_TABLE Text[ turkish ] = "~Man黣l"; Text[ language_user1 ] = " "; Text[ catalan ] = "~Manual"; - Text[ finnish ] = "~Manuaalinen"; + Text[ finnish ] = "Manuaalinen"; Text[ thai ] = "~喔斷箟喔о涪喔曕笝喙喔竾"; }; FixedLine FL_POS @@ -621,7 +621,7 @@ TabPage TP_FORMAT_TABLE Text[ greek ] = "郁镞鏖箸"; Text[ korean ] = "毵烄钉"; Text[ turkish ] = "Hizalama"; - Text[ catalan ] = "Alineaci髇"; + Text[ catalan ] = "Alineament"; Text[ thai ] = "喔堗副喔斷笗喔赤箒喔笝喙堗竾"; }; FixedLine FL_DIST @@ -634,7 +634,7 @@ TabPage TP_FORMAT_TABLE Text [ italian ] = "Distanze" ; Text [ portuguese_brazilian ] = "Dist?ncia" ; Text [ portuguese ] = "Espa鏰mento" ; - Text [ finnish ] = "Objektiv鋖it" ; + Text [ finnish ] = "V鋖it" ; Text [ danish ] = "Afstand" ; Text [ french ] = "蒫arts" ; Text [ swedish ] = "Avst錸d" ; @@ -642,7 +642,7 @@ TabPage TP_FORMAT_TABLE Text [ spanish ] = "Espacios" ; Text [ english_us ] = "Spacing" ; Text[ chinese_simplified ] = "闂撮殧"; - Text[ russian ] = "软蝈疴嚯"; + Text[ russian ] = "软蝈疴嚯"; Text[ polish ] = "Odst阷y"; Text[ japanese ] = "闁撻殧"; Text[ chinese_traditional ] = "闁撻殧"; @@ -651,7 +651,7 @@ TabPage TP_FORMAT_TABLE Text[ korean ] = "臧勱博"; Text[ turkish ] = "Aral齥"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Espacios"; + Text[ catalan ] = "Espaiat"; Text[ thai ] = "喔｀赴喔⑧赴喔箞喔侧竾"; }; FixedText FT_LEFT_DIST @@ -664,8 +664,8 @@ TabPage TP_FORMAT_TABLE Text [ italian ] = "A sinistra" ; Text [ portuguese_brazilian ] = "Para a esqueda" ; Text [ portuguese ] = " esqueda" ; - Text [ finnish ] = "~Vasen" ; - Text [ danish ] = "Til venstre" ; + Text [ finnish ] = "Vasen" ; + Text [ danish ] = "T~il venstre" ; Text [ french ] = " gauche" ; Text [ swedish ] = "Till v鋘s~ter" ; Text [ dutch ] = "~Naar links" ; @@ -681,7 +681,7 @@ TabPage TP_FORMAT_TABLE Text[ greek ] = "旭矧 翎 狁轶翦褴"; Text[ korean ] = "鞕检(~T)"; Text[ turkish ] = "S~ola"; - Text[ catalan ] = "Hacia la i~zda."; + Text[ catalan ] = "Esquer~ra"; Text[ thai ] = "喔嬥箟喔瞺喔"; }; MetricField ED_LEFT_DIST @@ -711,7 +711,7 @@ TabPage TP_FORMAT_TABLE Text [ italian ] = "A destra" ; Text [ portuguese_brazilian ] = "Para a direita" ; Text [ portuguese ] = " direita" ; - Text [ finnish ] = "Oi~kea" ; + Text [ finnish ] = "Oikea" ; Text [ danish ] = "Til h鴍re" ; Text [ french ] = " droite" ; Text [ swedish ] = "Till h鰚ger" ; @@ -728,7 +728,7 @@ TabPage TP_FORMAT_TABLE Text[ korean ] = "鞓るジ飒(~G)"; Text[ turkish ] = "Sa~餫"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Hacia la d~cha."; + Text[ catalan ] = "Dre~ta"; Text[ thai ] = "喔倊喔о覆"; }; @@ -776,7 +776,7 @@ TabPage TP_FORMAT_TABLE Text[ korean ] = "鞙(~A)"; Text[ turkish ] = "謓~ce"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Hacia ~arriba"; + Text[ catalan ] = "~A sobre"; Text[ thai ] = "~喔傕箟喔侧竾喔氞笝"; }; MetricField ED_TOP_DIST @@ -806,7 +806,7 @@ TabPage TP_FORMAT_TABLE Text [ italian ] = "In basso" ; Text [ portuguese_brazilian ] = "Para a ~base" ; Text [ portuguese ] = "Para ~baixo" ; - Text [ finnish ] = "~Alhaalla" ; + Text [ finnish ] = "Alhaalla" ; Text [ danish ] = "Forneden" ; Text [ french ] = "Vers le bas" ; Text [ swedish ] = "N~ere" ; @@ -823,7 +823,7 @@ TabPage TP_FORMAT_TABLE Text[ korean ] = "鞎勲灅(~B)"; Text[ turkish ] = "So~nra"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Hacia a~bajo"; + Text[ catalan ] = "~Sota"; Text[ thai ] = "喔傕箟喔侧竾~喔ム箞喔侧竾"; }; MetricField ED_BOTTOM_DIST @@ -850,6 +850,27 @@ TabPage TP_FORMAT_TABLE Hide = TRUE ; Text = "Eigenschaften" ; Text [ ENGLISH ] = "Properties" ; + Text[ english_us ] = "Properties"; + Text[ portuguese ] = "Properties"; + Text[ russian ] = "Properties"; + Text[ greek ] = "Properties"; + Text[ dutch ] = "Properties"; + Text[ french ] = "Propri閠閟"; + Text[ spanish ] = "Propiedades"; + Text[ finnish ] = "Properties"; + Text[ italian ] = "Propriet"; + Text[ danish ] = "Properties"; + Text[ swedish ] = "Egenskaper"; + Text[ polish ] = "Properties"; + Text[ japanese ] = "灞炴"; + Text[ korean ] = "霌彪 鞝曤炒"; + Text[ chinese_simplified ] = "灞炴"; + Text[ chinese_traditional ] = "灞"; + Text[ turkish ] = "Properties"; + Text[ arabic ] = "Properties"; + Text[ catalan ] = "Opcions"; + Text[ thai ] = "喔勦父喔撪釜喔∴笟喔编笗喔"; + Text[ portuguese_brazilian ] = "Propriedades"; }; FixedText FT_TEXTDIRECTION { @@ -858,6 +879,24 @@ TabPage TP_FORMAT_TABLE Hide = TRUE ; Text = "~Textfluss" ; Text [ ENGLISH ] = "Text ~direction" ; + Text[ english_us ] = "Text ~direction"; + Text[ portuguese ] = "Text ~direction"; + Text[ russian ] = "Text ~direction"; + Text[ greek ] = "Text ~direction"; + Text[ dutch ] = "Text ~direction"; + Text[ french ] = "Orientation du texte"; + Text[ spanish ] = "~Direcci髇 de escritura"; + Text[ finnish ] = "Text ~direction"; + Text[ italian ] = "Testo"; + Text[ danish ] = "Text ~direction"; + Text[ swedish ] = "Te~xtriktning"; + Text[ polish ] = "Text ~direction"; + Text[ japanese ] = "鏂囧瓧鏂瑰悜"; + Text[ korean ] = "韰嶌姢韸 氚╉枼"; + Text[ chinese_simplified ] = "鏂囧瓧鏂瑰悜"; + Text[ chinese_traditional ] = "鏂囧瓧鏂瑰悜"; + Text[ turkish ] = "Text ~direction"; + Text[ arabic ] = "Text ~direction"; }; ListBox LB_TEXTDIRECTION { @@ -868,8 +907,8 @@ TabPage TP_FORMAT_TABLE Hide = TRUE ; StringList = { - < "Links nach rechts" ; 0; > ; - < "Rechts nach links" ; 1; > ; + < "Links-nach-rechts" ; 0; > ; + < "Rechts-nach-links" ; 1; > ; < "Einstellungen des 黚ergeordneten Objektes verwenden" ; 4; > ; }; StringList [ ENGLISH ] = @@ -878,6 +917,66 @@ TabPage TP_FORMAT_TABLE < "Right-to-left" ; 1; > ; < "Use superordinate settings" ; 4; > ; }; + StringList [ english_us ] = + { + < "Left-to-right" ; 0; > ; + < "Right-to-left" ; 1; > ; + < "Use superordinate object settings" ; 4; > ; + }; + StringList [ japanese ] = + { + < "宸︺亱銈夊彸銇" ; 0; > ; + < "鍙炽亱銈夊乏銇" ; 1; > ; + < "鍛ㄣ倞銇儐銈偣銉堛伄鏂囧瓧鏂瑰悜銇悎銈忋仜銈" ; 4; > ; + }; + StringList [ language_user1 ] = + { + < "Links nach rechts" ; 0; > ; + < "Rechts nach links" ; 1; > ; + < "Einstellungen des 黚ergeordneten Objektes verwenden" ; 4; > ; + }; + StringList [ korean ] = + { + < "鞕检鞐愳劀 鞓るジ飒届溂搿" ; 0; > ; + < "鞓るジ飒届棎靹 鞕检鞙茧" ; 1; > ; + < "順勳灛 氍胳瀽 氚╉枼鞚 靹れ爼 鞝侅毄" ; 4; > ; + }; + StringList [ chinese_traditional ] = + { + < "寰炲乏鍚戝彸" ; 0; > ; + < "寰炲彸鍚戝乏" ; 1; > ; + < "娌跨敤鐝炬湁鐨勬枃瀛楁柟鍚戠殑瑷畾" ; 4; > ; + }; + StringList [ french ] = + { + < "De gauche droite" ; 0; > ; + < "De droite gauche" ; 1; > ; + < "Utiliser les param鑤res de l'objet sup閞ieur" ; 4; > ; + }; + StringList [ italian ] = + { + < "Da sinistra a destra" ; 0; > ; + < "Da destra a sinistra" ; 1; > ; + < "Usa le impostazioni dell'oggetto superiore" ; 4; > ; + }; + StringList [ chinese_simplified ] = + { + < "浠庡乏鍚戝彸" ; 0; > ; + < "浠庡彸鍚戝乏" ; 1; > ; + < "娌跨敤鐜版湁鐨勬枃瀛楁柟鍚戠殑璁惧畾" ; 4; > ; + }; + StringList [ swedish ] = + { + < "V鋘ster-till-h鰃er" ; 0; > ; + < "H鰃er-till-v鋘ster" ; 1; > ; + < "Anv鋘d det 鰒erordnade objektets inst鋖lningar" ; 4; > ; + }; + StringList [ spanish ] = + { + < "De izquierda a derecha" ; 0; > ; + < "De derecha a izquierda" ; 1; > ; + < "Utilizar la configuraci髇 del objeto superior. " ; 4; > ; + }; }; }; /**************************************************************************/ @@ -903,7 +1002,7 @@ TabPage TP_TABLE_COLUMN Text [ dutch ] = "~Tabelbreedte aanpassen" ; Text [ english_us ] = "Adapt table ~width" ; Text [ swedish ] = "Anpassa ~tabellbredd" ; - Text [ danish ] = "Tilpas tabelbredde" ; + Text [ danish ] = "T~ilpas tabelbredde" ; Text [ portuguese_brazilian ] = "Tabellenbreite anpassen" ; Text [ portuguese ] = "A~justar largura da tabela" ; Text[ chinese_simplified ] = "璋冩暣琛ㄦ牸瀹藉害(~W)"; @@ -913,10 +1012,10 @@ TabPage TP_TABLE_COLUMN Text[ chinese_traditional ] = "瑾挎暣琛ㄦ牸瀵害(~W)"; Text[ arabic ] = "汜橇闵 嶷阎 轻滔驷"; Text[ greek ] = "旭矬狁祜戕 痣軂麸躜 疬磲赆"; - Text[ korean ] = "響 雱堧箘 毵烄钉(~W)"; + Text[ korean ] = "響 雱堧箘 臁办爼(~W)"; Text[ turkish ] = "Tablo genii餴ne g鰎e ayarla"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Ajustar ancho de la tabla"; + Text[ catalan ] = "Adap~ta l'amplada de la taula"; Text[ finnish ] = "Sovita taulukon ~leveys"; Text[ thai ] = "喔涏福喔编笟喔勦抚喔侧浮~喔佮抚喙夃覆喔囙笗喔侧福喔侧竾"; }; @@ -930,14 +1029,14 @@ TabPage TP_TABLE_COLUMN Text [ english_us ] = "Ad~just columns proportionally" ; Text [ portuguese_brazilian ] = "Spalten proportional ?ndern" ; Text [ swedish ] = "膎dra ~kolumner proportionellt" ; - Text [ danish ] = "Modificer kolonner j鎣nt" ; + Text [ danish ] = "~Modificer kolonner j鎣nt" ; Text [ italian ] = "Modifica colonne proporzionalmente" ; Text [ spanish ] = "~Modificar columnas proporcionalmente" ; Text [ french ] = "Modifier les colonnes ~proportionnellement" ; Text [ dutch ] = "~Kolommen gelijkmatig wijzigen" ; Text [ portuguese ] = "Ajustar colunas ~proporcionalmente" ; Text[ chinese_simplified ] = "瀵圭О鍦拌皟鏁村垪瀹(~J)"; - Text[ russian ] = "如戾龛螯 疣忭铎屦眍 耱铍狯"; + Text[ russian ] = "蔓痤忭螯 痂眢 耱铍狯钼"; Text[ polish ] = "Z~modyfikuj r體nomiernie kolumny"; Text[ japanese ] = "鍏ㄥ垪銈掑悓妲樸伀瑾挎暣(~J)"; Text[ chinese_traditional ] = "灏嶇ū瑾挎暣娆勫(~J)"; @@ -946,7 +1045,7 @@ TabPage TP_TABLE_COLUMN Text[ korean ] = "鞐 鞚检爼頃橁矊 氤瓴(~J)"; Text[ turkish ] = "S黷unlar orant齦 de餴⺶ir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Modificar columnas proporcionalmente"; + Text[ catalan ] = "A~justa les columnes proporcionalment"; Text[ finnish ] = "~S滗d sarakkeet suhteessa"; Text[ thai ] = "喔涏福喔眫喔氞釜喔编笖喔箞喔о笝喔勦腑喔ム副喔∴笝喙"; }; @@ -966,16 +1065,16 @@ TabPage TP_TABLE_COLUMN Text [ portuguese ] = "Espa鏾 restante" ; Text [ portuguese_brazilian ] = "Noch verf?barer Platz" ; Text[ chinese_simplified ] = "杩樻湁鐜板瓨鍙敤绌洪棿"; - Text[ russian ] = "务蜞蝾 戾耱"; + Text[ russian ] = "砚钺钿眍 镳铖蝠囗耱忸"; Text[ polish ] = "Miejsce do dyspozycji"; Text[ japanese ] = "娈嬨倞銇偣銉氥兗銈"; Text[ chinese_traditional ] = "閭勬湁鐝惧瓨鍙敤绌洪枔"; Text[ arabic ] = "轻阌峭 轻闶绒砩"; Text[ greek ] = "震镫彘瘘戾盹 齄耧"; - Text[ korean ] = "鞎勳 靷毄臧電ロ暅 瓿店皠"; + Text[ korean ] = "雮晞 鞛堧姅 瓿店皠"; Text[ turkish ] = "Kalan bouk"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Espacio disponible"; + Text[ catalan ] = "Espai restant"; Text[ finnish ] = "Tilaa j鋖jell"; Text[ thai ] = "喔｀赴喔⑧赴喔箞喔侧竾喔椸傅喙堗箑喔弗喔粪腑"; }; @@ -1201,7 +1300,7 @@ TabPage TP_TABLE_COLUMN Text[ korean ] = "鞐 雱堧箘"; Text[ turkish ] = "S黷un genii餴"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ancho de columna"; + Text[ catalan ] = "Amplada de columna"; Text[ thai ] = "喔勦抚喔侧浮喔佮抚喙夃覆喔囙竸喔弗喔编浮喔權箤"; }; }; @@ -1233,7 +1332,7 @@ TabPage TP_TABLE_TEXTFLOW Text [ italian ] = "I~nterruzione" ; Text [ portuguese_brazilian ] = "~Interrup??o" ; Text [ portuguese ] = "~Quebra" ; - Text [ finnish ] = "~Keskeytys" ; + Text [ finnish ] = "~Vaihto" ; Text [ danish ] = "Skift" ; Text [ french ] = "~Saut" ; Text [ swedish ] = "~Brytning" ; @@ -1252,7 +1351,7 @@ TabPage TP_TABLE_TEXTFLOW Text[ korean ] = "雮橂垊旮(~B)"; Text[ turkish ] = "Kesme"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Salto"; + Text[ catalan ] = "~Salt"; Text[ thai ] = "喙亊喔氞箞喔"; }; RadioButton RB_BREAKPAGE @@ -1284,7 +1383,7 @@ TabPage TP_TABLE_TEXTFLOW Text[ korean ] = "韼橃澊歆(~P)"; Text[ turkish ] = "Sayfa"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~P醙ina"; + Text[ catalan ] = "~P鄃ina"; Text[ thai ] = "~喔笝喙夃覆"; }; RadioButton RB_BREAKCOLUMN @@ -1340,16 +1439,16 @@ TabPage TP_TABLE_TEXTFLOW Group = TRUE ; Check = TRUE ; Text[ chinese_simplified ] = "涔嬪墠(~F)"; - Text[ russian ] = "镥疱"; + Text[ russian ] = "襄疱"; Text[ polish ] = "przed"; Text[ japanese ] = "鍓(~F)"; Text[ chinese_traditional ] = "涔嬪墠(~F)"; Text[ arabic ] = "奕"; Text[ greek ] = "旭轫 狃"; - Text[ korean ] = "鞝勳棎(~F)"; + Text[ korean ] = "鞎(~F)"; Text[ turkish ] = "謓~ce"; Text[ language_user1 ] = " "; - Text[ catalan ] = "delan~te"; + Text[ catalan ] = "A~bans"; Text[ thai ] = "喔佮箞喔瓇喔"; }; RadioButton RB_PAGEBREAKAFTER @@ -1371,16 +1470,16 @@ TabPage TP_TABLE_TEXTFLOW Text [ spanish ] = "~Detr醩" ; Text [ english_us ] = "~After" ; Text[ chinese_simplified ] = "涔嬪悗(~A)"; - Text[ russian ] = "镱耠"; + Text[ russian ] = "项耠"; Text[ polish ] = "za"; Text[ japanese ] = "寰(~A)"; Text[ chinese_traditional ] = "涔嬪緦(~A)"; Text[ arabic ] = "融"; Text[ greek ] = "戾糗 狃"; - Text[ korean ] = "鞚错泟(~A)"; + Text[ korean ] = "霋(~A)"; Text[ turkish ] = "Son~ra"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~detr醩"; + Text[ catalan ] = "~Despr閟"; Text[ thai ] = "~喔弗喔编竾喔堗覆喔"; }; CheckBox CB_PAGECOLL @@ -1410,10 +1509,10 @@ TabPage TP_TABLE_TEXTFLOW Text[ chinese_traditional ] = "甯堕爜闈㈡ǎ寮(~Y)"; Text[ arabic ] = "蠕阖 蛰蜕"; Text[ greek ] = "戾 瘃躔 箦脒溽"; - Text[ korean ] = "韼橃澊歆 鞀ろ儉鞚缄臣 頃粯(~Y)"; + Text[ korean ] = "韼橃澊歆 鞀ろ儉鞚 韽暔(~Y)"; Text[ turkish ] = "Sayfa d鼁eni ile"; Text[ language_user1 ] = "All \"Vorlagen\" /Styles are written with a capital S.10.5.00EM"; - Text[ catalan ] = "C~on estilo de p醙ina"; + Text[ catalan ] = "Amb est~il de p鄃ina"; Text[ thai ] = "喔斷箟喔о涪喔ム副喔亊喔┼笓喔班斧喔權箟喔"; }; ListBox LB_PAGECOLL @@ -1448,7 +1547,7 @@ TabPage TP_TABLE_TEXTFLOW Text[ korean ] = "韼橃澊歆 氩堩樃(~N)"; Text[ turkish ] = "Sayfa ~numaralar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "N鷡mero de p醙ina"; + Text[ catalan ] = "N鷡mero de p鄃ina"; Text[ finnish ] = "~Sivunumero"; Text[ thai ] = "喙~喔ム競喔笝喙夃覆"; }; @@ -1490,10 +1589,10 @@ TabPage TP_TABLE_TEXTFLOW Text[ chinese_traditional ] = "涓嶅垎闁嬭〃鏍(~D)"; Text[ arabic ] = "谙 菡 轻滔驷"; Text[ greek ] = "歪 扃 溟衢皴桢 疬磲赆"; - Text[ korean ] = "響 雮橂垊歆 鞎婌潓.(~D)"; + Text[ korean ] = "響 雮橂垊歆 鞎婌潓(~D)"; Text[ turkish ] = "Tabloyu ay齬ma"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~No dividir tabla"; + Text[ catalan ] = "N~o divideixis la taula"; Text[ finnish ] = "~膌 jaa taulukkoa"; Text[ thai ] = "喙剘喔∴箞喙佮涪喔佮笗喔侧福喔侧竾"; }; @@ -1504,10 +1603,10 @@ TabPage TP_TABLE_TEXTFLOW Text = "Mit folgendem Absatz ~zusammenhalten" ; Text [ ENGLISH ] = "~keep with next" ; TabStop = TRUE ; - Text [ english_us ] = "~keep with next paragraph" ; + Text [ english_us ] = "~Keep with next paragraph" ; Text [ portuguese_brazilian ] = "Mit folgendem Absatz ~zusammenhalten" ; Text [ swedish ] = "H錶l ih~op med f鰈jande stycke" ; - Text [ danish ] = "Hold sammen med n鎠te afsnit" ; + Text [ danish ] = "Ho~ld sammen med n鎠te afsnit" ; Text [ italian ] = "Non separare dal paragrafo seguente." ; Text [ spanish ] = "Mantener ~junto al p醨rafo siguiente" ; Text [ french ] = "~Ne pas s閜arer du paragraphe suivant" ; @@ -1523,8 +1622,8 @@ TabPage TP_TABLE_TEXTFLOW Text[ korean ] = "雼れ潓 雼澖鞚 臧欖潃 韼橃澊歆鞐(~K)"; Text[ turkish ] = "Alttaki paragraf ile birlikte tut"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Mantener ~junto al p醨rafo siguiente"; - Text[ finnish ] = "~sido seuraavaan kappaleeseen"; + Text[ catalan ] = "~Conserva amb el par鄃raf seg黣nt"; + Text[ finnish ] = "Si~do seuraavaan kappaleeseen"; Text[ thai ] = "~喔曕覆喔∴笖喙夃抚喔⑧涪喙堗腑喔笝喙夃覆喔栢副喔斷箘喔"; }; CheckBox CB_HEADLINE @@ -1555,7 +1654,7 @@ TabPage TP_TABLE_TEXTFLOW Text[ korean ] = "鞝滊 氚橂车(~E)"; Text[ turkish ] = "Ba yinele"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Repet~ir encabezado"; + Text[ catalan ] = "R~epeteix l'encap鏰lament"; Text[ thai ] = "喔椸赋喔副喔о競喙夃腑~喔嬥箟喔"; }; FixedLine FL_VERT_ORIENT @@ -1570,7 +1669,7 @@ TabPage TP_TABLE_TEXTFLOW Text [ italian ] = "Allineamento verticale" ; Text [ spanish ] = "Alineaci髇 vertical" ; Text [ french ] = "Alignement vertical" ; - Text [ dutch ] = "Verticale uitlijning" ; + Text [ dutch ] = "Verticale tekstuitlijning" ; Text [ portuguese_brazilian ] = "Vertikale Ausrichtung" ; Text [ portuguese ] = "Alinhamento vertical" ; Text[ chinese_simplified ] = "鍨傜洿鏂瑰悜瀵归綈"; @@ -1583,7 +1682,7 @@ TabPage TP_TABLE_TEXTFLOW Text[ korean ] = "靾橃 毵烄钉"; Text[ turkish ] = "Dikey hizalama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Alineaci髇 vertical"; + Text[ catalan ] = "Alineament vertical"; Text[ finnish ] = "Tasaus pystysuunnassa"; Text[ thai ] = "喔堗副喔斷笂喔脆笖喙佮笝喔о笗喔编箟喔"; }; @@ -1595,7 +1694,7 @@ TabPage TP_TABLE_TEXTFLOW Text [ ENGLISH ] = "Top" ; Text [ english_us ] = "T~op" ; Text [ swedish ] = "~Uppe" ; - Text [ danish ] = "Top" ; + Text [ danish ] = "To~p" ; Text [ italian ] = "Alto" ; Text [ spanish ] = "~Arriba" ; Text [ french ] = "En haut" ; @@ -1612,8 +1711,8 @@ TabPage TP_TABLE_TEXTFLOW Text[ korean ] = "鞙(~O)"; Text[ turkish ] = "Orta"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Arriba"; - Text[ finnish ] = "~Yl鋙sa"; + Text[ catalan ] = "S~uperior"; + Text[ finnish ] = "~Yl鋜euna"; Text[ thai ] = "喔殈喔"; }; RadioButton RB_VERT_CENTER @@ -1624,15 +1723,15 @@ TabPage TP_TABLE_TEXTFLOW Text [ ENGLISH ] = "Middle" ; Text [ english_us ] = "Cente~red" ; Text [ swedish ] = "~Mitten" ; - Text [ danish ] = "Centreret" ; + Text [ danish ] = "~Centreret" ; Text [ italian ] = "Centro" ; Text [ spanish ] = "Centrado" ; - Text [ french ] = "~Milieu" ; + Text [ french ] = "Centre" ; Text [ dutch ] = "~Midden" ; Text [ portuguese_brazilian ] = "Mitte" ; Text [ portuguese ] = "~Centro" ; Text[ chinese_simplified ] = "涓(~R)"; - Text[ russian ] = "项 皴疱滂礤"; + Text[ russian ] = "项皴疱滂礤"; Text[ polish ] = "Po渞odku"; Text[ japanese ] = "涓ぎ(~R)"; Text[ chinese_traditional ] = "涓(~R)"; @@ -1641,7 +1740,7 @@ TabPage TP_TABLE_TEXTFLOW Text[ korean ] = "臧鞖措嵃(~R)"; Text[ turkish ] = "A瘕"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Centro"; + Text[ catalan ] = "Cent~rat"; Text[ finnish ] = "~Keskitetty"; Text[ thai ] = "喔曕福喔噡喔佮弗喔侧竾"; }; @@ -1653,7 +1752,7 @@ TabPage TP_TABLE_TEXTFLOW Text [ ENGLISH ] = "Bottom" ; Text [ english_us ] = "Bottom" ; Text [ swedish ] = "~Nere" ; - Text [ danish ] = "Nederst" ; + Text [ danish ] = "~Nederst" ; Text [ italian ] = "Basso" ; Text [ spanish ] = "A~bajo" ; Text [ french ] = "En bas" ; @@ -1670,8 +1769,8 @@ TabPage TP_TABLE_TEXTFLOW Text[ korean ] = "鞎勲灅"; Text[ turkish ] = "Yukar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "A~bajo"; - Text[ finnish ] = "Alaosa"; + Text[ catalan ] = "Part inferior"; + Text[ finnish ] = "Alareuna"; Text[ thai ] = "喔ム箞喔侧竾"; }; }; @@ -1689,17 +1788,36 @@ InfoBox MSG_WRONG_TABLENAME Message [ dutch ] = "In de naam van de tabel mogen geen spaties voorkomen." ; Message [ portuguese ] = "O nome da tabela n鉶 pode ter espa鏾s vazios" ; Message[ chinese_simplified ] = "琛ㄦ牸鍚嶇О涓嶈兘鍚湁绌烘牸瀛楃銆"; - Message[ russian ] = "褥 蜞犭桷 礤 漕腈眍 耦溴疰囹 镳钺咫钼."; + Message[ russian ] = "褥 蜞犭桷 礤 漕腈眍 耦溴疰囹 镳钺咫."; Message[ polish ] = "Nazwa tabeli nie mo縠 zawiera spacji."; Message[ japanese ] = "琛ㄥ悕銇偣銉氥兗銈广伅鍏ャ倢銈夈倢銇俱仜銈"; Message[ chinese_traditional ] = "琛ㄦ牸鍚嶇ū涓嶈兘鍚湁绌烘牸瀛楀厓銆"; Message[ arabic ] = "硖 冕 硗舒 怯 轻滔驷 卺 猛演 阌禽."; Message[ greek ] = "燥 镬 麸 疬磲赆 溴 屦轸褫疱翎 磲 疱耖蓣彘 赍碥"; - Message[ korean ] = "響 鞚措鞐愲姅 瓿惦氨鞚 韽暔霅橃柎靹滊姅 鞎堧惄雼堧嫟."; + Message[ korean ] = "響 鞚措鞐 瓿惦氨鞚 韽暔霅橃柎靹滊姅 鞎堧惄雼堧嫟."; Message[ turkish ] = "Tablo ad齨da bouk bulunmamal齞齬."; Message[ language_user1 ] = " "; - Message[ catalan ] = "El nombre de la tabla no debe contener espacios."; + Message[ catalan ] = "El nom de la taula no ha d'incloure espais."; Message[ finnish ] = "Taulukon nimess ei saa olla v鋖ej."; Message[ thai ] = "喔娻阜喙堗腑喔曕覆喔｀覆喔囙笗喙夃腑喔囙箘喔∴箞喔∴傅喔｀赴喔⑧赴喔箞喔侧竾"; }; + + + + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/table/tautofmt.src b/sw/source/ui/table/tautofmt.src index 935f2801135a..4a4694f5b9d8 100644 --- a/sw/source/ui/table/tautofmt.src +++ b/sw/source/ui/table/tautofmt.src @@ -2,9 +2,9 @@ * * $RCSfile: tautofmt.src,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: os $ $Date: 2002-06-03 12:26:00 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,7 +78,7 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ french ] = "AutoFormat" ; Text [ swedish ] = "Autoformat" ; Text [ dutch ] = "AutoOpmaak" ; - Text [ spanish ] = "AutoFormato" ; + Text [ spanish ] = "Formateado autom醫ico" ; Text [ english_us ] = "AutoFormat" ; Moveable = TRUE ; FixedLine FL_FORMAT @@ -87,7 +87,7 @@ ModalDialog DLG_AUTOFMT_TABLE Size = MAP_APPFONT ( 243 , 8 ) ; Text = "Format" ; Text [ english_us ] = "Format" ; - Text[ portuguese ] = "Formatar"; + Text[ portuguese ] = "Formato"; Text[ russian ] = "灶痨囹"; Text[ greek ] = "田聆镳镞珞"; Text[ dutch ] = "Opmaak"; @@ -95,17 +95,18 @@ ModalDialog DLG_AUTOFMT_TABLE Text[ spanish ] = "Formato"; Text[ finnish ] = "Muotoilu"; Text[ italian ] = "Formattazione"; - Text[ danish ] = "Formatering"; + Text[ danish ] = "Format"; Text[ swedish ] = "Format"; Text[ polish ] = "Format"; Text[ portuguese_brazilian ] = "Formatos"; - Text[ japanese ] = "彂幃"; - Text[ korean ] = "器杆泼"; - Text[ chinese_simplified ] = "格式化"; - Text[ chinese_traditional ] = "Αて"; + Text[ japanese ] = "鏇稿紡"; + Text[ korean ] = "靹滌嫕"; + Text[ chinese_simplified ] = "鏍煎紡"; + Text[ chinese_traditional ] = "鏍煎紡"; Text[ turkish ] = "Formatlama"; Text[ arabic ] = "输禹"; Text[ catalan ] = "Formato"; + Text[ thai ] = "喔｀腹喔涏箒喔氞笟"; }; ListBox LB_FORMAT { @@ -131,7 +132,7 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ italian ] = "Formato ~numero" ; Text [ portuguese_brazilian ] = "~Formatodon?ero" ; Text [ portuguese ] = "~Formato num閞ico" ; - Text [ finnish ] = "~Numeromuoto" ; + Text [ finnish ] = "Lukumuoto" ; Text [ danish ] = "Talformat" ; Text [ french ] = "~Format num閞ique" ; Text [ swedish ] = "Talf~ormat" ; @@ -139,17 +140,18 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ spanish ] = "Formato nu~m閞ico" ; Text [ english_us ] = "~Number format" ; TabStop = TRUE ; - Text[ chinese_simplified ] = "数字格式(~N)"; + Text[ chinese_simplified ] = "鏁板瓧鏍煎紡(~N)"; Text[ russian ] = "阻耠钼铋 纛痨囹"; Text[ polish ] = "Format liczb"; - 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 ] = "Say f~ormat"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Formato nu~m閞ico"; + Text[ catalan ] = "Format nu~m鑢ic"; + Text[ thai ] = "喔｀腹喔涏箒喔氞笟~喔曕副喔о箑喔ム競"; }; CheckBox BTN_BORDER { @@ -167,20 +169,21 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ french ] = "~Bordure" ; Text [ swedish ] = "~Inramning" ; Text [ dutch ] = "~Omranding" ; - Text [ spanish ] = "~Borde" ; + Text [ spanish ] = "~Bordes" ; Text [ english_us ] = "~Borders" ; TabStop = TRUE ; - Text[ chinese_simplified ] = "边框(~B)"; + Text[ chinese_simplified ] = "杈规(~B)"; Text[ russian ] = "吾疣祀屙桢"; Text[ polish ] = "Obramowanie"; - Text[ japanese ] = "奜榞(~B)"; - Text[ chinese_traditional ] = "娩(~B)"; + Text[ japanese ] = "澶栨灎(~B)"; + Text[ chinese_traditional ] = "閭婃(~B)"; Text[ arabic ] = "轻拖嫦"; Text[ greek ] = "绣襁泷犰灬"; - Text[ korean ] = "抛滴府(~B)"; + Text[ korean ] = "韰岆憪毽(~B)"; Text[ turkish ] = "~Kenarl齥"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Borde"; + Text[ catalan ] = "~Vores"; + Text[ thai ] = "喙~喔箟喔權競喔笟"; }; CheckBox BTN_FONT { @@ -195,23 +198,24 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ portuguese ] = "~Tipo de letra" ; Text [ finnish ] = "~Fontti" ; Text [ danish ] = "Skrifttype" ; - Text [ french ] = "~Police" ; + Text [ french ] = "Police" ; Text [ swedish ] = "~Teckensnitt" ; Text [ dutch ] = "~Lettertype" ; Text [ spanish ] = "Fuen~te" ; Text [ english_us ] = "F~ont" ; TabStop = TRUE ; - Text[ chinese_simplified ] = "字体(~O)"; + Text[ chinese_simplified ] = "瀛椾綋(~O)"; Text[ russian ] = "仞梏"; Text[ polish ] = "Czcionka"; - Text[ japanese ] = "太菽偺庬椶(~O)"; - Text[ chinese_traditional ] = "(~O)"; + Text[ japanese ] = "銉曘偐銉炽儓銇ó椤(~O)"; + Text[ chinese_traditional ] = "瀛楀瀷(~O)"; Text[ arabic ] = "滏 轻呜"; Text[ greek ] = "民犰灬麸箦轳"; - Text[ korean ] = "臂裁(~O)"; + Text[ korean ] = "旮昙(~O)"; Text[ turkish ] = "Yaz齮i~pi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Fuen~te"; + Text[ catalan ] = "Tipus de ~lletra"; + Text[ thai ] = "喔曕副喔о腑喔眫喔佮俯喔"; }; CheckBox BTN_PATTERN { @@ -232,17 +236,18 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ spanish ] = "Mo~delo" ; Text [ english_us ] = "~Pattern" ; TabStop = TRUE ; - Text[ chinese_simplified ] = "图案(~P)"; - Text[ russian ] = "~隅铕"; + Text[ chinese_simplified ] = "鍥炬(~P)"; + Text[ russian ] = "~勿磬戾眚"; Text[ polish ] = "De~se"; - 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 ] = "~Desen"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Mo~delo"; + Text[ catalan ] = "~Patr"; + Text[ thai ] = "~喔ム抚喔斷弗喔侧涪"; }; CheckBox BTN_ALIGNMENT { @@ -252,28 +257,29 @@ ModalDialog DLG_AUTOFMT_TABLE Text = "~Ausrichtung" ; Text [ ENGLISH ] = "Orien~tation" ; Text [ norwegian ] = "Orien~tation" ; - Text [ italian ] = "~Allineamento" ; + Text [ italian ] = "Allineamento" ; Text [ portuguese_brazilian ] = "Orien~ta??o" ; Text [ portuguese ] = "~Alinhamento" ; Text [ finnish ] = "~Tasaus" ; Text [ danish ] = "Justering" ; - Text [ french ] = "~Alignement" ; + Text [ french ] = "Alignement" ; Text [ swedish ] = "~Justering" ; Text [ dutch ] = "~Uitlijning" ; - Text [ spanish ] = "Orienta~ci髇" ; + Text [ spanish ] = "Alineaci髇" ; Text [ english_us ] = "Alignmen~t" ; TabStop = TRUE ; - Text[ chinese_simplified ] = "对齐(~T)"; + Text[ chinese_simplified ] = "瀵归綈(~T)"; Text[ russian ] = "蔓疣忭桠囗桢"; Text[ polish ] = "Wyr體nanie"; - Text[ japanese ] = "攝抲(~T)"; - Text[ chinese_traditional ] = "癸霍(~T)"; + Text[ japanese ] = "閰嶇疆(~T)"; + Text[ chinese_traditional ] = "灏嶉綂(~T)"; Text[ arabic ] = "轻阃切巧"; Text[ greek ] = "~郁镞鏖箸"; - Text[ korean ] = "嘎勉(~T)"; + Text[ korean ] = "毵烄钉(~T)"; Text[ turkish ] = "~Hizalama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Orienta~ci髇"; + Text[ catalan ] = "Alineamen~t"; + Text[ thai ] = "喔堗副喔斷笗喔赤箒喔笝喙垀喔"; }; FixedLine FL_FORMATS { @@ -293,17 +299,18 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ dutch ] = "Opmaak" ; Text [ spanish ] = "Formato" ; Text [ english_us ] = "Formatting" ; - Text[ chinese_simplified ] = "格式化"; + Text[ chinese_simplified ] = "鏍煎紡鍖"; Text[ russian ] = "灶痨囹桊钼囗桢"; Text[ polish ] = "Formatowanie"; - Text[ japanese ] = "彂幃愝掕"; - Text[ chinese_traditional ] = "Αて"; + Text[ japanese ] = "鏇稿紡瑷畾"; + Text[ chinese_traditional ] = "鏍煎紡鍖"; Text[ arabic ] = "输禹"; Text[ greek ] = "田聆镳镞珞"; - Text[ korean ] = "器杆泼"; + Text[ korean ] = "靹滌嫕 靹れ爼"; Text[ turkish ] = "Formatlama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Formato"; + Text[ catalan ] = "Formatatge"; + Text[ thai ] = "喔堗副喔斷福喔灌笡喙佮笟喔"; }; OKButton BTN_OK { @@ -338,17 +345,18 @@ ModalDialog DLG_AUTOFMT_TABLE TabStop = TRUE ; MapUnit = MAP_APPFONT ; Delta = 48 ; - Text[ chinese_simplified ] = "其他(~M)"; - Text[ russian ] = "令朦"; + Text[ chinese_simplified ] = "鍏朵粬(~M)"; + Text[ russian ] = "腻蜞腓"; Text[ polish ] = "Dod~atki"; - Text[ japanese ] = "堤呒(~M)"; - Text[ chinese_traditional ] = "ㄤ(~M)"; + Text[ japanese ] = "銈儣銈枫儳銉(~M)"; + Text[ chinese_traditional ] = "鍏朵粬(~M)"; Text[ arabic ] = "胖禽鞘"; Text[ greek ] = "旭桢翎"; - Text[ korean ] = "怠嘿烙(~M)"; + Text[ korean ] = "鞓奠厴(~M)"; Text[ turkish ] = "Ay~r齨t齦ar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Opciones"; + Text[ catalan ] = "~M閟"; + Text[ thai ] = "~喔｀覆喔⑧弗喔班箑喔傅喔⑧笖"; }; PushButton BTN_ADD { @@ -362,23 +370,24 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ portuguese ] = "~Adicionar" ; Text [ finnish ] = "~Lis滗" ; Text [ danish ] = "Tilf鴍" ; - Text [ french ] = "~Ajouter" ; + Text [ french ] = "Ajouter" ; Text [ swedish ] = "L鋨gg till" ; Text [ dutch ] = "~Toevoegen" ; Text [ spanish ] = "~A馻dir" ; Text [ english_us ] = "~Add" ; TabStop = TRUE ; - Text[ chinese_simplified ] = "插入(~A)"; + Text[ chinese_simplified ] = "鏂板(~A)"; Text[ russian ] = "念徉忤螯"; Text[ polish ] = "~Dodaj"; - 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 ] = "~Ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~A馻dir"; + Text[ catalan ] = "~Afegeix"; + Text[ thai ] = "喙~喔炧复喙堗浮"; }; PushButton BTN_REMOVE { @@ -392,23 +401,24 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ portuguese ] = "E~liminar" ; Text [ finnish ] = "~Poista" ; 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" ; TabStop = TRUE ; - Text[ chinese_simplified ] = "删除(~D)"; + Text[ chinese_simplified ] = "鍒犻櫎(~D)"; Text[ russian ] = "愉嚯栩"; Text[ polish ] = "Usu"; - Text[ japanese ] = "嶍彍(~D)"; - Text[ chinese_traditional ] = "埃(~D)"; + Text[ japanese ] = "鍓婇櫎(~D)"; + Text[ chinese_traditional ] = "鍒櫎(~D)"; Text[ arabic ] = "托"; Text[ greek ] = "拈徙襻鲛"; - Text[ korean ] = "昏力(~D)"; + Text[ korean ] = "靷牅(~D)"; Text[ turkish ] = "~Sil"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Eliminar"; + Text[ catalan ] = "~Suprimeix"; + Text[ thai ] = "~喔ム笟"; }; PushButton BTN_RENAME { @@ -426,18 +436,19 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ spanish ] = "Cambiar ~nombre" ; Text [ french ] = "Re~nommer" ; Text [ dutch ] = "~Naam wijzigen" ; - Text[ chinese_simplified ] = "重命名(~R)"; + Text[ chinese_simplified ] = "閲嶅懡鍚(~R)"; Text[ russian ] = "襄疱桁屙钼囹"; Text[ polish ] = "Zmie nazw"; - Text[ japanese ] = "柤慜偺曄峏(~R)"; - Text[ chinese_traditional ] = "穝㏑(~R)"; + Text[ japanese ] = "鍚嶅墠銇鏇(~R)"; + Text[ chinese_traditional ] = "閲嶆柊鍛藉悕(~R)"; Text[ arabic ] = "炮窍 视沩"; Text[ greek ] = "体麸盹灬筮"; - Text[ korean ] = "捞抚 官操扁(~R)"; + Text[ korean ] = "鞚措 氚旉靖旮(~R)"; Text[ turkish ] = "Yeniden~adland齬"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Cambiar ~nombre"; + Text[ catalan ] = "~Reanomena"; Text[ finnish ] = "~Nime uudelleen"; + Text[ thai ] = "喙~喔涏弗喔掂箞喔⑧笝喔娻阜喙堗腑"; }; HelpButton BTN_HELP { @@ -455,22 +466,23 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ portuguese ] = "Adicionar AutoFormato" ; Text [ finnish ] = "Lis滗 automaattinen muotoilu" ; Text [ danish ] = "Tilf鴍 AutoFormat" ; - Text [ french ] = "Ajouter AutoFormat" ; + Text [ french ] = "Ajouter un AutoFormat" ; Text [ swedish ] = "L鋑g till autoformat" ; - Text [ dutch ] = "AutoOpmaak toepassen" ; - Text [ spanish ] = "A馻dir AutoFormato" ; + Text [ dutch ] = "AutoOpmaak toevoegen" ; + Text [ spanish ] = "A馻dir Formateado autom醫ico" ; Text [ english_us ] = "Add AutoFormat" ; - Text[ chinese_simplified ] = "新增自动格式"; + Text[ chinese_simplified ] = "鏂板鑷姩鏍煎紡"; Text[ russian ] = "埋蜞忤螯 噔蝾纛痨囹"; Text[ polish ] = "Dodaj Autoformat"; - Text[ japanese ] = "蛋奶席膫虙菈"; - Text[ chinese_traditional ] = "穝糤笆Α"; + Text[ japanese ] = "銈兗銉堛儠銈┿兗銉炪儍銉堛伄杩藉姞"; + Text[ chinese_traditional ] = "鏂板鑷嫊鏍煎紡"; Text[ arabic ] = "胖禽 轻输禹 轻梳耷祈"; Text[ greek ] = "旭矬柁赙 刘麸田聆掾"; - Text[ korean ] = "磊悼辑侥 眠啊"; + Text[ korean ] = "鞛愲彊 靹滌嫕 於旉皜"; Text[ turkish ] = "Otomatik formatlamay ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "A馻dir AutoFormato"; + Text[ catalan ] = "Afegeix formatatge autom鄑ic"; + Text[ thai ] = "喙喔炧复喙堗浮喔｀腹喔涏箒喔氞笟喔副喔曕箓喔權浮喔编笗喔"; }; String STR_ADD_LABEL { @@ -487,17 +499,18 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ dutch ] = "Naam" ; Text [ spanish ] = "Nombre" ; Text [ english_us ] = "Name" ; - Text[ chinese_simplified ] = "名称"; + Text[ chinese_simplified ] = "鍚嶇О"; Text[ russian ] = "褥"; Text[ polish ] = "Nazwa"; - Text[ japanese ] = "柤慜"; - Text[ chinese_traditional ] = "嘿"; + Text[ japanese ] = "鍚嶅墠"; + Text[ chinese_traditional ] = "鍚嶇ū"; Text[ arabic ] = "轻怯"; Text[ greek ] = "柬镬"; - Text[ korean ] = "捞抚"; + Text[ korean ] = "鞚措"; Text[ turkish ] = "Ad"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nombre"; + Text[ catalan ] = "Nom"; + Text[ thai ] = "喔娻阜喙堗腑"; }; String STR_DEL_TITLE { @@ -512,19 +525,20 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ french ] = "Supprimer l'AutoFormat" ; Text [ swedish ] = "Radera Autoformat" ; Text [ dutch ] = "AutoOpmaak wissen" ; - Text [ spanish ] = "Eliminar AutoFormato" ; + Text [ spanish ] = "Borrar Formateado autom醫ico" ; Text [ english_us ] = "Delete AutoFormat" ; - Text[ chinese_simplified ] = "删除自动格式"; + Text[ chinese_simplified ] = "鍒犻櫎鑷姩鏍煎紡"; Text[ russian ] = "愉嚯栩 噔蝾纛痨囹"; Text[ polish ] = "Usu Autoformat"; - Text[ japanese ] = "蛋奶席膫虓韽"; - Text[ chinese_traditional ] = "埃笆Α"; + Text[ japanese ] = "銈兗銉堛儠銈┿兗銉炪儍銉堛伄鍓婇櫎"; + Text[ chinese_traditional ] = "鍒櫎鑷嫊鏍煎紡"; Text[ arabic ] = "托 轻输禹 轻梳耷祈"; Text[ greek ] = "拈徙襻鲛 刘麸田聆掾"; - Text[ korean ] = "磊悼辑侥 昏力"; + Text[ korean ] = "鞛愲彊 靹滌嫕 靷牅"; Text[ turkish ] = "Otomatik formatlamay sil"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Eliminar AutoFormato"; + Text[ catalan ] = "Suprimeix el formatatge autom鄑ic"; + Text[ thai ] = "喔ム笟喔｀腹喔涏箒喔氞笟喔副喔曕箓喔權浮喔编笗喔"; }; String STR_DEL_MSG { @@ -539,19 +553,20 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ french ] = "L'AutoFormat suivant va 阾re supprim :" ; Text [ swedish ] = "F鰈jande autoformat raderas:" ; Text [ dutch ] = "Het volgende AutoOpmaak-item wordt gewist." ; - Text [ spanish ] = "El siguiente AutoFormato se eliminar:" ; + Text [ spanish ] = "El Formateado autom醫ico siguiente se borrar:" ; Text [ english_us ] = "The following AutoFormat entry will be deleted:" ; - Text[ chinese_simplified ] = "删除以下的自动格式："; + Text[ chinese_simplified ] = "鍒犻櫎浠ヤ笅鐨勮嚜鍔ㄦ牸寮忥細"; Text[ russian ] = "央邃簋 噔蝾纛痨囹 狍溴 箐嚯屙:"; Text[ polish ] = "Usuni阾y zostanie nast阷uj筩y Autoformat:"; - Text[ japanese ] = "埲壓偺蛋奶席膫蛵韽渹硞陚軅:"; - Text[ chinese_traditional ] = "埃笆Α"; + Text[ japanese ] = "浠ヤ笅銇偑銉笺儓銉曘偐銉笺優銉冦儓銇墛闄ゃ仌銈屻伨銇:"; + Text[ chinese_traditional ] = "鍒櫎浠ヤ笅鐨勮嚜鍕曟牸寮忥細"; Text[ arabic ] = "渔 硎 托 轻输禹 轻梳耷祈 轻是犴:"; Text[ greek ] = " 孱掾 刘麸田聆 栳 溟徙襻鲥:"; - Text[ korean ] = "促澜苞 鞍篮 磊悼辑侥篮 昏力邓聪促:"; + Text[ korean ] = "雼れ潓瓿 臧欖潃 鞛愲彊 靹滌嫕鞚 靷牅霅╇媹雼:"; Text[ turkish ] = "A瘕daki otomatik formatlama silinecek:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "El siguiente AutoFormato se eliminar:"; + Text[ catalan ] = "L'entrada de formatatge autom鄑ic seg黣nt se suprimir:"; + Text[ thai ] = "喔｀覆喔⑧竵喔侧福喔｀腹喔涏箒喔氞笟喔副喔曕箓喔權浮喔编笗喔脆笝喔掂箟喔堗赴喔栢腹喔佮弗喔:"; }; String STR_RENAME_TITLE { @@ -563,21 +578,22 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ swedish ] = "Byt namn p autoformat" ; Text [ danish ] = "Omd鴅 AutoFormat" ; Text [ italian ] = "Rinomina formattazione automatica" ; - Text [ spanish ] = "Cambiar nombre del AutoFormato" ; + Text [ spanish ] = "Cambiar nombre del Formateado autom醫ico" ; Text [ french ] = "Renommer l'AutoFormat" ; Text [ dutch ] = "AutoOpmaak nieuwe naam geven" ; - Text[ chinese_simplified ] = "重命名自动格式"; + Text[ chinese_simplified ] = "閲嶅懡鍚嶈嚜鍔ㄦ牸寮"; Text[ russian ] = "襄疱桁屙钼囹 噔蝾纛痨囹"; Text[ polish ] = "Zmie nazw Autoformatu"; - Text[ japanese ] = "蛋奶席膫號紤O偺曄峏"; - Text[ chinese_traditional ] = "穝㏑笆Α"; + Text[ japanese ] = "銈兗銉堛儠銈┿兗銉炪儍銉堛伄鍚嶅墠銇鏇"; + Text[ chinese_traditional ] = "閲嶆柊鍛藉悕鑷嫊鏍煎紡"; Text[ arabic ] = "炮窍 视沩 轻输禹 轻梳耷祈"; Text[ greek ] = "体麸盹灬筮 刘麸田聆掾"; - Text[ korean ] = "磊悼辑侥 捞抚 官操扁"; + Text[ korean ] = "鞛愲彊 靹滌嫕 鞚措 氚旉靖旮"; Text[ turkish ] = "Otomatik formatlamay yeniden adland齬"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Cambiar nombre del AutoFormato"; + Text[ catalan ] = "Reanomena el formatatge autom鄑ic"; Text[ finnish ] = "Nime automaattinen muotoilu uudelleen"; + Text[ thai ] = "喙喔涏弗喔掂箞喔⑧笝喔娻阜喙堗腑喔｀腹喔涏箒喔氞笟喔副喔曕箓喔權浮喔编笗喔"; }; String STR_BTN_CLOSE { @@ -589,22 +605,23 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ portuguese ] = "~Fechar" ; Text [ finnish ] = "~Sulje" ; Text [ danish ] = "Luk" ; - Text [ french ] = "~Fermer" ; + Text [ french ] = "Fermer" ; Text [ swedish ] = "~St鋘g" ; Text [ dutch ] = "~Sluiten" ; Text [ spanish ] = "~Cerrar" ; Text [ english_us ] = "~Close" ; - Text[ chinese_simplified ] = "关闭(~C)"; + Text[ chinese_simplified ] = "鍏抽棴(~C)"; Text[ russian ] = "青牮"; Text[ polish ] = "Zamknij"; - Text[ japanese ] = "暵偠傞(~C)"; - Text[ chinese_traditional ] = "闽超(~C)"; + Text[ japanese ] = "闁夈仒銈(~C)"; + Text[ chinese_traditional ] = "闂滈枆(~C)"; Text[ arabic ] = "袍崆"; Text[ greek ] = "孰暹箝祜"; - Text[ korean ] = "摧扁(~C)"; + Text[ korean ] = "雼赴(~C)"; Text[ turkish ] = "~Kapat"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Cerrar"; + Text[ catalan ] = "~Tanca"; + Text[ thai ] = "~喔涏复喔"; }; String STR_JAN { @@ -621,17 +638,18 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ dutch ] = "Jan" ; Text [ spanish ] = "Ene" ; Text [ english_us ] = "Jan" ; - Text[ chinese_simplified ] = "一月"; + Text[ chinese_simplified ] = "涓鏈"; Text[ russian ] = "唔"; Text[ polish ] = "Stycze"; - Text[ japanese ] = "1寧"; - Text[ chinese_traditional ] = "る"; + Text[ japanese ] = "1鏈"; + Text[ chinese_traditional ] = "涓鏈"; Text[ arabic ] = "礓琼"; Text[ greek ] = "舍"; - Text[ korean ] = "1岿"; + Text[ korean ] = "1鞗"; Text[ turkish ] = "Ock"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ene"; + Text[ catalan ] = "Gen."; + Text[ thai ] = "喔.喔."; }; String STR_FEB { @@ -648,17 +666,18 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ dutch ] = "Feb" ; Text [ spanish ] = "Feb" ; Text [ english_us ] = "Feb" ; - Text[ chinese_simplified ] = "二月"; + Text[ chinese_simplified ] = "浜屾湀"; Text[ russian ] = "藻"; Text[ polish ] = "Luty"; - Text[ japanese ] = "2寧"; - Text[ chinese_traditional ] = "る"; + Text[ japanese ] = "2鏈"; + Text[ chinese_traditional ] = "浜屾湀"; Text[ arabic ] = "萑亚硌"; Text[ greek ] = "皱"; - Text[ korean ] = "2岿"; + Text[ korean ] = "2鞗"; Text[ turkish ] = "辵b"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Feb"; + Text[ catalan ] = "Feb."; + Text[ thai ] = "喔.喔."; }; String STR_MAR { @@ -675,17 +694,18 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ dutch ] = "Mrt" ; Text [ spanish ] = "Mar" ; Text [ english_us ] = "Mar" ; - Text[ chinese_simplified ] = "三月"; + Text[ chinese_simplified ] = "涓夋湀"; Text[ russian ] = "锑"; Text[ polish ] = "Marzec"; - Text[ japanese ] = "3寧"; - Text[ chinese_traditional ] = "る"; + Text[ japanese ] = "3鏈"; + Text[ chinese_traditional ] = "涓夋湀"; Text[ arabic ] = "闱延"; Text[ greek ] = "M狁"; - Text[ korean ] = "3岿"; + Text[ korean ] = "3鞗"; Text[ turkish ] = "Mar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Mar"; + Text[ catalan ] = "Mar"; + Text[ thai ] = "喔∴傅.喔."; }; String STR_NORTH { @@ -702,17 +722,18 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ dutch ] = "Noorden" ; Text [ spanish ] = "Norte" ; Text [ english_us ] = "North" ; - Text[ chinese_simplified ] = "北"; + Text[ chinese_simplified ] = "鍖"; Text[ russian ] = "彦忮"; Text[ polish ] = "P蟪noc"; - Text[ japanese ] = "杒"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "鍖"; + Text[ chinese_traditional ] = "鍖"; Text[ arabic ] = "轻糟轻"; Text[ greek ] = "嘛耨茯"; - Text[ korean ] = "合率"; + Text[ korean ] = "攵侅"; Text[ turkish ] = "Kuzey"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Norte"; + Text[ catalan ] = "Nord"; + Text[ thai ] = "喙喔笝喔粪腑"; }; String STR_MID { @@ -724,22 +745,23 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ portuguese ] = "Centro" ; Text [ finnish ] = "Keski" ; Text [ danish ] = "Midte" ; - Text [ french ] = "Milieu" ; + Text [ french ] = "Centre" ; Text [ swedish ] = "Mitten" ; Text [ dutch ] = "Midden" ; - Text [ spanish ] = "Centro" ; + Text [ spanish ] = "Centrado" ; Text [ english_us ] = "Mid" ; - Text[ chinese_simplified ] = "中"; + Text[ chinese_simplified ] = "涓"; Text[ russian ] = "彦疱滂磬"; Text[ polish ] = "Po渞odku"; - Text[ japanese ] = "拞墰"; - Text[ chinese_traditional ] = "い"; + Text[ japanese ] = "涓ぎ"; + Text[ chinese_traditional ] = "涓"; Text[ arabic ] = "轻嬗"; Text[ greek ] = "瘦眙耧"; - Text[ korean ] = "啊款单"; + Text[ korean ] = "臧鞖措嵃"; Text[ turkish ] = "Orta"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Centro"; + Text[ catalan ] = "Mig"; + Text[ thai ] = "喔佮弗喔侧竾"; }; String STR_SOUTH { @@ -756,17 +778,18 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ dutch ] = "Zuiden" ; Text [ spanish ] = "Sur" ; Text [ english_us ] = "South" ; - Text[ chinese_simplified ] = "南"; + Text[ chinese_simplified ] = "鍗"; Text[ russian ] = "捭"; Text[ polish ] = "Po硊dnie"; - Text[ japanese ] = "撿"; - Text[ chinese_traditional ] = "玭"; + Text[ japanese ] = "鍗"; + Text[ chinese_traditional ] = "鍗"; Text[ arabic ] = "轻啼嫒"; Text[ greek ] = "忘麸"; - Text[ korean ] = "巢率"; + Text[ korean ] = "雮"; Text[ turkish ] = "G黱ey"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sur"; + Text[ catalan ] = "Sud"; + Text[ thai ] = "喙冟笗喙"; }; String STR_SUM { @@ -783,17 +806,18 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ dutch ] = "Totaal" ; Text [ spanish ] = "Suma" ; Text [ english_us ] = "Sum" ; - Text[ chinese_simplified ] = "总计"; + Text[ chinese_simplified ] = "鎬昏"; Text[ russian ] = "洋祆"; Text[ polish ] = "Suma"; - Text[ japanese ] = "崌寁"; - Text[ chinese_traditional ] = "璸"; + Text[ japanese ] = "鍚堣▓"; + Text[ chinese_traditional ] = "灏忚▓"; Text[ arabic ] = "轻闾沔"; Text[ greek ] = "㈣耧轶灬"; - Text[ korean ] = "钦拌"; + Text[ korean ] = "頃╆硠"; Text[ turkish ] = "Toplam"; Text[ language_user1 ] = " "; Text[ catalan ] = "Suma"; + Text[ thai ] = "喔溹弗喔｀抚喔"; }; String STR_INVALID_AFNAME { @@ -809,32 +833,34 @@ ModalDialog DLG_AUTOFMT_TABLE Text [ danish ] = "Du har indtastet et ugyldigt navn.\nDet var ikke muligt at oprette AutoFormatet.\nV鎙g venligst et andet navn." ; Text [ french ] = "Vous avez saisi un nom non valide.\nL'AutoFormat n'a pas ou 阾re 閒fectu.\nIndiquez un autre nom." ; Text [ swedish ] = "Du har angett ett ogiltigt namn.\nDet gick inte att skapa autoformatet.\nV鋖j ett annat namn." ; - Text [ dutch ] = "U heeft een ongeldige naam vermeld.\nDe gewenste AutoOpmaak kon niet worden uitgevoerd.\nKies een andere naam." ; - Text [ spanish ] = "Ha indicado un nombre no v醠ido, \npor lo que no se pudo crear el AutoFormato.\nSeleccione otro nombre." ; + Text [ dutch ] = "U heeft een ongeldige naam vermeld.\nDe gewenste AutoOpmaak kan niet worden uitgevoerd.\nKies een andere naam." ; + Text [ spanish ] = "Ha indicado un nombre no v醠ido.\nEl Formateado autom醫ico no se ha podido efectuar.\nSeleccione otro nombre." ; Text [ ENGLISH_US ] = "You have entered an invalid name.\nThe desired AutoFormat could not be created. \nTry again using a different name." ; - Text[ chinese_simplified ] = "您给定了一个无效的名称。\n因此无法建立自动格式。\n请您输入一个有效名称。"; - Text[ russian ] = "蔓 镳桉忸桦 礤镳噔桦铄 桁.\n棱蝾纛痨囹 耦玟囹 礤忸珈铈眍.\n蔓徨痂蝈 漯筱铄 桁."; + Text[ chinese_simplified ] = "鎮ㄧ粰瀹氫簡涓涓棤鏁堢殑鍚嶇О銆俓n鍥犳鏃犳硶寤虹珛鑷姩鏍煎紡銆俓n璇锋偍杈撳叆涓涓湁鏁堝悕绉般"; + Text[ russian ] = "骡邃屙 礤镳噔桦铄 桁.\n湾忸珈铈眍 耦玟囹 驽豚屐 噔蝾纛痨囹.\n锐镱朦珞轵 漯筱铄 桁."; Text[ polish ] = "Podano nieprawid硂w nazw.\nUtworzenie Autoformatu nie by硂 mo縧iwe.\nWybierz inn nazw."; - Text[ japanese ] = "擖椡偟偨柤慜偼柍岠偱偡丅\n偙偺蛋奶席膫艂蛵鞇瑐艂珎軅箓駚B\n暿偺柤慜傪巊偭偰偔偩偝偄丅"; - Text[ chinese_traditional ] = "眤块礚嘿\n礚猭ミ笆Α\n叫块Τ嘿"; + 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 ] = "Ge鏴rsiz bir ad girdiniz.\nOtomatik formatlama olu⺶urulamad.\nBa⺧a bir ad se鏸niz."; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ha indicado un nombre no v醠ido, \npor lo que no se pudo crear el AutoFormato.\nSeleccione otro nombre."; + Text[ catalan ] = "Heu introdu飔 un nom incorrecte.\nNo s'ha pogut crear el formatatge autom鄑ic desitjat.\nTorneu-ho a provar amb un altre nom."; + Text[ thai ] = "喔勦父喔撪箘喔斷箟喙冟釜喙堗笂喔粪箞喔笚喔掂箞喙勦浮喙堗笘喔灌竵喔曕箟喔竾\n喙勦浮喙堗釜喔侧浮喔侧福喔栢釜喔｀箟喔侧竾喔｀腹喔涏箒喔氞笟喔副喔曕箓喔權浮喔编笗喔脆笚喔掂箞喔曕箟喔竾喔佮覆喔｀箘喔斷箟 \n喔ム腑喔囙箖喔娻箟喔娻阜喙堗腑喔椸傅喙堗笗喙堗覆喔囙竵喔编笝喔斷腹喔傅喔佮竸喔｀副喙夃竾"; }; - Text[ chinese_simplified ] = "自动格式"; + Text[ chinese_simplified ] = "鑷姩鏍煎紡"; Text[ russian ] = "棱蝾纛痨囹"; Text[ polish ] = "Autoformat"; - Text[ japanese ] = "蛋奶席"; - Text[ chinese_traditional ] = "笆Α"; + Text[ japanese ] = "銈兗銉堛儠銈┿兗銉炪儍銉"; + Text[ chinese_traditional ] = "鑷嫊鏍煎紡"; Text[ arabic ] = "轻输禹 轻梳耷祈"; Text[ greek ] = "刘麸田聆"; - Text[ korean ] = "磊悼辑侥"; + Text[ korean ] = "鞛愲彊 靹滌嫕"; Text[ turkish ] = "Otomatik formatlama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "AutoFormato"; + Text[ catalan ] = "Formatatge autom鄑ic"; + Text[ thai ] = "喔｀腹喔涏箒喔氞笟喔副喔曕箓喔權浮喔编笗喔"; }; ModalDialog DLG_SWDLG_STRINPUT { @@ -875,3 +901,19 @@ ModalDialog DLG_SWDLG_STRINPUT + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index 319e605fa205..5999df3944bc 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pview.cxx,v $ * - * $Revision: 1.38 $ + * $Revision: 1.39 $ * - * last change: $Author: fme $ $Date: 2002-12-10 10:26:19 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -220,9 +220,10 @@ #ifndef _SWSLOTS_HXX #include <swslots.hxx> #endif - -// OD 02.12.2002 #103492# -#define NEW_PREVIEW +// OD 12.12.2002 #103492# +#ifndef _PAGEPREVIEWLAYOUT_HXX +#include <pagepreviewlayout.hxx> +#endif SFX_IMPL_VIEWFACTORY(SwPagePreView, SW_RES(STR_NONAME)) { @@ -476,7 +477,8 @@ SwPreviewPrintOptionsDialog::SwPreviewPrintOptionsDialog( SwPagePreViewWin& rPar { FreeResource(); ViewShell& rViewSh = *rPreView.GetViewShell(); - aSettings.aPageMaxSize = rViewSh.GetPagePreViewPrtMaxSize(); + // OD 18.12.2002 #103492# + aSettings.aPageMaxSize = rViewSh.PagePreviewLayout()->GetMaxPageSize(); SfxPrinter* pPrinter = rViewSh.GetPrt( TRUE ); aSettings.aPrtSize = pPrinter->GetPaperSize(); //#97682# make sure that no division by zero occurs @@ -839,11 +841,10 @@ SwPagePreViewWin::SwPagePreViewWin( Window *pParent, SwPagePreView& rPView ) : Window( pParent, WinBits( WB_CLIPCHILDREN) ), mpViewShell( 0 ), mrView( rPView ), - // OD 02.12.2002 #103492# - maPreviewDocSize( Size(0,0) ), mbCalcScaleForPreviewLayout( true ), maPaintedPreviewDocRect( Rectangle(0,0,0,0) ) { + SetOutDevViewType( OUTDEV_VIEWTYPE_PRINTPREVIEW ); //#106611# SetHelpId(HID_PAGEPREVIEW); SetFillColor( GetBackground().GetColor() ); SetLineColor( GetBackground().GetColor()); @@ -852,7 +853,7 @@ SwPagePreViewWin::SwPagePreViewWin( Window *pParent, SwPagePreView& rPView ) const SwMasterUsrPref *pUsrPref = SW_MOD()->GetUsrPref(FALSE); mnRow = pUsrPref->GetPagePrevRow(); // 1 Zeile mnCol = pUsrPref->GetPagePrevCol(); // 1 Spalte - mnVirtPage = mnSttPage = mnSelectedPage = USHRT_MAX; + mnVirtPage = mnSttPage = USHRT_MAX; } /*-------------------------------------------------------------------- @@ -884,38 +885,20 @@ void SwPagePreViewWin::Paint( const Rectangle& rRect ) maPxWinSize = GetOutputSizePixel(); Rectangle aRect( LogicToPixel( rRect )); -#ifdef NEW_PREVIEW // OD 29.11.2002 #103492# - { - mnSelectedPage = 1; - mpViewShell->PreparePreviewPaint( 1, Point(0,0), &maPxWinSize, - mnSttPage, mnVirtPage, - maPaintedPreviewDocRect ); - mpViewShell->PaintPreview( mnSelectedPage, PixelToLogic( aRect ) ); - } -#else - mnSelectedPage = mnSttPage = mpViewShell->CalcPreViewPage( maPxWinSize, nRowCol, - 0, aPgSize, mnVirtPage, - mnSelectedPage ); - mpViewShell->PreViewPage( PixelToLogic( aRect ), nRowCol, mnSttPage, - aPgSize, mnSelectedPage ); - mnRow = BYTE( nRowCol >> 8 ); - mnCol = BYTE( nRowCol & 0xff ); -#endif + mpPgPrevwLayout->Prepare( 1, Point(0,0), maPxWinSize, + mnSttPage, mnVirtPage, + maPaintedPreviewDocRect ); + SetSelectedPage( 1 ); + mpPgPrevwLayout->Paint( PixelToLogic( aRect ) ); SetPagePreview(mnRow, mnCol); - maScale = GetMapMode().GetScaleX(); } else { - // OD 02.12.2002 #103492# - WHY SETTING SCALING??? MapMode aMM( GetMapMode() ); aMM.SetScaleX( maScale ); aMM.SetScaleY( maScale ); SetMapMode( aMM ); -#ifdef NEW_PREVIEW // OD 29.11.2002 #103492# - mpViewShell->PaintPreview( mnSelectedPage, rRect ); -#else - mpViewShell->PreViewPage( rRect, nRowCol, mnSttPage, aPgSize, mnSelectedPage ); -#endif + mpPgPrevwLayout->Paint( rRect ); } } @@ -937,22 +920,10 @@ void SwPagePreViewWin::CalcWish( BYTE nNewRow, BYTE nNewCol ) if( mnSttPage > nLastSttPg ) mnSttPage = nLastSttPg; -#ifdef NEW_PREVIEW // OD 29.11.2002 #103492# - { - mpViewShell->InitPreviewLayout( mnCol, mnRow, maPgSize, maPreviewDocSize, - true, &maPxWinSize ); - mpViewShell->PreparePreviewPaint( mnSttPage, Point(0,0), &maPxWinSize, - mnSttPage, mnVirtPage, - maPaintedPreviewDocRect ); - mnSelectedPage = mnSttPage; - } -#else - USHORT nRowCol = ( mnRow << 8 ) + mnCol; // Zeilen / Spalten - mnSelectedPage = mnSttPage = mpViewShell->CalcPreViewPage( maPxWinSize, nRowCol, mnSttPage, - aPgSize, mnVirtPage, USHRT_MAX ); - mnRow = BYTE( nRowCol >> 8 ); - mnCol = BYTE( nRowCol & 0xff ); -#endif + mpPgPrevwLayout->Init( mnCol, mnRow, maPxWinSize, true ); + mpPgPrevwLayout->Prepare( mnSttPage, Point(0,0), maPxWinSize, + mnSttPage, mnVirtPage, maPaintedPreviewDocRect ); + SetSelectedPage( mnSttPage ); SetPagePreview(mnRow, mnCol); maScale = GetMapMode().GetScaleX(); @@ -975,6 +946,8 @@ void SwPagePreViewWin::CalcWish( BYTE nNewRow, BYTE nNewCol ) rBindings.Invalidate( aInval ); rBindings.Update( FN_SHOW_TWO_PAGES ); rBindings.Update( FN_SHOW_MULTIPLE_PAGES ); + // OD 18.12.2002 #103492# - adjust scrollbars + mrView.ScrollViewSzChg(); } /*-------------------------------------------------------------------- Beschreibung: @@ -997,71 +970,70 @@ int SwPagePreViewWin::MovePage( int eMoveMode ) case MV_PAGE_UP: // OD 03.12.2002 #103492# - correct calculation of new start page. nNewSttPage = (mnSttPage - nPages > 0) ? (mnSttPage - nPages) : nDefSttPg; - // OD 03.12.2002 #103492# - correct calculation of new selected page. - mnSelectedPage = (mnSelectedPage - nPages > 0) ? (mnSelectedPage - nPages) : 1; + // OD 13.12.2002 #103492# - correct calculation of new selected page. + if ( (SelectedPage() - nPages) > 0 ) + SetSelectedPage( SelectedPage() - nPages ); + else + SetSelectedPage( 1 ); break; case MV_PAGE_DOWN: // OD 03.12.2002 #103492# - correct calculation of new start page. nNewSttPage = (mnSttPage + nPages) < nPageCount ? (mnSttPage + nPages) : nPageCount; // OD 03.12.2002 #103492# - correct calculation of new selected page. - mnSelectedPage = (mnSelectedPage + nPages) < nPageCount ? (mnSelectedPage + nPages) : nPageCount; + if ( (SelectedPage() + nPages) < nPageCount ) + SetSelectedPage( SelectedPage() + nPages ); + else + SetSelectedPage( nPageCount ); break; case MV_DOC_STT: nNewSttPage = nDefSttPg; - mnSelectedPage = nNewSttPage ? nNewSttPage : 1; + SetSelectedPage( nNewSttPage ? nNewSttPage : 1 ); break; case MV_DOC_END: // OD 03.12.2002 #103492# - correct calculation of new start page. nNewSttPage = nPageCount; - mnSelectedPage = nPageCount; + SetSelectedPage( nPageCount ); break; - default: + // OD 12.12.2002 #103492# - add new move mode + case MV_SELPAGE: + // <nNewSttPage> and <SelectedPage()> are already set. + // OD 20.02.2003 #107369# - not start at first column, only if the + // complete preview layout columns doesn't fit into window. + if ( !mpPgPrevwLayout->DoesPreviewLayoutColsFitIntoWindow() ) + bPaintPageAtFirstCol = false; + break; + case MV_SCROLL: + // OD 17.01.2003 #103492# - check, if paint page at first column + // has to be avoided + if ( !mpPgPrevwLayout->DoesPreviewLayoutRowsFitIntoWindow() || + !mpPgPrevwLayout->DoesPreviewLayoutColsFitIntoWindow() ) + bPaintPageAtFirstCol = false; + break; + case MV_NEWWINSIZE: + // OD 18.12.2002 #103492# - nothing special to do. + break; + case MV_CALC: + // OD 18.12.2002 #103492# - re-init page preview layout. + mpPgPrevwLayout->ReInit(); + // OD 03.12.2002 #103492# - correct calculation of new start page. if( nNewSttPage > nPageCount ) - { -#ifdef DEBUG - ASSERT( false, "SwPagePreViewWin::MovePage - start page > page count - OD-DEBUG" ); -#endif nNewSttPage = nPageCount; - } - - //put the the selected page into the current range - if(mnSelectedPage < nNewSttPage || mnSelectedPage >= (nNewSttPage + nPages) ) - { -#ifdef DEBUG - ASSERT( false, "SwPagePreViewWin::MovePage - selected page out of range - OD-DEBUG" ); -#endif - mnSelectedPage = nNewSttPage ? nNewSttPage : 1; - } - // OD 06.12.2002 #103492# - if ( !mpViewShell->DoesPreviewLayoutRowsFitIntoWindow() || - !mpViewShell->DoesPreviewLayoutColsFitIntoWindow() ) - bPaintPageAtFirstCol = false; + // OD 18.12.2002 #103492# - correct selected page number + if( SelectedPage() > nPageCount ) + SetSelectedPage( nNewSttPage ? nNewSttPage : 1 ); } - Size aSave( maPgSize ); -#ifdef NEW_PREVIEW // OD 29.11.2002 #103492# - { - mpViewShell->PreparePreviewPaint( nNewSttPage, Point(0,0), &maPxWinSize, - nNewSttPage, mnVirtPage, - maPaintedPreviewDocRect, - bPaintPageAtFirstCol ); - } -#else - USHORT nRowCol = ( mnRow << 8 ) + mnCol; // Zeilen / DoppelSeiten - nNewSttPage = mpViewShell->CalcPreViewPage( maPxWinSize, nRowCol, - nNewSttPage, maPgSize, mnVirtPage, - mnSelectedPage ); - mnRow = BYTE( nRowCol >> 8 ); - mnCol = BYTE( nRowCol & 0xff ); -#endif - if( nNewSttPage == mnSttPage && maPgSize == aSave ) + mpPgPrevwLayout->Prepare( nNewSttPage, Point(0,0), maPxWinSize, + nNewSttPage, mnVirtPage, + maPaintedPreviewDocRect, bPaintPageAtFirstCol ); + if( nNewSttPage == mnSttPage && + eMoveMode != MV_SELPAGE ) return FALSE; SetPagePreview(mnRow, mnCol); mnSttPage = nNewSttPage; - maScale = GetMapMode().GetScaleX(); static USHORT __READONLY_DATA aInval[] = { @@ -1086,31 +1058,23 @@ void SwPagePreViewWin::SetWinSize( const Size& rNewSize ) USHORT nRowCol = ( mnRow << 8 ) + mnCol; // Zeilen / DoppelSeiten if( USHRT_MAX == mnSttPage ) - mnSelectedPage = mnSttPage = GetDefSttPage(); + { + mnSttPage = GetDefSttPage(); + SetSelectedPage( GetDefSttPage() ); + } -#ifdef NEW_PREVIEW // OD 29.11.2002 #103492# + if ( mbCalcScaleForPreviewLayout ) { - if ( mbCalcScaleForPreviewLayout ) - { - mpViewShell->InitPreviewLayout( mnCol, mnRow, maPgSize, maPreviewDocSize, - true, &maPxWinSize ); - mbCalcScaleForPreviewLayout = false; - } - mpViewShell->PreparePreviewPaint( mnSttPage, Point(0,0), &maPxWinSize, - mnSttPage, mnVirtPage, - maPaintedPreviewDocRect ); + mpPgPrevwLayout->Init( mnCol, mnRow, maPxWinSize, true ); + maScale = GetMapMode().GetScaleX(); } -#else - mnSttPage = mpViewShell->CalcPreViewPage( maPxWinSize, nRowCol, - mnSttPage, maPgSize, - mnVirtPage, mnSelectedPage ); -#endif - if(mnSelectedPage < mnSttPage || mnSelectedPage > mnSttPage + (mnRow * mnCol) ) + mpPgPrevwLayout->Prepare( mnSttPage, Point(0,0), maPxWinSize, + mnSttPage, mnVirtPage, maPaintedPreviewDocRect ); + if ( mbCalcScaleForPreviewLayout ) { - mnSelectedPage = mnSttPage ? mnSttPage : 1; + SetSelectedPage( mnSttPage ); + mbCalcScaleForPreviewLayout = false; } - mnRow = BYTE( nRowCol >> 8 ); - mnCol = BYTE( nRowCol & 0xff ); SetPagePreview(mnRow, mnCol); maScale = GetMapMode().GetScaleX(); } @@ -1184,7 +1148,9 @@ void SwPagePreViewWin::Command( const CommandEvent& rCEvt ) bCallBase = !mrView.HandleWheelCommands( rCEvt ); break; - default: ASSERT( !this, "unknown command." ); + default: + // OD 17.12.2002 #103492# - delete assertion + ; } if( bCallBase ) @@ -1193,18 +1159,20 @@ void SwPagePreViewWin::Command( const CommandEvent& rCEvt ) void SwPagePreViewWin::MouseButtonDown( const MouseEvent& rMEvt ) { - if( MOUSE_LEFT == ( rMEvt.GetModifier() + rMEvt.GetButtons() ) && - 2 == rMEvt.GetClicks() ) + // OD 17.12.2002 #103492# - consider single-click to set selected page + if( MOUSE_LEFT == ( rMEvt.GetModifier() + rMEvt.GetButtons() ) ) { - Point aDocPos( PixelToLogic( rMEvt.GetPosPixel() ) ); - - // was habe wir denn hier getroffen?? - USHORT nRowCol = ( mnRow << 8 ) + mnCol; // Zeilen / DoppelSeiten - BOOL bDocPos = mpViewShell->IsPreViewDocPos( aDocPos, nRowCol, - mnSttPage, maPgSize ); - - if( bDocPos ) // dann kann man ja umschalten + Point aPrevwPos( PixelToLogic( rMEvt.GetPosPixel() ) ); + Point aDocPos; + bool bPosInEmptyPage; + sal_uInt16 nNewSelectedPage; + bool bIsDocPos = + mpPgPrevwLayout->IsPrevwPosInDocPrevwPage( aPrevwPos, + aDocPos, bPosInEmptyPage, nNewSelectedPage ); + if ( bIsDocPos && rMEvt.GetClicks() == 2 ) { + // close page preview, set new cursor position and switch to + // normal view. String sNewCrsrPos( String::CreateFromInt32( aDocPos.X() )); ((( sNewCrsrPos += ';' ) += String::CreateFromInt32( aDocPos.Y() )) ) @@ -1215,6 +1183,15 @@ void SwPagePreViewWin::MouseButtonDown( const MouseEvent& rMEvt ) pTmpFrm->GetBindings().Execute( SID_VIEWSHELL0, NULL, 0, SFX_CALLMODE_ASYNCHRON ); } + else if ( bIsDocPos || bPosInEmptyPage ) + // show clicked page as the selected one + mpPgPrevwLayout->MarkNewSelectedPage( nNewSelectedPage ); + GetViewShell()->ShowPreViewSelection( nNewSelectedPage ); + // OD 19.02.2003 #107369# - adjust position at vertical scrollbar. + if ( mpPgPrevwLayout->DoesPreviewLayoutRowsFitIntoWindow() ) + { + mrView.SetVScrollbarThumbPos( nNewSelectedPage ); + } } } @@ -1238,6 +1215,28 @@ void SwPagePreViewWin::SetPagePreview( BYTE nRow, BYTE nCol ) } } +/** get selected page in document preview + + OD 13.12.2002 #103492# + + @author OD +*/ +sal_uInt16 SwPagePreViewWin::SelectedPage() const +{ + return mpPgPrevwLayout->SelectedPage(); +} + +/** set selected page number in document preview + + OD 13.12.2002 #103492# + + @author OD +*/ +void SwPagePreViewWin::SetSelectedPage( sal_uInt16 _nSelectedPageNum ) +{ + mpPgPrevwLayout->SetSelectedPage( _nSelectedPageNum ); +} + void SwPagePreViewWin::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); @@ -1251,6 +1250,8 @@ void SwPagePreViewWin::DataChanged( const DataChangedEvent& rDCEvt ) // den Settings abgefragt werden. if( rDCEvt.GetFlags() & SETTINGS_STYLE ) mrView.InvalidateBorder(); //Scrollbarbreiten + //#106746# zoom has to be disabled if Accessibility support is switched on + lcl_InvalidateZoomSlots(mrView.GetViewFrame()->GetBindings()); break; case DATACHANGED_PRINTER: @@ -1264,7 +1265,82 @@ void SwPagePreViewWin::DataChanged( const DataChangedEvent& rDCEvt ) } } -/* */ +/** help method to execute SfxRequest FN_PAGEUP and FN_PAGEDOWN + + OD 04.03.2003 #107369# + + @author OD +*/ +void SwPagePreView::_ExecPgUpAndPgDown( const bool _bPgUp, + SfxRequest* _pReq ) +{ + SwPagePreviewLayout* pPagePrevwLay = GetViewShell()->PagePreviewLayout(); + // check, if top/bottom of preview is *not* already visible. + if( pPagePrevwLay->GetWinPagesScrollAmount( _bPgUp ? -1 : 1 ) != 0 ) + { + if ( pPagePrevwLay->DoesPreviewLayoutRowsFitIntoWindow() && + pPagePrevwLay->DoesPreviewLayoutColsFitIntoWindow() ) + { + const int eMvMode = _bPgUp ? + SwPagePreViewWin::MV_PAGE_UP : + SwPagePreViewWin::MV_PAGE_DOWN; + if ( ChgPage( eMvMode, TRUE ) ) + aViewWin.Invalidate(); + } + else + { + SwTwips nScrollAmount; + sal_uInt16 nNewSelectedPageNum = 0; + const sal_uInt16 nVisPages = aViewWin.GetRow() * aViewWin.GetCol(); + if( _bPgUp ) + { + if ( pPagePrevwLay->DoesPreviewLayoutRowsFitIntoWindow() ) + { + nScrollAmount = pPagePrevwLay->GetWinPagesScrollAmount( -1 ); + if ( (aViewWin.SelectedPage() - nVisPages) > 0 ) + nNewSelectedPageNum = aViewWin.SelectedPage() - nVisPages; + else + nNewSelectedPageNum = 1; + } + else + nScrollAmount = - Min( aViewWin.GetOutputSize().Height(), + aViewWin.GetPaintedPreviewDocRect().Top() ); + } + else + { + if ( pPagePrevwLay->DoesPreviewLayoutRowsFitIntoWindow() ) + { + nScrollAmount = pPagePrevwLay->GetWinPagesScrollAmount( 1 ); + if ( (aViewWin.SelectedPage() + nVisPages) <= mnPageCount ) + nNewSelectedPageNum = aViewWin.SelectedPage() + nVisPages; + else + nNewSelectedPageNum = mnPageCount; + } + else + nScrollAmount = Min( aViewWin.GetOutputSize().Height(), + ( pPagePrevwLay->GetPrevwDocSize().Height() - + aViewWin.GetPaintedPreviewDocRect().Bottom() ) ); + } + aViewWin.Scroll( 0, nScrollAmount ); + if ( nNewSelectedPageNum != 0 ) + { + aViewWin.SetSelectedPage( nNewSelectedPageNum ); + } + ScrollViewSzChg(); + static USHORT __READONLY_DATA aInval[] = + { + FN_START_OF_DOCUMENT, FN_END_OF_DOCUMENT, FN_PAGEUP, FN_PAGEDOWN, 0 + }; + SfxBindings& rBindings = GetViewFrame()->GetBindings(); + rBindings.Invalidate( aInval ); + aViewWin.Invalidate(); + } + } + + if ( _pReq ) + _pReq->Done(); +} + /*-------------------------------------------------------------------- Beschreibung: --------------------------------------------------------------------*/ @@ -1273,7 +1349,8 @@ void SwPagePreView::Execute( SfxRequest &rReq ) { int eMvMode; BYTE nRow = 1; - BOOL bRetVal = FALSE, bRefresh = TRUE; + BOOL bRetVal = FALSE; + bool bRefresh = true; USHORT nSttPage = aViewWin.GetSttPage(), nPages = aViewWin.GetRow() * aViewWin.GetCol(), @@ -1366,58 +1443,58 @@ void SwPagePreView::Execute( SfxRequest &rReq ) break; case FN_CHAR_LEFT: case FN_CHAR_RIGHT: - { - sal_uInt16 nNewSelectedPage; - sal_uInt16 nNewStartPage; - Point aNewStartPos; - sal_Int16 nHoriMove; - if( rReq.GetSlot() == FN_CHAR_LEFT ) - nHoriMove = -1; - else - nHoriMove = 1; - GetViewShell()->MovePreviewSelectedPage( - aViewWin.GetSelectedPage(), nHoriMove, 0, - nNewSelectedPage, nNewStartPage, aNewStartPos ); - aViewWin.GetSelectedPage() = nNewSelectedPage; - if ( GetViewShell()->IsPageVisibleInCurrPreview( nNewSelectedPage ) ) - break; - aViewWin.SetSttPage( nNewStartPage ); - eMvMode = SwPagePreViewWin::MV_CALC; - goto MOVEPAGE; - } case FN_LINE_UP: case FN_LINE_DOWN: { + SwPagePreviewLayout* pPagePrevwLay = GetViewShell()->PagePreviewLayout(); sal_uInt16 nNewSelectedPage; sal_uInt16 nNewStartPage; Point aNewStartPos; - sal_Int16 nVertMove; - if( rReq.GetSlot() == FN_LINE_UP ) - nVertMove = -1; - else - nVertMove = 1; - GetViewShell()->MovePreviewSelectedPage( - aViewWin.GetSelectedPage(), 0, nVertMove, + sal_Int16 nHoriMove = 0; + sal_Int16 nVertMove = 0; + switch(rReq.GetSlot()) + { + case FN_CHAR_LEFT: nHoriMove = -1; break; + case FN_CHAR_RIGHT: nHoriMove = 1; break; + case FN_LINE_UP: nVertMove = -1; break; + case FN_LINE_DOWN: nVertMove = 1; break; + } + pPagePrevwLay->CalcStartValuesForSelectedPageMove( nHoriMove, nVertMove, nNewSelectedPage, nNewStartPage, aNewStartPos ); - aViewWin.GetSelectedPage() = nNewSelectedPage; - if ( GetViewShell()->IsPageVisibleInCurrPreview( nNewSelectedPage ) ) - break; - aViewWin.SetSttPage( nNewStartPage ); - eMvMode = SwPagePreViewWin::MV_CALC; - goto MOVEPAGE; + if ( aViewWin.SelectedPage() != nNewSelectedPage ) + { + if ( pPagePrevwLay->IsPageVisible( nNewSelectedPage ) ) + { + pPagePrevwLay->MarkNewSelectedPage( nNewSelectedPage ); + // OD 19.02.2003 #107369# - adjust position at vertical scrollbar. + SetVScrollbarThumbPos( nNewSelectedPage ); + bRefresh = false; + } + else + { + aViewWin.SetSelectedPage( nNewSelectedPage ); + aViewWin.SetSttPage( nNewStartPage ); + int nRet = ChgPage( SwPagePreViewWin::MV_SELPAGE, TRUE ); + bRefresh = 0 != nRet; + } + GetViewShell()->ShowPreViewSelection( nNewSelectedPage ); + rReq.Done(); + } + break; } case FN_PAGEUP: - eMvMode = SwPagePreViewWin::MV_PAGE_UP; goto MOVEPAGE; case FN_PAGEDOWN: - eMvMode = SwPagePreViewWin::MV_PAGE_DOWN; goto MOVEPAGE; - + { + _ExecPgUpAndPgDown( rReq.GetSlot() == FN_PAGEUP, &rReq ); + break; + } case FN_START_OF_LINE: case FN_START_OF_DOCUMENT: - aViewWin.GetSelectedPage() = 1; + aViewWin.SetSelectedPage( 1 ); eMvMode = SwPagePreViewWin::MV_DOC_STT; bRetVal = TRUE; goto MOVEPAGE; case FN_END_OF_LINE: case FN_END_OF_DOCUMENT: - aViewWin.GetSelectedPage() = mnPageCount; + aViewWin.SetSelectedPage( mnPageCount ); eMvMode = SwPagePreViewWin::MV_DOC_END; bRetVal = TRUE; goto MOVEPAGE; MOVEPAGE: { @@ -1471,7 +1548,7 @@ MOVEPAGE: break; case FN_INSERT_BREAK: { - USHORT nSelPage = aViewWin.GetSelectedPage(); + USHORT nSelPage = aViewWin.SelectedPage(); //if a dummy page is selected (e.g. a non-existing right/left page) //the direct neighbor is used if(GetViewShell()->IsDummyPage( nSelPage ) && GetViewShell()->IsDummyPage( --nSelPage )) @@ -1502,27 +1579,38 @@ void SwPagePreView::GetState( SfxItemSet& rSet ) BYTE nRow = 1; USHORT nWhich = aIter.FirstWhich(); ASSERT(nWhich, leeres Set); + SwPagePreviewLayout* pPagePrevwLay = GetViewShell()->PagePreviewLayout(); + //#106746# zoom has to be disabled if Accessibility support is switched on + BOOL bZoomEnabled = !Application::GetSettings().GetMiscSettings().GetEnableATToolSupport(); while(nWhich) { switch(nWhich) { case FN_START_OF_DOCUMENT: + { + if ( pPagePrevwLay->IsPageVisible( 1 ) ) + rSet.DisableItem(nWhich); + break; + } + case FN_END_OF_DOCUMENT: + { + if ( pPagePrevwLay->IsPageVisible( mnPageCount ) ) + rSet.DisableItem(nWhich); + break; + } case FN_PAGEUP: - if( aViewWin.GetSttPage() == aViewWin.GetDefSttPage() ) + { + if( pPagePrevwLay->GetWinPagesScrollAmount( -1 ) == 0 ) rSet.DisableItem(nWhich); break; - + } case FN_PAGEDOWN: - case FN_END_OF_DOCUMENT: - { - USHORT nNextPg = ( aViewWin.GetRow() * aViewWin.GetCol() ) + - aViewWin.GetSttPage() - 1; - - if( nNextPg >= mnPageCount ) - rSet.DisableItem( nWhich ); - } + { + if( pPagePrevwLay->GetWinPagesScrollAmount( 1 ) == 0 ) + rSet.DisableItem(nWhich); break; + } case FN_STAT_PAGE: { @@ -1535,29 +1623,39 @@ void SwPagePreView::GetState( SfxItemSet& rSet ) case SID_ATTR_ZOOM: case FN_STAT_ZOOM: { - const SwViewOption* pVOpt = GetViewShell()->GetViewOptions(); - SvxZoomItem aZoom((SvxZoomType)pVOpt->GetZoomType(), - pVOpt->GetZoom()); - aZoom.SetValueSet( - SVX_ZOOM_ENABLE_50| - SVX_ZOOM_ENABLE_75| - SVX_ZOOM_ENABLE_100| - SVX_ZOOM_ENABLE_150| - SVX_ZOOM_ENABLE_200); - rSet.Put( aZoom ); + if(bZoomEnabled) + { + const SwViewOption* pVOpt = GetViewShell()->GetViewOptions(); + SvxZoomItem aZoom((SvxZoomType)pVOpt->GetZoomType(), + pVOpt->GetZoom()); + aZoom.SetValueSet( + SVX_ZOOM_ENABLE_50| + SVX_ZOOM_ENABLE_75| + SVX_ZOOM_ENABLE_100| + SVX_ZOOM_ENABLE_150| + SVX_ZOOM_ENABLE_200); + rSet.Put( aZoom ); + } + else + rSet.DisableItem(nWhich); } break; case FN_PREVIEW_ZOOM: { - const SwViewOption* pVOpt = GetViewShell()->GetViewOptions(); - rSet.Put(SfxUInt16Item(nWhich, pVOpt->GetZoom())); + if(bZoomEnabled) + { + const SwViewOption* pVOpt = GetViewShell()->GetViewOptions(); + rSet.Put(SfxUInt16Item(nWhich, pVOpt->GetZoom())); + } + else + rSet.DisableItem(nWhich); } break; case SID_ZOOM_IN: case SID_ZOOM_OUT: { const SwViewOption* pVOpt = GetViewShell()->GetViewOptions(); - if((SID_ZOOM_OUT == nWhich && pVOpt->GetZoom() >= MAX_PREVIEW_ZOOM)|| + if(!bZoomEnabled || (SID_ZOOM_OUT == nWhich && pVOpt->GetZoom() >= MAX_PREVIEW_ZOOM)|| (SID_ZOOM_IN == nWhich && pVOpt->GetZoom() <= MIN_PREVIEW_ZOOM)) { rSet.DisableItem(nWhich); @@ -1667,6 +1765,11 @@ void SwPagePreView::Init(const SwViewOption * pPrefs) GetViewShell()->ApplyViewOptions( aOpt ); GetViewShell()->ApplyAccessiblityOptions(SW_MOD()->GetAccessibilityOptions()); + // OD 09.01.2003 #i6467# - adjust view shell option to the same as for print + SwPrtOptions aPrintOptions( GetViewFrame()->GetObjectShell()->GetTitle(0) ); + SwView::MakeOptions( 0, aPrintOptions, 0, false, 0, 0 ); + GetViewShell()->AdjustOptionsForPagePreview( aPrintOptions ); + if( pESh->GetDoc()->IsBrowseMode() ) { pESh->GetDoc()->SetBrowseMode( FALSE ); @@ -1703,7 +1806,10 @@ SwPagePreView::SwPagePreView(SfxViewFrame *pFrame, SfxViewShell* pOldSh): GetDocShell()->IsInFrame()? 0 : WB_SIZEABLE )), sPageStr( SW_RES(STR_PAGE) ), mnPageCount( 0 ), - nNewPage(USHRT_MAX) + nNewPage(USHRT_MAX), + // OD 09.01.2003 #106334# + mbResetFormDesignMode( false ), + mbFormDesignModeToReset( false ) { SetName(String::CreateFromAscii("PageView" )); SetWindow( &aViewWin ); @@ -1747,6 +1853,14 @@ SwPagePreView::SwPagePreView(SfxViewFrame *pFrame, SfxViewShell* pOldSh): } } + // OD 09.01.2003 #106334# - for form shell remember design mode of draw view + // of previous view shell + if ( pVS && pVS->HasDrawView() ) + { + mbResetFormDesignMode = true; + mbFormDesignModeToReset = pVS->GetDrawView()->IsDesignMode(); + } + if( pVS ) pNew = new ViewShell( *pVS, &aViewWin, 0, VSHELLFLAG_ISPREVIEW ); else @@ -1854,11 +1968,9 @@ int SwPagePreView::_CreateScrollbar( int bHori ) */ IMPL_LINK_INLINE_START( SwPagePreView, BtnPage, Button *, pButton ) { - int eMvMode = pButton == pPageUpBtn - ? SwPagePreViewWin::MV_PAGE_UP - : SwPagePreViewWin::MV_PAGE_DOWN; - if( ChgPage( eMvMode ) ) - aViewWin.Invalidate(); + // OD 04.03.2003 #107369# - use new helper method to perform page up + // respectively page down. + _ExecPgUpAndPgDown( pButton == pPageUpBtn ); return 0; } IMPL_LINK_INLINE_END( SwPagePreView, BtnPage, Button *, pButton ) @@ -1872,7 +1984,8 @@ int SwPagePreView::ChgPage( int eMvMode, int bUpdateScrollbar ) { Rectangle aPixVisArea( aViewWin.LogicToPixel( aVisArea ) ); int bChg = aViewWin.MovePage( eMvMode ) || - eMvMode == SwPagePreViewWin::MV_CALC; + eMvMode == SwPagePreViewWin::MV_CALC || + eMvMode == SwPagePreViewWin::MV_NEWWINSIZE; aVisArea = aViewWin.PixelToLogic( aPixVisArea ); if( bChg ) @@ -2014,7 +2127,8 @@ void SwPagePreView::SetVisArea( const Rectangle &rRect, BOOL bUpdateScrollbar ) // setze am View-Win die aktuelle Size aVisArea = aLR; aViewWin.SetWinSize( aLR.GetSize() ); - ChgPage( SwPagePreViewWin::MV_CALC, bUpdateScrollbar ); + // OD 18.12.2002 #103492# - use new mode + ChgPage( SwPagePreViewWin::MV_NEWWINSIZE, bUpdateScrollbar ); aViewWin.Invalidate(); } @@ -2031,7 +2145,7 @@ IMPL_LINK( SwPagePreView, ScrollHdl, SwScrollbar *, pScrollbar ) if( !pScrollbar->IsHoriScroll() && pScrollbar->GetType() == SCROLL_DRAG && Help::IsQuickHelpEnabled() && - GetViewShell()->DoesPreviewLayoutRowsFitIntoWindow()) + GetViewShell()->PagePreviewLayout()->DoesPreviewLayoutRowsFitIntoWindow()) { // wieviele Seiten scrollen ?? String sStateStr(sPageStr); @@ -2067,20 +2181,64 @@ IMPL_LINK( SwPagePreView, EndScrollHdl, SwScrollbar *, pScrollbar ) { if(!GetViewShell()) return 0; + + // OD 04.03.2003 #107369# - boolean to avoid unnecessary invalidation of the window. + bool bInvalidateWin = true; + if( !pScrollbar->IsHoriScroll() ) // scroll vertically { - if(Help::IsQuickHelpEnabled()) + if ( Help::IsQuickHelpEnabled() ) Help::ShowQuickHelp(pScrollbar, Rectangle(), aEmptyStr, 0); - if(GetViewShell()->DoesPreviewLayoutRowsFitIntoWindow()) + if ( GetViewShell()->PagePreviewLayout()->DoesPreviewLayoutRowsFitIntoWindow() ) { // wieviele Seiten scrollen ?? USHORT nThmbPos = (USHORT)pScrollbar->GetThumbPos(); // OD 05.12.2002 #103492# - adjust to new preview functionality - if( nThmbPos != aViewWin.GetSelectedPage() ) + if( nThmbPos != aViewWin.SelectedPage() ) { - aViewWin.SetSttPage( nThmbPos ); - aViewWin.GetSelectedPage() = nThmbPos; - ChgPage( SwPagePreViewWin::MV_CALC, FALSE ); + // OD 17.01.2003 #103492# - consider case that page <nThmbPos> + // is already visible + SwPagePreviewLayout* pPagePrevwLay = GetViewShell()->PagePreviewLayout(); + if ( pPagePrevwLay->IsPageVisible( nThmbPos ) ) + { + pPagePrevwLay->MarkNewSelectedPage( nThmbPos ); + // OD 04.03.2003 #107369# - invalidation of window is unnecessary + bInvalidateWin = false; + } + else + { + // OD 17.01.2003 #103492# - consider whether layout columns + // fit or not. + if ( !pPagePrevwLay->DoesPreviewLayoutColsFitIntoWindow() ) + { + aViewWin.SetSttPage( nThmbPos ); + aViewWin.SetSelectedPage( nThmbPos ); + ChgPage( SwPagePreViewWin::MV_SCROLL, FALSE ); + // OD 20.01.2003 #103492# - update scrollbars + ScrollViewSzChg(); + } + else + { + // OD 04.03.2003 #107369# - correct scroll amount + const sal_Int16 nPageDiff = nThmbPos - aViewWin.SelectedPage(); + const sal_uInt16 nVisPages = aViewWin.GetRow() * aViewWin.GetCol(); + sal_Int16 nWinPagesToScroll = nPageDiff / nVisPages; + if ( nPageDiff % nVisPages ) + { + // decrease/increase number of preview pages to scroll + nPageDiff < 0 ? --nWinPagesToScroll : ++nWinPagesToScroll; + } + aViewWin.SetSelectedPage( nThmbPos ); + aViewWin.Scroll( 0, pPagePrevwLay->GetWinPagesScrollAmount( nWinPagesToScroll ) ); + } + } + // OD 17.01.2003 #103492# - update accessibility + GetViewShell()->ShowPreViewSelection( nThmbPos ); + } + else + { + // OD 04.03.2003 #107369# - invalidation of window is unnecessary + bInvalidateWin = false; } } else @@ -2100,7 +2258,11 @@ IMPL_LINK( SwPagePreView, EndScrollHdl, SwScrollbar *, pScrollbar ) }; SfxBindings& rBindings = GetViewFrame()->GetBindings(); rBindings.Invalidate( aInval ); - aViewWin.Invalidate(); + // OD 04.03.2003 #107369# - control invalidation of window + if ( bInvalidateWin ) + { + aViewWin.Invalidate(); + } return 0; } /*-------------------------------------------------------------------- @@ -2152,29 +2314,38 @@ void SwPagePreView::ScrollViewSzChg() return ; if(pVScrollbar) { - if(GetViewShell()->DoesPreviewLayoutRowsFitIntoWindow()) + if(GetViewShell()->PagePreviewLayout()->DoesPreviewLayoutRowsFitIntoWindow()) { //vertical scrolling by row // OD 04.12.2002 #103492# - adjust to new preview functionality USHORT nVisPages = aViewWin.GetRow() * aViewWin.GetCol(); pVScrollbar->SetVisibleSize( nVisPages ); - pVScrollbar->SetThumbPos( aViewWin.GetSttPage() ); + // OD 19.02.2003 #107369# - set selected page as scroll bar position, + // if it is visible. + SwPagePreviewLayout* pPagePrevwLay = GetViewShell()->PagePreviewLayout(); + if ( pPagePrevwLay->IsPageVisible( aViewWin.SelectedPage() ) ) + { + pVScrollbar->SetThumbPos( aViewWin.SelectedPage() ); + } + else + { + pVScrollbar->SetThumbPos( aViewWin.GetSttPage() ); + } pVScrollbar->SetLineSize( aViewWin.GetCol() ); pVScrollbar->SetPageSize( nVisPages ); // calculate and set scrollbar range Range aScrollbarRange( 1, mnPageCount ); // increase range by one, because left-top-corner is left blank. ++aScrollbarRange.Max(); - // increase range by number of blank page places in last layout row. - sal_uInt16 nTmp = (mnPageCount+1) % aViewWin.GetCol(); - if ( nTmp > 0 ) - aScrollbarRange.Max() += aViewWin.GetCol() - nTmp; + // OD 17.01.2003 #103492# - increase range in order to access all pages + aScrollbarRange.Max() += ( nVisPages - 1 ); pVScrollbar->SetRange( aScrollbarRange ); } else //vertical scrolling by pixel { const Rectangle& rDocRect = aViewWin.GetPaintedPreviewDocRect(); - const Size& rPreviewSize = aViewWin.GetPreviewDocSize(); + const Size& rPreviewSize = + GetViewShell()->PagePreviewLayout()->GetPrevwDocSize(); pVScrollbar->SetRangeMax(rPreviewSize.Height()) ; long nVisHeight = rDocRect.GetHeight(); pVScrollbar->SetVisibleSize( nVisHeight ); @@ -2186,7 +2357,8 @@ void SwPagePreView::ScrollViewSzChg() if(pHScrollbar) { const Rectangle& rDocRect = aViewWin.GetPaintedPreviewDocRect(); - const Size& rPreviewSize = aViewWin.GetPreviewDocSize(); + const Size& rPreviewSize = + GetViewShell()->PagePreviewLayout()->GetPrevwDocSize(); long nVisWidth = 0; long nThumb = 0; long nVisPage = 0; @@ -2379,13 +2551,17 @@ PrintDialog* SwPagePreView::CreatePrintDialog( Window *pParent ) --------------------------------------------------------------------*/ +// OD 18.12.2002 #103492# - no longer needed ?? Size SwPagePreView::GetOptimalSizePixel() const { + ASSERT( false, "overloaded virtual method <SwPagePreView::GetOptimalSizePixel()> needed ??" ) + return Size( -1, -1 ); +/* //JP 09.06.99: was wird hier errechnet ????? -/* ALT: - SfxApplicationWindow* pWin = SFX_APPWINDOW ; - Rectangle aRect = pWin->GetClientAreaPixel(); -*/ +// ALT: +// SfxApplicationWindow* pWin = SFX_APPWINDOW ; +// Rectangle aRect = pWin->GetClientAreaPixel(); + Window& rWin = GetViewFrame()->GetWindow(); Rectangle aRect( Point(0, 0), rWin.GetOutputSizePixel() ); Size aMaxSize( aRect.GetWidth(), aRect.GetHeight() ); @@ -2403,65 +2579,26 @@ Size SwPagePreView::GetOptimalSizePixel() const aMaxSize.Height() += nYBorder; aMaxSize.Width() += nXBorder; return aMaxSize; +*/ } /*-------------------------------------------------------------------- Beschreibung: --------------------------------------------------------------------*/ - -void SwPagePreViewWin::GetOptimalSize( Size& rSize ) const +// OD 12.12.2002 #103492# +void SwPagePreViewWin::SetViewShell( ViewShell* pShell ) { -#ifdef DEBUG - ASSERT( false, "SwPagePreViewWin called [Debug-Assertion by OD]"); -#endif - Size aPageSize, aPrevwDocSize; - USHORT nVirtPage; - Rectangle aPaintedDocPreviewRect; - -#ifdef NEW_PREVIEW // OD 29.11.2002 #103492# + mpViewShell = pShell; + if ( mpViewShell && mpViewShell->IsPreView() ) { - mpViewShell->InitPreviewLayout( mnCol, mnRow, aPageSize, aPrevwDocSize, - true, &rSize ); - sal_uInt16 nDummy; - mpViewShell->PreparePreviewPaint( mnSttPage, Point(0,0), &rSize, - nDummy, nVirtPage, - aPaintedDocPreviewRect ); - } -#else - USHORT nRowCol = ( mnRow << 8 ) + mnCol; - mpViewShell->CalcPreViewPage( rSize, nRowCol, - mnSttPage, aPageSize, - nVirtPage, USHRT_MAX ); -#endif - - if(aPageSize.Width() && aPageSize.Height()) - { - long nXRel = (long )aPageSize.Width() * mnCol + (( mnCol + 1) * 142); - nXRel /= rSize.Width(); - long nYRel = aPageSize.Height() * mnRow + (( mnRow + 1) * 142); - nYRel /= rSize.Height(); - //n?Rel geben das Verhaeltnis von benoetigten Pixeln zu - //vorhandenen Pixeln wieder - //Danach wird in der Richtung abgeschnitten, in der mehr Platz ist - if(nXRel < nYRel ) - { - rSize.Width() *= nXRel; - rSize.Width() /= nYRel; - } - else - { - rSize.Height() *= nYRel; - rSize.Height() /= nXRel; - } + mpPgPrevwLayout = mpViewShell->PagePreviewLayout(); } } - void SwPagePreViewWin::RepaintCoreRect( const SwRect& rRect ) { - USHORT nRowCol = ( mnRow << 8 ) + mnCol; - mpViewShell->RepaintCoreRect( rRect, nRowCol, mnSttPage, maPgSize ); + mpPgPrevwLayout->Repaint( Rectangle( rRect.Pos(), rRect.SSize() ) ); } /** method to adjust preview to a new zoom factor @@ -2480,15 +2617,14 @@ void SwPagePreViewWin::AdjustPreviewToNewZoom( const sal_uInt16 nZoomFactor) // calculate new start position for preview paint Size aNewWinSize = PixelToLogic( maPxWinSize ); Point aNewPaintStartPos = - mpViewShell->GetPreviewStartPosForNewScale( aNewScale, maScale, aNewWinSize ); + mpPgPrevwLayout->GetPreviewStartPosForNewScale( aNewScale, maScale, aNewWinSize ); // remember new scaling and prepare preview paint // Note: paint of preview will be performed by a corresponding invalidate // due to property changes. maScale = aNewScale; - mpViewShell->PreparePreviewPaint( 0, aNewPaintStartPos, - &maPxWinSize, mnSttPage, mnVirtPage, - maPaintedPreviewDocRect ); + mpPgPrevwLayout->Prepare( 0, aNewPaintStartPos, maPxWinSize, + mnSttPage, mnVirtPage, maPaintedPreviewDocRect ); } /* -----------------04.12.2002 10:46----------------- @@ -2499,9 +2635,10 @@ void SwPagePreViewWin::AdjustPreviewToNewZoom( const sal_uInt16 nZoomFactor) void SwPagePreViewWin::Scroll(long nXMove, long nYMove) { maPaintedPreviewDocRect.Move(nXMove, nYMove); - mpViewShell->PreparePreviewPaint( 0, maPaintedPreviewDocRect.TopLeft(), - &maPxWinSize, mnSttPage, mnVirtPage, - maPaintedPreviewDocRect ); + mpPgPrevwLayout->Prepare( 0, maPaintedPreviewDocRect.TopLeft(), + maPxWinSize, mnSttPage, mnVirtPage, + maPaintedPreviewDocRect ); + } BOOL SwPagePreView::HandleWheelCommands( const CommandEvent& rCEvt ) @@ -2510,29 +2647,32 @@ BOOL SwPagePreView::HandleWheelCommands( const CommandEvent& rCEvt ) const CommandWheelData* pWData = rCEvt.GetWheelData(); if( pWData && COMMAND_WHEEL_ZOOM == pWData->GetMode() ) { - BYTE nRow = aViewWin.GetRow(), nCol = aViewWin.GetCol(); - if( 0L > pWData->GetDelta() ) - { - if( PVIEW_MIN_ROW < nRow ) --nRow; - if( PVIEW_MIN_COL < nCol ) --nCol; - } - else + if(!Application::GetSettings().GetMiscSettings().GetEnableATToolSupport()) { - if( PVIEW_MAX_ROW > nRow ) ++nRow; - if( PVIEW_MAX_COL > nCol ) ++nCol; + USHORT nFactor = GetViewShell()->GetViewOptions()->GetZoom(); + const USHORT nOffset = 10; + if( 0L > pWData->GetDelta() ) + { + nFactor -= nOffset; + if(nFactor < MIN_PREVIEW_ZOOM) + nFactor = MIN_PREVIEW_ZOOM; + } + else + { + nFactor += nOffset; + if(nFactor > MAX_PREVIEW_ZOOM) + nFactor = MAX_PREVIEW_ZOOM; + } + SetZoom(SVX_ZOOM_PERCENT, nFactor); } - aViewWin.CalcWish( nRow, nCol ); - aViewWin.Invalidate(); bOk = TRUE; } else - bOk = aViewWin.HandleScrollCommand( rCEvt, 0, - pVScrollbar && pVScrollbar->IsVisible(TRUE) ? pVScrollbar : 0 ); + bOk = aViewWin.HandleScrollCommand( rCEvt, pHScrollbar, pVScrollbar ); return bOk; } -#ifdef ACCESSIBLE_LAYOUT ::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessible> SwPagePreViewWin::CreateAccessible() { @@ -2540,11 +2680,8 @@ BOOL SwPagePreView::HandleWheelCommands( const CommandEvent& rCEvt ) // happend already!!! DBG_ASSERT( GetViewShell() != NULL, "We need a view shell" ); - return GetViewShell()->CreateAccessiblePreview( - mnRow, mnCol, mnSttPage, maPgSize, - GetViewShell()->GetPreviewFreePix(), maScale, mnSelectedPage ); + return GetViewShell()->CreateAccessiblePreview(); } -#endif /* -----------------------------06.05.2002 13:18------------------------------ @@ -2590,12 +2727,30 @@ void SwPagePreView::SetZoom(SvxZoomType eType, USHORT nFactor) { ViewShell& rSh = *GetViewShell(); SwViewOption aOpt(*rSh.GetViewOptions()); - aOpt.SetZoom(nFactor); - aOpt.SetZoomType(eType); - rSh.ApplyViewOptions( aOpt ); - lcl_InvalidateZoomSlots(GetViewFrame()->GetBindings()); - // OD 02.12.2002 #103492# - aViewWin.AdjustPreviewToNewZoom( nFactor ); - ScrollViewSzChg(); + // OD 16.12.2002 #103492# - perform action only on changes of zoom or zoom type. + if ( aOpt.GetZoom() != nFactor || + aOpt.GetZoomType() != eType ) + { + aOpt.SetZoom(nFactor); + aOpt.SetZoomType(eType); + rSh.ApplyViewOptions( aOpt ); + lcl_InvalidateZoomSlots(GetViewFrame()->GetBindings()); + // OD 02.12.2002 #103492# + aViewWin.AdjustPreviewToNewZoom( nFactor ); + ScrollViewSzChg(); + } } +/** adjust position of vertical scrollbar + + OD 19.02.2003 #107369 + + @author OD +*/ +void SwPagePreView::SetVScrollbarThumbPos( const sal_uInt16 _nNewThumbPos ) +{ + if ( pVScrollbar ) + { + pVScrollbar->SetThumbPos( _nNewThumbPos ); + } +} diff --git a/sw/source/ui/uiview/pview.src b/sw/source/ui/uiview/pview.src index c39a9588a83f..f41e89e7d6d8 100644 --- a/sw/source/ui/uiview/pview.src +++ b/sw/source/ui/uiview/pview.src @@ -2,9 +2,9 @@ * * $RCSfile: pview.src,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: os $ $Date: 2002-12-06 14:13:57 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -97,7 +97,7 @@ ModalDialog DLG_PAGEPREVIEW_PRINTOPTIONS TEXT[ dutch ] = "Verdeling"; TEXT[ chinese_simplified ] = "鍒嗗竷"; TEXT[ greek ] = "梳翎盹燹"; - TEXT[ korean ] = "攵勴暊"; + TEXT[ korean ] = "氚半秳"; TEXT[ turkish ] = "Da瘕l齧"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Distribuci"; @@ -514,10 +514,10 @@ ModalDialog DLG_PAGEPREVIEW_PRINTOPTIONS TEXT[ portuguese_brazilian ] = "~Vertikal"; TEXT[ portuguese ] = "~Vertical"; TEXT[ danish ] = "Lodret"; - TEXT[ french ] = "~Vertical"; + TEXT[ french ] = " la verticale"; TEXT[ swedish ] = "~Vertikalt"; TEXT[ dutch ] = "~Verticaal"; - TEXT[ spanish ] = "~Vertical"; + TEXT[ spanish ] = "~Verticalmente"; TEXT[ english_us ] = "~Vertically"; TEXT[ chinese_simplified ] = "绾靛悜(~V)"; TEXT[ russian ] = "洛痱桕嚯"; @@ -698,7 +698,7 @@ ModalDialog DLG_PAGEPREVIEW_PRINTOPTIONS TEXT[ dutch ] = "Standaar~d"; TEXT[ chinese_simplified ] = "榛樿(~D)"; TEXT[ greek ] = "旭镥痖腼戕"; - TEXT[ korean ] = "旮半掣 臧(~D)"; + TEXT[ korean ] = "旮半掣臧(~D)"; TEXT[ turkish ] = "Standar~t"; TEXT[ catalan ] = "~Per defecte"; TEXT[ finnish ] = "~Oletus"; @@ -736,7 +736,7 @@ ModalDialog DLG_PAGEPREVIEW_ZOOM SVLook = TRUE ; Size = MAP_APPFONT ( 141 , 69 ) ; Text = "Mehrere Seiten" ; - Text [ english_us ] = "Multiple pages" ; + Text [ english_us ] = "Multiple Pages" ; Moveable = TRUE ; FixedText FT_COL { @@ -853,20 +853,27 @@ ModalDialog DLG_PAGEPREVIEW_ZOOM Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; }; - Text[ chinese_simplified ] = "鏄剧ず姣斾緥"; + Text[ chinese_simplified ] = "澶氶〉"; Text[ russian ] = "锑聒蜞"; Text[ polish ] = "Skala"; - Text[ japanese ] = "銉椼儸銉撱儱銉笺伄銈恒兗銉"; - Text[ chinese_traditional ] = "椤ず姣斾緥"; + Text[ japanese ] = "瑜囨暟銉氥兗銈"; + Text[ chinese_traditional ] = "鍥涢爜"; Text[ arabic ] = "蔬软 媸折硌"; Text[ dutch ] = "Maatstaf"; - Text[ chinese_simplified ] = "鏄剧ず姣斾緥"; + Text[ chinese_simplified ] = "澶氶〉"; Text[ greek ] = "孰哽彡"; - Text[ korean ] = "頇曤寑/於曥唽"; + Text[ korean ] = "雼れ 韼橃澊歆"; Text[ turkish ] = "Yak齨la⺶齬"; Text[ language_user1 ] = " "; Text[ catalan ] = "Zoom"; Text[ thai ] = "喔⑧箞喔/喔傕涪喔侧涪"; + Text[ portuguese ] = "Zoom"; + Text[ french ] = "Plusieurs pages"; + Text[ spanish ] = "Varias p醙inas"; + Text[ finnish ] = "Zoomaus"; + Text[ italian ] = "Pi pagine"; + Text[ danish ] = "M錶estok"; + Text[ swedish ] = "Flera sidor"; }; String RID_PVIEW_TOOLBOX { @@ -890,7 +897,7 @@ String RID_PVIEW_TOOLBOX Text[ dutch ] = "Afdrukvoorbeeld"; Text[ chinese_simplified ] = "椤甸潰瑙嗗浘"; Text[ greek ] = "旭镥痖箨珞 尻酏瘗箸"; - Text[ korean ] = "鞚胳噭 氙鸽Μ氤搓赴"; + Text[ korean ] = "鞚胳噭 氙鸽Μ 氤搓赴"; Text[ turkish ] = "Sayfa 鰊izleme"; Text[ language_user1 ] = " "; Text[ catalan ] = "Visualitzaci pr鑦ia de la p鄃ina"; @@ -942,7 +949,9 @@ ToolBox RID_PVIEW_TOOLBOX { Identifier = FN_SHOW_MULTIPLE_PAGES ; HelpID = FN_SHOW_MULTIPLE_PAGES ; + DropDown = TRUE; }; + ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; ToolBoxItem { Identifier = SID_ZOOM_OUT; @@ -986,3 +995,8 @@ ToolBox RID_PVIEW_TOOLBOX + + + + + diff --git a/sw/source/ui/uiview/scroll.cxx b/sw/source/ui/uiview/scroll.cxx index 19f5ef4bb129..af9252bd03ad 100644 --- a/sw/source/ui/uiview/scroll.cxx +++ b/sw/source/ui/uiview/scroll.cxx @@ -2,9 +2,9 @@ * * $RCSfile: scroll.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: ssa $ $Date: 2002-09-17 09:40:27 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,6 +69,8 @@ #include "swrect.hxx" #include "scroll.hxx" +#define SCROLL_LINE_SIZE 250 + SwScrollbar::SwScrollbar( Window *pWin, int bHoriz ) : ScrollBar( pWin, @@ -92,13 +94,13 @@ SwScrollbar::SwScrollbar( Window *pWin, int bHoriz ) : Range des Scrollbars neu einzustellen. ------------------------------------------------------------------------*/ - void SwScrollbar::DocSzChgd( const Size &rSize ) { aDocSz = rSize; SetRange( Range( 0, bHori ? rSize.Width() : rSize.Height()) ); const ULONG nVisSize = GetVisibleSize(); - SetLineSize( nVisSize * 10 / 100 ); + SetLineSize( SCROLL_LINE_SIZE ); +// SetLineSize( nVisSize * 10 / 100 ); SetPageSize( nVisSize * 77 / 100 ); } @@ -148,7 +150,7 @@ void SwScrollbar::EnableThumbPos( BOOL bEnable, const SwRect &rVisArea ) void SwScrollbar::Show( BOOL bSet ) { bVisible = bSet; - if( (!bSet || bSizeSet || !bAuto) && IsUpdateMode() ) + if( (!bSet || !bAuto) && IsUpdateMode() && bSizeSet) ScrollBar::Show(bSet); } diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx index 8be25bf88d68..4b0a583dacc8 100644 --- a/sw/source/ui/uiview/srcview.cxx +++ b/sw/source/ui/uiview/srcview.cxx @@ -2,9 +2,9 @@ * * $RCSfile: srcview.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: os $ $Date: 2002-10-25 10:08:30 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -587,11 +587,11 @@ void SwSrcView::Execute(SfxRequest& rReq) } if(pMed) { - SvStream* pInStream = pMed->GetInStream(); - pInStream->Seek(0); - pInStream->SetStreamSize(0); - aEditWin.Write( *pInStream ); - pMed->CloseInStream(); + SvStream* pOutStream = pMed->GetOutStream(); + pOutStream->Seek(0); + pOutStream->SetStreamSize(0); + aEditWin.Write( *pOutStream ); + pMed->CloseOutStream(); pMed->Commit(); pDocShell->GetDoc()->ResetModified(); SourceSaved(); @@ -739,6 +739,11 @@ void SwSrcView::GetState(SfxItemSet& rSet) } } break; + case SID_MAIL_SENDDOCASPDF: + case SID_MAIL_SENDDOC : + case SID_EXPORTDOCASPDF: + case SID_DIRECTEXPORTDOCASPDF: + case SID_EXPORTDOC: case SID_REPEAT: rSet.DisableItem(nWhich); break; @@ -762,7 +767,6 @@ void SwSrcView::GetState(SfxItemSet& rSet) rSet.DisableItem(nWhich); } break; - } nWhich = aIter.NextWhich(); } @@ -1041,14 +1045,8 @@ void SwSrcView::Load(SwDocShell* pDocShell) rtl_getBestMimeCharsetFromTextEncoding( pHtmlOptions->GetTextEncoding() ); rtl_TextEncoding eDestEnc = rtl_getTextEncodingFromMimeCharset( pCharSet ); - rtl_TextEncoding eHeaderEnc = SfxHTMLParser::GetEncodingByHttpHeader( - pDocShell->GetHeaderAttributes() ); - if( RTL_TEXTENCODING_DONTKNOW != eHeaderEnc ) - eDestEnc = eHeaderEnc; - eLoadEncoding = eDestEnc; - aEditWin.SetReadonly(pDocShell->IsReadOnly()); - aEditWin.SetTextEncoding(eLoadEncoding); + aEditWin.SetTextEncoding(eDestEnc); SfxMedium* pMedium = pDocShell->GetMedium(); const SfxFilter* pFilter = pMedium->GetFilter(); @@ -1059,6 +1057,15 @@ void SwSrcView::Load(SwDocShell* pDocShell) SvStream* pStream = pMedium->GetInStream(); if(pStream && 0 == pStream->GetError() ) { + rtl_TextEncoding eHeaderEnc = + SfxHTMLParser::GetEncodingByHttpHeader( + pDocShell->GetHeaderAttributes() ); + if( RTL_TEXTENCODING_DONTKNOW != eHeaderEnc && + eDestEnc != eHeaderEnc ) + { + eDestEnc = eHeaderEnc; + aEditWin.SetTextEncoding(eDestEnc); + } pStream->SetStreamCharSet( eDestEnc ); pStream->Seek(0); TextEngine* pTextEngine = aEditWin.GetTextEngine(); @@ -1112,6 +1119,8 @@ void SwSrcView::Load(SwDocShell* pDocShell) } aEditWin.ClearModifyFlag(); + eLoadEncoding = eDestEnc; + if(bDocModified) pDocShell->SetModified();// das Flag wird zwischendurch zurueckgesetzt // AutoLoad abschalten diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx index 716db5fc423c..9b407c69c53a 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -2,9 +2,9 @@ * * $RCSfile: view.cxx,v $ * - * $Revision: 1.52 $ + * $Revision: 1.53 $ * - * last change: $Author: os $ $Date: 2002-12-10 15:31:12 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -382,7 +382,8 @@ void SwView::SelectShell() // //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - + if(bInDtor) + return; // Entscheidung, ob UpdateTable gerufen werden muss sal_Bool bUpdateTable = sal_False; const SwFrmFmt* pCurTableFmt = pWrtShell->GetTableFmt(); @@ -830,8 +831,17 @@ SwView::SwView( SfxViewFrame *pFrame, SfxViewShell* pOldSh ) nFormSfxId( USHRT_MAX ), nSelectionType( INT_MAX ), nLastPasteDestination( 0xFFFF ), - nNewPage(USHRT_MAX) + nNewPage(USHRT_MAX), + bInMailMerge(FALSE), + bInDtor(FALSE) { + // OD 18.12.2002 #103492# - According to discussion with MBA and further + // investigations, no old SfxViewShell will be set as parameter <pOldSh>, + // if function "New Window" is performed to open an additional view beside + // an already existing one. + // If the view is switch from one to another, the 'old' view is given by + // parameter <pOldSh>. + RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "SwView::SwView" ); _CreateScrollbar( TRUE ); @@ -868,29 +878,38 @@ SwView::SwView( SfxViewFrame *pFrame, SfxViewShell* pOldSh ) sal_Bool bOldShellWasPagePreView = FALSE, bOldShellWasSrcView = FALSE; - if( !pOldSh ) + + // OD 18.12.2002 #103492# - determine, if there is an existing view for + // document + SfxViewShell* pExistingSh = 0; + if ( pOldSh ) + pExistingSh = pOldSh; + else { - //Gibt es schon eine Sicht auf das Dokument? SfxViewFrame *pF = SfxViewFrame::GetFirst( pDocSh ); if( pF == pFrame ) pF = SfxViewFrame::GetNext( *pF, pDocSh ); if( pF ) - pOldSh = pF->GetViewShell(); + pExistingSh = pF->GetViewShell(); } - else if( pOldSh->IsA( TYPE( SwPagePreView ) ) ) + + // determine type of existing view + if( pExistingSh && + pExistingSh->IsA( TYPE( SwPagePreView ) ) ) { - sSwViewData = ((SwPagePreView*)pOldSh)->GetPrevSwViewData(); - sNewCrsrPos = ((SwPagePreView*)pOldSh)->GetNewCrsrPos(); - nNewPage = ((SwPagePreView*)pOldSh)->GetNewPage(); + sSwViewData = ((SwPagePreView*)pExistingSh)->GetPrevSwViewData(); + sNewCrsrPos = ((SwPagePreView*)pExistingSh)->GetNewCrsrPos(); + nNewPage = ((SwPagePreView*)pExistingSh)->GetNewPage(); bOldShellWasPagePreView = TRUE; } - else if( pOldSh->IsA( TYPE( SwSrcView ) ) ) + else if( pExistingSh && + pExistingSh->IsA( TYPE( SwSrcView ) ) ) bOldShellWasSrcView = TRUE; RTL_LOGFILE_CONTEXT_TRACE( aLog, "before create WrtShell" ); - if(PTR_CAST( SwView, pOldSh)) + if(PTR_CAST( SwView, pExistingSh)) { - pWrtShell = new SwWrtShell( *((SwView*)pOldSh)->pWrtShell, + pWrtShell = new SwWrtShell( *((SwView*)pExistingSh)->pWrtShell, pEditWin, *this); //MA: Das kann doch nur zu einem GPF fuehren! // nSelectionType = ((SwView*)pOldSh)->nSelectionType; @@ -915,7 +934,7 @@ SwView::SwView( SfxViewFrame *pFrame, SfxViewShell* pOldSh ) // add the ViewShell to the ring of the other ViewShell(s) if(bOldShellWasPagePreView) { - ViewShell& rPreviewViewShell = *((SwPagePreView*)pOldSh)->GetViewShell(); + ViewShell& rPreviewViewShell = *((SwPagePreView*)pExistingSh)->GetViewShell(); pWrtShell->MoveTo(&rPreviewViewShell); //#95521# to update the field command et.al. if necessary const SwViewOption* pPreViewOpt = rPreviewViewShell.GetViewOptions(); @@ -923,6 +942,14 @@ SwView::SwView( SfxViewFrame *pFrame, SfxViewShell* pOldSh ) pPreViewOpt->IsHidden() != aUsrPref.IsHidden() || pPreViewOpt->IsShowHiddenPara() != aUsrPref.IsShowHiddenPara() ) rPreviewViewShell.ApplyViewOptions(aUsrPref); + // OD 09.01.2003 #106334# - reset design mode at draw view for form + // shell, if needed. + if ( ((SwPagePreView*)pExistingSh)->ResetFormDesignMode() && + pWrtShell->HasDrawView() ) + { + SdrView* pDrawView = pWrtShell->GetDrawView(); + pDrawView->SetDesignMode( ((SwPagePreView*)pExistingSh)->FormDesignModeToReset() ); + } } } RTL_LOGFILE_CONTEXT_TRACE( aLog, "after create WrtShell" ); @@ -1090,6 +1117,7 @@ SwView::SwView( SfxViewFrame *pFrame, SfxViewShell* pOldSh ) SwView::~SwView() { + bInDtor = TRUE; pEditWin->Hide(); // damit kein Paint Aerger machen kann! // An der SwDocShell den Pointer auf die View ruecksetzen SwDocShell* pDocSh = GetDocShell(); @@ -1221,12 +1249,31 @@ void SwView::ReadUserData( const String &rUserData, sal_Bool bBrowse ) sal_Bool bSelectObj = (0 != rUserData.GetToken( nOff, ';', nPos ).ToInt32()) && pWrtShell->IsObjSelectable( aCrsrPos ); + // OD 11.02.2003 #100556# - set flag value to avoid macro execution. + bool bSavedFlagValue = pWrtShell->IsMacroExecAllowed(); + pWrtShell->SetMacroExecAllowed( false ); pWrtShell->SwCrsrShell::SetCrsr( aCrsrPos, !bSelectObj ); if( bSelectObj ) { pWrtShell->SelectObj( aCrsrPos ); pWrtShell->EnterSelFrmMode( &aCrsrPos ); } + // OD 11.02.2003 #100556# - reset flag value + pWrtShell->SetMacroExecAllowed( bSavedFlagValue ); + + //apply information from page preview - if available + if( sNewCrsrPos.Len() ) + { + long nX = sNewCrsrPos.GetToken( 0, ';' ).ToInt32(), + nY = sNewCrsrPos.GetToken( 1, ';' ).ToInt32(); + pWrtShell->SwCrsrShell::SetCrsr( Point( nX, nY ), FALSE ); + sNewCrsrPos.Erase(); + } + else if(USHRT_MAX != nNewPage) + { + pWrtShell->GotoPage(nNewPage); + nNewPage = USHRT_MAX; + } SelectShell(); @@ -1346,12 +1393,17 @@ void SwView::ReadUserDataSequence ( const com::sun::star::uno::Sequence < com::s sal_Bool bSelectObj = (sal_False != bSelectedFrame ) && pWrtShell->IsObjSelectable( aCrsrPos ); + // OD 11.02.2003 #100556# - set flag value to avoid macro execution. + bool bSavedFlagValue = pWrtShell->IsMacroExecAllowed(); + pWrtShell->SetMacroExecAllowed( false ); pWrtShell->SwCrsrShell::SetCrsr( aCrsrPos, !bSelectObj ); if( bSelectObj ) { pWrtShell->SelectObj( aCrsrPos ); pWrtShell->EnterSelFrmMode( &aCrsrPos ); } + // OD 11.02.2003 #100556# - reset flag value + pWrtShell->SetMacroExecAllowed( bSavedFlagValue ); } SelectShell(); diff --git a/sw/source/ui/uiview/view.src b/sw/source/ui/uiview/view.src index fb1d9de24cf0..65e38612f66a 100644 --- a/sw/source/ui/uiview/view.src +++ b/sw/source/ui/uiview/view.src @@ -2,9 +2,9 @@ * * $RCSfile: view.src,v $ * - * $Revision: 1.39 $ + * $Revision: 1.40 $ * - * last change: $Author: os $ $Date: 2002-08-30 10:37:39 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -95,7 +95,7 @@ QueryBox DLG_WRAP MESSAGE [ portuguese ] = "Deseja continuar com a verifica玢o no in韈io do documento?" ; MESSAGE [ finnish ] = "Haluatko jatkaa tarkistusta asiakirjan alusta?" ; MESSAGE [ danish ] = "Vil du forts鎡te kontrollen fra dokumentets start?" ; - MESSAGE [ french ] = "Voulez-vous continuer la v閞ification depuis le d閎ut du document?" ; + MESSAGE [ french ] = "Continuer la v閞ification au d閎ut du document ?" ; MESSAGE [ swedish ] = "Vill du forts鋞ta kontrollen i b鰎jan p dokumentet?" ; MESSAGE [ dutch ] = "Wilt u dat de spellingcontrole wordt voortgezet bij het begin van het document?" ; MESSAGE [ spanish ] = "緿esea continuar la revisi髇 desde el comienzo del documento?" ; @@ -123,7 +123,7 @@ QueryBox DLG_BODY MESSAGE [ italian ] = "Controllare il testo principale?" ; MESSAGE [ portuguese_brazilian ] = "Deseja verificar o corpo do documento?" ; MESSAGE [ portuguese ] = "Deseja verificar o texto principal?" ; - MESSAGE [ finnish ] = "Haluatko tarkistaa p??tekstin?" ; + MESSAGE [ finnish ] = "Haluatko tarkistaa p滗tekstin?" ; MESSAGE [ danish ] = "Vil du kontrollere br鴇teksten?" ; MESSAGE [ french ] = "Voulez-vous v閞ifier le texte principal?" ; MESSAGE [ swedish ] = "Vill du kontrollera huvudtexten?" ; @@ -131,7 +131,7 @@ QueryBox DLG_BODY MESSAGE [ spanish ] = "緿esea verificar el texto principal?" ; MESSAGE [ english_us ] = "Do you want to check the main text?" ; MESSAGE[ chinese_simplified ] = "鎮ㄨ妫鏌ユ鏂囧悧锛"; - MESSAGE[ russian ] = "蔓 躅蜩蝈 镳钼屦栩 汶噔睇 蝈犟?"; + MESSAGE[ russian ] = "橡钼屦栩 汶噔睇 蝈犟?"; MESSAGE[ polish ] = "Czy chcesz sprawdza tekst g丑wny?"; MESSAGE[ japanese ] = "鏈枃銈掋儊銈с儍銈仐銇俱仚銇嬨"; MESSAGE[ chinese_traditional ] = "鎮ㄨ妾㈡煡鍏ф枃锕"; @@ -154,20 +154,20 @@ QueryBox DLG_PRT_FIELDNAME MESSAGE [ portuguese_brazilian ] = "Option Show fieldname is checked.\nDo you want to print the document with fieldnames?" ; MESSAGE [ portuguese ] = "A op玢o 'Mostrar nome do campo' est activada.\nImprimir o documento com os nomes do campo?" ; MESSAGE [ french ] = "L'option Afficher le nom de champ est activ閑.\nVoulez-vous imprimer le document avec le nom de champ ?" ; - MESSAGE [ dutch ] = "Optie Veldnaam weergeven is actief.\nWilt u het document met de veldnaam afdrukken?" ; + MESSAGE [ dutch ] = "Optie 'Veldnaam weergeven' is actief.\nWilt u het document met de veldnaam afdrukken?" ; MESSAGE [ spanish ] = "La opci髇 nombre de campo est activada. \n緿esea imprimir el archivo con nombres de campo?" ; MESSAGE [ danish ] = "Vis feltnavn er aktiveret\nVil du udskrive dokumentet med feltnavn?" ; MESSAGE [ swedish ] = "Alternativet Visa f鋖tnamn 鋜 aktiverat.\nVill du skriva ut dokumentet med f鋖tnamn?" ; MESSAGE [ finnish ] = "N鋣t kentt鋕omennot -asetus on valittuna.\nHaluatko tulostaa asiakirjan niin, ett kentt鋘imet n鋕yv鋞?" ; MESSAGE [ english_us ] = "Show field commands option is checked.\nDo you want to print the document with field names?" ; MESSAGE[ chinese_simplified ] = "瀛楁鍚嶇О閫夐」杩樺浜庝娇鐢ㄧ殑鐘舵併俓n鎮ㄨ杩炲悓瀛楁鍚嶇О涓璧锋墦鍗拌繖涓枃浠跺悧锛"; - MESSAGE[ russian ] = "相疣戾蝠 '项赅玎螯 桁 镱' 铗戾麇.\n蔓 躅蜩蝈 磬镥鬣蜞螯 漕牦戾眚 桁屙囔 镱?"; + MESSAGE[ russian ] = "相疣戾蝠 '项赅玎螯 桁 镱' 篑蜞眍怆屙.\n袜镥鬣蜞螯 漕牦戾眚 桁屙囔 镱?"; MESSAGE[ polish ] = "Opcja Poka nazw pola jest uaktywiona.\nCzy chcesz wydrukowa ten dokument z nazw pola?"; MESSAGE[ japanese ] = "銈儣銈枫儳銉炽仹銉曘偅銉笺儷銉夊悕銇屻偄銈儐銈ｃ儢銇仾銇ｃ仸銇勩伨銇欍俓n鏂囨浉銇儠銈ｃ兗銉儔鍚嶃倰鍗板埛銇椼伨銇欍亱銆"; MESSAGE[ chinese_traditional ] = "娆勪綅鍚嶇ū閬搁爡閭勮檿鏂间娇鐢ㄧ媭鎱嬨俓n鎮ㄨ閫ｅ悓娆勪綅鍚嶇ū涓璧峰垪鍗伴欏嬫獢妗堬箹"; MESSAGE[ arabic ] = "轻雾茄 \"刨迩 怯 轻娃醆" 湓.\n遽 恃硐 厝勤 轻阌输 让鱼橇 轻娃驷"; MESSAGE[ greek ] = " 屦殡镢 镬 疱溥秕 暹磲 屙羼泔痫殓燧礴.\n容脲翦 磲 尻趱瘗桢 麸 葶泷狯 灬孢 戾 翎 镯狒 豉 疱溥;"; - MESSAGE[ korean ] = "鞓奠厴 頃勲摐 鞚措 響滌嫓臧 頇滌劚頇旊悩鞏 鞛堨姷雼堧嫟.\n頃勲摐 鞚措瓿 頃粯 氍胳劀毳 鞚胳噭頃橁矤鞀惦媹旯?"; + MESSAGE[ korean ] = "鞓奠厴 頃勲摐鞚 鞚措 響滌嫓臧 頇滌劚頇旊悩鞏 鞛堨姷雼堧嫟.\n頃勲摐 鞚措鞚 臧欖澊 氍胳劀鞐 鞚胳噭頃橃嫓瓴犾姷雼堦箤?"; MESSAGE[ turkish ] = "\"Alan ad齨 g鰎黱t黮e\" se鏴ne餴 etkin.\nBelgeyi alan adlar齳la yazd齬mak istiyor musunuz?"; MESSAGE[ language_user1 ] = " "; MESSAGE[ catalan ] = "L'opci Mostra les ordres de camp est activada. \nVoleu imprimir el document amb els noms de camp?"; @@ -197,7 +197,7 @@ QueryBox DLG_SPECIAL MESSAGE[ chinese_traditional ] = "鎮ㄨ妾㈡煡鐗规畩鍗鍩燂箹"; MESSAGE[ arabic ] = "遽 恃硐 轻氏揄 蓓 轻沅秦 轻吻丈"; MESSAGE[ greek ] = "歪 氵礤 蓦邈黠 豉 彘溟掰 疱耖秣;"; - MESSAGE[ korean ] = "韸轨爼頃 鞓侅棴鞚 瓴靷晿瓴犾姷雼堦箤?"; + MESSAGE[ korean ] = "韸轨垬 鞓侅棴鞚 瓴靷晿鞁滉矤鞀惦媹旯?"; MESSAGE[ turkish ] = "謟el b鰈黰ler denetlensin mi?"; MESSAGE[ language_user1 ] = " "; MESSAGE[ catalan ] = "Voleu revisar les regions especials?"; @@ -213,15 +213,15 @@ QueryBox DLG_THESAURUS MESSAGE [ italian ] = "Tale temine andrebbe evitato. Avviare il dizionario dei sinonimi?" ; MESSAGE [ portuguese_brazilian ] = "Por favor evite esta palavra!Iniciar thesaurus?" ; MESSAGE [ portuguese ] = "Evite esta palavra! Iniciar o dicion醨io de sin髇imos?" ; - MESSAGE [ finnish ] = "T?m? sana esiintyy v?ltett?vien sanojen luettelossa! Avataanko synonyymisanasto?" ; + MESSAGE [ finnish ] = "T鋗 sana esiintyy v鋖tett鋠ien sanojen luettelossa. Avataanko synonyymisanasto?" ; MESSAGE [ danish ] = "Undg venligst dette ord! Vil du bruge synonymordbogen?" ; MESSAGE [ french ] = "Il vaudrait mieux 関iter d'employer ce mot ! Souhaitez-vous consulter le dictionnaire des synonymes ?" ; MESSAGE [ swedish ] = "Undvik det h鋜 ordet! Starta synonymordlista?" ; MESSAGE [ dutch ] = "Dit woord niet gebruiken! Thesaurus starten?" ; - MESSAGE [ spanish ] = "eber韆 evitar esta palabra! 縄niciar b鷖queda de sin髇imos?" ; + MESSAGE [ spanish ] = "vite esta palabra! 縄niciar b鷖queda de sin髇imos?" ; MESSAGE [ english_us ] = "This word appears in the list of words you want to avoid! Start thesaurus?" ; MESSAGE[ chinese_simplified ] = "鎮ㄥ簲璇ラ伩鍏嶄娇鐢ㄨ繖涓瓧锛佹偍瑕佸惎鍔ㄥ悓涔夎瘝璇嶅吀鍚楋紵"; - MESSAGE[ russian ] = "语铗疱犭屙桢 钽 耠钼 蔓 漕腈睇 桤徨汔螯! 青矬耱栩 蝈玎箴篑?"; + MESSAGE[ russian ] = "语铗疱犭屙桢 钽 耠钼 耠邃箦 桤徨汔螯! 青矬耱栩 蝈玎箴篑?"; MESSAGE[ polish ] = "Unikaj tego s硂wa! W彻czy Tezaurus?"; MESSAGE[ japanese ] = "銇撱伄鍗樿獮銇娇鐢ㄣ伅閬裤亼銇︺亸銇犮仌銇勩傞缇╄獮杈炲吀銈掗枊濮嬨仐銇俱仚銇嬨"; MESSAGE[ chinese_traditional ] = "鎮ㄦ噳瑭查伩鍏嶄娇鐢ㄩ欏嬪瓧锕楁偍瑕佸暉鍕曞悓缇╄瑭炲吀鍡庯箹"; @@ -243,7 +243,7 @@ QueryBox DLG_SPECIAL_FORCED MESSAGE [ italian ] = "Il controllo delle aree speciali non attivo, controllare lo stesso?" ; MESSAGE [ portuguese_brazilian ] = "Verifica??o de Regi?s especiais est? desativada, Verificar assim mesmo?" ; MESSAGE [ portuguese ] = "A verifica玢o de zonas especiais est desactivada, mesmo assim prosseguir?" ; - MESSAGE [ finnish ] = "Tarkista erityisalueet -toiminto on poistettu k?yt?t?. Tarkistetaanko kuitenkin?" ; + MESSAGE [ finnish ] = "Tarkista erityisalueet -toiminto on poistettu k鋣t鰏t. Tarkistetaanko kuitenkin?" ; MESSAGE [ danish ] = "Stavekontrol af s鎟omr錮er er sl錯t fra, skal der kontrolleres alligevel?" ; MESSAGE [ french ] = "La v閞ification dans les zones sp閏iales est d閟activ閑. V閞ifier tout de m阭e ?" ; MESSAGE [ swedish ] = "Kontroll av specialomr錮en 鋜 avst鋘gd. Kontrollera 鋘d?" ; @@ -251,7 +251,7 @@ QueryBox DLG_SPECIAL_FORCED MESSAGE [ spanish ] = "La verificaci髇 de las 醨eas especiales est desactivada, 緿esea de todas maneras verificar?" ; MESSAGE [ english_us ] = "Check special regions is deactivated. Check anyway?" ; MESSAGE[ chinese_simplified ] = "鐗规畩鍖哄煙鐨勬鏌ュ凡缁忓叧闂紝鎮ㄨ繕鏄鎵ц杩欓」妫鏌ワ紵"; - MESSAGE[ russian ] = "橡钼屦赅 耧弼栲朦睇 钺豚耱彘 铗觌屙, 埋 疣忭 镳钼屦栩?"; + MESSAGE[ russian ] = "橡钼屦赅 耧弼栲朦睇 钺豚耱彘 铗觌屙. 橡钼屦栩, 礤 耢铗 磬 ?"; MESSAGE[ polish ] = "Sprawdzanie obszar體 specjalnych jest wy彻czone, mimo to sprawdza?"; MESSAGE[ japanese ] = "鐗瑰垾绡勫洸銇偑銉曘伀銇仯銇︺亜銇俱仚銆傘仢銈屻仹銈傘儊銈с儍銈仐銇俱仚銇嬨"; MESSAGE[ chinese_traditional ] = "宸茬稉闂滈枆鐗规畩鍗鍩熺殑妾㈡煡锕愰倓鏄鍩疯閫欏嬫寚浠わ箹"; @@ -281,7 +281,7 @@ QueryBox MSG_SEARCH_END Message [ spanish ] = "%PRODUCTNAME Writer ha buscado hasta el final del documento. 緿esea continuar la b鷖queda desde el principio?" ; Message [ english_us ] = "%PRODUCTNAME Writer has searched to the end of the document. Do you want to continue at the beginning?" ; Message[ chinese_simplified ] = "%PRODUCTNAME Writer 宸茬粡鎼滃鑷虫枃妗ｇ殑缁撴潫浣嶇疆銆傝缁х画浠庢枃妗ｇ殑璧峰浣嶇疆寮濮嬫悳瀵伙紵"; - Message[ russian ] = "%PRODUCTNAME Writer 铖簌羼蜮桦 镱桉 觐眦 漕牦戾眚. 蔓 躅蜩蝈 镳钿铍骅螯 镱桉 磬鬣豚 漕牦戾眚?"; + Message[ russian ] = "%PRODUCTNAME Writer 铖簌羼蜮桦 镱桉 觐眦 漕牦戾眚. 橡钿铍骅螯 镱桉 磬鬣豚 漕牦戾眚?"; Message[ polish ] = "%PRODUCTNAME Writer przeszuka dokument do ko馽a. Czy kontynuowa wyszukiwanie od pocz箃ku dokumentu?"; Message[ japanese ] = "%PRODUCTNAME Writer 銇佹枃鏇告湯銇俱仹妞滅储銇椼伨銇椼仧銆傛枃鏇搞伄濮嬨倎銇埢銇ｃ仸缍氳銇椼伨銇欍亱銆"; Message[ chinese_traditional ] = "%PRODUCTNAME Writer 宸茬稉鎼滃皨鑷虫枃浠剁殑绲愭潫浣嶇疆銆傝寰炴枃浠剁殑璧峰浣嶇疆绻肩簩鎼滃皨锛"; @@ -311,13 +311,13 @@ QueryBox MSG_SEARCH_START Message [ spanish ] = "%PRODUCTNAME Writer ha buscado hasta el principio del documento. 緿esea continuar desde el final?" ; Message [ english_us ] = "%PRODUCTNAME Writer has searched to the beginning of the document. Do you want to continue at the end?" ; Message[ chinese_simplified ] = "%PRODUCTNAME Writer 宸茬粡鎼滃鑷虫枃妗ｇ殑璧峰浣嶇疆銆傝缁х画浠庢枃浠剁殑缁撴潫浣嶇疆寮濮嬫悳瀵伙紵"; - Message[ russian ] = "%PRODUCTNAME Writer 铖簌羼蜮桦 镱桉 磬鬣脲 漕牦戾眚. 蔓 躅蜩蝈 镳钿铍骅螯 镱桉 觐眦 漕牦戾眚?"; + Message[ russian ] = "%PRODUCTNAME Writer 铖簌羼蜮桦 镱桉 磬鬣塍 漕牦戾眚. 橡钿铍骅螯 镱桉 觐眦 漕牦戾眚?"; Message[ polish ] = "%PRODUCTNAME Writer przeszuka dokument do pocz箃ku. Czy kontynuowa wyszukiwanie od ko馽a dokumentu?"; Message[ japanese ] = "%PRODUCTNAME Writer 銇佹枃鏇搞伄濮嬨倎銇俱仹妞滅储銇椼伨銇椼仧銆傛枃鏇告湯銇埢銇ｃ仸妞滅储銈掔稓銇戙伨銇欍亱銆"; Message[ chinese_traditional ] = "%PRODUCTNAME Writer 宸茬稉鎼滃皨鑷虫枃浠剁殑璧峰浣嶇疆銆傝寰炴枃浠剁殑绲愭潫浣嶇疆绻肩簩鎼滃皨锕"; Message[ arabic ] = "耷 %PRODUCTNAME Writer 惹崛退 褪 认琼 轻阌输. 遽 恃硐 闶侨谏 轻韧 阡 溴琼 轻阌输峡"; Message[ greek ] = "燥 %PRODUCTNAME Writer 镫镪朕聩箦 翮 犴徭摁珞 翮 狁鬓 麸 邈泷荟秕. 容脲翦 磲 篚礤鏖篝暹 犴徭摁珞 狃 麸 糨腼 麸 邈泷荟秕;"; - Message[ korean ] = "%PRODUCTNAME Writer臧 氍胳劀鞚 鞁滌瀾攵攵勱箤歆 瓴靸夗枅鞀惦媹雼. 氍胳劀鞚 雭濍秬攵勳棎靹 瓴靸夓潉 瓿勳啀頃橁矤鞀惦媹旯?"; + Message[ korean ] = "%PRODUCTNAME Writer臧 氍胳劀鞚 鞁滌瀾旯岇 瓴靸夗枅鞀惦媹雼. 氍胳劀鞚 雭濎棎靹 瓴靸夓潉 瓿勳啀頃橃嫓瓴犾姷雼堦箤?"; Message[ turkish ] = "%PRODUCTNAME Writer belgenin bana kadar aramay tamamlad. Belgenin sonundan aramaya devam etmek istiyor musunuz?"; Message[ language_user1 ] = " "; Message[ catalan ] = "%PRODUCTNAME Writer ha buscado hasta el principio del documento. 緿esea continuar desde el final?"; @@ -334,10 +334,10 @@ InfoBox MSG_NO_MERGE_ENTRY Message [ italian ] = "Non stato possibile unire alcunch." ; Message [ spanish ] = "No se pudieron fusionar los documentos." ; Message [ french ] = "Impossible de fusionner les documents." ; - Message [ dutch ] = "Er was geen merge van documenten mogelijk." ; + Message [ dutch ] = "Er is geen samenvoeging van documenten mogelijk." ; Message [ portuguese ] = "Foi imposs韛el intercalar os documentos." ; Message[ chinese_simplified ] = "鏃犳硶鍚堝苟鏂囨。銆"; - Message[ russian ] = "吾滂龛螯 黩-腓犷 礤 箐噱蝰."; + Message[ russian ] = "湾忸珈铈眍 钺滂龛螯 漕牦戾眚."; Message[ polish ] = "Nie mo縩a by硂 scali dokument體."; Message[ japanese ] = "銇伀銈傜祼鍚堛仹銇嶃伨銇涖倱銇с仐銇熴"; Message[ chinese_traditional ] = "鐒℃硶鍚堜降鏂囦欢銆"; @@ -358,21 +358,21 @@ InfoBox MSG_ERR_INSERT_GLOS MESSAGE [ italian ] = "Impossibile creare voce di glossario." ; MESSAGE [ portuguese_brazilian ] = "N?o pude inserir Texto Autom?tico." ; MESSAGE [ portuguese ] = "Imposs韛el inserir o AutoTexto." ; - MESSAGE [ finnish ] = "Automaattista teksti? ei voitu luoda." ; + MESSAGE [ finnish ] = "Automaattista teksti ei voitu luoda." ; MESSAGE [ danish ] = "Det var ikke muligt at oprette AutoTekst." ; MESSAGE [ french ] = "Impossible de cr閑r l'AutoTexte." ; MESSAGE [ swedish ] = "AutoText kunde inte skapas." ; - MESSAGE [ dutch ] = "AutoTekst kon niet worden toegepast." ; - MESSAGE [ spanish ] = "No se pudo crear el AutoTexto." ; + MESSAGE [ dutch ] = "AutoTekst kan niet worden toegepast." ; + MESSAGE [ spanish ] = "No se pudo crear el Texto autom醫ico." ; MESSAGE [ english_us ] = "AutoText could not be created." ; MESSAGE[ chinese_simplified ] = "鏃犳硶寤虹珛鑷姩鍥炬枃闆嗐"; - MESSAGE[ russian ] = "杨玟囹 噔蝾蝈犟 礤忸珈铈眍."; + MESSAGE[ russian ] = "湾忸珈铈眍 耦玟囹 噔蝾蝈犟."; MESSAGE[ polish ] = "Autotekst nie m骻 zosta utworzony."; MESSAGE[ japanese ] = "鍏ュ姏鏀彺銇屼綔鎴愩仹銇嶃伨銇涖倱銇с仐銇熴"; MESSAGE[ chinese_traditional ] = "鐒℃硶寤虹珛鑷嫊鍦栨枃闆嗐"; MESSAGE[ arabic ] = ".授醒 胖禽 轻湔 轻梳耷祈"; MESSAGE[ greek ] = "腻 摁犴 漉磲酎 磲 瘃矬翦桢 麸 刘麸叔哽屙."; - MESSAGE[ korean ] = "鞛愲彊 韰嶌姢韸鸽ゼ 毵岆摛 靾 鞐嗢棃鞀惦媹雼."; + MESSAGE[ korean ] = "鞛愲彊 韰嶌姢韸鸽ゼ 毵岆摛歆 氇豁枅鞀惦媹雼."; MESSAGE[ turkish ] = "Otomatik metin yarat齦amad."; MESSAGE[ language_user1 ] = " "; MESSAGE[ catalan ] = "No s'ha pogut crear el text autom鄑ic."; @@ -392,13 +392,13 @@ InfoBox MSG_ERR_SRCSTREAM Message [ dutch ] = "De brontekst kan niet worden geladen." ; Message [ portuguese ] = " imposs韛el carregar o texto-fonte." ; Message[ chinese_simplified ] = "鏃犳硶瑁呭叆婧愭枃鏈"; - Message[ russian ] = "青沭箸赅 桉躅漤钽 蝈犟蜞 礤忸珈铈磬."; + Message[ russian ] = "湾忸珈铈眍 玎沭箸栩 桉躅漤 蝈犟."; Message[ polish ] = "Nie mo縩a by硂 za砤dowa tekstu 焤骴硂wego."; Message[ japanese ] = "銈姐兗銈广儐銈偣銉堛倰瑾伩杈笺伩銇с亶銇俱仜銈撱"; Message[ chinese_traditional ] = "鐒℃硶杓夊叆鍘熷妾斻"; Message[ arabic ] = ".崆 磴咪 释沩 湔 轻阏涎"; Message[ greek ] = "腻 暹磲 漉磲酎 磲 鲲耵暹 麸 贻殪屙 瘃镙脲躞珧."; - Message[ korean ] = "靻岇姢 韰嶌姢韸鸽ゼ 搿滊摐頃 靾 鞐嗢姷雼堧嫟."; + Message[ korean ] = "鞗愲掣鞚 搿滊摐頃 靾 鞐嗢姷雼堧嫟."; Message[ turkish ] = "Kaynak kod y黭lenemiyor."; Message[ language_user1 ] = " "; Message[ catalan ] = "No es pot carregar el text font"; @@ -421,10 +421,10 @@ InfoBox MSG_ERR_NO_FAX Message[ polish ] = "W sekwencji Narz阣zia/Opcje/%1/Drukuj nie ustawiono drukarki faksu."; Message[ turkish ] = "Ara鏻ar/Se鏴nekler/Yazd齬ma alt齨da faks konfig黵asyonu yap齦mad."; Message[ language_user1 ] = " "; - Message[ russian ] = " 彦疴桉/相疣戾蝠/%1/襄鬣螯 羿犟-镳桧蝈 礤 篑蜞眍怆屙."; + Message[ russian ] = " 彦疴桉/相疣戾蝠/%1/脏犟-镳桧蝈 礤 篑蜞眍怆屙."; Message[ greek ] = "腻 蓣彘 锺轶翦 尻趱瘗艮 汩 Fax 篝 溟徜耧燹 篷汜脲哚/硼殡镢蒡/%1/抨酏瘗箸."; Message[ japanese ] = "銉勩兗銉 鈫 銈儣銈枫儳銉 鈫 %1 鈫 鍗板埛銇 Fax 銉椼儶銉炽偪銇岃ō瀹氥仌銈屻仸銇勩伨銇涖倱銆"; - Message[ korean ] = "霃勱惮/鞓奠厴/%1/鞚胳噭頃橃棎靹 韺╈姢 頂勲Π韯瓣皜 靹れ爼霅橃 鞎婌晿鞀惦媹雼."; + Message[ korean ] = "霃勱惮 -> 鞓奠厴 -> %1 -> 鞚胳噭鞐愳劀 韺╈姢 頂勲Π韯瓣皜 靹れ爼霅橃 鞎婌晿鞀惦媹雼."; Message[ chinese_simplified ] = "鍦ㄥ伐鍏/閫夐」/%1/鎵撳嵃鏈哄娌℃湁璁惧畾浼犵湡鎵撳嵃鏈恒"; Message[ chinese_traditional ] = "鍦ㄥ伐鍏/閬搁爡/%1/姗熷嵃琛ㄦ铏曟矑鏈夎ō瀹氬垪鍗板偝鐪熺殑椹呭嫊绋嬪紡銆"; Message[ arabic ] = "犴邮 邃沁 炮锨锨 厍融 萸哂 释 \"孟媲/雾茄鞘/%1/厝勤蒤"."; @@ -438,7 +438,7 @@ String STR_WEBOPTIONS TEXT [ English ] = "HTML document" ; TEXT[ english_us ] = "HTML document"; TEXT[ portuguese ] = "Documento HTML"; - TEXT[ russian ] = "念牦戾眚 HTML"; + TEXT[ russian ] = "洛-耱疣龛鲟"; TEXT[ greek ] = "搞泷狯 HTML"; TEXT[ dutch ] = "HTML-document"; TEXT[ french ] = "Document HTML"; @@ -492,7 +492,7 @@ InfoBox MSG_NOT_FOUND Message [ italian ] = "Termine non trovato" ; Message [ portuguese_brazilian ] = "Padrao de busca n?o encontrado." ; Message [ portuguese ] = "Imposs韛el encontrar express鉶 procurada." ; - Message [ finnish ] = "Hakuavainta ei l?tynyt." ; + Message [ finnish ] = "Etsitt鋠滗 ei l鰕tynyt." ; Message [ danish ] = "S鴊ningen gav intet resultat." ; Message [ french ] = "Terme recherch introuvable !" ; Message [ swedish ] = "S鰇ord hittades inte." ; @@ -506,7 +506,7 @@ InfoBox MSG_NOT_FOUND Message[ chinese_traditional ] = "娌掓湁鎵惧埌鎵瑕佹悳灏嬬殑姊濈洰銆"; Message[ arabic ] = "授醒 轻谒嫜 卺 轻软卿鞘 轻薯 嗜退 阡迩."; Message[ greek ] = "腻 怦蓁珀犴 翎 溴滹燧磲 痫 犴徭玺荇."; - Message[ korean ] = "瓴靸夓毄鞏措ゼ 彀眷 氇豁枅鞀惦媹雼."; + Message[ korean ] = "瓴靸 韨るゼ 彀眷 氇豁枅鞀惦媹雼."; Message[ turkish ] = "Arama terimi bulunamad."; Message[ language_user1 ] = " "; Message[ catalan ] = "No s'ha trobat la clau de cerca."; @@ -520,7 +520,7 @@ InfoBox MSG_INDEX_OVERFLOW Message [ italian ] = "Termine non trovato" ; Message [ portuguese_brazilian ] = "Padrao de busca n?o encontrado." ; Message [ portuguese ] = "localizado." ; - Message [ finnish ] = "l?tynyt." ; + Message [ finnish ] = "l鰕tynyt." ; Message [ danish ] = "fundet." ; Message [ french ] = "trouv(e/s)." ; Message [ swedish ] = "funnet." ; @@ -550,7 +550,7 @@ InfoBox MSG_SCAN_NOSOURCE Message [ italian ] = "Sorgente non specificata." ; Message [ spanish ] = "No se especific la fuente." ; Message [ french ] = "Source non d閒inie." ; - Message [ dutch ] = "Bron niet aangegeven." ; + Message [ dutch ] = "Bron niet gedefinieerd." ; Message [ portuguese_brazilian ] = "Quelle nicht gesetzt." ; Message [ portuguese ] = "Fonte n鉶 especificada." ; Message[ chinese_simplified ] = "娌℃湁鎸囧畾婧愩"; @@ -560,7 +560,7 @@ InfoBox MSG_SCAN_NOSOURCE Message[ chinese_traditional ] = "娌掓湁瀹氱京渚嗘簮銆"; Message[ arabic ] = ".徙 硎 释享 轻阏涎"; Message[ greek ] = "腻 锺唧翮赍 瘃镙脲躞."; - Message[ korean ] = "靻岇姢臧 靹れ爼霅橃 鞎婌晿鞀惦媹雼."; + Message[ korean ] = "鞗愲掣鞚 歆鞝曤悩歆 鞎婌晿鞀惦媹雼."; Message[ turkish ] = "Kaynak belirlenmedi."; Message[ language_user1 ] = " "; Message[ catalan ] = "No s'ha indicat la font."; @@ -575,12 +575,12 @@ String STR_NOGLOS1 TEXT [ italian ] = "Testo automatico per la sigla '" ; TEXT [ portuguese_brazilian ] = "Texto Autom?tico para Abrevia??o" ; TEXT [ portuguese ] = "AutoTexto para abreviatura '" ; - TEXT [ finnish ] = "Automaattinen teksti pikavalinnalle '" ; + TEXT [ finnish ] = "Automaattista teksti pikavalinnalle" ; TEXT [ danish ] = "AutoTekst til genvej '" ; TEXT [ french ] = "AutoTexte pour raccourci ' " ; TEXT [ swedish ] = "AutoText f鰎 genv鋑 '" ; TEXT [ dutch ] = "AutoTekst voor afkortingen '" ; - TEXT [ spanish ] = "AutoTexto para la abreviatura '" ; + TEXT [ spanish ] = "Texto autom醫ico para la abreviatura '" ; TEXT [ english_us ] = "AutoText for Shortcut '" ; TEXT[ chinese_simplified ] = "鑷姩鍥炬枃闆嗙缉鍐 '"; TEXT[ russian ] = "棱蝾蝈犟 耦牮帙屙棹 '"; @@ -589,7 +589,7 @@ String STR_NOGLOS1 TEXT[ chinese_traditional ] = "鑷嫊鍦栨枃闆嗙府瀵<"; TEXT[ arabic ] = "湔 轻梳耷祈 後俏收茄 '"; TEXT[ greek ] = "刘麸叔哽屙 汩 翎 狁鏖贶 '"; - TEXT[ korean ] = "鞛愲彊 韰嶌姢韸 氚旊臧旮 '"; + TEXT[ korean ] = "鞛愲彊 韰嶌姢韸 氚旊 臧旮 '"; TEXT[ turkish ] = "Otomatik metin k齭altmas '"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "El text autom鄑ic per a la drecera '"; @@ -607,7 +607,7 @@ String STR_NOGLOS2 TEXT [ italian ] = "' non trovato." ; TEXT [ portuguese_brazilian ] = "' n?o encontrado." ; TEXT [ portuguese ] = "' n鉶 encontrado." ; - TEXT [ finnish ] = "Kohdetta ' ei l?dy." ; + TEXT [ finnish ] = "ei l鰕dy." ; TEXT [ danish ] = "'blev ikke fundet." ; TEXT [ french ] = "' est introuvable." ; TEXT [ swedish ] = "' hittades inte." ; @@ -615,13 +615,13 @@ String STR_NOGLOS2 TEXT [ spanish ] = "' no se encontr." ; TEXT [ english_us ] = "' not found." ; TEXT[ chinese_simplified ] = "' 娌℃湁琚壘鍒般"; - TEXT[ russian ] = "' 礤磬殇屙."; + TEXT[ russian ] = " 礤 磬殇屙."; TEXT[ polish ] = "' nie znaleziono."; TEXT[ japanese ] = "銆嶃伅瑕嬨仱銇嬨倞銇俱仜銈撱仹銇椼仧銆"; TEXT[ chinese_traditional ] = ">娌掓湁鎵惧埌銆"; TEXT[ arabic ] = "徙 眭谒 卺礤 '"; TEXT[ greek ] = "' 溴 怦蓁珀."; - TEXT[ korean ] = "' 彀眷 氇豁枅鞚."; + TEXT[ korean ] = "' 彀眷 氇豁枅鞀惦媹雼."; TEXT[ turkish ] = "' bulunamad."; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "' no s'ha trobat."; @@ -631,7 +631,7 @@ String STR_NUM_LEVEL { TEXT = "Ebene " ; TEXT [ English ] = "Level " ; - Text [ dutch ] = "Niveau " ; + Text [ dutch ] = "Niveau" ; Text [ english_us ] = "Level " ; Text [ italian ] = "Livello " ; Text [ spanish ] = "Nivel " ; @@ -662,21 +662,21 @@ String STR_ERROR_NOLANG TEXT [ italian ] = "Nell'area verificata non stata impostata nessuna lingua." ; TEXT [ portuguese_brazilian ] = "No language choosed in checked region." ; TEXT [ portuguese ] = "Na sec玢o verificada n鉶 existe nenhuma l韓gua definida." ; - TEXT [ finnish ] = "Tarkistettavassa alueessa ei ole valittu kielt?." ; + TEXT [ finnish ] = "Tarkistettavassa osassa ei ole valittu kielt." ; TEXT [ danish ] = "Der er ikke angivet et sprog i det kontrollerede omr錮e." ; TEXT [ french ] = "Aucune langue choisie pour r間ion d閒inie." ; TEXT [ swedish ] = "Inget spr錵 鋜 inst鋖lt i det kontrollerade omr錮et." ; - TEXT [ dutch ] = "In gecontroleerd bereik geen taal vastgelegd." ; - TEXT [ spanish ] = "No se ha seleccionado ning鷑 idioma en el 醨ea revisada." ; + TEXT [ dutch ] = "In gecontroleerd bereik is geen taal vastgelegd." ; + TEXT [ spanish ] = "No se ha seleccionado ning鷑 idioma para la secci髇 controlada." ; TEXT [ english_us ] = "No language is selected in the proofed section." ; TEXT[ chinese_simplified ] = "鍦ㄦ鏌ョ殑鍖哄煙鍐呮病鏈夐変腑浠讳綍璇█銆"; - TEXT[ russian ] = " 镳钼屦屙眍 皴牿梃 琨 礤 篑蜞眍怆屙."; + TEXT[ russian ] = " 镳钼屦屙眍 疣玟咫 琨 礤 篑蜞眍怆屙."; TEXT[ polish ] = "W sprawdzanym obszarze nie ustawiono j陑yka."; TEXT[ japanese ] = "銉併偋銉冦偗銇椼仧绡勫洸銇伅瑷瑾炪亴瑷畾銇曘倢銇︺亜銇俱仜銈撱"; TEXT[ chinese_traditional ] = "鍦ㄥ凡缍撴鏌ョ殑鍗鍩熷収娌掓湁瑷畾浠讳綍涓鍊嬭獮瑷銆"; TEXT[ arabic ] = ".徙 硎 释享 庙 巅 蓓 轻湄寝 轻阆揶 蓓"; TEXT[ greek ] = "腻 锺唧翮赍 汶筢 汩 翮 咫邈鼽戾礴 疱耖秣."; - TEXT[ korean ] = "瓴靸夒悳 鞓侅棴鞐愲姅 靹れ爼霅 鞏胳柎臧 鞐嗢姷雼堧嫟."; + TEXT[ korean ] = "瓴靸夒悳 甑棴鞐愲姅 靹れ爼霅 鞏胳柎臧 鞐嗢姷雼堧嫟."; TEXT[ turkish ] = "Denetlenen b鰈黰de dil se鏸lmedi."; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "No s'ha seleccionat cap idioma en l'鄏ea revisada."; @@ -690,7 +690,7 @@ String STR_EDIT_FOOTNOTE TEXT [ italian ] = "Modifica nota a pi pagina" ; TEXT [ portuguese_brazilian ] = "Editar nota de rodap?" ; TEXT [ portuguese ] = "Editar nota de rodap" ; - TEXT [ finnish ] = "Muokkaa alaviitett?" ; + TEXT [ finnish ] = "Muokkaa alaviitett" ; TEXT [ danish ] = "Rediger fodnote" ; TEXT [ french ] = "蒬ition de note de bas de page" ; TEXT [ swedish ] = "Redigera fotnot" ; @@ -718,21 +718,21 @@ String STR_NB_REPLACED Text [ italian ] = "Testo sostituito XX volte" ; Text [ portuguese_brazilian ] = "Padrao de busca substitu?do XX vezes." ; Text [ portuguese ] = "Express鉶 procurada substitu韉a XX vezes." ; - Text [ finnish ] = "Hakuavain korvattu XX kertaa." ; + Text [ finnish ] = "Etsitt鋠 korvattu XX kertaa." ; Text [ danish ] = "S鴊eord erstattet XX gange." ; Text [ french ] = "Le terme recherch a 閠 remplac XX fois." ; Text [ swedish ] = "S鰇ord ersatt XX g錸ger." ; - Text [ dutch ] = "Het gezochte item is XX keer vervangen." ; + Text [ dutch ] = "Zoekbegrip XX keer vervangen." ; Text [ spanish ] = "La expresi髇 buscada ha sido reemplazada XX veces." ; Text [ english_us ] = "Search key replaced XX times." ; Text[ chinese_simplified ] = "鎼滃鏉＄洰琚 XX 娆℃浛鎹€"; - Text[ russian ] = "锐觐祛 耠钼 玎戾礤眍 XX疣."; + Text[ russian ] = "锐觐祛 耠钼 玎戾礤眍 XX 疣."; Text[ polish ] = "Szukane has硂 zosta硂 XX razy zast筽ione."; Text[ japanese ] = "XX 鍊嬨伄妞滅储銈兗銇岀疆鎻涖仌銈屻伨銇椼仧銆"; Text[ chinese_traditional ] = "鎼滃皨闋呯洰琚 XX 娆′唬鏇裤"; Text[ arabic ] = "抒 怯嗜锨 软卿鞘 轻韧 鬃 阊."; Text[ greek ] = "歧麸屙 篝镩麇唢 犴糸赆翎篝荑珀 XX 鲲褫."; - Text[ korean ] = "瓴靸 鞖╈柎臧 XX氩 雽觳措惃."; + Text[ korean ] = "瓴靸 韨り皜 XX氩 氚旊岇棃鞀惦媹雼."; Text[ turkish ] = "Arama terimi XX kez de餴⺶irildi."; Text[ language_user1 ] = " "; Text[ catalan ] = "La clau de cerca ha estat reempla鏰da XX vegades."; @@ -773,11 +773,11 @@ String STR_SRCVIEW_ROW Text [ italian ] = "Riga " ; Text [ portuguese_brazilian ] = "Fileira " ; Text [ portuguese ] = "Linha " ; - Text [ finnish ] = "Rivi" ; + Text [ finnish ] = "Rivi " ; Text [ danish ] = "R鎘ke " ; Text [ french ] = "Ligne " ; Text [ swedish ] = "Rad " ; - Text [ dutch ] = "Rij " ; + Text [ dutch ] = "Rij" ; Text [ spanish ] = "Fila " ; Text [ english_us ] = "Row " ; Text[ chinese_simplified ] = "琛 "; @@ -801,15 +801,15 @@ String STR_SRCVIEW_COL Text [ italian ] = "Colonna " ; Text [ portuguese_brazilian ] = "Coluna " ; Text [ portuguese ] = "Coluna " ; - Text [ finnish ] = "Sarake" ; + Text [ finnish ] = "Palsta " ; Text [ danish ] = "Kolonne " ; Text [ french ] = "Colonne " ; Text [ swedish ] = "Kolumn " ; - Text [ dutch ] = "Kolom " ; + Text [ dutch ] = "Kolom" ; Text [ spanish ] = "Columna " ; Text [ english_us ] = "Column " ; Text[ chinese_simplified ] = "鍒 "; - Text[ russian ] = "暑腩黻 "; + Text[ russian ] = "羊铍徨"; Text[ polish ] = "Kolumna "; Text[ japanese ] = "鍒 "; Text[ chinese_traditional ] = "娆 "; @@ -831,7 +831,7 @@ String STR_PRINT_TITLE Text[ danish ] = "Udskriv det markerede"; Text[ french ] = "Imprimer la s閘ection"; Text[ swedish ] = "Skriv ut det markerade"; - Text[ dutch ] = "Afdrukken van de selectie"; + Text[ dutch ] = "Selectie afdrukken"; Text[ spanish ] = "Imprimir la selecci髇"; Text[ english_us ] = "Printing selection"; Text[ chinese_simplified ] = "鎵撳嵃閫変腑鐨勯儴鍒"; @@ -841,7 +841,7 @@ String STR_PRINT_TITLE Text[ chinese_traditional ] = "鍒楀嵃閬稿彇閮ㄤ唤"; Text[ arabic ] = "厝勤 轻释享"; Text[ greek ] = "抨酏瘗箸 屦殡镢掾"; - Text[ korean ] = "靹犿儩 鞚胳噭"; + Text[ korean ] = "靹犿儩頃 氩旍渼 鞚胳噭"; Text[ turkish ] = "Se鏸mi yazd齬"; Text[ language_user1 ] = " "; Text[ catalan ] = "Impressi de la selecci"; @@ -862,13 +862,13 @@ String STR_PRINT_MSG Text[ spanish ] = "緿esea imprimir solo la selecci髇 o todo el documento?"; Text[ english_us ] = "Do you want to print the selection or the entire document?"; Text[ chinese_simplified ] = "瑕佹墦鍗伴変腑鐨勯儴鍒嗚繕鏄鎵撳嵃鏁翠釜鏂囨。锛"; - Text[ russian ] = "蔓 躅蜩蝈 磬镥鬣蜞螯 忮顸 漕牦戾眚 桦 蝾朦觐 恹溴脲龛?"; + Text[ russian ] = "袜镥鬣蜞螯 忮顸 漕牦戾眚 桦 蝾朦觐 恹溴脲眄铄?"; Text[ polish ] = "Czy chcesz wydrukowa selekcj czy te ca硑 dokument?"; Text[ japanese ] = "閬告姙绡勫洸銇嬫枃鏇稿叏浣撱伄銇┿仭銈夈倰鍗板埛銇椼伨銇欍亱锛"; Text[ chinese_traditional ] = "鎮ㄨ鍒楀嵃閬稿彇鐨勯儴浠介倓鏄鍒楀嵃鏁村嬫枃浠讹箹"; Text[ arabic ] = "遽 恃硐 厝勤 轻释享 勉 轻阌输 让咩徨"; Text[ greek ] = "容脲翦 磲 尻趱瘙箦翦 翮 屦殡邈燧礴 疱耖秣 镫腌耧 麸 葶泷狯;"; - Text[ korean ] = "靹犿儩霅 氍胳劀雮 鞝勳泊 氍胳劀毳 鞚胳噭頃橁矤鞀惦媹旯?"; + Text[ korean ] = "靹犿儩 氩旍渼毵 鞚胳噭頃橃嫓瓴犾姷雼堦箤, 鞎勲媹氅 鞝勳泊 氍胳劀毳 鞚胳噭頃橃嫓瓴犾姷雼堦箤?"; Text[ turkish ] = "Se鏸mi ya da t黰 belgeyi yazd齬mak istiyor musunuz?"; Text[ language_user1 ] = " "; Text[ catalan ] = "Voleu imprimir la selecci o b tot el document?"; @@ -936,7 +936,7 @@ String STR_READONLY_SEL TEXT[ english_us ] = "read-only"; TEXT[ portuguese ] = "s leitura"; TEXT[ russian ] = "蝾朦觐 潆 黩屙"; - TEXT[ dutch ] = "schrijfbeveiligd"; + TEXT[ dutch ] = "Alleen-lezen"; TEXT[ french ] = "en lecture seule"; TEXT[ spanish ] = "s髄o lectura"; TEXT[ italian ] = "a sola lettura"; @@ -976,11 +976,11 @@ String STR_SAVEAS_SRC Text[ chinese_traditional ] = "鍖嚭鍘熷妾(~E)..."; Text[ arabic ] = "收享 湔 轻阏涎..."; Text[ greek ] = "蓬徙 赍殪蓓秕 瘃镙脲躞珧..."; - Text[ korean ] = "靻岇姢韰嶌姢韸 雮措炒雮搓赴(~E)..."; + Text[ korean ] = "鞗愲掣 雮措炒雮搓赴(~E)..."; Text[ turkish ] = "Kaynak kodu da aktar..."; Text[ language_user1 ] = " "; Text[ catalan ] = "~Exporta la font..."; - Text[ finnish ] = "~Vie l鋒de"; + Text[ finnish ] = "~Vie l鋒de..."; Text[ thai ] = "~喔箞喔囙腑喔竵喔椸傅喙堗浮喔..."; }; String MN_SRCVIEW_POPUPMENU @@ -995,7 +995,7 @@ String MN_SRCVIEW_POPUPMENU Text [ italian ] = "Testo sorgente HTML" ; Text [ spanish ] = "Texto fuente HTML" ; Text [ french ] = "Texte source HTML" ; - Text [ dutch ] = "HTML - brontekst" ; + Text [ dutch ] = "HTML-brontekst" ; Text[ chinese_simplified ] = "HTML 婧愭枃鏈"; Text[ russian ] = "锐躅漤 蝈犟 纛痨囹 HTML"; Text[ polish ] = "Tekst 焤骴硂wy HTML"; @@ -1003,7 +1003,7 @@ String MN_SRCVIEW_POPUPMENU Text[ chinese_traditional ] = "HTML 鍘熷妾"; Text[ arabic ] = "湔 阏涎 HTML"; Text[ greek ] = "榴麇唢 瘃镙脲躞珧 HTML"; - Text[ korean ] = "HTML 靻岇姢韰嶌姢韸"; + Text[ korean ] = "HTML 鞗愲掣"; Text[ turkish ] = "HTML kaynak kodu"; Text[ language_user1 ] = " "; Text[ catalan ] = "Font HTML"; @@ -1203,7 +1203,7 @@ Menu MN_SRCVIEW_POPUPMENU Text[ chinese_traditional ] = "HTML 鍘熷妾"; Text[ arabic ] = "湔 阏涎 HTML"; Text[ greek ] = "叔哽屙 瘃镙脲躞珧 HTML"; - Text[ korean ] = "HTML 靻岇姢韰嶌姢韸"; + Text[ korean ] = "HTML 鞗愲掣"; Text[ turkish ] = "HTML kaynak kodu"; Text[ language_user1 ] = " "; Text[ catalan ] = "Font HTML"; @@ -1215,3 +1215,18 @@ Menu MN_SRCVIEW_POPUPMENU + + + + + + + + + + + + + + + diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx index 0121c5aa3f1a..de94e65f0a8a 100644 --- a/sw/source/ui/uiview/view0.cxx +++ b/sw/source/ui/uiview/view0.cxx @@ -2,9 +2,9 @@ * * $RCSfile: view0.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: os $ $Date: 2002-08-28 12:23:22 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -157,7 +157,7 @@ SFX_IMPL_INTERFACE( SwView, SfxViewShell, SW_RES(RID_TOOLS_TOOLBOX) ) SFX_CHILDWINDOW_REGISTRATION(FN_REDLINE_ACCEPT); SFX_CHILDWINDOW_REGISTRATION(SID_HYPERLINK_DIALOG); SFX_CHILDWINDOW_REGISTRATION(GalleryChildWindow::GetChildWindowId()); - + SFX_CHILDWINDOW_REGISTRATION(FN_INSERT_FIELD_DATA_ONLY); SFX_FEATURED_CHILDWINDOW_REGISTRATION(FN_SYNC_LABELS, 1); SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_TOOLS| diff --git a/sw/source/ui/uiview/view1.cxx b/sw/source/ui/uiview/view1.cxx index c51a715cbf1c..b281817dc7fd 100644 --- a/sw/source/ui/uiview/view1.cxx +++ b/sw/source/ui/uiview/view1.cxx @@ -2,9 +2,9 @@ * * $RCSfile: view1.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: os $ $Date: 2002-03-15 07:32:50 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -149,18 +149,6 @@ void SwView::Activate(BOOL bMDIActivate) if( sSwViewData.Len() ) { ReadUserData( sSwViewData, FALSE ); - if( sNewCrsrPos.Len() ) - { - long nX = sNewCrsrPos.GetToken( 0, ';' ).ToInt32(), - nY = sNewCrsrPos.GetToken( 1, ';' ).ToInt32(); - pWrtShell->SwCrsrShell::SetCrsr( Point( nX, nY ), FALSE ); - sNewCrsrPos.Erase(); - } - else if(USHRT_MAX != nNewPage) - { - pWrtShell->GotoPage(nNewPage); - nNewPage = USHRT_MAX; - } sSwViewData.Erase(); } diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index 38dd92366721..4f8a3ae17e25 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: view2.cxx,v $ * - * $Revision: 1.37 $ + * $Revision: 1.38 $ * - * last change: $Author: os $ $Date: 2002-12-12 16:37:20 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -91,6 +91,9 @@ #ifndef _SFX_PASSWD_HXX #include <sfx2/passwd.hxx> #endif +#ifndef _SFX_HELP_HXX +#include <sfx2/sfxhelp.hxx> +#endif #ifndef _SVX_LANGITEM_HXX //autogen #include <svx/langitem.hxx> #endif @@ -285,16 +288,41 @@ #ifndef _VIEW_HRC #include <view.hrc> #endif +#ifndef _APP_HRC +#include <app.hrc> +#endif #ifndef _FMTCLDS_HXX //autogen #include <fmtclds.hxx> #endif #include <helpid.h> +#ifndef _SVTOOLS_TEMPLDLG_HXX +#include <svtools/templdlg.hxx> +#endif +#ifndef _DBCONFIG_HXX +#include <dbconfig.hxx> +#endif +#ifndef _DBMGR_HXX +#include <dbmgr.hxx> +#endif +#ifndef _MAILMRGE_HXX +#include "mailmrge.hxx" +#endif +#ifndef _COMPHELPER_PROCESSFACTORY_HXX_ +#include <comphelper/processfactory.hxx> +#endif +#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ +#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#endif +#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ +#include <com/sun/star/container/XNameAccess.hpp> +#endif //Damit die Seitenanzeige in der Statusleiste nicht unnoetig erfolgt. static String sLstPg; static USHORT nPageCnt = 0; const char __FAR_DATA sStatusDelim[] = " : "; +using namespace ::rtl; using namespace com::sun::star; using namespace com::sun::star::i18n; using namespace com::sun::star::util; @@ -302,6 +330,9 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::scanner; using namespace ::com::sun::star::i18n; +using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::container; +#define C2U(char) rtl::OUString::createFromAscii(char) /*--------------------------------------------------------------------------- Beschreibung: String fuer die Seitenanzeige in der Statusbar basteln. @@ -753,6 +784,63 @@ void __EXPORT SwView::Execute(SfxRequest &rReq) } } break; + case FN_INSERT_FIELD_DATA_ONLY : + { + BOOL bShow = FALSE; + if( pArgs && + SFX_ITEM_SET == pArgs->GetItemState(nSlot, FALSE, &pItem )) + bShow = ((const SfxBoolItem*)pItem)->GetValue(); + //GetViewFrame()->ShowChildWindow(nSlot, bShow && bInMailMerge); + if((bShow && bInMailMerge) != GetViewFrame()->HasChildWindow(nSlot)) + GetViewFrame()->ToggleChildWindow(nSlot); + //if fields have been succesfully inserted call the "real" + //mail merge dialog + SwWrtShell &rSh = GetWrtShell(); + if(bInMailMerge && rSh.IsAnyDatabaseFieldInDoc()) + { + SwNewDBMgr* pNewDBMgr = rSh.GetNewDBMgr(); + if (pNewDBMgr) + { + SwDBData aData; + aData = rSh.GetDBData(); + rSh.EnterStdMode(); // Wechsel in Textshell erzwingen; ist fuer + // das Mischen von DB-Feldern notwendig. + AttrChangedNotify( &rSh ); + pNewDBMgr->SetMergeType( DBMGR_MERGE ); + + Sequence<PropertyValue> aProperties(3); + PropertyValue* pValues = aProperties.getArray(); + pValues[0].Name = C2U("DataSourceName"); + pValues[1].Name = C2U("Command"); + pValues[2].Name = C2U("CommandType"); + pValues[0].Value <<= aData.sDataSource; + pValues[1].Value <<= aData.sCommand; + pValues[2].Value <<= aData.nCommandType; + pNewDBMgr->ExecuteFormLetter(rSh, aProperties, TRUE); + } + } + bInMailMerge &= bShow; + GetViewFrame()->GetBindings().Invalidate(FN_INSERT_FIELD); + } + break; + case FN_QRY_MERGE: + { + BOOL bUseCurrentDocument = TRUE; + BOOL bQuery = !pArgs||SFX_ITEM_SET != pArgs->GetItemState(nSlot); + if(bQuery) + { + SfxViewFrame* pFrame = GetViewFrame(); + SfxHelp::OpenHelpAgent( pFrame->GetFrame(), HID_MAIL_MERGE_SELECT ); + SwMailMergeCreateFromDlg* pDlg = new SwMailMergeCreateFromDlg( + &pFrame->GetWindow()); + if(RET_OK == pDlg->Execute()) + bUseCurrentDocument = pDlg->IsThisDocument(); + else + break; + } + GenerateFormLetter(bUseCurrentDocument); + } + break; default: ASSERT(!this, falscher Dispatcher); return; @@ -930,10 +1018,15 @@ void SwView::StateStatusLine(SfxItemSet &rSet) rShell.GetAttr(aSet); const SfxPoolItem* pItem; if(SFX_ITEM_AVAILABLE <= - aSet.GetItemState(RES_PARATR_NUMRULE, TRUE, &pItem)) + aSet.GetItemState(RES_PARATR_NUMRULE, TRUE + /*, &pItem */ )) { const String& rNumStyle = - ((const SfxStringItem*)pItem)->GetValue(); + ((const SfxStringItem &) + aSet.Get(RES_PARATR_NUMRULE)).GetValue(); + /* #i5116# GetItemState does not necessarily + change pItem */ + // ((const SfxStringItem*)pItem)->GetValue(); if(rNumStyle.Len()) { sStr.AppendAscii(sStatusDelim); @@ -1485,4 +1578,149 @@ extern int lcl_FindDocShell( SfxObjectShellRef& xDocSh, delete pMed; return nFound; } +/* -----------------05.02.2003 12:06----------------- + * + * --------------------------------------------------*/ +void SwView::EnableMailMerge(BOOL bEnable ) +{ + bInMailMerge = bEnable; + SfxBindings& rBind = GetViewFrame()->GetBindings(); + rBind.Invalidate(FN_INSERT_FIELD_DATA_ONLY); + rBind.Update(FN_INSERT_FIELD_DATA_ONLY); +} +/* -----------------05.02.2003 16:33----------------- + * + * --------------------------------------------------*/ +/* -----------------27.11.2002 12:12----------------- + * + * --------------------------------------------------*/ +void SwView::GenerateFormLetter(BOOL bUseCurrentDocument) +{ + if(bUseCurrentDocument) + { + if(!GetWrtShell().IsAnyDatabaseFieldInDoc()) + { + //check availability of data sources (except biblio source) + Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); + Reference<XNameAccess> xDBContext; + if( xMgr.is() ) + { + Reference<XInterface> xInstance = xMgr->createInstance( + OUString::createFromAscii( "com.sun.star.sdb.DatabaseContext" )); + xDBContext = Reference<XNameAccess>(xInstance, UNO_QUERY) ; + } + if(!xDBContext.is()) + return ; + Sequence < OUString > aNames = xDBContext->getElementNames(); + BOOL bCallAddressPilot = FALSE; + if(!aNames.getLength() || + (1 == aNames.getLength() && + aNames.getConstArray()[0] == SW_MOD()->GetDBConfig()->GetBibliographySource().sDataSource)) + { + // no data sources are available - create a new one + WarningBox aWarning( + &GetViewFrame()->GetWindow(), + SW_RES(MSG_DATA_SOURCES_UNAVAILABLE)); + // no cancel allowed + aWarning.Execute(); + bCallAddressPilot = TRUE; + } + else + { + //take an existing data source or create a new one? + SwMailMergeFieldConnectionsDlg* pConnectionsDlg = new SwMailMergeFieldConnectionsDlg( + &GetViewFrame()->GetWindow()); + if(RET_OK == pConnectionsDlg->Execute()) + bCallAddressPilot = !pConnectionsDlg->IsUseExistingConnections(); + else + return; + + } + if(bCallAddressPilot) + { + GetViewFrame()->GetDispatcher()->Execute( + SID_ADDRESS_DATA_SOURCE, SFX_CALLMODE_SYNCHRON); + } + + //call insert fields with database field page available, only + SfxViewFrame* pVFrame = GetViewFrame(); + //at first hide the default field dialog if currently visible + pVFrame->SetChildWindow(FN_INSERT_FIELD, FALSE); + //enable the status of the db field dialog - it is disabled in the status method + //to prevent creation of the dialog without mail merge active + EnableMailMerge(); + //then show the "Data base only" field dialog + SfxBoolItem aOn(FN_INSERT_FIELD_DATA_ONLY, TRUE); + pVFrame->GetDispatcher()->Execute(FN_INSERT_FIELD_DATA_ONLY, + SFX_CALLMODE_SYNCHRON, &aOn, 0); + return; + } + else + { + // check whether the + String sSource; + if(!GetWrtShell().IsFieldDataSourceAvailable(sSource)) + { + WarningBox aWarning( &GetViewFrame()->GetWindow(), + SW_RES(MSG_MERGE_SOURCE_UNAVAILABLE)); + String sTmp(aWarning.GetMessText()); + sTmp.SearchAndReplaceAscii("%1", sSource); + aWarning.SetMessText(sTmp); + aWarning.Execute(); + return ; + } + } + SwNewDBMgr* pNewDBMgr = GetWrtShell().GetNewDBMgr(); + + SwDBData aData; + SwWrtShell &rSh = GetWrtShell(); + aData = rSh.GetDBData(); + rSh.EnterStdMode(); // Wechsel in Textshell erzwingen; ist fuer + // das Mischen von DB-Feldern notwendig. + AttrChangedNotify( &rSh ); + pNewDBMgr->SetMergeType( DBMGR_MERGE ); + + if (pNewDBMgr) + { + Sequence<PropertyValue> aProperties(3); + PropertyValue* pValues = aProperties.getArray(); + pValues[0].Name = C2U("DataSourceName"); + pValues[1].Name = C2U("Command"); + pValues[2].Name = C2U("CommandType"); + pValues[0].Value <<= aData.sDataSource; + pValues[1].Value <<= aData.sCommand; + pValues[2].Value <<= aData.nCommandType; + pNewDBMgr->ExecuteFormLetter(GetWrtShell(), aProperties, TRUE); + } + } + else + { + //call documents and template dialog + SfxApplication* pSfxApp = SFX_APP(); + Window* pTopWin = pSfxApp->GetTopWindow(); + SvtDocumentTemplateDialog* pDocTemplDlg = new SvtDocumentTemplateDialog( pTopWin ); + pDocTemplDlg->SelectTemplateFolder(); + + int nRet = pDocTemplDlg->Execute(); + sal_Bool bNewWin = sal_False; + if ( nRet == RET_OK ) + { + if ( pTopWin != pSfxApp->GetTopWindow() ) + { + // the dialogue opens a document -> a new TopWindow appears + pTopWin = pSfxApp->GetTopWindow(); + bNewWin = sal_True; + } + } + + delete pDocTemplDlg; + if ( bNewWin ) + // after the destruction of the dialogue its parent comes to top, + // but we want that the new document is on top + pTopWin->ToTop(); + +// return; + } +} + diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx index 1a58d557ffdc..d77437df94ef 100644 --- a/sw/source/ui/uiview/viewport.cxx +++ b/sw/source/ui/uiview/viewport.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewport.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: os $ $Date: 2002-12-11 09:33:08 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1100,41 +1100,54 @@ void SwView::ShowAtResize() void SwView::InnerResizePixel( const Point &rOfst, const Size &rSize ) { bInInnerResizePixel = TRUE; - SvBorder aBorder; - CalcAndSetBorderPixel( aBorder, TRUE ); - Size aSz( rSize ); - aSz.Height() += aBorder.Top() + aBorder.Bottom(); - aSz.Width() += aBorder.Left() + aBorder.Right(); - Size aEditSz( GetEditWin().GetOutputSizePixel() ); - const BOOL bBrowse = pWrtShell->IsBrowseMode(); - ViewResizePixel( GetEditWin(), rOfst, aSz, aEditSz, TRUE, *pVScrollbar, + const BOOL bHScrollVisible = pHScrollbar->IsVisible(TRUE); + const BOOL bVScrollVisible = pVScrollbar->IsVisible(TRUE); + BOOL bRepeat = FALSE; + do + { + SvBorder aBorder; + CalcAndSetBorderPixel( aBorder, TRUE ); + Size aSz( rSize ); + aSz.Height() += aBorder.Top() + aBorder.Bottom(); + aSz.Width() += aBorder.Left() + aBorder.Right(); + Size aEditSz( GetEditWin().GetOutputSizePixel() ); + const BOOL bBrowse = pWrtShell->IsBrowseMode(); + ViewResizePixel( GetEditWin(), rOfst, aSz, aEditSz, TRUE, *pVScrollbar, *pHScrollbar, pPageUpBtn, pPageDownBtn, pNaviBtn, *pScrollFill, pVRuler, pHRuler, 0 != PTR_CAST(SwWebView, this), pWrtShell->GetViewOptions()->IsVRulerRight()); - if ( bShowAtResize ) - ShowAtResize(); + if ( bShowAtResize ) + ShowAtResize(); - if( pHRuler->IsVisible() || pVRuler->IsVisible() ) - { - const Fraction& rFrac = GetEditWin().GetMapMode().GetScaleX(); - USHORT nZoom = USHORT(rFrac.GetNumerator() * 100L / rFrac.GetDenominator()); + if( pHRuler->IsVisible() || pVRuler->IsVisible() ) + { + const Fraction& rFrac = GetEditWin().GetMapMode().GetScaleX(); + USHORT nZoom = USHORT(rFrac.GetNumerator() * 100L / rFrac.GetDenominator()); - const Fraction aFrac( nZoom, 100 ); - pVRuler->SetZoom( aFrac ); - pHRuler->SetZoom( aFrac ); - InvalidateRulerPos(); //Inhalt invalidieren. - } - //CursorStack zuruecksetzen, da die Cursorpositionen fuer PageUp/-Down - //nicht mehr zum aktuell sichtbaren Bereich passen - pWrtShell->ResetCursorStack(); + const Fraction aFrac( nZoom, 100 ); + pVRuler->SetZoom( aFrac ); + pHRuler->SetZoom( aFrac ); + InvalidateRulerPos(); //Inhalt invalidieren. + } + //CursorStack zuruecksetzen, da die Cursorpositionen fuer PageUp/-Down + //nicht mehr zum aktuell sichtbaren Bereich passen + pWrtShell->ResetCursorStack(); - //EditWin niemals einstellen! + //EditWin niemals einstellen! - //VisArea einstellen, aber dort nicht das SetVisArea der DocShell rufen! - bProtectDocShellVisArea = TRUE; - CalcVisArea( aEditSz ); + //VisArea einstellen, aber dort nicht das SetVisArea der DocShell rufen! + bProtectDocShellVisArea = TRUE; + CalcVisArea( aEditSz ); + //visibility changes of the automatic horizontal scrollbar + //require to repeat the ViewResizePixel() call - but only once! + if(bRepeat) + bRepeat = FALSE; + else if(bHScrollVisible != pHScrollbar->IsVisible(TRUE) || + bVScrollVisible != pVScrollbar->IsVisible(TRUE)) + bRepeat = TRUE; + }while( bRepeat ); bProtectDocShellVisArea = FALSE; bInInnerResizePixel = FALSE; } @@ -1220,8 +1233,12 @@ void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize ) //nicht mehr zum aktuell sichtbaren Bereich passen pWrtShell->ResetCursorStack(); - ASSERT( ( aEditSz.Width() > 0 && aEditSz.Height() > 0 ) - || !aVisArea.IsEmpty(), "Small world, isn't it?" ); +#ifdef DEBUG + SwEditWin &rW = GetEditWin(); +#endif + ASSERT( !GetEditWin().IsVisible() || + (( aEditSz.Width() > 0 && aEditSz.Height() > 0 ) + || !aVisArea.IsEmpty()), "Small world, isn't it?" ); //EditWin niemals einstellen! diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx index eb5a90fdc318..45f86945e09d 100644 --- a/sw/source/ui/uiview/viewprt.cxx +++ b/sw/source/ui/uiview/viewprt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewprt.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: os $ $Date: 2002-11-29 12:14:12 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -318,6 +318,9 @@ ErrCode SwView::DoPrint( SfxPrinter *pPrinter, PrintDialog *pDlg, } else { + const BOOL bLockedView = pSh->IsViewLocked(); + pSh->LockView( TRUE ); + //BrowseView abschalten und die View gegen alle Paints locken. FASTBOOL bBrowse = pSh->IsBrowseMode(); SfxAllItemSet aSet( SFX_APP()->GetPool() ); @@ -327,7 +330,6 @@ ErrCode SwView::DoPrint( SfxPrinter *pPrinter, PrintDialog *pDlg, if ( pSh->GetWin() ) pSh->GetWin()->Update(); pSh->LockPaint(); - pSh->LockView( TRUE ); aSet.Put( aBrowse, aBrowse.Which() ); SfxRequest aReq( SID_BROWSER_MODE, 0, aSet ); GetDocShell()->Execute( aReq ); @@ -372,9 +374,10 @@ ErrCode SwView::DoPrint( SfxPrinter *pPrinter, PrintDialog *pDlg, aSet.Put( aBrowse, aBrowse.Which() ); SfxRequest aReq( SID_BROWSER_MODE, 0, aSet ); GetDocShell()->Execute( aReq ); - pSh->LockView( FALSE ); pSh->UnlockPaint(); } + + pSh->LockView( bLockedView ); } } @@ -486,6 +489,8 @@ void __EXPORT SwView::ExecutePrint(SfxRequest& rReq) SFX_REQUEST_ARG(rReq, pSilentItem, SfxBoolItem, SID_SILENT, FALSE); BOOL bSilent = pSilentItem ? pSilentItem->GetValue() : FALSE; SFX_REQUEST_ARG(rReq, pPrintFromMergeItem, SfxBoolItem, FN_QRY_MERGE, FALSE); + if(pPrintFromMergeItem) + rReq.RemoveItem(FN_QRY_MERGE); BOOL bFromMerge = pPrintFromMergeItem ? pPrintFromMergeItem->GetValue() : FALSE; if(!bSilent && !bFromMerge && pSh->IsAnyDatabaseFieldInDoc()) { diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx index ed534feba949..ecec90bd5c1f 100644 --- a/sw/source/ui/uiview/viewsrch.cxx +++ b/sw/source/ui/uiview/viewsrch.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewsrch.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: os $ $Date: 2002-12-10 14:26:22 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,6 +84,9 @@ #ifndef _SVTOOLS_CJKOPTIONS_HXX #include <svtools/cjkoptions.hxx> #endif +#ifndef _SVTOOLS_CTLOPTIONS_HXX +#include <svtools/ctloptions.hxx> +#endif #ifndef _SVX_PAGEITEM_HXX //autogen #include <svx/pageitem.hxx> #endif @@ -453,7 +456,8 @@ void SwView::ExecSearch(SfxRequest& rReq, BOOL bNoMessage) aArr.Insert( aNormalAttr, sizeof( aNormalAttr ) / sizeof( aNormalAttr[0] ), 0 ); - if( /*CTL*/ FALSE ) + SvtCTLOptions aCTLOpt; + if( aCTLOpt.IsCTLFontEnabled() ) aArr.Insert( aCTLAttr, sizeof( aCTLAttr ) / sizeof( aCTLAttr[0] ), 14 ); @@ -629,7 +633,7 @@ BOOL SwView::SearchAll(USHORT* pFound) pWrtShell->SttDoc(); } bExtra = FALSE; - USHORT nFound = FUNC_Search( aOpts ); + USHORT nFound = (USHORT)FUNC_Search( aOpts ); if(pFound) *pFound = nFound; bFound = 0 != nFound; @@ -735,7 +739,7 @@ ULONG SwView::FUNC_Search( const SwSearchOptions& rOptions ) // build SearchOptions to be used // SearchOptions aSearchOpt( pSrchItem->GetSearchOptions() ); - aSearchOpt.Locale = CreateLocale( GetAppLanguage() ); + aSearchOpt.Locale = CreateLocale( (USHORT)GetAppLanguage() ); if( !bDoReplace ) aSearchOpt.replaceString = aEmptyStr; diff --git a/sw/source/ui/uiview/viewstat.cxx b/sw/source/ui/uiview/viewstat.cxx index 9f7567059806..60eb564d8ae1 100644 --- a/sw/source/ui/uiview/viewstat.cxx +++ b/sw/source/ui/uiview/viewstat.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewstat.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: os $ $Date: 2002-05-03 11:10:20 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,6 +88,9 @@ #ifndef _SVT_IMAGEITM_HXX #include <svtools/imageitm.hxx> #endif +#ifndef _SVTOOLS_LANGUAGEOPTIONS_HXX +#include <svtools/languageoptions.hxx> +#endif #ifndef _SVX_PROTITEM_HXX //autogen #include <svx/protitem.hxx> #endif @@ -444,6 +447,10 @@ void SwView::GetState(SfxItemSet &rSet) rSet.Put(aImageItem); } break; + case FN_INSERT_FIELD_DATA_ONLY : + if(!bInMailMerge && !GetViewFrame()->HasChildWindow(nWhich)) + rSet.DisableItem(nWhich); + break; } nWhich = aIter.NextWhich(); } @@ -469,6 +476,11 @@ void SwView::GetDrawState(SfxItemSet &rSet) else { SfxAllEnumItem aEnum(SID_INSERT_DRAW, nDrawSfxId); + if ( !SvtLanguageOptions().IsVerticalTextEnabled() ) + { + aEnum.DisableValue( SID_DRAW_CAPTION_VERTICAL ); + aEnum.DisableValue( SID_DRAW_TEXT_VERTICAL ); + } rSet.Put(aEnum); } break; diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx index faf57b91c62e..9ac9a6012c84 100644 --- a/sw/source/ui/uiview/viewtab.cxx +++ b/sw/source/ui/uiview/viewtab.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewtab.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: os $ $Date: 2002-09-26 13:21:46 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1101,7 +1101,8 @@ void SwView::ExecTabWin( SfxRequest& rReq ) nBorder = nPageWidth - aTabCols.GetLeftMin() + DOCUMENTBORDER - aColItem.GetRight(); - aTabCols.SetRight( nBorder ); + if ( nPageWidth >= aTabCols.GetLeftMin() + aTabCols.GetRight() ) + aTabCols.SetRight( nBorder ); // Tabcols der Reihe nach // Die letzte Col wird durch den Rand definiert @@ -1493,8 +1494,8 @@ void SwView::StateTabWin(SfxItemSet& rSet) case SID_RULER_BORDERS_VERTICAL: case SID_RULER_BORDERS: { - BOOL bRTL; - BOOL bFrameHasVerticalColumns = bFrmSelection && rSh.IsFrmVertical(FALSE, bRTL); + BOOL bFrameRTL; + BOOL bFrameHasVerticalColumns = rSh.IsFrmVertical(FALSE, bFrameRTL) && bFrmSelection; if((SID_RULER_BORDERS_VERTICAL == nWhich) && ((!bVerticalWriting && !bFrmSelection) || (bFrmSelection && !bFrameHasVerticalColumns)) || @@ -1516,6 +1517,8 @@ void SwView::StateTabWin(SfxItemSet& rSet) { rSh.GetTabCols( aTabCols ); nNum = rSh.GetCurTabColNum(); + if(rSh.IsTableRightToLeft()) + nNum = aTabCols.Count() - nNum; } ASSERT(nNum <= aTabCols.Count(), "TabCol not found"); @@ -1589,7 +1592,7 @@ void SwView::StateTabWin(SfxItemSet& rSet) if( //eigentlich sollte FRMTYPE_COLSECT nicht enthalten sein, wenn der Rahmen selektiert ist! !bFrmSelection && - nFrmType & FRMTYPE_COLSECT ) + nFrmType & FRMTYPE_COLSECT ) { const SwSection *pSect = rSh.GetAnySection(FALSE, pPt); ASSERT( pSect, "Welcher Bereich?"); @@ -1597,7 +1600,11 @@ void SwView::StateTabWin(SfxItemSet& rSet) { SwSectionFmt *pFmt = pSect->GetFmt(); const SwFmtCol& rCol = pFmt->GetCol(); - SvxColumnItem aColItem(--nNum); + if(rSh.IsInRightToLeftText()) + nNum = rCol.GetColumns().Count() - nNum; + else + --nNum; + SvxColumnItem aColItem(nNum); const SwRect &rRect = rSh.GetAnyCurRect(RECT_SECTION, pPt); ::lcl_FillSvxColumn(rCol, USHORT(bVerticalWriting ? rRect.Height() : rRect.Width()), aColItem, 0); @@ -1625,10 +1632,13 @@ void SwView::StateTabWin(SfxItemSet& rSet) // Spalten in Rahmen if ( nNum ) { - nNum--; const SwFrmFmt* pFmt = rSh.GetFlyFrmFmt() ; const SwFmtCol& rCol = pFmt->GetCol(); + if(rSh.IsInRightToLeftText()) + nNum = rCol.GetColumns().Count() - nNum; + else + nNum--; SvxColumnItem aColItem(nNum); const SwRect &rSizeRect = rSh.GetAnyCurRect(RECT_FLY_PRT_EMBEDDED, pPt); @@ -1664,9 +1674,13 @@ void SwView::StateTabWin(SfxItemSet& rSet) } else { // Spalten auf der Seite - nNum--; const SwFrmFmt& rMaster = rDesc.GetMaster(); SwFmtCol aCol(rMaster.GetCol()); + if(rFrameDir.GetValue() == FRMDIR_HORI_RIGHT_TOP) + nNum = aCol.GetColumns().Count() - nNum; + else + nNum--; + SvxColumnItem aColItem(nNum); const SwRect aPrtRect = rSh.GetAnyCurRect(RECT_PAGE_PRT, pPt); const SvxBoxItem& rBox = (const SvxBoxItem&)rMaster.GetAttr(RES_BOX); diff --git a/sw/source/ui/uno/RefreshListenerContainer.cxx b/sw/source/ui/uno/RefreshListenerContainer.cxx index 8efc1f021a5e..26af61dcac30 100644 --- a/sw/source/ui/uno/RefreshListenerContainer.cxx +++ b/sw/source/ui/uno/RefreshListenerContainer.cxx @@ -2,9 +2,9 @@ * * $RCSfile: RefreshListenerContainer.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mtg $ $Date: 2001-11-27 18:45:26 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ #ifdef PRECOMPILED -#include "ui_pch.hxx" +#include "core_pch.hxx" #endif #pragma hdrstop diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx index fec3159051bb..09b611d54c1d 100644 --- a/sw/source/ui/uno/SwXDocumentSettings.cxx +++ b/sw/source/ui/uno/SwXDocumentSettings.cxx @@ -2,9 +2,9 @@ * * $RCSfile: SwXDocumentSettings.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: tl $ $Date: 2002-11-11 13:27:04 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,10 +59,17 @@ * ************************************************************************/ #ifdef PRECOMPILED -#include "ui_pch.hxx" +#include "core_pch.hxx" #endif #pragma hdrstop +#ifndef _VOS_MUTEX_HXX_ +#include <vos/mutex.hxx> +#endif +#ifndef _SFX_SFXBASECONTROLLER_HXX_ +#include <sfx2/sfxbasecontroller.hxx> +#endif + #ifndef _SW_XDOCUMENT_SETTINGS_HXX #include <SwXDocumentSettings.hxx> #endif @@ -122,6 +129,7 @@ #include <vcl/svapp.hxx> #endif + using namespace rtl; using namespace comphelper; using namespace com::sun::star; @@ -178,7 +186,7 @@ MasterPropertySetInfo * lcl_createSettingsInfo() { RTL_CONSTASCII_STRINGPARAM("SaveGlobalDocumentLinks"), HANDLE_SAVE_GLOBAL_DOCUMENT_LINKS, CPPUTYPE_BOOLEAN, 0, 0}, { RTL_CONSTASCII_STRINGPARAM("CurrentDatabaseDataSource"), HANDLE_CURRENT_DATABASE_DATA_SOURCE, CPPUTYPE_OUSTRING, 0, 0}, { RTL_CONSTASCII_STRINGPARAM("CurrentDatabaseCommand"), HANDLE_CURRENT_DATABASE_COMMAND, CPPUTYPE_OUSTRING, 0, 0}, - { RTL_CONSTASCII_STRINGPARAM("CurrentDatabaseCommandType"), HANDLE_CURRENT_DATABASE_COMMAND_TYPE, CPPUTYPE_INT32, 0, 0}, + { RTL_CONSTASCII_STRINGPARAM("CurrentDatabaseCommandType"), HANDLE_CURRENT_DATABASE_COMMAND_TYPE, CPPUTYPE_INT32, 0, 0}, { RTL_CONSTASCII_STRINGPARAM("SaveVersionOnClose"), HANDLE_SAVE_VERSION_ON_CLOSE, CPPUTYPE_BOOLEAN, 0, 0}, { RTL_CONSTASCII_STRINGPARAM("UpdateFromTemplate"), HANDLE_UPDATE_FROM_TEMPLATE, CPPUTYPE_BOOLEAN, 0, 0}, /* @@ -213,11 +221,13 @@ MasterPropertySetInfo * lcl_createSettingsInfo() } SwXDocumentSettings::SwXDocumentSettings ( SwXTextDocument * pModel ) -: MasterHelperNoState ( lcl_createSettingsInfo (), &Application::GetSolarMutex () ) +: MasterPropertySet ( lcl_createSettingsInfo (), + &Application::GetSolarMutex () ) , mxModel ( pModel ) , mpModel ( pModel ) , mpDocSh ( NULL ) , mpDoc ( NULL ) +, mpPrinter( NULL ) { registerSlave ( new SwXPrintSettings ( PRINT_SETTINGS_DOCUMENT, mpModel->GetDocShell()->GetDoc() ) ); registerSlave ( new SwXPrintPreviewSettings ( mpModel->GetDocShell()->GetDoc() ) ); @@ -227,6 +237,65 @@ SwXDocumentSettings::~SwXDocumentSettings() throw() { } + +Any SAL_CALL SwXDocumentSettings::queryInterface( const Type& rType ) + throw(RuntimeException) +{ + return ::cppu::queryInterface ( rType, + // OWeakObject interfaces + reinterpret_cast< XInterface* > ( this ), + static_cast< XWeak* > ( this ), + // my own interfaces + static_cast< XPropertySet* > ( this ), + static_cast< XPropertyState* > ( this ), + static_cast< XMultiPropertySet* > ( this ), + static_cast< XServiceInfo* > ( this ), + static_cast< XTypeProvider* > ( this ) ); +} +void SwXDocumentSettings::acquire () + throw () +{ + OWeakObject::acquire(); +} +void SwXDocumentSettings::release () + throw () +{ + OWeakObject::release(); +} + +uno::Sequence< uno::Type > SAL_CALL SwXDocumentSettings::getTypes( ) + throw (RuntimeException) +{ + vos::OGuard aGuard(Application::GetSolarMutex()); + + uno::Sequence< uno::Type > aBaseTypes( 5 ); + uno::Type* pBaseTypes = aBaseTypes.getArray(); + + // from MasterPropertySet + pBaseTypes[0] = ::getCppuType((Reference< XPropertySet >*)0); + pBaseTypes[1] = ::getCppuType((Reference< XPropertyState >*)0); + pBaseTypes[2] = ::getCppuType((Reference< XMultiPropertySet >*)0); + // + pBaseTypes[3] = ::getCppuType((Reference< XServiceInfo >*)0); + pBaseTypes[4] = ::getCppuType((Reference< XTypeProvider >*)0); + + return aBaseTypes; +} + +uno::Sequence< sal_Int8 > SAL_CALL SwXDocumentSettings::getImplementationId( ) + throw (RuntimeException) +{ + vos::OGuard aGuard(Application::GetSolarMutex()); + static Sequence< sal_Int8 > aId( 16 ); + static sal_Bool bInit = sal_False; + if(!bInit) + { + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; + } + return aId; +} + void SwXDocumentSettings::_preSetValues () throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) { @@ -313,7 +382,11 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf { SfxPrinter *pNewPrinter = new SfxPrinter ( pPrinter->GetOptions().Clone(), sPrinterName ); if (pNewPrinter->IsKnown()) - mpDoc->SetPrt ( pNewPrinter, sal_False ); + { + // set printer only once; in _postSetValues + delete mpPrinter; + mpPrinter = pNewPrinter; + } else delete pNewPrinter; } @@ -345,7 +418,9 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf SfxItemSet *pItemSet = new SfxItemSet( mpDoc->GetAttrPool(), nRange ); SfxPrinter *pPrinter = SfxPrinter::Create ( aStream, pItemSet ); - mpDoc->SetPrt( pPrinter, sal_False ); + // set printer only once; in _postSetValues + delete mpPrinter; + mpPrinter = pPrinter; if ( !pPrinter->IsOriginal() ) { @@ -441,6 +516,10 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf void SwXDocumentSettings::_postSetValues () throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) { + // set printer only once, namely here! + if( mpPrinter != NULL ) + mpDoc->SetPrt( mpPrinter, true ); + mpDocSh = 0; mpDoc = 0; } @@ -625,3 +704,5 @@ Sequence< OUString > SAL_CALL SwXDocumentSettings::getSupportedServiceNames( ) aSeq[1] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Writer.Settings") ); return aSeq; } + + diff --git a/sw/source/ui/uno/SwXDocumentSettings.hxx b/sw/source/ui/uno/SwXDocumentSettings.hxx index dc4bd1e65d44..a1e6a5be46eb 100644 --- a/sw/source/ui/uno/SwXDocumentSettings.hxx +++ b/sw/source/ui/uno/SwXDocumentSettings.hxx @@ -2,9 +2,9 @@ * * $RCSfile: SwXDocumentSettings.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: mtg $ $Date: 2001-11-27 18:46:30 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,16 +73,30 @@ #ifndef _COM_SUN_STAR_TEXT_XTEXTDOCUMENT_HPP #include <com/sun/star/text/XTextDocument.hpp> #endif -#ifndef _COMPHELPER_SETTINGSHELPER_HXX_ -#include <comphelper/SettingsHelper.hxx> +#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ +#include <com/sun/star/lang/XServiceInfo.hpp> +#endif +#ifndef _COM_SUN_STAR_LANG_XTYPEPROVIDER_HPP_ +#include <com/sun/star/lang/XTypeProvider.hpp> +#endif +#ifndef _CPPUHELPER_WEAK_HXX_ +#include <cppuhelper/weak.hxx> +#endif +#ifndef _CPPUHELPER_IMPLBASE5_HXX_ +#include <cppuhelper/implbase5.hxx> #endif + class SwXTextDocument; class SwDocShell; class SwDoc; +class SfxPrinter; - -class SwXDocumentSettings : public comphelper::MasterHelperNoState +class SwXDocumentSettings : + public comphelper::MasterPropertySet, + public com::sun::star::lang::XServiceInfo, + public com::sun::star::lang::XTypeProvider, + public cppu::OWeakObject { protected: com::sun::star::uno::Reference< com::sun::star::text::XTextDocument > mxModel; @@ -90,6 +104,12 @@ protected: SwDocShell* mpDocSh; SwDoc* mpDoc; + /** the printer should be set only once; since there are several + * printer-related properties, remember the last printer and set it in + * _postSetValues */ + SfxPrinter* mpPrinter; + + virtual void _preSetValues () throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); virtual void _setSingleValue( const comphelper::PropertyInfo & rInfo, const ::com::sun::star::uno::Any &rValue ) @@ -109,6 +129,14 @@ public: virtual ~SwXDocumentSettings() throw(); + // XInterface + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) + throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL acquire( ) + throw (); + virtual void SAL_CALL release( ) + throw (); + // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(com::sun::star::uno::RuntimeException); @@ -116,5 +144,9 @@ public: throw(com::sun::star::uno::RuntimeException); virtual com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(com::sun::star::uno::RuntimeException); + + // XTypeProvider + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException); }; #endif diff --git a/sw/source/ui/uno/SwXPrintPreviewSettings.cxx b/sw/source/ui/uno/SwXPrintPreviewSettings.cxx index ef6f0768126a..24d2c0ceb948 100644 --- a/sw/source/ui/uno/SwXPrintPreviewSettings.cxx +++ b/sw/source/ui/uno/SwXPrintPreviewSettings.cxx @@ -2,9 +2,9 @@ * * $RCSfile: SwXPrintPreviewSettings.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mtg $ $Date: 2001-11-27 18:47:41 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,7 +59,7 @@ * ************************************************************************/ #ifdef PRECOMPILED -#include "ui_pch.hxx" +#include "core_pch.hxx" #endif #pragma hdrstop #ifndef _SW_XPRINTPREVIEWSETTINGS_HXX_ @@ -124,7 +124,7 @@ static ChainablePropertySetInfo * lcl_createPrintPreviewSettingsInfo() return new ChainablePropertySetInfo ( aPrintPreviewSettingsMap_Impl ); } SwXPrintPreviewSettings::SwXPrintPreviewSettings( SwDoc *pDoc) -: ChainableHelperNoState( lcl_createPrintPreviewSettingsInfo (), &Application::GetSolarMutex() ) +: ChainablePropertySet ( lcl_createPrintPreviewSettingsInfo (), &Application::GetSolarMutex() ) , mbPreviewDataChanged( sal_False ) , mpDoc( pDoc) { @@ -137,6 +137,29 @@ SwXPrintPreviewSettings::~SwXPrintPreviewSettings() { } +Any SAL_CALL SwXPrintPreviewSettings::queryInterface( const Type& rType ) + throw(RuntimeException) +{ + return ::cppu::queryInterface ( rType , + // OWeakObject interfaces + reinterpret_cast< XInterface* > ( this ) , + static_cast< XWeak* > ( this ) , + // my own interfaces + static_cast< XServiceInfo* > ( this ) , + static_cast< XPropertySet* > ( this ) , + static_cast< XMultiPropertySet* > ( this ) ); +} +void SwXPrintPreviewSettings::acquire () + throw () +{ + OWeakObject::acquire(); +} +void SwXPrintPreviewSettings::release () + throw () +{ + OWeakObject::release(); +} + void SwXPrintPreviewSettings::_preSetValues () throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException ) { diff --git a/sw/source/ui/uno/SwXPrintPreviewSettings.hxx b/sw/source/ui/uno/SwXPrintPreviewSettings.hxx index 97a4e433ae03..2c4387e5580c 100644 --- a/sw/source/ui/uno/SwXPrintPreviewSettings.hxx +++ b/sw/source/ui/uno/SwXPrintPreviewSettings.hxx @@ -2,9 +2,9 @@ * * $RCSfile: SwXPrintPreviewSettings.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mtg $ $Date: 2001-11-27 18:48:28 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,14 +67,17 @@ #endif #pragma hdrstop +#ifndef _COMPHELPER_CHAINABLEPROPERTYSET_HXX_ +#include <comphelper/ChainablePropertySet.hxx> +#endif #ifndef _COM_SUN_STAR_TEXT_XTEXTDOCUMENT_HPP #include <com/sun/star/text/XTextDocument.hpp> #endif -#ifndef _COMPHELPER_CHAINABLEPROPERTYSET_HXX_ -#include <comphelper/ChainablePropertySet.hxx> +#ifndef _CPPUHELPER_WEAK_HXX_ +#include <cppuhelper/weak.hxx> #endif -#ifndef _COMPHELPER_SETTINGSHELPER_HXX_ -#include <comphelper/SettingsHelper.hxx> +#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ +#include <com/sun/star/lang/XServiceInfo.hpp> #endif class SwXTextDocument; @@ -82,7 +85,9 @@ class SwDocShell; class SwDoc; class SwPagePreViewPrtData; -class SwXPrintPreviewSettings : public comphelper::ChainableHelperNoState +class SwXPrintPreviewSettings :public comphelper::ChainablePropertySet, + public cppu::OWeakObject, + public com::sun::star::lang::XServiceInfo { friend class SwXDocumentSettings; protected: @@ -109,6 +114,14 @@ public: virtual ~SwXPrintPreviewSettings() throw(); + // XInterface + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) + throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL acquire( ) + throw (); + virtual void SAL_CALL release( ) + throw (); + //XServiceInfo virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException ); diff --git a/sw/source/ui/uno/makefile.mk b/sw/source/ui/uno/makefile.mk index 6a3f37911274..883a6de23af5 100644 --- a/sw/source/ui/uno/makefile.mk +++ b/sw/source/ui/uno/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.10 $ +# $Revision: 1.11 $ # -# last change: $Author: os $ $Date: 2002-06-21 14:21:42 $ +# last change: $Author: hr $ $Date: 2003-03-27 15:44:55 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -84,6 +84,7 @@ SLOFILES = \ $(SLO)$/unodispatch.obj\ $(SLO)$/unotxdoc.obj\ $(SLO)$/unoatxt.obj \ + $(SLO)$/unomailmerge.obj \ $(SLO)$/unomod.obj \ $(SLO)$/unotxvw.obj \ $(SLO)$/dlelstnr.obj \ @@ -98,6 +99,7 @@ EXCEPTIONSFILES= \ $(SLO)$/dlelstnr.obj \ $(SLO)$/unotxdoc.obj \ $(SLO)$/unoatxt.obj \ + $(SLO)$/unomailmerge.obj \ $(SLO)$/unomod.obj \ $(SLO)$/unotxvw.obj \ $(SLO)$/unofreg.obj \ diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx index 473c0c608700..df4147ed7b12 100644 --- a/sw/source/ui/uno/unoatxt.cxx +++ b/sw/source/ui/uno/unoatxt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoatxt.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: tl $ $Date: 2002-08-14 12:16:27 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -763,6 +763,7 @@ sal_Bool SwXAutoTextGroup::hasElements(void) throw( uno::RuntimeException ) nCount = pGlosGroup->GetCount(); else throw uno::RuntimeException(); + delete pGlosGroup; return nCount > 0; } @@ -890,7 +891,7 @@ void SwXAutoTextGroup::setPropertyValue( throw beans::UnknownPropertyException(); SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(sGroupName, sal_False) : 0; - if(!pGlosGroup && !pGlosGroup->GetError()) + if(!pGlosGroup || pGlosGroup->GetError()) throw uno::RuntimeException(); switch(pMap->nWID) { @@ -1233,6 +1234,7 @@ void SwXAutoTextEntry::applyTo(const Reference< text::XTextRange > & xTextRange) SwTextBlocks* pBlock = pGlossaries->GetGroupDoc(sGroupName); sal_Bool bResult = pBlock && !pBlock->GetError() && pDoc->InsertGlossary( *pBlock, sEntryName, *pInsertPaM); + delete pBlock; delete pInsertPaM; if(!bResult) @@ -1342,6 +1344,8 @@ void SwAutoTextEventDescriptor::replaceByName( pBlocks->SetMacroTable( nIndex, aMacroTable ); } } + + delete pBlocks; } // else: ignore } @@ -1385,6 +1389,8 @@ void SwAutoTextEventDescriptor::getByName( rMacro = *pMacro; } } + + delete pBlocks; } } diff --git a/sw/source/ui/uno/unofreg.cxx b/sw/source/ui/uno/unofreg.cxx index 81f93dbd634c..dcc9ecbd7fad 100644 --- a/sw/source/ui/uno/unofreg.cxx +++ b/sw/source/ui/uno/unofreg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unofreg.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: os $ $Date: 2002-06-24 13:58:02 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -124,6 +124,14 @@ extern uno::Sequence< OUString > SAL_CALL SwXModule_getSupportedServiceNames() t extern OUString SAL_CALL SwXModule_getImplementationName() throw(); extern uno::Reference< uno::XInterface > SAL_CALL SwXModule_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); +extern uno::Sequence< OUString > SAL_CALL SwXMailMerge_getSupportedServiceNames() throw(); +extern OUString SAL_CALL SwXMailMerge_getImplementationName() throw(); +extern uno::Reference< uno::XInterface > SAL_CALL SwXMailMerge_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); + +extern uno::Sequence< OUString > SAL_CALL SwXMailMerge_getSupportedServiceNames() throw(); +extern OUString SAL_CALL SwXMailMerge_getImplementationName() throw(); +extern uno::Reference< uno::XInterface > SAL_CALL SwXMailMerge_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception ); + // #ifdef __cplusplus extern "C" @@ -187,6 +195,8 @@ sal_Bool SAL_CALL component_writeInfo( SwXAutoTextContainer_getSupportedServiceNames() ); lcl_uno_writeInfo( pKey, SwXModule_getImplementationName(), SwXModule_getSupportedServiceNames() ); + lcl_uno_writeInfo( pKey, SwXMailMerge_getImplementationName(), + SwXMailMerge_getSupportedServiceNames() ); //Filter options lcl_uno_writeInfo( pKey, SwXFilterOptions::getImplementationName_Static(), SwXFilterOptions::getSupportedServiceNames_Static() ); @@ -309,6 +319,14 @@ void * SAL_CALL component_getFactory( const sal_Char * pImplName, SwXModule_createInstance, SwXModule_getSupportedServiceNames() ); } + else if( SwXMailMerge_getImplementationName().equalsAsciiL( + pImplName, nImplNameLen ) ) + { + xFactory = ::cppu::createSingleFactory( xMSF, + SwXMailMerge_getImplementationName(), + SwXMailMerge_createInstance, + SwXMailMerge_getSupportedServiceNames() ); + } else if( SwXFilterOptions::getImplementationName_Static().equalsAsciiL( pImplName, nImplNameLen ) ) { diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx new file mode 100644 index 000000000000..9f481cfcf812 --- /dev/null +++ b/sw/source/ui/uno/unomailmerge.cxx @@ -0,0 +1,1000 @@ +/************************************************************************* + * + * $RCSfile: unomailmerge.cxx,v $ + * + * $Revision: 1.2 $ + * + * last change: $Author: hr $ $Date: 2003-03-27 15:44:56 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ + +#ifdef PRECOMPILED +#include "ui_pch.hxx" +#endif + +#pragma hdrstop + +#ifndef _SV_SVAPP_HXX +#include <vcl/svapp.hxx> +#endif +#ifndef _VOS_MUTEX_HXX_ +#include <vos/mutex.hxx> +#endif +#ifndef _OSL_MUTEX_HXX_ +#include <osl/mutex.hxx> +#endif +#ifndef _SFX_ITEMPROP_HXX +#include <svtools/itemprop.hxx> +#endif +#ifndef SVTOOLS_URIHELPER_HXX +#include <svtools/urihelper.hxx> +#endif +#ifndef _SVX_DATACCESSDESCRIPTOR_HXX_ +#include <svx/dataaccessdescriptor.hxx> +#endif +#ifndef _SHL_HXX +#include <tools/shl.hxx> // GetAppData +#endif +#ifndef _URLOBJ_HXX +#include <tools/urlobj.hxx> +#endif +#ifndef _TOOLS_TEMPFILE_HXX +#include <tools/tempfile.hxx> +#endif +#ifndef _RTTI_HXX +#include <tools/rtti.hxx> +#endif +#ifndef _SFXAPP_HXX +#include <sfx2/app.hxx> +#endif +#ifndef _SFXDOCFILE_HXX +#include <sfx2/docfile.hxx> +#endif +#ifndef _SFX_DOCFILT_HACK_HXX +#include <sfx2/docfilt.hxx> +#endif +#ifndef _COMPHELPER_PROCESSFACTORY_HXX_ +#include <comphelper/processfactory.hxx> +#endif +#ifndef _CPPUHELPER_IMPLBASE1_HXX_ +#include <cppuhelper/implbase1.hxx> // WeakImplHelper1 +#endif + +#ifndef _COM_SUN_STAR_SDB_COMMANDTYPE_HPP_ +#include <com/sun/star/sdb/CommandType.hpp> +#endif +#ifndef _COM_SUN_STAR_TEXT_MAILMERGETYPE_HPP_ +#include <com/sun/star/text/MailMergeType.hpp> +#endif +#ifndef _COM_SUN_STAR_TEXT_MAILMERGEEVENT_HPP_ +#include <com/sun/star/text/MailMergeEvent.hpp> +#endif +#ifndef _COM_SUN_STAR_TEXT_XMAILMERGELISTENER_HPP_ +#include <com/sun/star/text/XMailMergeListener.hpp> +#endif +#ifndef _COM_SUN_STAR_TEXT_XMAILMERGEBROADCASTER_HPP_ +#include <com/sun/star/text/XMailMergeBroadcaster.hpp> +#endif +#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPP_ +#include <com/sun/star/beans/PropertyAttribute.hpp> +#endif + +#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ +#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#endif +#ifndef _COM_SUN_STAR_LANG_XUNOTUNNEL_HPP_ +#include <com/sun/star/lang/XUnoTunnel.hpp> +#endif +#ifndef _COM_SUN_STAR_SDBC_XRESULTSET_HPP_ +#include <com/sun/star/sdbc/XResultSet.hpp> +#endif +#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ +#include <com/sun/star/sdbc/XConnection.hpp> +#endif +#ifndef _COM_SUN_STAR_SDBC_XROWSET_HPP_ +#include <com/sun/star/sdbc/XRowSet.hpp> +#endif +#ifndef _COM_SUN_STAR_SDBC_XRESULTSET_HPP_ +#include <com/sun/star/sdbc/XResultSet.hpp> +#endif +#ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_ +#include <com/sun/star/frame/XModel.hpp> +#endif +#ifndef _COM_SUN_STAR_FRAME_XCOMPONENTLOADER_HPP_ +#include <com/sun/star/frame/XComponentLoader.hpp> +#endif +#ifndef _COM_SUN_STAR_UTIL_XCLOSEABLE_HPP_ +#include <com/sun/star/util/XCloseable.hpp> +#endif +#ifndef _COM_SUN_STAR_UTIL_CloseVetoException_HPP_ +#include <com/sun/star/util/CloseVetoException.hpp> +#endif + + +#ifndef _UNOMAILMERGE_HXX_ +#include <unomailmerge.hxx> +#endif +#ifndef SW_SWDLL_HXX +#include <swdll.hxx> +#endif +#ifndef _SWMODULE_HXX +#include <swmodule.hxx> +#endif +#ifndef _UNOPRNMS_HXX +#include <unoprnms.hxx> +#endif +#ifndef _UNOMAP_HXX +#include <unomap.hxx> +#endif +#ifndef _SWUNOHELPER_HXX +#include <swunohelper.hxx> +#endif +#ifndef _SWDOCSH_HXX +#include <docsh.hxx> +#endif +#ifndef _SWVIEW_HXX +#include <view.hxx> +#endif +#ifndef _SWDBMGR_HXX +#include <dbmgr.hxx> +#endif +#ifndef _UNOTXDOC_HXX +#include <unotxdoc.hxx> +#endif +#ifndef _PRTOPT_HXX +#include <prtopt.hxx> +#endif +#ifndef _WRTSH_HXX +#include <wrtsh.hxx> +#endif +#ifndef _SHELLIO_HXX +#include <shellio.hxx> +#endif +#ifndef _SWDBMGR_HXX +#include <dbmgr.hxx> +#endif + +#define C2U(x) OUString::createFromAscii(x) +#define SN_MAILMERGE "com.sun.star.text.MailMerge" + +using namespace com::sun::star; +using namespace com::sun::star::frame; +using namespace com::sun::star::uno; +using namespace com::sun::star::lang; +using namespace com::sun::star::beans; +using namespace com::sun::star::text; +using namespace rtl; +using namespace SWUnoHelper; + +//////////////////////////////////////////////////////////// + +class DisposeHelper +{ + uno::Reference< XComponent > xC; + + // disallow use of copy c-tor and assignment operator + DisposeHelper( const DisposeHelper & ); + DisposeHelper & operator = ( const DisposeHelper & ); + +public: + DisposeHelper() {} +#ifdef DEBUG + ~DisposeHelper(); +#else + ~DisposeHelper() { if (xC.is()) xC->dispose(); } +#endif + + BOOL SetInterface( uno::Reference< XInterface > &rxRef ) { return (xC = uno::Reference< XComponent >( rxRef, UNO_QUERY )).is(); } +}; + +#ifdef DEBUG +DisposeHelper::~DisposeHelper() +{ + if (xC.is()) + xC->dispose(); +} +#endif + +//////////////////////////////////////////////////////////// + +osl::Mutex & GetMailMergeMutex() +{ + static osl::Mutex aMutex; + return aMutex; +} + +//////////////////////////////////////////////////////////// + + static void CloseModelAndDocSh( + Reference< frame::XModel > &rxModel, + SfxObjectShellRef &rxDocSh ) + { + rxDocSh = 0; + + //! models/documents should never be disposed (they may still be + //! used for printing which is called asynchronously for example) + //! instead call close + Reference< util::XCloseable > xClose( rxModel, UNO_QUERY ); + if (xClose.is()) + { + try + { + xClose->close( sal_True ); + } + catch (util::CloseVetoException &) + { + } + } +} + +//////////////////////////////////////////////////////////// + +static BOOL LoadFromURL_impl( + Reference< frame::XModel > &rxModel, + SfxObjectShellRef &rxDocSh, + const String &rURL, + BOOL bClose ) + throw (RuntimeException) +{ + // try to open the document readonly and hidden + Reference< frame::XModel > xTmpModel; + Sequence < PropertyValue > aArgs( 1 ); + aArgs[0].Name = C2U("Hidden"); + sal_Bool bVal = sal_True; + aArgs[0].Value <<= bVal; + try + { + Reference < XComponentLoader > xDesktop( ::comphelper::getProcessServiceFactory()-> + createInstance( C2U("com.sun.star.frame.Desktop") ), UNO_QUERY ); + xTmpModel = Reference < XModel >( xDesktop->loadComponentFromURL( + rURL, C2U("_blank"), 0, aArgs ), UNO_QUERY ); + } + catch( Exception & ) + { + return FALSE; + } + + // try to get the DocShell + SwDocShell *pTmpDocShell = 0; + Reference < XUnoTunnel > xTunnel( xTmpModel, UNO_QUERY ); + if (xTunnel.is()) + { + SwXTextDocument* pTextDoc = (SwXTextDocument *) xTunnel->getSomething( SwXTextDocument::getUnoTunnelId() ); + pTmpDocShell = pTextDoc ? pTextDoc->GetDocShell() : 0; + } + + BOOL bRes = FALSE; + if (xTmpModel.is() && pTmpDocShell) // everything available? + { + if (bClose) + CloseModelAndDocSh( rxModel, rxDocSh ); + // set new stuff + rxModel = xTmpModel; + rxDocSh = pTmpDocShell; + bRes = TRUE; + } + else + { + SfxObjectShellRef xTmpDocSh = pTmpDocShell; + CloseModelAndDocSh( xTmpModel, xTmpDocSh ); + } + + return bRes; +} + +//////////////////////////////////////////////////////////// + +static BOOL DeleteTmpFile_Impl( + Reference< frame::XModel > &rxModel, + SfxObjectShellRef &rxDocSh, + const String &rTmpFileURL, + BOOL bClose ) +{ + BOOL bRes = FALSE; + if (rTmpFileURL.Len()) + { + if (bClose) + { + rxDocSh = 0; + + //! models/documents should never be disposed (they may still be + //! used for printing which is called asynchronously for example) + //! instead call close + Reference< util::XCloseable > xClose( rxModel, UNO_QUERY ); + if (xClose.is()) + { + try + { + xClose->close( sal_True ); + } + catch (util::CloseVetoException &) + { + //! here we have the problem that the temporary file that is + //! currently being printed will never be deleted. :-( + } + } + } + + rxModel = 0; + rxDocSh = 0; // destroy doc shell + + bRes = SWUnoHelper::UCB_DeleteFile( rTmpFileURL ); + DBG_ASSERT( bRes, "temp file not deleted" ); + } + return bRes; +} + +//////////////////////////////////////////////////////////// + +SwXMailMerge::SwXMailMerge() : + pMap( aSwMapProvider.GetPropertyMap( PROPERTY_MAP_MAILMERGE ) ), + aEvtListeners ( GetMailMergeMutex() ), + aMergeListeners ( GetMailMergeMutex() ), + aPropListeners ( GetMailMergeMutex() ) +{ + // create empty document + // like in: SwModule::InsertEnv (appenv.cxx) + SwDocShell *pDocShell = new SwDocShell( SFX_CREATE_MODE_STANDARD ); + xDocSh = pDocShell; + xDocSh->DoInitNew( 0 ); + SfxViewFrame *pFrame = SFX_APP()->CreateViewFrame( *xDocSh, 0, TRUE ); + SwView *pView = (SwView*) pFrame->GetViewShell(); + pView->AttrChangedNotify( &pView->GetWrtShell() );//Damit SelectShell gerufen wird. + + xModel = pDocShell->GetModel(); + + nDataCommandType = sdb::CommandType::TABLE; + nOutputType = MailMergeType::PRINTER; + bEscapeProcessing = sal_False; + bSinglePrintJobs = sal_False; + bFileNameFromColumn = sal_False; + + bDisposing = sal_False; +} + +SwXMailMerge::~SwXMailMerge() +{ + DeleteTmpFile_Impl( xModel, xDocSh, aTmpFileName, TRUE ); +} + +uno::Any SAL_CALL SwXMailMerge::execute( + const uno::Sequence< beans::NamedValue >& rArguments ) + throw (IllegalArgumentException, Exception, RuntimeException) +{ + vos::OGuard aGuard( Application::GetSolarMutex() ); + + // + // get property values to be used + // (use values from the service as default and override them with + // the values that are provided as arguments) + // + uno::Sequence< uno::Any > aCurSelection = aSelection; + uno::Reference< sdbc::XResultSet > xCurResultSet = xResultSet; + uno::Reference< sdbc::XConnection > xCurConnection = xConnection; + uno::Reference< frame::XModel > xCurModel = xModel; + OUString aCurDataSourceName = aDataSourceName; + OUString aCurDataCommand = aDataCommand; + OUString aCurFilter = aFilter; + OUString aCurDocumentURL = aDocumentURL; + OUString aCurOutputURL = aOutputURL; + OUString aCurFileNamePrefix = aFileNamePrefix; + sal_Int32 nCurDataCommandType = nDataCommandType; + sal_Int16 nCurOutputType = nOutputType; + sal_Bool bCurEscapeProcessing = bEscapeProcessing; + sal_Bool bCurSinglePrintJobs = bSinglePrintJobs; + sal_Bool bCurFileNameFromColumn = bFileNameFromColumn; + // + SfxObjectShellRef xCurDocSh = xDocSh; // the document + // + const beans::NamedValue *pArguments = rArguments.getConstArray(); + sal_Int32 nArgs = rArguments.getLength(); + for (sal_Int32 i = 0; i < nArgs; ++i) + { + const OUString &rName = pArguments[i].Name; + const Any &rValue = pArguments[i].Value; + + BOOL bOK = TRUE; + if (rName.equalsAscii( GetPropName( UNO_NAME_SELECTION ) )) + bOK = rValue >>= aCurSelection; + else if (rName.equalsAscii( GetPropName( UNO_NAME_RESULT_SET ) )) + bOK = rValue >>= xCurResultSet; + else if (rName.equalsAscii( GetPropName( UNO_NAME_CONNECTION ) )) + bOK = rValue >>= xCurConnection; + else if (rName.equalsAscii( GetPropName( UNO_NAME_MODEL ) )) + throw PropertyVetoException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is read-only: " ) ) + rName, static_cast < cppu::OWeakObject * > ( this ) ); + else if (rName.equalsAscii( GetPropName( UNO_NAME_DATA_SOURCE_NAME ) )) + bOK = rValue >>= aCurDataSourceName; + else if (rName.equalsAscii( GetPropName( UNO_NAME_DATA_COMMAND ) )) + bOK = rValue >>= aCurDataCommand; + else if (rName.equalsAscii( GetPropName( UNO_NAME_FILTER ) )) + bOK = rValue >>= aCurFilter; + else if (rName.equalsAscii( GetPropName( UNO_NAME_DOCUMENT_URL ) )) + { + bOK = rValue >>= aCurDocumentURL; + if (aCurDocumentURL.getLength() + && !LoadFromURL_impl( xCurModel, xCurDocSh, aCurDocumentURL, FALSE )) + throw RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Failed to create document from URL: " ) ) + aCurDocumentURL, static_cast < cppu::OWeakObject * > ( this ) ); + } + else if (rName.equalsAscii( GetPropName( UNO_NAME_OUTPUT_URL ) )) + { + bOK = rValue >>= aCurOutputURL; + if (aCurOutputURL.getLength()) + { + if (!UCB_IsDirectory(aCurOutputURL)) + throw IllegalArgumentException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "URL does not point to a directory: " ) ) + aCurOutputURL, static_cast < cppu::OWeakObject * > ( this ), 0 ); + if (UCB_IsReadOnlyFileName(aCurOutputURL)) + throw IllegalArgumentException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "URL is read-only: " ) ) + aCurOutputURL, static_cast < cppu::OWeakObject * > ( this ), 0 ); + } + } + else if (rName.equalsAscii( GetPropName( UNO_NAME_FILE_NAME_PREFIX ) )) + bOK = rValue >>= aCurFileNamePrefix; + else if (rName.equalsAscii( GetPropName( UNO_NAME_DATA_COMMAND_TYPE ) )) + bOK = rValue >>= nCurDataCommandType; + else if (rName.equalsAscii( GetPropName( UNO_NAME_OUTPUT_TYPE ) )) + bOK = rValue >>= nCurOutputType; + else if (rName.equalsAscii( GetPropName( UNO_NAME_ESCAPE_PROCESSING ) )) + bOK = rValue >>= bCurEscapeProcessing; + else if (rName.equalsAscii( GetPropName( UNO_NAME_SINGLE_PRINT_JOBS ) )) + bOK = rValue >>= bCurSinglePrintJobs; + else if (rName.equalsAscii( GetPropName( UNO_NAME_FILE_NAME_FROM_COLUMN ) )) + bOK = rValue >>= bCurFileNameFromColumn; + else + throw UnknownPropertyException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is unknown: " ) ) + rName, static_cast < cppu::OWeakObject * > ( this ) ); + + if (!bOK) + throw IllegalArgumentException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property type mismatch or property not set: " ) ) + rName, static_cast < cppu::OWeakObject * > ( this ), 0 ); + } + + SfxViewFrame* pFrame = SfxViewFrame::GetFirst( xCurDocSh, 0, FALSE); + SwView *pView = PTR_CAST( SwView, pFrame->GetViewShell() ); + if (!pView) + throw RuntimeException(); + SwWrtShell &rSh = *pView->GetWrtShellPtr(); + + // avoid assertion in 'Update' from Sfx by supplying a shell + // and thus avoiding the SelectShell call in Writers GetState function + // while still in Update of Sfx. + // (GetSelection in Update is not allowed) + if (pView && aCurDocumentURL.getLength()) + pView->AttrChangedNotify( &pView->GetWrtShell() );//Damit SelectShell gerufen wird. + + DisposeHelper aRowSetDisposeHelper; + if (!xCurResultSet.is()) + { + if (!aCurDataSourceName.getLength() || !aCurDataCommand.getLength() ) + { + DBG_ERROR("PropertyValues missing or unset") + throw IllegalArgumentException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Either the ResultSet or DataSourceName and DataCommand must be set." ) ), static_cast < cppu::OWeakObject * > ( this ), 0 ); + } + + // + // build ResultSet from DataSourceName, DataCommand and DataCommandType + // + Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); + if (xMgr.is()) + { + Reference< XInterface > xInstance = xMgr->createInstance( + C2U( "com.sun.star.sdb.RowSet" )); + aRowSetDisposeHelper.SetInterface( xInstance ); + Reference< XPropertySet > xRowSetPropSet( xInstance, UNO_QUERY ); + DBG_ASSERT( xRowSetPropSet.is(), "failed to get XPropertySet interface from RowSet" ); + if (xRowSetPropSet.is()) + { + if (xCurConnection.is()) + xRowSetPropSet->setPropertyValue( C2U("ActiveConnection"), makeAny( xCurConnection ) ); + xRowSetPropSet->setPropertyValue( C2U("DataSourceName"), makeAny( aCurDataSourceName ) ); + xRowSetPropSet->setPropertyValue( C2U("Command"), makeAny( aCurDataCommand ) ); + xRowSetPropSet->setPropertyValue( C2U("CommandType"), makeAny( nCurDataCommandType ) ); + xRowSetPropSet->setPropertyValue( C2U("EscapeProcessing"), makeAny( bCurEscapeProcessing ) ); + xRowSetPropSet->setPropertyValue( C2U("ApplyFilter"), makeAny( sal_True ) ); + xRowSetPropSet->setPropertyValue( C2U("Filter"), makeAny( aCurFilter ) ); + + Reference< sdbc::XRowSet > xRowSet( xInstance, UNO_QUERY ); + if (xRowSet.is()) + xRowSet->execute(); // build ResultSet from properties + xCurResultSet = Reference< sdbc::XResultSet >( xRowSet, UNO_QUERY ); + DBG_ASSERT( xCurResultSet.is(), "failed to build ResultSet" ); + } + } + } + + svx::ODataAccessDescriptor aDescriptor; + aDescriptor[ svx::daDataSource ] <<= aCurDataSourceName; + aDescriptor[ svx::daConnection ] <<= xCurConnection; + aDescriptor[ svx::daCommand ] <<= aCurDataCommand; + aDescriptor[ svx::daCommandType ] <<= nCurDataCommandType; + aDescriptor[ svx::daEscapeProcessing ] <<= bCurEscapeProcessing; + aDescriptor[ svx::daCursor ] <<= xCurResultSet; + // aDescriptor[ svx::daColumnName ] not used + // aDescriptor[ svx::daColumnObject ] not used + aDescriptor[ svx::daSelection ] <<= aCurSelection; + + USHORT nMergeType; + switch (nCurOutputType) + { + case MailMergeType::PRINTER : nMergeType = DBMGR_MERGE_MAILMERGE; break; + case MailMergeType::FILE : nMergeType = DBMGR_MERGE_MAILFILES; break; + default: + throw IllegalArgumentException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Invalid value of property:" ) ) + C2U("OutputType"), static_cast < cppu::OWeakObject * > ( this ), 0 ); + } + + SwNewDBMgr* pMgr = rSh.GetNewDBMgr(); + DBG_ASSERT( pMgr, "database manager missing" ); + if (MailMergeType::PRINTER == nCurOutputType) + { + SwPrintData aPrtData = *SW_MOD()->GetPrtOptions( FALSE ); + SwPrintData* pShellPrintData = rSh.GetPrintData(); + if (pShellPrintData) + aPrtData = *pShellPrintData; + aPrtData.SetPrintSingleJobs( bCurSinglePrintJobs ); + rSh.SetPrintData( aPrtData ); + } + else if (MailMergeType::FILE == nCurOutputType) + { + INetURLObject aURLObj; + aURLObj.SetSmartProtocol( INET_PROT_FILE ); + + if (aCurDocumentURL.getLength()) + { + // if OutputURL or FileNamePrefix are missing get + // them from DocumentURL + aURLObj.SetSmartURL( aCurDocumentURL ); + if (!aCurFileNamePrefix.getLength()) + aCurFileNamePrefix = aURLObj.GetBase(); // filename without extension + if (!aCurOutputURL.getLength()) + { + //aCurOutputURL = aURLObj.GetURLPath(); + aURLObj.removeSegment(); + aCurOutputURL = aURLObj.GetMainURL( INetURLObject::DECODE_TO_IURI ); + } + } + else // default empty document without URL + { + if (!aCurOutputURL.getLength()) + throw RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "OutputURL is not set and can not be obtained." ) ), static_cast < cppu::OWeakObject * > ( this ) ); + } + + aURLObj.SetSmartURL( aCurOutputURL ); + String aPath = aURLObj.GetMainURL( INetURLObject::DECODE_TO_IURI ); + + String aDelim( INET_PATH_TOKEN ); + if (aPath.Len() >= aDelim.Len() && + aPath.Copy( aPath.Len()-aDelim.Len() ).CompareTo( aDelim ) != COMPARE_EQUAL) + aPath += aDelim; + if (bCurFileNameFromColumn) + pMgr->SetEMailColumn( aCurFileNamePrefix ); + else + { + aPath += String( aCurFileNamePrefix ); + pMgr->SetEMailColumn( String() ); + } + pMgr->SetSubject( aPath ); + } + + // save document with temporary filename +// if (aTmpFileName.Len()) +// xCurDocSh->DoSave(); +// else + { + const SfxFilter *pSfxFlt = SwIoSystem::GetFilterOfFormat( + String::CreateFromAscii( FILTER_XML ), + SwDocShell::Factory().GetFilterContainer() ); + String aExtension( pSfxFlt->GetDefaultExtension() ); + aExtension.EraseLeadingChars( '*' ); + TempFile aTempFile( C2U("SwMM"), &aExtension ); + aTmpFileName = aTempFile.GetName(); + SfxMedium *pDstMed = new SfxMedium( aTmpFileName, STREAM_STD_READWRITE, TRUE ); + pDstMed->SetFilter( pSfxFlt ); + + xCurDocSh->DoSaveAs(*pDstMed); + xCurDocSh->DoSaveCompleted(pDstMed); + if (xCurDocSh->GetError()) + throw RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Failed to save temporary file." ) ), static_cast < cppu::OWeakObject * > ( this ) ); + } + + pMgr->SetMergeSilent( TRUE ); // suppress dialogs, message boxes, etc. + const SwXMailMerge *pOldSrc = pMgr->GetMailMergeEvtSrc(); + DBG_ASSERT( !pOldSrc || pOldSrc == this, "Ooops... different event source already set." ); + pMgr->SetMailMergeEvtSrc( this ); // launch events for listeners + BOOL bSucc = pMgr->MergeNew( nMergeType, rSh, aDescriptor ); + pMgr->SetMailMergeEvtSrc( pOldSrc ); + + DeleteTmpFile_Impl( xCurModel, xCurDocSh, aTmpFileName, xCurModel != xModel ); + //aTmpFileName.Erase(); + + if (xCurModel != xModel) // temporary model and doc shell used? + CloseModelAndDocSh( xCurModel, xCurDocSh ); + + if (!bSucc) + throw RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Mail merge failed." ) ), static_cast < cppu::OWeakObject * > ( this ) ); + + return makeAny( sal_True ); +} + +void SwXMailMerge::LaunchMailMergeEvent( const MailMergeEvent &rEvt ) const +{ + cppu::OInterfaceIteratorHelper aIt( ((SwXMailMerge *) this)->aMergeListeners ); + while (aIt.hasMoreElements()) + { + Reference< XMailMergeListener > xRef( aIt.next(), UNO_QUERY ); + if (xRef.is()) + xRef->notifyMailMergeEvent( rEvt ); + } +} + +void SwXMailMerge::launchEvent( const PropertyChangeEvent &rEvt ) const +{ + cppu::OInterfaceContainerHelper *pContainer = + aPropListeners.getContainer( rEvt.PropertyHandle ); + if (pContainer) + { + cppu::OInterfaceIteratorHelper aIt( *pContainer ); + while (aIt.hasMoreElements()) + { + Reference< XPropertyChangeListener > xRef( aIt.next(), UNO_QUERY ); + if (xRef.is()) + xRef->propertyChange( rEvt ); + } + } +} + + +uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXMailMerge::getPropertySetInfo( ) + throw (RuntimeException) +{ + vos::OGuard aGuard( Application::GetSolarMutex() ); + static Reference< XPropertySetInfo > aRef = new SfxItemPropertySetInfo( pMap ); + return aRef; +} + +void SAL_CALL SwXMailMerge::setPropertyValue( + const OUString& rPropertyName, const uno::Any& rValue ) + throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) +{ + vos::OGuard aGuard( Application::GetSolarMutex() ); + + const SfxItemPropertyMap* pCur = + SfxItemPropertyMap::GetByName( pMap, rPropertyName ); + if (!pCur) + throw UnknownPropertyException(); + else if (pCur->nFlags & PropertyAttribute::READONLY) + throw PropertyVetoException(); + else + { + void *pData = NULL; + const com::sun::star::uno::Type* pType = pCur->pType; + switch (pCur->nWID) + { + case WID_SELECTION : pData = &aSelection; break; + case WID_RESULT_SET : pData = &xResultSet; break; + case WID_CONNECTION : pData = &xConnection; break; + case WID_MODEL : pData = &xModel; break; + case WID_DATA_SOURCE_NAME : pData = &aDataSourceName; break; + case WID_DATA_COMMAND : pData = &aDataCommand; break; + case WID_FILTER : pData = &aFilter; break; + case WID_DOCUMENT_URL : pData = &aDocumentURL; break; + case WID_OUTPUT_URL : pData = &aOutputURL; break; + case WID_DATA_COMMAND_TYPE : pData = &nDataCommandType; break; + case WID_OUTPUT_TYPE : pData = &nOutputType; break; + case WID_ESCAPE_PROCESSING : pData = &bEscapeProcessing; break; + case WID_SINGLE_PRINT_JOBS : pData = &bSinglePrintJobs; break; + case WID_FILE_NAME_FROM_COLUMN : pData = &bFileNameFromColumn; break; + case WID_FILE_NAME_PREFIX : pData = &aFileNamePrefix; break; + default : + DBG_ERROR("unknown WID"); + } + Any aOld( pData, *pType ); + + sal_Bool bChanged = sal_False; + sal_Bool bOK = sal_True; + if (aOld != rValue) + { + if (pData == &aSelection) + bOK = rValue >>= aSelection; + else if (pData == &xResultSet) + bOK = rValue >>= xResultSet; + else if (pData == &xConnection) + bOK = rValue >>= xConnection; + else if (pData == &xModel) + bOK = rValue >>= xModel; + else if (pData == &aDataSourceName) + bOK = rValue >>= aDataSourceName; + else if (pData == &aDataCommand) + bOK = rValue >>= aDataCommand; + else if (pData == &aFilter) + bOK = rValue >>= aFilter; + else if (pData == &aDocumentURL) + { + OUString aText; + bOK = rValue >>= aText; + if (aText.getLength() + && !LoadFromURL_impl( xModel, xDocSh, aText, TRUE )) + throw RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Failed to create document from URL: " ) ) + aText, static_cast < cppu::OWeakObject * > ( this ) ); + aDocumentURL = aText; + } + else if (pData == &aOutputURL) + { + OUString aText; + bOK = rValue >>= aText; + if (aText.getLength()) + { + if (!UCB_IsDirectory(aText)) + throw IllegalArgumentException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "URL does not point to a directory: " ) ) + aText, static_cast < cppu::OWeakObject * > ( this ), 0 ); + if (UCB_IsReadOnlyFileName(aText)) + throw IllegalArgumentException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "URL is read-only: " ) ) + aText, static_cast < cppu::OWeakObject * > ( this ), 0 ); + } + aOutputURL = aText; + } + else if (pData == &nDataCommandType) + bOK = rValue >>= nDataCommandType; + else if (pData == &nOutputType) + bOK = rValue >>= nOutputType; + else if (pData == &bEscapeProcessing) + bOK = rValue >>= bEscapeProcessing; + else if (pData == &bSinglePrintJobs) + bOK = rValue >>= bSinglePrintJobs; + else if (pData == &bFileNameFromColumn) + bOK = rValue >>= bFileNameFromColumn; + else if (pData == &aFileNamePrefix) + bOK = rValue >>= aFileNamePrefix; + else + DBG_ERROR( "invalid pointer" ); + DBG_ASSERT( bOK, "set value failed" ); + bChanged = sal_True; + } + if (!bOK) + throw IllegalArgumentException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property type mismatch or property not set: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ), 0 ); + + if (bChanged) + { + PropertyChangeEvent aChgEvt( (XPropertySet *) this, rPropertyName, + FALSE, pCur->nWID, aOld, rValue ); + launchEvent( aChgEvt ); + } + } +} + +uno::Any SAL_CALL SwXMailMerge::getPropertyValue( + const OUString& rPropertyName ) + throw (UnknownPropertyException, WrappedTargetException, RuntimeException) +{ + vos::OGuard aGuard( Application::GetSolarMutex() ); + + Any aRet; + + const SfxItemPropertyMap* pCur = SfxItemPropertyMap::GetByName( pMap, rPropertyName ); + if (!pCur) + throw UnknownPropertyException(); + else + { + switch (pCur->nWID) + { + case WID_SELECTION : aRet <<= aSelection; break; + case WID_RESULT_SET : aRet <<= xResultSet; break; + case WID_CONNECTION : aRet <<= xConnection; break; + case WID_MODEL : aRet <<= xModel; break; + case WID_DATA_SOURCE_NAME : aRet <<= aDataSourceName; break; + case WID_DATA_COMMAND : aRet <<= aDataCommand; break; + case WID_FILTER : aRet <<= aFilter; break; + case WID_DOCUMENT_URL : aRet <<= aDocumentURL; break; + case WID_OUTPUT_URL : aRet <<= aOutputURL; break; + case WID_DATA_COMMAND_TYPE : aRet <<= nDataCommandType; break; + case WID_OUTPUT_TYPE : aRet <<= nOutputType; break; + case WID_ESCAPE_PROCESSING : aRet <<= bEscapeProcessing; break; + case WID_SINGLE_PRINT_JOBS : aRet <<= bSinglePrintJobs; break; + case WID_FILE_NAME_FROM_COLUMN : aRet <<= bFileNameFromColumn; break; + case WID_FILE_NAME_PREFIX : aRet <<= aFileNamePrefix; break; + default : + DBG_ERROR("unknown WID"); + } + } + + return aRet; +} + +void SAL_CALL SwXMailMerge::addPropertyChangeListener( + const OUString& rPropertyName, + const uno::Reference< beans::XPropertyChangeListener >& rListener ) + throw (UnknownPropertyException, WrappedTargetException, RuntimeException) +{ + vos::OGuard aGuard( Application::GetSolarMutex() ); + if (!bDisposing && rListener.is()) + { + const SfxItemPropertyMap* pCur = + SfxItemPropertyMap::GetByName( pMap, rPropertyName ); + if (pCur) + aPropListeners.addInterface( pCur->nWID, rListener ); + else + throw UnknownPropertyException(); + } +} + +void SAL_CALL SwXMailMerge::removePropertyChangeListener( + const OUString& rPropertyName, + const uno::Reference< beans::XPropertyChangeListener >& rListener ) + throw (UnknownPropertyException, WrappedTargetException, RuntimeException) +{ + vos::OGuard aGuard( Application::GetSolarMutex() ); + if (!bDisposing && rListener.is()) + { + const SfxItemPropertyMap* pCur = + SfxItemPropertyMap::GetByName( pMap, rPropertyName ); + if (pCur) + aPropListeners.removeInterface( pCur->nWID, rListener ); + else + throw UnknownPropertyException(); + } +} + +void SAL_CALL SwXMailMerge::addVetoableChangeListener( + const OUString& rPropertyName, + const uno::Reference< beans::XVetoableChangeListener >& rListener ) + throw (UnknownPropertyException, WrappedTargetException, RuntimeException) +{ + // no vetoable property, thus no support for vetoable change listeners + DBG_WARNING( "not implemented"); +} + +void SAL_CALL SwXMailMerge::removeVetoableChangeListener( + const OUString& rPropertyName, + const uno::Reference< beans::XVetoableChangeListener >& rListener ) + throw (UnknownPropertyException, WrappedTargetException, RuntimeException) +{ + // no vetoable property, thus no support for vetoable change listeners + DBG_WARNING( "not implemented"); +} + + +void SAL_CALL SwXMailMerge::dispose() + throw(RuntimeException) +{ + vos::OGuard aGuard( Application::GetSolarMutex() ); + + if (!bDisposing) + { + bDisposing = sal_True; + + EventObject aEvtObj( (XPropertySet *) this ); + aEvtListeners.disposeAndClear( aEvtObj ); + aMergeListeners.disposeAndClear( aEvtObj ); + aPropListeners.disposeAndClear( aEvtObj ); + } +} + +void SAL_CALL SwXMailMerge::addEventListener( + const Reference< XEventListener >& rxListener ) + throw(RuntimeException) +{ + vos::OGuard aGuard( Application::GetSolarMutex() ); + if (!bDisposing && rxListener.is()) + aEvtListeners.addInterface( rxListener ); +} + +void SAL_CALL SwXMailMerge::removeEventListener( + const Reference< XEventListener >& rxListener ) + throw(RuntimeException) +{ + vos::OGuard aGuard( Application::GetSolarMutex() ); + if (!bDisposing && rxListener.is()) + aEvtListeners.removeInterface( rxListener ); +} + +void SAL_CALL SwXMailMerge::addMailMergeEventListener( + const uno::Reference< XMailMergeListener >& rxListener ) + throw (RuntimeException) +{ + vos::OGuard aGuard( Application::GetSolarMutex() ); + if (!bDisposing && rxListener.is()) + aMergeListeners.addInterface( rxListener ); +} + +void SAL_CALL SwXMailMerge::removeMailMergeEventListener( + const uno::Reference< XMailMergeListener >& rxListener ) + throw (RuntimeException) +{ + vos::OGuard aGuard( Application::GetSolarMutex() ); + if (!bDisposing && rxListener.is()) + aMergeListeners.removeInterface( rxListener ); +} + +OUString SAL_CALL SwXMailMerge::getImplementationName() + throw(RuntimeException) +{ + vos::OGuard aGuard( Application::GetSolarMutex() ); + return SwXMailMerge_getImplementationName(); +} + +sal_Bool SAL_CALL SwXMailMerge::supportsService( const OUString& rServiceName ) + throw(RuntimeException) +{ + vos::OGuard aGuard( Application::GetSolarMutex() ); + return C2U( SN_MAILMERGE ) == rServiceName; +} + +uno::Sequence< OUString > SAL_CALL SwXMailMerge::getSupportedServiceNames() + throw(RuntimeException) +{ + vos::OGuard aGuard( Application::GetSolarMutex() ); + return SwXMailMerge_getSupportedServiceNames(); +} + +//////////////////////////////////////////////////////////// + +uno::Sequence< OUString > SAL_CALL SwXMailMerge_getSupportedServiceNames() + throw() +{ + uno::Sequence< OUString > aNames(1); + aNames.getArray()[0] = C2U( SN_MAILMERGE ); + return aNames; +} + +OUString SAL_CALL SwXMailMerge_getImplementationName() + throw() +{ + return OUString( C2U( "SwXMailMerge" ) ); +} + +uno::Reference< uno::XInterface > SAL_CALL SwXMailMerge_createInstance( + const uno::Reference< XMultiServiceFactory > & rSMgr) + throw( uno::Exception ) +{ + vos::OGuard aGuard( Application::GetSolarMutex() ); + + //the module may not be loaded + SW_MOD()->Load(); + + uno::Reference< uno::XInterface > xRef = (cppu::OWeakObject *) new SwXMailMerge(); + return xRef; +} + diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index 59c302f0e537..da5bde61b376 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unotxdoc.cxx,v $ * - * $Revision: 1.69 $ + * $Revision: 1.70 $ * - * last change: $Author: os $ $Date: 2002-12-04 12:19:29 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2451,7 +2451,8 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount( if (!pDoc) throw RuntimeException(); SwWrtShell *pWrtShell = pDoc->GetDocShell()->GetWrtShell(); - pWrtShell->CalcLayout(); + if(pWrtShell) + pWrtShell->CalcLayout(); return pDoc->GetPageCount(); } diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx index 48ef72760405..a5a0feab4cd2 100644 --- a/sw/source/ui/uno/unotxvw.cxx +++ b/sw/source/ui/uno/unotxvw.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unotxvw.cxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: tl $ $Date: 2002-11-11 14:14:55 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:44:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -345,12 +345,13 @@ Sequence< uno::Type > SAL_CALL SwXTextView::getTypes( ) throw(::com::sun::star: ---------------------------------------------------------------------------*/ Sequence< sal_Int8 > SAL_CALL SwXTextView::getImplementationId( ) throw(::com::sun::star::uno::RuntimeException) { - static uno::Sequence< sal_Int8 > aId( 16 ); - static BOOL bInit = FALSE; + vos::OGuard aGuard(Application::GetSolarMutex()); + static Sequence< sal_Int8 > aId( 16 ); + static sal_Bool bInit = sal_False; if(!bInit) { - rtl_createUuid( (sal_uInt8 *)aId.getArray(), 0, sal_True ); - bInit = TRUE; + rtl_createUuid( (sal_uInt8 *)(aId.getArray() ), 0, sal_True ); + bInit = sal_True; } return aId; } @@ -531,6 +532,7 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface) throw( lang::IllegalArg const SwUnoCrsr* pUnoCrsr = pRange->GetTblCrsr(); if(pUnoCrsr) { + UnoActionRemoveContext aContext(pDoc); rSh.EnterStdMode(); rSh.SetSelection(*pUnoCrsr); return sal_True; @@ -1324,6 +1326,15 @@ void SwXTextViewCursor::gotoRange( FindSttNodeByType(eSearchNodeType); const SwNode* pSrcNode = 0; + if(pCursor && pCursor->GetCrsr()) + { + pSrcNode = pCursor->GetCrsr()->GetNode(); + } + else if(pRange && pRange->GetBookmark()) + { + SwBookmark* pBkm = pRange->GetBookmark(); + pSrcNode = &pBkm->GetPos().nNode.GetNode(); + } const SwStartNode* pTmp = pSrcNode ? pSrcNode->FindSttNodeByType(eSearchNodeType) : 0; //SectionNodes ueberspringen @@ -1331,6 +1342,10 @@ void SwXTextViewCursor::gotoRange( { pTmp = pTmp->FindStartNode(); } + while(pOwnStartNode && pOwnStartNode->IsSectionNode()) + { + pOwnStartNode = pOwnStartNode->FindStartNode(); + } //ohne Expand darf mit dem ViewCursor ueberall hingesprungen werden //mit Expand nur in der gleichen Umgebung if(bExpand && diff --git a/sw/source/ui/utlui/attrdesc.src b/sw/source/ui/utlui/attrdesc.src index 4c149ac9ef6c..d4e71fa53bdf 100644 --- a/sw/source/ui/utlui/attrdesc.src +++ b/sw/source/ui/utlui/attrdesc.src @@ -2,9 +2,9 @@ * * $RCSfile: attrdesc.src,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: kz $ $Date: 2002-04-26 09:36:42 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:45:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,11 +87,12 @@ String STR_DROP_OVER Text[ dutch ] = "Initialen over"; Text[ chinese_simplified ] = "瀛楅澶у啓锛岄珮搴︾瓑浜"; Text[ greek ] = "叔鲠脶哚 疖睐"; - Text[ korean ] = "雼澖鞚 觳 氍胳瀽 鞛レ嫕 鞙勳箻"; + Text[ korean ] = "雼澖 觳 氍胳瀽 鞛レ嫕"; Text[ turkish ] = "Ba㭎arfi/leri b鼀黷"; Text[ language_user1 ] = " "; - Text[ catalan ] = "L韓eas para iniciales"; + Text[ catalan ] = "Caplletres sobre"; Text[ finnish ] = "Anfangikoko"; + Text[ thai ] = "喔曕副喔о腑喔编竵喔┼福喔傕付喙夃笝喔曕箟喔權笚喔掂箞喔∴傅喔傕笝喔侧笖喙冟斧喔嵿箞喔氞笝"; }; String STR_DROP_LINES { @@ -107,7 +108,7 @@ String STR_DROP_LINES Text [ portuguese ] = "Linhas" ; Text [ portuguese_brazilian ] = "Zeilen" ; Text[ chinese_simplified ] = "琛"; - Text[ russian ] = "羊痤觇"; + Text[ russian ] = "耱痤觇"; Text[ polish ] = "Wiersze"; Text[ japanese ] = "琛"; Text[ chinese_traditional ] = "琛"; @@ -115,11 +116,12 @@ String STR_DROP_LINES Text[ dutch ] = "Regels"; Text[ chinese_simplified ] = "琛"; Text[ greek ] = "民犰燧"; - Text[ korean ] = "頄"; + Text[ korean ] = "欷"; Text[ turkish ] = "Sat齬"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Filas"; + Text[ catalan ] = "files"; Text[ finnish ] = "rivit"; + Text[ thai ] = "喙佮笘喔"; }; String STR_NO_DROP_LINES { @@ -146,8 +148,9 @@ String STR_NO_DROP_LINES Text[ korean ] = "雼澖 觳 氍胳瀽 鞛レ嫕 鞐嗢潓"; Text[ turkish ] = "Ba㭎arf yok"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sin iniciales"; + Text[ catalan ] = "Sense caplletra"; Text[ finnish ] = "Ei anfangeja"; + Text[ thai ] = "喔曕副喔о腑喔编竵喔┼福喔傕付喙夃笝喔曕箟喔權笚喔掂箞喙勦浮喙堗浮喔掂競喔權覆喔斷箖喔笉喙"; }; String STR_NO_PAGEDESC { @@ -163,7 +166,7 @@ String STR_NO_PAGEDESC Text [ portuguese ] = "Sem quebra de p醙ina" ; Text [ portuguese_brazilian ] = "kein Seitenumbruch" ; Text[ chinese_simplified ] = "涓嶆崲椤"; - Text[ russian ] = "徨 疣琊 耱疣龛"; + Text[ russian ] = "铃 疣琊 耱疣龛"; Text[ polish ] = "Bez 砤mania strony"; Text[ japanese ] = "鏀广儦銉笺偢銇仐"; Text[ chinese_traditional ] = "涓嶆彌闋"; @@ -174,8 +177,9 @@ String STR_NO_PAGEDESC Text[ korean ] = "韼橃澊歆 雮橂垊旮 鞐嗢潓"; Text[ turkish ] = "Sayfa sonu yok"; Text[ language_user1 ] = " "; - Text[ catalan ] = "sin salto de p醙ina"; - Text[ finnish ] = "Ei rivinvaihtoa"; + Text[ catalan ] = "sense salt de p鄃ina"; + Text[ finnish ] = "Ei sivunvaihtoa"; + Text[ thai ] = "喙勦浮喙堗箒喔氞箞喔囙斧喔權箟喔"; }; String STR_NO_MIRROR { @@ -191,7 +195,7 @@ String STR_NO_MIRROR Text [ portuguese ] = "N鉶 reflectir" ; Text [ portuguese_brazilian ] = "nicht Spiegeln" ; Text[ chinese_simplified ] = "涓嶇炕杞"; - Text[ russian ] = "礤 铗疣驵螯"; + Text[ russian ] = "湾 铗疣驵螯"; Text[ polish ] = "Nie odbijaj"; Text[ japanese ] = "鍙嶈虎銇椼仾銇"; Text[ chinese_traditional ] = "涓嶇炕杞"; @@ -199,11 +203,12 @@ String STR_NO_MIRROR Text[ dutch ] = "niet spiegelen"; Text[ chinese_simplified ] = "涓嶇炕杞"; Text[ greek ] = "歪 扃 氵礤 犴翎碥觌狍"; - Text[ korean ] = "雽旃 鞎婌潓"; + Text[ korean ] = "雽旃 鞎堩暔"; Text[ turkish ] = "Yans齮ma"; Text[ language_user1 ] = " "; - Text[ catalan ] = "No reflejar"; + Text[ catalan ] = "No reflexis"; Text[ finnish ] = "膌 peilaa"; + Text[ thai ] = "喔涪喙堗覆喔箞喔竾喔佮福喔班笀喔"; }; String STR_VERT_MIRROR { @@ -212,7 +217,7 @@ String STR_VERT_MIRROR Text [ dutch ] = "verticaal spiegelen" ; Text [ english_us ] = "Flip vertically" ; Text [ italian ] = "Rispecchia in verticale" ; - Text [ spanish ] = "Reflejar vertical" ; + Text [ spanish ] = "Reflejar verticalmente" ; Text [ french ] = "Refl閠er verticalement" ; Text [ swedish ] = "spegelv鋘d vertikalt" ; Text [ danish ] = "spejlvend lodret" ; @@ -227,11 +232,12 @@ String STR_VERT_MIRROR Text[ dutch ] = "verticaal spiegelen"; Text[ chinese_simplified ] = "鍨傜洿缈昏浆"; Text[ greek ] = "锺殒糸 犴狍赳秭"; - Text[ korean ] = "靾橃 雽旃"; + Text[ korean ] = "靸來晿 氚橃爠"; Text[ turkish ] = "Dikey yans齮"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Reflejar vertical"; + Text[ catalan ] = "Inverteix verticalment"; Text[ finnish ] = "K滗nn pystysuunta"; + Text[ thai ] = "喔炧弗喔脆竵喔曕覆喔∴箒喔權抚喔曕副喙夃竾"; }; String STR_HORI_MIRROR { @@ -240,7 +246,7 @@ String STR_HORI_MIRROR Text [ dutch ] = "horizontaal spiegelen" ; Text [ english_us ] = "Flip horizontal" ; Text [ italian ] = "Rispecchia in orizzontale" ; - Text [ spanish ] = "Reflejar horizontal" ; + Text [ spanish ] = "Reflejar horizontalmente" ; Text [ french ] = "Refl閠er horizontalement" ; Text [ swedish ] = "Spegelv鋘d horisontellt" ; Text [ danish ] = "spejlvend vandret" ; @@ -255,11 +261,12 @@ String STR_HORI_MIRROR Text[ dutch ] = "horizontaal spiegelen"; Text[ chinese_simplified ] = "姘村钩缈昏浆"; Text[ greek ] = "锺殒糸 犴狍赳秭"; - Text[ korean ] = "靾橅弶 雽旃"; + Text[ korean ] = "膦岇毎 氚橃爠"; Text[ turkish ] = "Yatay yans齮"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Reflejar horizontal"; - Text[ finnish ] = "K滗nn vaakasuunta"; + Text[ catalan ] = "Inverteix horitzontalment"; + Text[ finnish ] = "K滗nn vaakasuunnassa"; + Text[ thai ] = "喔炧弗喔脆竵喔曕覆喔∴箒喔權抚喔權腑喔"; }; String STR_BOTH_MIRROR { @@ -269,7 +276,7 @@ String STR_BOTH_MIRROR Text [ italian ] = "Rispecchiare in orizzontale e verticale" ; Text [ spanish ] = "Reflejar vertical y horizontalmente" ; Text [ french ] = "Refl閠er verticalement et horizontalement" ; - Text [ dutch ] = "Hoizontaal en verticaal spiegelen" ; + Text [ dutch ] = "Horizontaal en verticaal spiegelen" ; Text [ swedish ] = "spegelv鋘d vert. o. hori." ; Text [ danish ] = "spejlvend lodret og vandret" ; Text [ portuguese_brazilian ] = "vert. und horizontal Spiegeln" ; @@ -280,14 +287,15 @@ String STR_BOTH_MIRROR Text[ japanese ] = "涓婁笅銇ㄥ乏鍙炽伀鍙嶈虎"; Text[ chinese_traditional ] = "鍨傜洿鍜屾按骞崇炕杞"; Text[ arabic ] = "卿谶怯 衙禹 婷蒉"; - Text[ dutch ] = "Hoizontaal en verticaal spiegelen"; + Text[ dutch ] = "Horizontaal en verticaal spiegelen"; Text[ chinese_simplified ] = "鍨傜洿鍜屾按骞崇炕杞"; Text[ greek ] = "锺殒糸 赆 赆翎挈聃鲧 犴狍赳秭"; - Text[ korean ] = "靾橅弶瓿 靾橃 雽旃"; + Text[ korean ] = "靸來晿 氚橃爠 氚 膦岇毎 氚橃爠"; Text[ turkish ] = "Dikey ve yatay yans齮"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Reflejar vertical y horizontalmente"; + Text[ catalan ] = "Inverteix horitzontalment i verticalment"; Text[ finnish ] = "Vaaka- ja pystysuuntainen k滗nn鰏"; + Text[ thai ] = "喔炧弗喔脆竵喔曕覆喔∴箒喔權抚喔權腑喔權箒喔ム赴喙佮笝喔о笗喔编箟喔"; }; String STR_MIRROR_TOGGLE { @@ -303,7 +311,7 @@ String STR_MIRROR_TOGGLE Text [ french ] = "+ refl閠er horizontalement sur les pages paires" ; Text [ dutch ] = "+ op even pagina's horizontaal spiegelen" ; Text[ chinese_simplified ] = "+ 姘村钩缈昏浆鍒板伓鏁伴〉闈"; - Text[ russian ] = " +铗疣玷螯 镱 泐痂珙眚嚯 磬 麇蝽 耱疣龛鲟"; + Text[ russian ] = "悟疣玷螯 镱 泐痂珙眚嚯 磬 麇蝽 耱疣龛鲟"; Text[ polish ] = "+ odbij w poziomie na stronach parzystych"; Text[ japanese ] = "+ 鍋舵暟銉氥兗銈搞伀涓婁笅鍙嶈虎"; Text[ chinese_traditional ] = "+ 姘村钩缈昏綁鍒板伓鏁搁爜闈"; @@ -311,11 +319,12 @@ String STR_MIRROR_TOGGLE Text[ dutch ] = "+ op even pagina's horizontaal spiegelen"; Text[ chinese_simplified ] = "+ 姘村钩缈昏浆鍒板伓鏁伴〉闈"; Text[ greek ] = "+ 锺殒糸 犴翎碥觌狍 箦 祜磔 箦脒溴"; - Text[ korean ] = " + 歆濎垬 韼橃澊歆鞐愳劀 靾橅弶鞙茧 雽旃"; + Text[ korean ] = "+ 歆濎垬 韼橃澊歆鞐愳劀 膦岇毎 氚橃爠"; Text[ turkish ] = "+ 鏸ft numaral sayfalarda yatay yans齮"; Text[ language_user1 ] = " "; - Text[ catalan ] = "+ reflejar horizontalmente en las p醙inas pares"; + Text[ catalan ] = "+ reflexa horitzontalment a les p鄃ines parells"; Text[ finnish ] = "+ peilaa vaakasuunnassa parillisilla sivuilla"; + Text[ thai ] = "+ 喔箞喔竾喔曕覆喔∴箒喔權抚喔權腑喔權笟喔權斧喔權箟喔侧笚喔掂箞喙喔浮喔粪腑喔權竵喔编笝"; }; String STR_CHARFMT { @@ -331,7 +340,7 @@ String STR_CHARFMT Text [ portuguese ] = "Estilos de caracteres" ; Text [ portuguese_brazilian ] = "Zeichenvorlage" ; Text[ chinese_simplified ] = "瀛楃鏍峰紡"; - Text[ russian ] = "羊桦 珥嚓钼"; + Text[ russian ] = "羊桦 耔焘铍"; Text[ polish ] = "Styl znaku"; Text[ japanese ] = "鏂囧瓧銈广偪銈ゃ儷"; Text[ chinese_traditional ] = "瀛楀厓妯ｅ紡"; @@ -339,11 +348,12 @@ String STR_CHARFMT Text[ dutch ] = "Tekenopmaakprofiel"; Text[ chinese_simplified ] = "瀛楃鏍峰紡"; Text[ greek ] = "郁蹼 麽襻牯揆"; - Text[ korean ] = "氍胳瀽 韰滍攲毽"; + Text[ korean ] = "氍胳瀽 鞀ろ儉鞚"; Text[ turkish ] = "Karakter bi鏸mi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Estilo de caracteres"; - Text[ finnish ] = "Merkist鰊 tyyli"; + Text[ catalan ] = "Estil de car郼ters"; + Text[ finnish ] = "Merkkityyli"; + Text[ thai ] = "喔ム副喔佮俯喔撪赴喔曕副喔о腑喔编竵喔傕福喔"; }; String STR_NO_CHARFMT { @@ -359,7 +369,7 @@ String STR_NO_CHARFMT Text [ portuguese ] = "Estilo de caracteres inexistente" ; Text [ portuguese_brazilian ] = "keine Zeichenvorlage" ; Text[ chinese_simplified ] = "鏃犲瓧绗︽牱寮"; - Text[ russian ] = "铃 耱桦 珥嚓钼"; + Text[ russian ] = "铃 耱桦 耔焘铍"; Text[ polish ] = "Brak stylu znak體"; Text[ japanese ] = "鏂囧瓧銈广偪銈ゃ儷銇仐"; Text[ chinese_traditional ] = "鐒″瓧鍏冩ǎ寮"; @@ -367,11 +377,12 @@ String STR_NO_CHARFMT Text[ dutch ] = "geen opmaakprofiel"; Text[ chinese_simplified ] = "鏃犲瓧绗︽牱寮"; Text[ greek ] = "鼯襁 篝蹼 麽襻牯揆"; - Text[ korean ] = "氍胳瀽 韰滍攲毽 鞐嗢潓."; + Text[ korean ] = "氍胳瀽 鞀ろ儉鞚 鞐嗢潓"; Text[ turkish ] = "Karakter bi鏸mi yok"; Text[ language_user1 ] = " "; - Text[ catalan ] = "El estilo de car醕ter no existe"; - Text[ finnish ] = "Ei merkist鰊 tyyli"; + Text[ catalan ] = "L'estil de car郼ter no existeix"; + Text[ finnish ] = "Ei merkkityyli"; + Text[ thai ] = "喙勦浮喙堗浮喔掂弗喔编竵喔┼笓喔班笗喔编抚喔副喔佮競喔｀赴"; }; String STR_FOOTER { @@ -399,8 +410,9 @@ String STR_FOOTER Text[ korean ] = "氚旊嫢旮"; Text[ turkish ] = "Altbilgi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Pie de p醙ina"; - Text[ finnish ] = "Alaselite"; + Text[ catalan ] = "Peu de p鄃ina"; + Text[ finnish ] = "Alatunniste"; + Text[ thai ] = "喔箞喔о笝喔椸箟喔侧涪"; }; String STR_NO_FOOTER { @@ -417,7 +429,7 @@ String STR_NO_FOOTER Text [ portuguese ] = "Sem rodap" ; Text [ portuguese_brazilian ] = "keine Fu?zeile" ; Text[ chinese_simplified ] = "鏃犻〉鑴"; - Text[ russian ] = "徨 龛骓邈 觐腩眚栩箅"; + Text[ russian ] = "铃 龛骓邈 觐腩眚栩箅"; Text[ polish ] = "Bez stopki"; Text[ japanese ] = "銉曘儍銈裤仾銇"; Text[ chinese_traditional ] = "鐒￠爜灏"; @@ -425,11 +437,12 @@ String STR_NO_FOOTER Text[ dutch ] = "geen voettekst"; Text[ chinese_simplified ] = "鏃犻〉鑴"; Text[ greek ] = "鼯襁 躔矬蓦殇"; - Text[ korean ] = "氚旊嫢旮 鞐嗢潓."; + Text[ korean ] = "氚旊嫢旮 鞐嗢潓"; Text[ turkish ] = "Altbilgi yok"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sin pie de p醙ina"; - Text[ finnish ] = "Ei alaselitett"; + Text[ catalan ] = "Sense peu de p鄃ina"; + Text[ finnish ] = "Ei alatunnistetta"; + Text[ thai ] = "喙勦浮喙堗浮喔掂釜喙堗抚喔權笚喙夃覆喔"; }; String STR_HEADER { @@ -456,8 +469,9 @@ String STR_HEADER Text[ korean ] = "毹鸽Μ旮"; Text[ turkish ] = "躶tbilgi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezamiento"; - Text[ finnish ] = "Yl鋙tsikko"; + Text[ catalan ] = "Encap鏰lament"; + Text[ finnish ] = "Yl鋞unniste"; + Text[ thai ] = "喔箞喔о笝喔副喔"; }; String STR_NO_HEADER { @@ -473,7 +487,7 @@ String STR_NO_HEADER Text [ portuguese ] = "Sem cabe鏰lho" ; Text [ portuguese_brazilian ] = "keine Kopfzeile" ; Text[ chinese_simplified ] = "鏃犻〉鐪"; - Text[ russian ] = "徨 忮瘐礤泐 觐腩眚栩箅"; + Text[ russian ] = "铃 忮瘐礤泐 觐腩眚栩箅"; Text[ polish ] = "Bez nag丑wka"; Text[ japanese ] = "銉樸儍銉銇仐"; Text[ chinese_traditional ] = "鐒￠爜棣"; @@ -481,11 +495,12 @@ String STR_NO_HEADER Text[ dutch ] = "geen koptekst"; Text[ chinese_simplified ] = "鏃犻〉鐪"; Text[ greek ] = "鼯襁 赍鲠脒溽"; - Text[ korean ] = "毹鸽Μ旮 鞐嗢潓."; + Text[ korean ] = "毹鸽Μ旮 鞐嗢潓"; Text[ turkish ] = "躶tbilgi yok"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sin encabezamiento"; - Text[ finnish ] = "Ei yl鋙tsikkoa"; + Text[ catalan ] = "Sense encap鏰lament"; + Text[ finnish ] = "Ei yl鋞unnistetta"; + Text[ thai ] = "喙勦浮喙堗浮喔掂釜喙堗抚喔權斧喔编抚"; }; String STR_SURROUND_IDEAL { @@ -501,7 +516,7 @@ String STR_SURROUND_IDEAL Text [ portuguese ] = "Ajuste ideal" ; Text [ portuguese_brazilian ] = "idealer Umlauf" ; Text[ chinese_simplified ] = "鏈浣虫枃瀛楃幆缁"; - Text[ russian ] = "铒蜩爨朦眍 钺蝈赅龛"; + Text[ russian ] = "物蜩爨朦眍 钺蝈赅龛"; Text[ polish ] = "Obieg idealny"; Text[ japanese ] = "鏈閬┿仾鎶樸倞杩斻仐"; Text[ chinese_traditional ] = "鏈閬╁悎鏂囧瓧鐠扮篂"; @@ -509,11 +524,12 @@ String STR_SURROUND_IDEAL Text[ dutch ] = "ideale omloop"; Text[ chinese_simplified ] = "鏈浣虫枃瀛楃幆缁"; Text[ greek ] = "廨媵轶翮 犴徜唣膣箸"; - Text[ korean ] = "斓滌爜 氍胳瀽鞐 氚办箻"; + Text[ korean ] = "斓滌爜鞙茧 氍胳灔 氚办箻"; Text[ turkish ] = "Optimum metin da瘕l齧"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ajuste ideal"; + Text[ catalan ] = "Ajustament ideal"; Text[ finnish ] = "Optimaalinen rivitys"; + Text[ thai ] = "喔曕副喔斷箑喔浮喔侧赴喔椸傅喙堗釜喔膏笖"; }; String STR_SURROUND_NONE { @@ -529,7 +545,7 @@ String STR_SURROUND_NONE Text [ portuguese ] = "Sem ajuste" ; Text [ portuguese_brazilian ] = "kein Umlauf" ; Text[ chinese_simplified ] = "涓嶇幆缁"; - Text[ russian ] = "徨 钺蝈赅龛"; + Text[ russian ] = "铃 钺蝈赅龛"; Text[ polish ] = "Brak obiegu"; Text[ japanese ] = "涓婁笅鎶樸倞杩斻仐"; Text[ chinese_traditional ] = "涓嶇挵绻"; @@ -537,11 +553,12 @@ String STR_SURROUND_NONE Text[ dutch ] = "geen omloop"; Text[ chinese_simplified ] = "涓嶇幆缁"; Text[ greek ] = "座襁 犴徜唣膣箸"; - Text[ korean ] = "氍胳瀽鞐 氚办箻 鞐嗢潓"; + Text[ korean ] = "氍胳灔 氚办箻 鞐嗢潓"; Text[ turkish ] = "Metin da瘕l齧 yok"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sin ajuste"; + Text[ catalan ] = "Sense ajustament"; Text[ finnish ] = "Ei rivityst"; + Text[ thai ] = "喙勦浮喙堗笗喔编笖"; }; String STR_SURROUND_THROUGHT { @@ -565,11 +582,12 @@ String STR_SURROUND_THROUGHT Text[ dutch ] = "doorloop"; Text[ chinese_simplified ] = "璐┛"; Text[ greek ] = "拈 燧箫"; - Text[ korean ] = "氍胳灔頋愲ゴ旮"; + Text[ korean ] = "氚办箻 鞐嗢潓"; Text[ turkish ] = "Metin arkas齨a g鰊der"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Continuo"; + Text[ catalan ] = "Continu"; Text[ finnish ] = "Kautta"; + Text[ thai ] = "喔溹箞喔侧笝"; }; String STR_SURROUND_PARALLEL { @@ -585,7 +603,7 @@ String STR_SURROUND_PARALLEL Text [ portuguese ] = "Ajuste paralelo" ; Text [ portuguese_brazilian ] = "paralleler Umlauf" ; Text[ chinese_simplified ] = "骞宠鐜粫"; - Text[ russian ] = "镟疣腚咫铄 钺蝈赅龛"; + Text[ russian ] = "吾蝈赅龛 镱 觐眚箴"; Text[ polish ] = "Obieg r體noleg硑"; Text[ japanese ] = "涓婁笅鎶樸倞杩斻仐"; Text[ chinese_traditional ] = "骞宠鐠扮篂"; @@ -593,11 +611,12 @@ String STR_SURROUND_PARALLEL Text[ dutch ] = "omloop parallel"; Text[ chinese_simplified ] = "骞宠鐜粫"; Text[ greek ] = "疳褴腚珉 犴徜唣膣箸"; - Text[ korean ] = "氍胳瀽鞐 氚办箻锛岉弶頄"; + Text[ korean ] = "韽夗枆鞙茧 氍胳灔 氚办箻"; Text[ turkish ] = "Paralel metin da瘕l齧"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ajuste paralelo"; + Text[ catalan ] = "Ajustament paral.lel"; Text[ finnish ] = "Samansuuntainen rivitys"; + Text[ thai ] = "喔曕副喔斷箒喔氞笟喔傕笝喔侧笝"; }; String STR_SURROUND_COLUMN { @@ -613,7 +632,7 @@ String STR_SURROUND_COLUMN Text [ portuguese ] = "Ajustar colunas" ; Text [ portuguese_brazilian ] = "spaltiger Umlauf" ; Text[ chinese_simplified ] = "鍒楀唴鏂囧瓧鐜粫"; - Text[ russian ] = "吾蝈赅龛 忖桎 觐腩眍"; + Text[ russian ] = "吾蝈赅龛 忤溴 觐腩眍"; Text[ polish ] = "Obieg kolumnowy"; Text[ japanese ] = "鍒椼伄鎶樸倞杩斻仐"; Text[ chinese_traditional ] = "鍒楀収鏂囧瓧鐠扮篂"; @@ -621,11 +640,12 @@ String STR_SURROUND_COLUMN Text[ dutch ] = "omloop kolom"; Text[ chinese_simplified ] = "鍒楀唴鏂囧瓧鐜粫"; Text[ greek ] = "另徜唣膣箸 篝揠珧"; - Text[ korean ] = "氍胳瀽鞐 氚办箻锛岆嫧鞐愳劀"; + Text[ korean ] = "鞐 氍胳灔 氚办箻"; Text[ turkish ] = "-"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ajuste en columnas"; - Text[ finnish ] = "Sarakkeen rivitys"; + Text[ catalan ] = "Ajustament de columnes"; + Text[ finnish ] = "Palstan rivitys"; + Text[ thai ] = "喔曕副喔斷竸喔弗喔编浮喔權箤"; }; String STR_SURROUND_LEFT { @@ -649,11 +669,12 @@ String STR_SURROUND_LEFT Text[ dutch ] = "omloop linkerkant"; Text[ chinese_simplified ] = "宸︾幆缁"; Text[ greek ] = "犴徜唣膣箸 狁轶翦褴"; - Text[ korean ] = "氍胳瀽鞐 氚办箻锛岇櫦飒"; + Text[ korean ] = "氍胳灔 氚办箻 鞕检"; Text[ turkish ] = "Sol metin da瘕l齧"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ajuste a la izquierda"; + Text[ catalan ] = "Ajustament esquerre"; Text[ finnish ] = "Rivitys vasemmalle"; + Text[ thai ] = "喔曕副喔斷笖喙夃覆喔權笅喙夃覆喔"; }; String STR_SURROUND_RIGHT { @@ -677,11 +698,12 @@ String STR_SURROUND_RIGHT Text[ dutch ] = "omloop rechterkant"; Text[ chinese_simplified ] = "鍙崇幆缁"; Text[ greek ] = "犴徜唣膣箸 溴铋"; - Text[ korean ] = "氍胳瀽鞐 氚办箻锛岇槫毳胳"; + Text[ korean ] = "氤鸽鞚 鞓るジ飒届溂搿 氚办箻"; Text[ turkish ] = "Sa metin da瘕l齧"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ajuste a la derecha"; + Text[ catalan ] = "Ajustament dret"; Text[ finnish ] = "Rivit oikealle"; + Text[ thai ] = "喔曕副喔斷笖喙夃覆喔權競喔о覆"; }; String STR_SURROUND_INSIDE { @@ -705,11 +727,12 @@ String STR_SURROUND_INSIDE Text[ dutch ] = "omloop binnenkant"; Text[ chinese_simplified ] = "鍐呴儴鐜粫"; Text[ greek ] = "另徜唣膣箸 - 弩羼殛"; - Text[ korean ] = "氍胳瀽鞐 氚办箻锛岇晥飒"; + Text[ korean ] = "氍胳灔 氚办箻 鞎堨溂搿"; Text[ turkish ] = "葭 metin da瘕l齧"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ajuste interno"; + Text[ catalan ] = "Ajustament intern"; Text[ finnish ] = "Sisempi rivitys"; + Text[ thai ] = "喔曕副喔斷笖喙夃覆喔權箖喔"; }; String STR_SURROUND_OUTSIDE { @@ -734,11 +757,12 @@ String STR_SURROUND_OUTSIDE Text[ dutch ] = "omloop buitenkant"; Text[ chinese_simplified ] = "澶栫幆缁"; Text[ greek ] = "另徜唣膣箸 - 孱羼殛"; - Text[ korean ] = "氍胳瀽鞐 氚办箻锛岆皵旯レ"; + Text[ korean ] = "氍胳灔 氚办箻 氚旉攻飒届溂搿"; Text[ turkish ] = "D metin da瘕l齧"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ajuste externo"; + Text[ catalan ] = "Ajustament exterior"; Text[ finnish ] = "Ulompi rivitys"; + Text[ thai ] = "喔曕副喔斷笖喙夃覆喔權笝喔竵"; }; String STR_SURROUND_ANCHORONLY { @@ -754,7 +778,7 @@ String STR_SURROUND_ANCHORONLY Text [ portuguese ] = "(s 鈔cora)" ; Text [ portuguese_brazilian ] = "(nur Anker)" ; Text[ chinese_simplified ] = "(鍙槸鏍囪)"; - Text[ russian ] = "(蝾朦觐 镳桠珀)"; + Text[ russian ] = "(蝾朦觐 觐瘘)"; Text[ polish ] = "(tylko kotwica)"; Text[ japanese ] = "(銈€兂銈兗銇伩)"; Text[ chinese_traditional ] = "(鍙槸妯欒櫉)"; @@ -762,11 +786,12 @@ String STR_SURROUND_ANCHORONLY Text[ dutch ] = "(alleen anker)"; Text[ chinese_simplified ] = "(鍙槸鏍囪)"; Text[ greek ] = "(禳盹 徙挲聩箸)"; - Text[ korean ] = "(瓿犾爼 旮办毵)"; + Text[ korean ] = "(旮办 鞙勳箻毵)"; Text[ turkish ] = "(yaln齴ca sabitleyici)"; Text[ language_user1 ] = " "; - Text[ catalan ] = "(solo ancla)"; + Text[ catalan ] = "(nom閟 ancla)"; Text[ finnish ] = "(Vain ankkuri)"; + Text[ thai ] = "(喔浮喔腑喔⑧箞喔侧竾喙喔斷傅喔⑧抚)"; }; String STR_FRM_WIDTH { @@ -793,8 +818,9 @@ String STR_FRM_WIDTH Text[ korean ] = "雱堧箘:"; Text[ turkish ] = "Geniik:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ancho:"; + Text[ catalan ] = "Amplada"; Text[ finnish ] = "Leveys:"; + Text[ thai ] = "喔勦抚喔侧浮喔佮抚喙夃覆喔:"; }; String STR_FRM_FIXEDHEIGHT { @@ -811,7 +837,7 @@ String STR_FRM_FIXEDHEIGHT Text [ portuguese ] = "Altura fixa:" ; Text [ portuguese_brazilian ] = "feste H?e:" ; Text[ chinese_simplified ] = "鍥哄畾楂樺害锛"; - Text[ russian ] = "翳犟桊钼囗磬 恹耦蜞:"; + Text[ russian ] = "澡犟桊钼囗磬 恹耦蜞:"; Text[ polish ] = "Sta砤 wysoko滄:"; Text[ japanese ] = "瑕忓畾銇珮銇:"; Text[ chinese_traditional ] = "鍥哄畾楂樺害锛"; @@ -822,8 +848,9 @@ String STR_FRM_FIXEDHEIGHT Text[ korean ] = "瓿犾爼霅 雴掛澊:"; Text[ turkish ] = "Sabit y黭seklik:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Altura fija:"; + Text[ catalan ] = "Al鏰da fixa"; Text[ finnish ] = "Kiinte korkeus:"; + Text[ thai ] = "喔勦抚喔侧浮喔腹喔囙竸喔囙笚喔掂箞:"; }; String STR_FRM_MINHEIGHT { @@ -840,7 +867,7 @@ String STR_FRM_MINHEIGHT Text [ portuguese ] = "Altura min.:" ; Text [ portuguese_brazilian ] = "min. H?e:" ; Text[ chinese_simplified ] = "鏈灏忛珮搴︼細"; - Text[ russian ] = "扈. 恹耦蜞:"; + Text[ russian ] = "惕. 恹耦蜞:"; Text[ polish ] = "Min. wysoko滄:"; Text[ japanese ] = "鏈浣庛伄楂樸仌:"; Text[ chinese_traditional ] = "鏈灏忛珮搴︼細"; @@ -851,36 +878,38 @@ String STR_FRM_MINHEIGHT Text[ korean ] = "斓滌唽 雴掛澊:"; Text[ turkish ] = "Asg.y黭seklik:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Altura m韓ima:"; + Text[ catalan ] = "Al鏰da m韓ima:"; Text[ finnish ] = "Korkeus v鋒."; + Text[ thai ] = "喔勦抚喔侧浮喔腹喔囙笝喙夃腑喔⑧笚喔掂箞喔父喔:"; }; String STR_FLY_AT_CNTNT { TEXT = "absatzgebunden" ; TEXT [ English ] = "at paragraph" ; - Text [ dutch ] = "alinea-gebonden" ; + Text [ dutch ] = "alineagebonden" ; Text [ english_us ] = "to paragraph" ; Text [ italian ] = "al paragrafo" ; - Text [ spanish ] = "seg鷑 p醨rafo" ; + Text [ spanish ] = "al p醨rafo" ; Text [ french ] = "li au paragraphe" ; Text [ swedish ] = "bunden till stycke" ; Text [ danish ] = "bundet til afsnit" ; Text [ portuguese ] = "ligado ao par醙rafo" ; Text [ portuguese_brazilian ] = "absatzgebunden" ; Text[ chinese_simplified ] = "鍜屾钀借繛鍦ㄤ竴璧"; - Text[ russian ] = "镳桠珀 噌玎鲶"; + Text[ russian ] = " 噌玎鲶"; Text[ polish ] = "zwi箊any z akapitem"; Text[ japanese ] = "娈佃惤銇祼鍚"; Text[ chinese_traditional ] = "鍜屾钀介ｅ湪涓璧"; Text[ arabic ] = "阊嗜 惹彷扪"; - Text[ dutch ] = "alinea-gebonden"; + Text[ dutch ] = "alineagebonden"; Text[ chinese_simplified ] = "鍜屾钀借繛鍦ㄤ竴璧"; Text[ greek ] = "瘃矧 疳褴泷狯"; - Text[ korean ] = "雼澖鞐"; + Text[ korean ] = "雼澖鞐 瓴绊暕"; Text[ turkish ] = "Paragrafa ba餷"; Text[ language_user1 ] = " "; - Text[ catalan ] = "seg鷑 p醨rafo"; + Text[ catalan ] = "segons par鄃raf"; Text[ finnish ] = "kappaleeseen"; + Text[ thai ] = "喙勦笡喔⑧副喔囙涪喙堗腑喔笝喙夃覆"; }; String STR_FLY_IN_CNTNT { @@ -888,27 +917,28 @@ String STR_FLY_IN_CNTNT TEXT [ English ] = "at character" ; Text [ english_us ] = "to character" ; Text [ italian ] = "al carattere" ; - Text [ spanish ] = "seg鷑 car醕ter" ; + Text [ spanish ] = "al car醕ter" ; Text [ french ] = "au caract鑢e" ; - Text [ dutch ] = "schriftteken-gebonden" ; + Text [ dutch ] = "Tekengebonden" ; Text [ swedish ] = "bunden till tecken" ; Text [ danish ] = "bundet til tegn" ; Text [ portuguese ] = "conforme car醕ter" ; Text [ portuguese_brazilian ] = "zeichengebunden" ; Text[ chinese_simplified ] = "鍜屾枃瀛楄繛鍦ㄤ竴璧"; - Text[ russian ] = "镳桠珀 珥嚓"; + Text[ russian ] = " 耔焘铍"; Text[ polish ] = "zwi箊any ze znakiem"; Text[ japanese ] = "鏂囧瓧銇祼鍚"; Text[ chinese_traditional ] = "鍜屾枃瀛楅ｅ湪涓璧"; Text[ arabic ] = "阊嗜 惹崦脱"; - Text[ dutch ] = "schriftteken-gebonden"; + Text[ dutch ] = "Tekengebonden"; Text[ chinese_simplified ] = "鍜屾枃瀛楄繛鍦ㄤ竴璧"; Text[ greek ] = "瘃矧 麽襻牯揆"; - Text[ korean ] = "氍胳瀽鞐"; + Text[ korean ] = "氍胳瀽鞐 瓴绊暕"; Text[ turkish ] = "Karaktere ba餷"; Text[ language_user1 ] = " "; - Text[ catalan ] = "seg鷑 car醕ter"; + Text[ catalan ] = "segons car郼ter"; Text[ finnish ] = "merkkiin"; + Text[ thai ] = "喙勦笡喔⑧副喔囙笗喔编抚喔副喔佮競喔｀赴"; }; String STR_FLY_PAGE { @@ -918,25 +948,26 @@ String STR_FLY_PAGE Text [ italian ] = "alla pagina" ; Text [ spanish ] = "a la p醙ina" ; Text [ french ] = " la page" ; - Text [ dutch ] = "pagina-gebonden" ; + Text [ dutch ] = "paginagebonden" ; Text [ swedish ] = "bunden till sida" ; Text [ danish ] = "bundet til side" ; Text [ portuguese ] = "conforme p醙ina" ; Text [ portuguese_brazilian ] = "seitengebunden" ; Text[ chinese_simplified ] = "鍜岄〉杩炲湪涓璧"; - Text[ russian ] = "镳桠珀 耱疣龛鲥"; + Text[ russian ] = " 耱疣龛鲥"; Text[ polish ] = "zwi箊any ze stron"; Text[ japanese ] = "銉氥兗銈搞伀绲愬悎"; Text[ chinese_traditional ] = "鍜岄爜閫ｅ湪涓璧"; Text[ arabic ] = "阊嗜 惹嵴萃"; - Text[ dutch ] = "pagina-gebonden"; + Text[ dutch ] = "paginagebonden"; Text[ chinese_simplified ] = "鍜岄〉杩炲湪涓璧"; Text[ greek ] = "瘃矧 箦脒溽"; - Text[ korean ] = "韼橃澊歆 甏霠"; + Text[ korean ] = "韼橃澊歆鞐 瓴绊暕"; Text[ turkish ] = "Sayfaya ba餷"; Text[ language_user1 ] = " "; - Text[ catalan ] = "a la p醙ina"; + Text[ catalan ] = "a la p鄃ina"; Text[ finnish ] = "sivulle"; + Text[ thai ] = "喙勦笡喔⑧副喔囙斧喔權箟喔"; }; String STR_POS_X { @@ -963,8 +994,9 @@ String STR_POS_X Text[ korean ] = "X 膦岉憸:"; Text[ turkish ] = "X koord.:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Coord. X:"; + Text[ catalan ] = "Coordenada X"; Text[ finnish ] = "X-koordinaatti:"; + Text[ thai ] = "喔炧复喔佮副喔 X :"; }; String STR_POS_Y { @@ -991,8 +1023,9 @@ String STR_POS_Y Text[ korean ] = "Y 膦岉憸:"; Text[ turkish ] = "Y koord.:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Coord. Y:"; + Text[ catalan ] = "Coordenada Y"; Text[ finnish ] = "Y-koordinaatti:"; + Text[ thai ] = "喔炧复喔佮副喔 Y :"; }; String STR_VERT_TOP { @@ -1016,11 +1049,12 @@ String STR_VERT_TOP Text[ dutch ] = "boven"; Text[ chinese_simplified ] = "涓"; Text[ greek ] = "疖睐"; - Text[ korean ] = "鞙勳棎"; + Text[ korean ] = "鞙"; Text[ turkish ] = "黶tte"; Text[ language_user1 ] = " "; - Text[ catalan ] = "arriba"; + Text[ catalan ] = "a la part superior"; Text[ finnish ] = "ylh滗ll"; + Text[ thai ] = "喔椸傅喙堗笖喙夃覆喔權笟喔"; }; String STR_VERT_CENTER { @@ -1029,7 +1063,7 @@ String STR_VERT_CENTER Text [ dutch ] = "verticaal gecentreerd" ; Text [ english_us ] = "Centered vertically" ; Text [ italian ] = "Centrato in verticale" ; - Text [ spanish ] = "centrado vertical" ; + Text [ spanish ] = "Centrado verticalmente" ; Text [ french ] = "Centr verticalement" ; Text [ swedish ] = "vertikalt centrerad" ; Text [ danish ] = "lodret centreret" ; @@ -1047,8 +1081,9 @@ String STR_VERT_CENTER Text[ korean ] = "靾橃鞙茧 臧鞖措嵃"; Text[ turkish ] = "Dikey ortala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "centrado vertical"; + Text[ catalan ] = "Centrat verticalment"; Text[ finnish ] = "Keskitetty pystytasossa"; + Text[ thai ] = "喔曕福喔囙竵喔ム覆喔囙笗喔侧浮喙佮笝喔о笗喔编箟喔"; }; String STR_VERT_BOTTOM { @@ -1075,8 +1110,9 @@ String STR_VERT_BOTTOM Text[ korean ] = "鞎勲灅鞐"; Text[ turkish ] = "altta"; Text[ language_user1 ] = " "; - Text[ catalan ] = "abajo"; + Text[ catalan ] = "a la part inferior"; Text[ finnish ] = "pohjalla"; + Text[ thai ] = "喔椸傅喙堗笖喙夃覆喔權弗喙堗覆喔"; }; String STR_LINE_TOP { @@ -1085,8 +1121,8 @@ String STR_LINE_TOP Text [ dutch ] = "bovenste regel" ; Text [ english_us ] = "Top of line" ; Text [ italian ] = "Riga in alto" ; - Text [ spanish ] = "L韓ea superior" ; - Text [ french ] = "Ligne sup閞ieure" ; + Text [ spanish ] = "L韓ea arriba" ; + Text [ french ] = "Ligne en haut" ; Text [ swedish ] = "講ersta raden" ; Text [ danish ] = "r鎘ke 鴙erst" ; Text [ portuguese ] = "Linha superior" ; @@ -1100,11 +1136,12 @@ String STR_LINE_TOP Text[ dutch ] = "bovenste regel"; Text[ chinese_simplified ] = "琛屼笂鏂"; Text[ greek ] = "民犰燹 疖睐"; - Text[ korean ] = "靹 鞙"; + Text[ korean ] = "欷 鞙"; Text[ turkish ] = "Sat齬 黶t"; Text[ language_user1 ] = " "; - Text[ catalan ] = "L韓ea superior"; - Text[ finnish ] = "Viivan yl鋙sa"; + Text[ catalan ] = "L韓ia superior"; + Text[ finnish ] = "Viivan yl鋜euna"; + Text[ thai ] = "喔氞福喔｀笚喔编笖喔氞笝"; }; String STR_LINE_CENTER { @@ -1120,7 +1157,7 @@ String STR_LINE_CENTER Text [ portuguese ] = "Centrado sobre a linha na vertical" ; Text [ portuguese_brazilian ] = "vertikal zur Zeile zentriert" ; Text[ chinese_simplified ] = "鍜岃鍨傜洿灞呬腑"; - Text[ russian ] = "洛痱桕嚯铄 鲥眚痂痤忄龛 镱 铗眍龛 耱痤赍"; + Text[ russian ] = "洛痱桕嚯铄 鲥眚痂痤忄龛 镱 铗眍龛 腓龛"; Text[ polish ] = "Wy渞odkowany pionowo do wiersza"; Text[ japanese ] = "銈汇儷銇瀭鐩淬伀涓ぎ鎻冦亪"; Text[ chinese_traditional ] = "鍜岃鍨傜洿缃腑"; @@ -1128,11 +1165,12 @@ String STR_LINE_CENTER Text[ dutch ] = "verticaal op de regel gecentreerd"; Text[ chinese_simplified ] = "鍜岃鍨傜洿灞呬腑"; Text[ greek ] = "赆翎挈聃鲠 赍眙襻耖箪蓓 瘃矧 翮 泷犰燹"; - Text[ korean ] = "欷勳棎 雽頃 靾橃鞙茧 臧鞖措嵃"; + Text[ korean ] = "欷勳潉 臧鞖措嵃搿"; Text[ turkish ] = "Sat齬a g鰎e dikey ortala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Centrado verticalmente a la l韓ea"; + Text[ catalan ] = "Centrat verticalment a la l韓ia"; Text[ finnish ] = "Keskitetty rivi"; + Text[ thai ] = "喔氞福喔｀笚喔编笖喔曕福喔囙竵喔ム覆喔"; }; String STR_LINE_BOTTOM { @@ -1141,8 +1179,8 @@ String STR_LINE_BOTTOM Text [ dutch ] = "onderste regel" ; Text [ english_us ] = "Bottom of line" ; Text [ italian ] = "Riga in basso" ; - Text [ spanish ] = "L韓ea inferior" ; - Text [ french ] = "Ligne inf閞ieure" ; + Text [ spanish ] = "L韓ea abajo" ; + Text [ french ] = "Ligne en bas" ; Text [ swedish ] = "Nedersta raden" ; Text [ danish ] = "r鎘ke nederst" ; Text [ portuguese ] = "Linha inferior" ; @@ -1156,11 +1194,12 @@ String STR_LINE_BOTTOM Text[ dutch ] = "onderste regel"; Text[ chinese_simplified ] = "琛屼笅鏂"; Text[ greek ] = "民犰燹 贶豉"; - Text[ korean ] = "靹 鞎勲灅"; + Text[ korean ] = "欷 鞎勲灅"; Text[ turkish ] = "Sat齬 alt"; Text[ language_user1 ] = " "; - Text[ catalan ] = "L韓ea inferior"; - Text[ finnish ] = "Viivan alaosa"; + Text[ catalan ] = "L韓ia inferior"; + Text[ finnish ] = "Viivan alareuna"; + Text[ thai ] = "喔氞福喔｀笚喔编笖喔ム箞喔侧竾"; }; String STR_REGISTER_ON { @@ -1170,7 +1209,7 @@ String STR_REGISTER_ON Text [ italian ] = "Conformit registro" ; Text [ spanish ] = "Conformidad registro" ; Text [ french ] = "Contr鬺e de rep閞age" ; - Text [ dutch ] = "registeren" ; + Text [ dutch ] = "registreren" ; Text [ swedish ] = "Register" ; Text [ danish ] = "hold register" ; Text [ portuguese ] = "Registo" ; @@ -1181,23 +1220,24 @@ String STR_REGISTER_ON Text[ japanese ] = "鍗板埛瑕嬪綋銈掑悎銈忋仜銈"; Text[ chinese_traditional ] = "姝ｅ弽闋佺殑琛岃窛鐩哥瓑"; Text[ arabic ] = "轻卿寿倾"; - Text[ dutch ] = "registeren"; + Text[ dutch ] = "registreren"; Text[ chinese_simplified ] = "姝ｅ弽椤电殑琛岃窛鐩哥瓑"; Text[ greek ] = "硼殁邂徇 邈泷狯掾"; - Text[ korean ] = "霠堨鞀ろ劙 氤挫湢"; + Text[ korean ] = "鞚胳噭頃 霑 臧電 毵烄钉 "; Text[ turkish ] = "E㱮t sat齬 y黭sekli餴"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Conformidad registro"; - Text[ finnish ] = "Rekisteri-tosi"; + Text[ catalan ] = "Conforme al registre"; + Text[ finnish ] = "Rivirekisteri"; + Text[ thai ] = "喔ム竾喔椸赴喙喔氞傅喔⑧笝-喔堗福喔脆竾"; }; String STR_REGISTER_OFF { TEXT = "keine Registerhaltigkeit" ; TEXT [ English ] = "no register" ; - Text [ dutch ] = "niet registeren" ; + Text [ dutch ] = "niet registreren" ; Text [ english_us ] = "Not register-true" ; Text [ italian ] = "Senza conformit registro" ; - Text [ spanish ] = "Sin conformidad registro" ; + Text [ spanish ] = "Sin conformidad de registro" ; Text [ french ] = "Pas de contr鬺e de rep閞age" ; Text [ swedish ] = "inget register" ; Text [ danish ] = "hold ikke register" ; @@ -1209,14 +1249,15 @@ String STR_REGISTER_OFF Text[ japanese ] = "鍗板埛瑕嬪綋銈掑悎銈忋仜銇亜"; Text[ chinese_traditional ] = "姝ｅ弽闋佺殑琛岃窛涓嶇浉绛"; Text[ arabic ] = "认驿 卿寿倾"; - Text[ dutch ] = "niet registeren"; + Text[ dutch ] = "niet registreren"; Text[ chinese_simplified ] = "姝ｅ弽椤电殑琛岃窛涓嶇浉绛"; Text[ greek ] = "座襁 屦殁邂徇 邈泷狯掾"; - Text[ korean ] = "霠堨鞀ろ劙 氤挫湢 鞐嗢潓"; + Text[ korean ] = "臧電 毵烄钉 鞐嗢潓"; Text[ turkish ] = "E㱮t sat齬 y黭sekli餴 mevcut de餴l"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sin conformidad registro"; - Text[ finnish ] = "Ei rekister鰅ty-tosi"; + Text[ catalan ] = "No conforme al registre"; + Text[ finnish ] = "Ei rivirekisteri"; + Text[ thai ] = "喙勦浮喙堗弗喔囙笚喔班箑喔氞傅喔⑧笝-喔堗福喔脆竾"; }; String STR_HORI_RIGHT { @@ -1225,7 +1266,7 @@ String STR_HORI_RIGHT Text [ dutch ] = "rechts" ; Text [ english_us ] = "at the right" ; Text [ italian ] = "Destra" ; - Text [ spanish ] = "derecha" ; + Text [ spanish ] = "a la derecha" ; Text [ french ] = " droite" ; Text [ swedish ] = "h鰃er" ; Text [ danish ] = "h鴍re" ; @@ -1243,8 +1284,9 @@ String STR_HORI_RIGHT Text[ korean ] = "鞓るジ飒"; Text[ turkish ] = "sa"; Text[ language_user1 ] = " "; - Text[ catalan ] = "derecha"; + Text[ catalan ] = "a la dreta"; Text[ finnish ] = "oikealla"; + Text[ thai ] = "喔椸傅喙堗笖喙夃覆喔權競喔о覆"; }; String STR_HORI_CENTER { @@ -1253,7 +1295,7 @@ String STR_HORI_CENTER Text [ dutch ] = "horizontaal gecentreerd" ; Text [ english_us ] = "Centered horizontally" ; Text [ italian ] = "Centrato in orizzontale" ; - Text [ spanish ] = "Centrado horizontal" ; + Text [ spanish ] = "Centrado horizontalmente" ; Text [ french ] = "Centr horizontalement" ; Text [ swedish ] = "Horisontellt centrerad" ; Text [ danish ] = "vandret centreret" ; @@ -1268,11 +1310,12 @@ String STR_HORI_CENTER Text[ dutch ] = "horizontaal gecentreerd"; Text[ chinese_simplified ] = "姘村钩灞呬腑"; Text[ greek ] = "锺殒镯暨 赍眙襻耖箪蓓"; - Text[ korean ] = "靾橅弶鞙茧 臧鞖措嵃"; + Text[ korean ] = "靾橅弶鞙茧 臧鞖措嵃鞐"; Text[ turkish ] = "Yatay ortala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Centrado horizontal"; + Text[ catalan ] = "Centrat horitzontalment"; Text[ finnish ] = "Keskitetty vaakataso"; + Text[ thai ] = "喔曕福喔囙竵喔ム覆喔囙笗喔侧浮喙佮笝喔о笝喔笝"; }; String STR_HORI_LEFT { @@ -1280,7 +1323,7 @@ String STR_HORI_LEFT TEXT [ English ] = "at the left" ; Text [ english_us ] = "at the left" ; Text [ italian ] = "sinistra" ; - Text [ spanish ] = "Izquierda" ; + Text [ spanish ] = "a la izquierda" ; Text [ french ] = " gauche" ; Text [ dutch ] = "links" ; Text [ swedish ] = "v鋘ster" ; @@ -1299,8 +1342,9 @@ String STR_HORI_LEFT Text[ korean ] = "鞕检"; Text[ turkish ] = "sol"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Izquierda"; + Text[ catalan ] = "a l'esquerra"; Text[ finnish ] = "vasemmalla"; + Text[ thai ] = "喔椸傅喙堗笖喙夃覆喔權笅喙夃覆喔"; }; String STR_HORI_INSIDE { @@ -1327,8 +1371,9 @@ String STR_HORI_INSIDE Text[ korean ] = "雮措秬"; Text[ turkish ] = "i"; Text[ language_user1 ] = " "; - Text[ catalan ] = "interior"; + Text[ catalan ] = "dins"; Text[ finnish ] = "sis鋖l"; + Text[ thai ] = "喔傕箟喔侧竾喙冟笝"; }; String STR_HORI_OUTSIDE { @@ -1356,8 +1401,9 @@ String STR_HORI_OUTSIDE Text[ korean ] = "鞕鸽秬"; Text[ turkish ] = "d"; Text[ language_user1 ] = " "; - Text[ catalan ] = "exterior"; + Text[ catalan ] = "fora"; Text[ finnish ] = "ulkopuolella"; + Text[ thai ] = "喔傕箟喔侧竾喔權腑喔"; }; String STR_HORI_FULL { @@ -1381,11 +1427,12 @@ String STR_HORI_FULL Text[ dutch ] = "volle breedte"; Text[ chinese_simplified ] = "鏁翠釜瀹藉害"; Text[ greek ] = "镫腌耧 痣荇矧"; - Text[ korean ] = "鞝勳泊 雱堧箘"; + Text[ korean ] = "斓滊寑 雱堧箘"; Text[ turkish ] = "Tam geniik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ancho total"; + Text[ catalan ] = "Amplada completa"; Text[ finnish ] = "T鋣si leveys"; + Text[ thai ] = "喔勦抚喔侧浮喔佮抚喙夃覆喔囙箑喔曕箛喔"; }; String STR_COLUMNS { @@ -1401,7 +1448,7 @@ String STR_COLUMNS Text [ portuguese ] = "Colunas" ; Text [ portuguese_brazilian ] = "Spalten" ; Text[ chinese_simplified ] = "鍒"; - Text[ russian ] = "暑腩黻"; + Text[ russian ] = "羊铍狯"; Text[ polish ] = "Kolumny"; Text[ japanese ] = "娈电祫銇"; Text[ chinese_traditional ] = "娆"; @@ -1412,8 +1459,9 @@ String STR_COLUMNS Text[ korean ] = "雼"; Text[ turkish ] = "S黷un"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Columnas"; - Text[ finnish ] = "Sarakkeet"; + Text[ catalan ] = "Columnes"; + Text[ finnish ] = "Palstat"; + Text[ thai ] = "喔勦腑喔ム副喔∴笝喙"; }; String STR_LINE_WIDTH { @@ -1437,11 +1485,12 @@ String STR_LINE_WIDTH Text[ dutch ] = "breedte scheidingslijn:"; Text[ chinese_simplified ] = "鍒嗛殧绾跨矖锛"; Text[ greek ] = "须荇矧 溟狩轶糸贽 泷犰燹:"; - Text[ korean ] = "甑秳 旮绊樃 雱堧箘:"; + Text[ korean ] = "甑秳靹 雱堧箘:"; Text[ turkish ] = "Ay齬ma 鏸zgisi genii餴:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ancho de la l韓ea de separaci髇:"; + Text[ catalan ] = "Amplada del separador:"; Text[ finnish ] = "Erottimen leveys:"; + Text[ thai ] = "喔曕副喔о箒喔⑧竵喔勦抚喔侧浮喔佮抚喙夃覆喔:"; }; String STR_MAX_FTN_HEIGHT { @@ -1469,8 +1518,9 @@ String STR_MAX_FTN_HEIGHT Text[ korean ] = "斓滊寑 臧侅＜ 鞓侅棴:"; Text[ turkish ] = "azm. dipnot alan:"; Text[ language_user1 ] = " "; - Text[ catalan ] = "羠ea m醲. de la nota al pie:"; + Text[ catalan ] = "纑ea m鄕. de la nota al peu:"; Text[ finnish ] = "Suurin alaviiteala:"; + Text[ thai ] = "喔炧阜喙夃笝喔椸傅喙堗箑喔娻复喔囙腑喔｀福喔栢笚喔掂箞喔∴覆喔佮笚喔掂箞喔父喔:"; }; String STR_EDIT_IN_READONLY { @@ -1490,21 +1540,22 @@ String STR_EDIT_IN_READONLY Text [ italian ] = "modificabile nel documento a sola lettura" ; Text [ spanish ] = "Se puede editar en documentos de s髄o lectura" ; Text [ french ] = " 閐iter dans le document en mode Lecture seule" ; - Text [ dutch ] = "editeerbaar in schrijfbeveiligd document" ; + Text [ dutch ] = "bewerkbaar in alleen-lezen document" ; Text[ chinese_simplified ] = "鑳藉缂栬緫鍙椾繚鎶ょ殑鏂囨。"; - Text[ russian ] = "骂珈铈眍耱 镳噔觇 蝾朦觐 玎眄铎 铗 玎镨耔 漕牦戾眚"; + Text[ russian ] = "骂珈铈眍耱 镳噔觇 漕牦戾眚 蝾朦觐 潆 黩屙"; Text[ polish ] = "Mo縧iwy do edycji tylko w dokumencie do odczytu"; Text[ japanese ] = "瑾伩鍙栥倞灏傜敤銉夈偔銉ャ儭銉炽儓鍐呫仹绶ㄩ泦鍙兘"; Text[ chinese_traditional ] = "鑳藉绶ㄨ集鍙椾繚璀风殑鏂囦欢"; Text[ arabic ] = "耷柔 後释秧 蓓 阌输 後扪橇 蒉"; - Text[ dutch ] = "editeerbaar in schrijfbeveiligd document"; + Text[ dutch ] = "bewerkbaar in alleen-lezen document"; Text[ chinese_simplified ] = "鑳藉缂栬緫鍙椾繚鎶ょ殑鏂囨。"; Text[ greek ] = "漉磲酎翮翎 屦孱羼汜筮狎 箦 葶泷狯 '禳盹 汩 犴茔睐箸'"; Text[ korean ] = "鞚疥赴 鞝勳毄 氍胳劀鞐愳劀 韼胳 臧電"; Text[ turkish ] = "Salt okunur belgede d鼁enlenebilir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Se puede editar en documentos de solo lectura"; + Text[ catalan ] = "Es pot editar en documents de nom閟 lectura"; Text[ finnish ] = "Muokattavissa ainoastaan vain luku -asiakirjoissa"; + Text[ thai ] = "喔覆喔∴覆喔｀笘喙佮竵喙夃箘喔傕箖喔權箑喔竵喔覆喔｀箒喔氞笟喔箞喔侧笝喔涪喙堗覆喔囙箑喔斷傅喔⑧抚"; }; String STR_LAYOUT_SPLIT { @@ -1520,7 +1571,7 @@ String STR_LAYOUT_SPLIT Text [ french ] = "Scinder" ; Text [ dutch ] = "splitsen" ; Text[ chinese_simplified ] = "鍒嗛殧"; - Text[ russian ] = "朽玟咫栩"; + Text[ russian ] = "朽玑栩"; Text[ polish ] = "Podziel"; Text[ japanese ] = "鍒嗗壊"; Text[ chinese_traditional ] = "鍒嗛枊"; @@ -1531,8 +1582,9 @@ String STR_LAYOUT_SPLIT Text[ korean ] = "雮橂垊旮"; Text[ turkish ] = "B鰈"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Dividir"; + Text[ catalan ] = "Divideix"; Text[ finnish ] = "Jaa"; + Text[ thai ] = "喙佮涪喔"; }; String STR_NUMRULE_ON { @@ -1559,8 +1611,9 @@ String STR_NUMRULE_ON Text[ korean ] = "氩堩樃 毵り赴旮"; Text[ turkish ] = "Numaralama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇"; + Text[ catalan ] = "Numeraci"; Text[ finnish ] = "Numerointi"; + Text[ thai ] = "喔ム赋喔斷副喔氞笗喔编抚喙喔ム競"; }; String STR_NUMRULE_OFF { @@ -1576,7 +1629,7 @@ String STR_NUMRULE_OFF Text [ french ] = "pas de num閞otation" ; Text [ dutch ] = "geen nummering" ; Text[ chinese_simplified ] = "鏃犵紪鍙"; - Text[ russian ] = "徨 眢戾疣鲨"; + Text[ russian ] = "铃 眢戾疣鲨"; Text[ polish ] = "Bez numeracji"; Text[ japanese ] = "鐣彿浠樸亼銇仐"; Text[ chinese_traditional ] = "涓嶇法铏"; @@ -1587,8 +1640,9 @@ String STR_NUMRULE_OFF Text[ korean ] = "氩堩樃 毵り赴旮 鞐嗢潓"; Text[ turkish ] = "Numaralama yok"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sin numeraci髇"; + Text[ catalan ] = "Sense numeraci"; Text[ finnish ] = "ei numerointia"; + Text[ thai ] = "喙勦浮喙堗弗喔赤笖喔编笟喔曕副喔о箑喔ム競"; }; String STR_CONNECT1 { @@ -1601,22 +1655,23 @@ String STR_CONNECT1 Text [ danish ] = "forbundet med " ; Text [ italian ] = "Collegato con " ; Text [ spanish ] = "Vinculado a " ; - Text [ french ] = "Li 郲_] " ; - Text [ dutch ] = "Verbonden met " ; + Text [ french ] = "Li " ; + Text [ dutch ] = "Verbonden met" ; Text[ chinese_simplified ] = "杩炴帴鍒 "; Text[ russian ] = "砚玎螯 "; Text[ polish ] = "Po彻czony z "; Text[ japanese ] = "绲愬悎鍏 "; Text[ chinese_traditional ] = "閫ｇ祼鍒 "; Text[ arabic ] = "阊嗜 阙 "; - Text[ dutch ] = "Verbonden met "; + Text[ dutch ] = "Verbonden met"; Text[ chinese_simplified ] = "杩炴帴鍒 "; Text[ greek ] = "吁礓邃屐蓓 戾 "; - Text[ korean ] = "鞐瓣舶 "; + Text[ korean ] = "鞐瓣舶 雽靸"; Text[ turkish ] = "Ba餷an齦an "; Text[ language_user1 ] = " "; - Text[ catalan ] = "Vinculado a "; + Text[ catalan ] = "Enlla鏰t a "; Text[ finnish ] = "linkitetty kohteeseen "; + Text[ thai ] = "喙喔娻阜喙堗腑喔∴箓喔⑧竾喙勦笡喔⑧副喔 "; }; String STR_CONNECT2 { @@ -1630,21 +1685,22 @@ String STR_CONNECT2 Text [ italian ] = "e " ; Text [ spanish ] = "y " ; Text [ french ] = "et " ; - Text [ dutch ] = "en " ; + Text [ dutch ] = "en" ; Text[ chinese_simplified ] = "鍜 "; Text[ russian ] = " "; Text[ polish ] = "i "; Text[ japanese ] = "銇娿倛銇 "; Text[ chinese_traditional ] = "鍜 "; Text[ arabic ] = " "; - Text[ dutch ] = "en "; + Text[ dutch ] = "en"; Text[ chinese_simplified ] = "鍜 "; Text[ greek ] = "赆 "; - Text[ korean ] = "鞕 "; + Text[ korean ] = "鞕(瓿)"; Text[ turkish ] = "ve "; Text[ language_user1 ] = " "; - Text[ catalan ] = "y "; - Text[ finnish ] = "ja"; + Text[ catalan ] = "i"; + Text[ finnish ] = "ja "; + Text[ thai ] = "喙佮弗喔 "; }; String STR_LINECOUNT { @@ -1671,8 +1727,9 @@ String STR_LINECOUNT Text[ korean ] = "欷 靹戈赴"; Text[ turkish ] = "Sat齬 say"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Contar l韓eas"; + Text[ catalan ] = "Compte l韓ies"; Text[ finnish ] = "Laske rivit"; + Text[ thai ] = "喔權副喔氞笟喔｀福喔椸副喔"; }; String STR_DONTLINECOUNT { @@ -1696,11 +1753,12 @@ String STR_DONTLINECOUNT Text[ dutch ] = "Regels niet tellen"; Text[ chinese_simplified ] = "涓嶈鏁拌"; Text[ greek ] = "槛 赆翎燧赳珞 泷犰忐"; - Text[ korean ] = "靹 靹胳 鞎婌潓"; + Text[ korean ] = "欷 靹胳 鞎婌潓"; Text[ turkish ] = "Sat齬lar sayma"; Text[ language_user1 ] = " "; - Text[ catalan ] = "No contar las l韓eas"; + Text[ catalan ] = "No comptis les l韓ies"; Text[ finnish ] = "ei rivien laskemista"; + Text[ thai ] = "喙勦浮喙堗笝喔编笟喔氞福喔｀笚喔编笖"; }; String STR_LINCOUNT_START { @@ -1714,21 +1772,22 @@ String STR_LINCOUNT_START Text [ italian ] = "Iniziare a contare le righe con: " ; Text [ spanish ] = "Iniciar recuento de l韓eas con: " ; Text [ french ] = "Commencer le compte des lignes : " ; - Text [ dutch ] = "regels telllen starten bij: " ; + Text [ dutch ] = "regels tellen starten bij:" ; Text[ chinese_simplified ] = "璁℃暟琛屼粠锛 "; Text[ russian ] = "袜鬣螯 镱漶麇 耱痤 : "; Text[ polish ] = "Rozpocznij liczenie wierszy od: "; Text[ japanese ] = "琛屾暟銇堛伄闁嬪: "; Text[ chinese_traditional ] = "瑷堟暩琛屽緸锛 "; Text[ arabic ] = "认 恃揄 轻糜匮 溶: "; - Text[ dutch ] = "regels telllen starten bij: "; + Text[ dutch ] = "regels tellen starten bij:"; Text[ chinese_simplified ] = "璁℃暟琛屼粠锛 "; Text[ greek ] = "抨赀礴箸 赆翎燧赳珞珧 泷犰忐 狃: "; - Text[ korean ] = "欷 靹戈赴 鞁滌瀾 鞙勳箻: "; + Text[ korean ] = "欷 靹戈赴 鞁滌瀾: "; Text[ turkish ] = "Sat齬 sayma baang齝: "; Text[ language_user1 ] = " "; - Text[ catalan ] = "Iniciar recuento de l韓eas con: "; + Text[ catalan ] = "Inicia el recompte de l韓ies amb: "; Text[ finnish ] = "aloita rivilaskenta uudelleen m滗rityksell: "; + Text[ thai ] = "喙喔｀复喙堗浮喔權副喔氞笟喔｀福喔椸副喔斷箖喔浮喙堗笖喙夃抚喔: "; }; String STR_LUMINANCE @@ -1739,7 +1798,7 @@ String STR_LUMINANCE Text[ portuguese ] = "Brilho: "; Text[ russian ] = "唣觐耱: "; Text[ greek ] = "柱翦轫玺: "; - Text[ dutch ] = "Helderheid: "; + Text[ dutch ] = "Helderheid:"; Text[ french ] = "Luminosit : "; Text[ spanish ] = "Brillo: "; Text[ italian ] = "Luminosit: "; @@ -1753,8 +1812,9 @@ String STR_LUMINANCE Text[ chinese_traditional ] = "浜害锛 "; Text[ turkish ] = "Luminance: "; Text[ arabic ] = "轻胖橇:"; - Text[ catalan ] = "Brillo: "; + Text[ catalan ] = "Lluminositat:"; Text[ finnish ] = "Kirkkaus: "; + Text[ thai ] = "喔勦抚喔侧浮喔抚喙堗覆喔: "; }; String STR_CHANNELR @@ -1765,7 +1825,7 @@ String STR_CHANNELR Text[ portuguese ] = "Propor玢o de vermelho: "; Text[ russian ] = "暑腓麇耱忸 牮囫眍泐: "; Text[ greek ] = "另犭镢哚 挈觋轫秕: "; - Text[ dutch ] = "Rood: "; + Text[ dutch ] = "Rood:"; Text[ french ] = "Proportion de rouge : "; Text[ spanish ] = "Proporci髇 de rojo: "; Text[ italian ] = "Percentuale di rosso: "; @@ -1779,8 +1839,9 @@ String STR_CHANNELR Text[ chinese_traditional ] = "绱呰壊姣斾緥锛 "; Text[ turkish ] = "Red portion: "; Text[ arabic ] = "溆壬 轻猛阊:"; - Text[ catalan ] = "Proporci髇 de rojo: "; + Text[ catalan ] = "Vermell:"; Text[ finnish ] = "Punainen: "; + Text[ thai ] = "喙佮笖喔: "; }; String STR_CHANNELG @@ -1791,7 +1852,7 @@ String STR_CHANNELG Text[ portuguese ] = "Propor玢o de verde: "; Text[ russian ] = "暑腓麇耱忸 珏脲眍泐: "; Text[ greek ] = "另犭镢哚 瘃狍唔秕: "; - Text[ dutch ] = "Green: "; + Text[ dutch ] = "Groen:"; Text[ french ] = "Proportion de vert : "; Text[ spanish ] = "Proporci髇 verde: "; Text[ italian ] = "Percentuale di verde: "; @@ -1805,8 +1866,9 @@ String STR_CHANNELG Text[ chinese_traditional ] = "缍犺壊姣斾緥锛 "; Text[ turkish ] = "Green portion: "; Text[ arabic ] = "溆壬 轻梦盅:"; - Text[ catalan ] = "Proporci髇 verde: "; + Text[ catalan ] = "Verd:"; Text[ finnish ] = "Vihre: "; + Text[ thai ] = "喙喔傕傅喔⑧抚: "; }; String STR_CHANNELB @@ -1817,7 +1879,7 @@ String STR_CHANNELB Text[ portuguese ] = "Propor玢o de azul: "; Text[ russian ] = "暑腓麇耱忸 耔礤泐: "; Text[ greek ] = "另犭镢哚 祓脲: "; - Text[ dutch ] = "Blauw: "; + Text[ dutch ] = "Blauw:"; Text[ french ] = "Proportion de bleu : "; Text[ spanish ] = "Proporci髇 de azul: "; Text[ italian ] = "Percentuale di blu: "; @@ -1831,8 +1893,9 @@ String STR_CHANNELB Text[ chinese_traditional ] = "钘嶈壊姣斾緥锛 "; Text[ turkish ] = "Blue portion: "; Text[ arabic ] = "溆壬 轻靡艳:"; - Text[ catalan ] = "Proporci髇 de azul: "; + Text[ catalan ] = "Blau:"; Text[ finnish ] = "Sininen: "; + Text[ thai ] = "喔權箟喔赤箑喔囙复喔: "; }; String STR_CONTRAST @@ -1843,7 +1906,7 @@ String STR_CONTRAST Text[ portuguese ] = "Contraste: "; Text[ russian ] = "暑眚疣耱: "; Text[ greek ] = "曙眙褴篝: "; - Text[ dutch ] = "Contrast: "; + Text[ dutch ] = "Contrast:"; Text[ french ] = "Contraste : "; Text[ spanish ] = "Contraste: "; Text[ italian ] = "Contrasto: "; @@ -1852,13 +1915,14 @@ String STR_CONTRAST Text[ polish ] = "Kontrast: "; Text[ portuguese_brazilian ] = "Contrast: "; Text[ japanese ] = "銈炽兂銉堛儵銈广儓: "; - Text[ korean ] = "雽臁: "; + Text[ korean ] = "雽牍: "; Text[ chinese_simplified ] = "瀵规瘮搴︼細 "; Text[ chinese_traditional ] = "灏嶆瘮搴︼細 "; Text[ turkish ] = "Contrast: "; Text[ arabic ] = "轻嗜琼:"; - Text[ catalan ] = "Contraste: "; + Text[ catalan ] = "Contrast:"; Text[ finnish ] = "Kontrasti: "; + Text[ thai ] = "喔勦抚喔侧浮喔勦浮喔娻副喔: "; }; String STR_GAMMA @@ -1869,7 +1933,7 @@ String STR_GAMMA Text[ portuguese ] = "Gamma: "; Text[ russian ] = "绵祆: "; Text[ greek ] = "密祆: "; - Text[ dutch ] = "Gamma: "; + Text[ dutch ] = "Gamma:"; Text[ french ] = "Gamma : "; Text[ spanish ] = "Gamma: "; Text[ italian ] = "Gamma: "; @@ -1883,8 +1947,9 @@ String STR_GAMMA Text[ chinese_traditional ] = "鐏拌壊绯绘暩锛 "; Text[ turkish ] = "Gamma: "; Text[ arabic ] = "矍闱:"; - Text[ catalan ] = "Gamma: "; + Text[ catalan ] = "Gamma:"; Text[ finnish ] = "Gamma: "; + Text[ thai ] = "喙佮竵喔∴浮喙堗覆: "; }; String STR_TRANSPARENCY @@ -1895,7 +1960,7 @@ String STR_TRANSPARENCY Text[ portuguese ] = "Transpar阯cia: "; Text[ russian ] = "橡铉疣黜铖螯: "; Text[ greek ] = "拈狯茼彘: "; - Text[ dutch ] = "Transparantie: "; + Text[ dutch ] = "Transparantie:"; Text[ french ] = "Transparence: "; Text[ spanish ] = "Transparencia: "; Text[ italian ] = "Trasparenza: "; @@ -1904,13 +1969,14 @@ String STR_TRANSPARENCY Text[ polish ] = "Przezroczysto滄: "; Text[ portuguese_brazilian ] = "Transparency: "; Text[ japanese ] = "閫忛亷鎬: "; - Text[ korean ] = "韴獏: "; + Text[ korean ] = "韴獏霃: "; Text[ chinese_simplified ] = "閫忔槑 "; Text[ chinese_traditional ] = "閫忔槑 "; Text[ turkish ] = "Transparency: "; Text[ arabic ] = "轻暂禽砩:"; - Text[ catalan ] = "Transparencia: "; - Text[ finnish ] = "L鋚ikuultavuus: "; + Text[ catalan ] = "Transpar鑞cia: "; + Text[ finnish ] = "L鋚in鋕yvyys: "; + Text[ thai ] = "喔勦抚喔侧浮喙傕笡喔｀箞喔囙箒喔竾: "; }; String STR_INVERT @@ -1925,7 +1991,7 @@ String STR_INVERT Text[ french ] = "Invertir"; Text[ spanish ] = "Invertir"; Text[ italian ] = "Inverti"; - Text[ danish ] = "Invert"; + Text[ danish ] = "Inverter"; Text[ swedish ] = "Invertera"; Text[ polish ] = "Odwr箧"; Text[ portuguese_brazilian ] = "Invert"; @@ -1935,8 +2001,9 @@ String STR_INVERT Text[ chinese_traditional ] = "浜掕鑹茶綁鎻"; Text[ turkish ] = "Invert"; Text[ arabic ] = "谶"; - Text[ catalan ] = "Invertir"; + Text[ catalan ] = "Inverteix"; Text[ finnish ] = "K滗nn"; + Text[ thai ] = "喔弗喔编笟"; }; String STR_INVERT_NOT { @@ -1955,13 +2022,14 @@ String STR_INVERT_NOT Text[ polish ] = "nie odwracaj"; Text[ portuguese_brazilian ] = "not invert"; Text[ japanese ] = "閫嗚虎銇仐"; - Text[ korean ] = "氚橃爠 鞎婌潓"; + Text[ korean ] = "氚橃爠頃橃 鞎婌潓"; Text[ chinese_simplified ] = "涓嶈浆鎹簰琛ヨ壊"; Text[ chinese_traditional ] = "涓嶈綁鎻涗簰瑁滆壊"; Text[ turkish ] = "not invert"; Text[ arabic ] = "谙 轻谶"; - Text[ catalan ] = "no invertir"; + Text[ catalan ] = "no inverteixis"; Text[ finnish ] = "鋖 k滗nn"; + Text[ thai ] = "喙勦浮喙堗釜喔ム副喔"; }; String STR_DRAWMODE @@ -1970,9 +2038,9 @@ String STR_DRAWMODE Text[ english ] = "Graphics mode: "; Text[ english_us ] = "Graphics mode: "; Text[ portuguese ] = "Modo Gr醘ico: "; - Text[ russian ] = "绣骅 痂耋黻: "; + Text[ russian ] = "绣骅 沭圄梓羼觐泐 钺牝 "; Text[ greek ] = "梳糗篝狍 脲轸秕胥哚 泷狯殛: "; - Text[ dutch ] = "Afbeeldingenmodus: "; + Text[ dutch ] = "Afbeeldingenmodus:"; Text[ french ] = "Mode Graphique : "; Text[ spanish ] = "Modo gr醘ico: "; Text[ italian ] = "Modo immagine: "; @@ -1981,13 +2049,14 @@ String STR_DRAWMODE Text[ polish ] = "Tryb grafiki: "; Text[ portuguese_brazilian ] = "Graphics mode: "; Text[ japanese ] = "鍥炽儮銉笺儔: "; - Text[ korean ] = "攴鸽灅頂 氇摐: "; + Text[ korean ] = "攴鸽 氇摐: "; Text[ chinese_simplified ] = "鍥惧舰妯″紡锛 "; Text[ chinese_traditional ] = "鍦栧舰妯″紡锛 "; Text[ turkish ] = "Graphics mode: "; Text[ arabic ] = "嬷 轻真:"; - Text[ catalan ] = "Modo gr醘ico: "; + Text[ catalan ] = "Mode gr鄁ic: "; Text[ finnish ] = "Grafiikkatila: "; + Text[ thai ] = "喙傕斧喔∴笖喔佮福喔侧笩喔脆竸: "; }; String STR_DRAWMODE_STD @@ -1996,7 +2065,7 @@ String STR_DRAWMODE_STD Text[ english ] = "Standard"; Text[ english_us ] = "Standard"; Text[ portuguese ] = "Padr鉶"; - Text[ russian ] = "羊囗溧痱"; + Text[ russian ] = "项 箪铍鬣龛"; Text[ greek ] = "旭镥痖腼戕"; Text[ dutch ] = "Standaard"; Text[ french ] = "Standard"; @@ -2012,8 +2081,9 @@ String STR_DRAWMODE_STD Text[ chinese_traditional ] = "妯欐簴"; Text[ turkish ] = "Standart"; Text[ arabic ] = "揄怯"; - Text[ catalan ] = "Est醤dar"; + Text[ catalan ] = "Est鄋dard"; Text[ finnish ] = "Vakio"; + Text[ thai ] = "喔∴覆喔曕福喔愢覆喔"; }; String STR_DRAWMODE_GREY { @@ -2032,13 +2102,14 @@ String STR_DRAWMODE_GREY Text[ polish ] = "Odcienie szaro渃i"; Text[ portuguese_brazilian ] = "Greys"; Text[ japanese ] = "銈般儸銉笺偣銈便兗銉"; - Text[ korean ] = "須岇儔霃"; + Text[ korean ] = "須岇儔臁"; Text[ chinese_simplified ] = "鐏板害"; Text[ chinese_traditional ] = "鐏伴殠"; Text[ turkish ] = "Greys"; Text[ arabic ] = "涎糖 轻雁窍"; - Text[ catalan ] = "Escala de grises"; + Text[ catalan ] = "Escales de grisos"; Text[ finnish ] = "Harmaas鋠yt"; + Text[ thai ] = "喔箑喔佮弗喔傅喙喔椸覆"; }; String STR_DRAWMODE_BLACKWHITE { @@ -2050,20 +2121,21 @@ String STR_DRAWMODE_BLACKWHITE Text[ greek ] = "提/Ⅲ瘃"; Text[ dutch ] = "Zwart-wit"; Text[ french ] = "Noir/Blanc"; - Text[ spanish ] = "Negro/Blanco"; + Text[ spanish ] = "Blanco y Negro"; Text[ italian ] = "Bianco/nero"; Text[ danish ] = "Sort-hvid"; Text[ swedish ] = "Svartvitt"; Text[ polish ] = "Czarno-bia硑"; Text[ portuguese_brazilian ] = "Black/White"; Text[ japanese ] = "鐧介粧"; - Text[ korean ] = "頋/氚"; + Text[ korean ] = "頋戨氨"; Text[ chinese_simplified ] = "榛戠櫧"; Text[ chinese_traditional ] = "榛戠櫧"; Text[ turkish ] = "Black/White"; Text[ arabic ] = "糜嫦/萌碇"; - Text[ catalan ] = "Negro/Blanco"; + Text[ catalan ] = "Blanc i negre"; Text[ finnish ] = "Mustavalkoinen"; + Text[ thai ] = "喔斷赋喙佮弗喔班競喔侧抚"; }; String STR_DRAWMODE_WATERMARK { @@ -2075,20 +2147,21 @@ String STR_DRAWMODE_WATERMARK Text[ greek ] = "珍狒珈"; Text[ dutch ] = "Watermerk"; Text[ french ] = "Filigrane"; - Text[ spanish ] = "Marca de agua"; + Text[ spanish ] = "Filigrana"; Text[ italian ] = "Filigrana"; Text[ danish ] = "Vandm鎟ke"; Text[ swedish ] = "Vattenm鋜ke"; Text[ polish ] = "Znak wodny"; Text[ portuguese_brazilian ] = "Watermark"; Text[ japanese ] = "閫忋亱銇"; - Text[ korean ] = "攵堧箾鞐 牍勳栋氪愳暭 氤挫澊電 氍措姮(鞓: 歆韽)"; + Text[ korean ] = "鞗岉劙毵堩伂"; Text[ chinese_simplified ] = "姘村嵃"; Text[ chinese_traditional ] = "姘村嵃"; Text[ turkish ] = "Watermark"; Text[ arabic ] = "卺倾 闱祈"; - Text[ catalan ] = "Marca de agua"; + Text[ catalan ] = "Marca d'aigua"; Text[ finnish ] = "Vesileima"; + Text[ thai ] = "喔ム覆喔⑧笝喙夃赋"; }; String STR_ROTATION { @@ -2112,8 +2185,9 @@ String STR_ROTATION Text[ chinese_traditional ] = "鏃嬭綁"; Text[ turkish ] = "Rotation"; Text[ arabic ] = "轻怯氏茄"; - Text[ catalan ] = "Rotaci髇"; + Text[ catalan ] = "Gir"; Text[ finnish ] = "Kierto"; + Text[ thai ] = "喔浮喔膏笝"; }; String STR_GRID_NONE @@ -2133,13 +2207,14 @@ String STR_GRID_NONE Text[ swedish ] = "Inget raster"; Text[ polish ] = "No grid"; Text[ portuguese_brazilian ] = "No grid"; - Text[ japanese ] = "銈般儶銉冦儔绶氥仾銇"; - Text[ korean ] = "氍胳瀽 靾/鞐 靾 鞕戈辰靹 鞐嗢潓"; + Text[ japanese ] = "銇仐"; + Text[ korean ] = "攴鸽Μ霌 鞐嗢潓"; Text[ chinese_simplified ] = "涓嶄娇鐢ㄦ牸瀛愮嚎"; Text[ chinese_traditional ] = "涓嶄娇鐢ㄦ牸瀛愮窔"; Text[ turkish ] = "No grid"; Text[ arabic ] = "No grid"; Text[ catalan ] = "No grid"; + Text[ thai ] = "No grid"; }; String STR_GRID_LINES_ONLY @@ -2159,13 +2234,14 @@ String STR_GRID_LINES_ONLY Text[ swedish ] = "Raster (bara linjer)"; Text[ polish ] = "Line grid"; Text[ portuguese_brazilian ] = "Line grid"; - Text[ japanese ] = "銈般儶銉冦儔绶 (琛屻偘銉儍銉夌窔銇伩)"; - Text[ korean ] = "氍胳瀽 靾/鞐 靾 鞕戈辰靹(欷 毵)"; + Text[ japanese ] = "缃窔"; + Text[ korean ] = "攴鸽Μ霌 (欷 毵)"; Text[ chinese_simplified ] = "鏍煎瓙绾(浠呯嚎鏉)"; Text[ chinese_traditional ] = "鏍煎瓙绶(鍍呯窔姊)"; Text[ turkish ] = "Line grid"; Text[ arabic ] = "Line grid"; Text[ catalan ] = "Line grid"; + Text[ thai ] = "Line grid"; }; String STR_GRID_LINES_CHARS @@ -2185,12 +2261,18 @@ String STR_GRID_LINES_CHARS Text[ swedish ] = "Raster (linjer och tecken)"; Text[ polish ] = "Line and character grid"; Text[ portuguese_brazilian ] = "Line and character grid"; - Text[ japanese ] = "銈般儶銉冦儔绶 (琛屻偘銉儍銉夌窔銇ㄦ枃瀛椼偘銉儍銉夌窔)"; - Text[ korean ] = "氍胳瀽 靾/鞐 靾 鞕戈辰靹(欷勱臣 氍胳瀽)"; + Text[ japanese ] = "鍘熺ǹ鐢ㄧ礄"; + Text[ korean ] = "攴鸽Μ霌 (欷勱臣 氍胳瀽)"; Text[ chinese_simplified ] = "鏍煎瓙绾(绾挎潯鍜屽瓧绗)"; Text[ chinese_traditional ] = "鏍煎瓙绶(绶氭鍜屽瓧鍏)"; Text[ turkish ] = "Line and character grid"; Text[ arabic ] = "Line and character grid"; Text[ catalan ] = "Line and character grid"; + Text[ thai ] = "Line and character grid"; }; + + + + + diff --git a/sw/source/ui/utlui/gloslst.src b/sw/source/ui/utlui/gloslst.src index 6adef660d2f1..5ff11217b67b 100644 --- a/sw/source/ui/utlui/gloslst.src +++ b/sw/source/ui/utlui/gloslst.src @@ -2,9 +2,9 @@ * * $RCSfile: gloslst.src,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:19:59 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:45:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,22 +85,23 @@ ModalDialog DLG_GLOSSARY_DECIDE_DLG Text [ swedish ] = "AutoText - grupp" ; Text [ danish ] = "AutoTekst - gruppe" ; Text [ italian ] = "Testo automatico - Gruppo" ; - Text [ spanish ] = "Grupo AutoTexto" ; + Text [ spanish ] = "Texto autom醫ico - Grupo" ; Text [ french ] = "AutoTexte - Groupe" ; - Text [ dutch ] = "AutoTekst-groep" ; + Text [ dutch ] = "AutoTekst - groep" ; Text [ portuguese ] = "AutoTexto - Grupo" ; - Text[ chinese_simplified ] = "自动图文集小组"; + Text[ chinese_simplified ] = "鑷姩鍥炬枃闆嗗皬缁"; Text[ russian ] = "棱蝾蝈犟 - 灭箫镟"; Text[ polish ] = "Autotekst - Grupa"; - Text[ japanese ] = "擖椡巟墖 皋侔踢"; - Text[ chinese_traditional ] = "笆瓜ゅ栋竤舱"; + Text[ japanese ] = "鍏ュ姏鏀彺 銈般儷銉笺儣"; + Text[ chinese_traditional ] = "鑷嫊鍦栨枃闆嗙兢绲"; Text[ arabic ] = "闾沔谏 湔 梳耷祈"; Text[ greek ] = "响茕 刘麸叔殪蓓秕"; - Text[ korean ] = "磊悼咆胶飘－弊缝"; + Text[ korean ] = "鞛愲彊 韰嶌姢韸 攴鸽９"; Text[ turkish ] = "Otomatik metin - Grup"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Grupo AutoTexto"; + Text[ catalan ] = "Grup AutoText"; Text[ finnish ] = "Automaattinen teksti - ryhm"; + Text[ thai ] = "喔傕箟喔竸喔о覆喔∴腑喔编笗喙傕笝喔∴副喔曕复 - 喔堗副喔斷竵喔ム父喙堗浮"; }; OKButton PB_OK { @@ -138,20 +139,21 @@ ModalDialog DLG_GLOSSARY_DECIDE_DLG Text [ italian ] = "Seleziona modulo di testo: " ; Text [ spanish ] = "Seleccionar m骴ulo de texto: " ; Text [ french ] = "S閘ection du module de texte : " ; - Text [ dutch ] = "Tekstbouwsteen selecteren: " ; + Text [ dutch ] = "Tekstbouwsteen selecteren:" ; Text [ portuguese ] = "Seleccionar m骴ulo de texto: " ; - Text[ chinese_simplified ] = "选择自动图文集条目： "; + Text[ chinese_simplified ] = "閫夋嫨鑷姩鍥炬枃闆嗘潯鐩細 "; Text[ russian ] = "蔓狃囹 噔蝾蝈犟: "; Text[ polish ] = "Zaznacz blok tekstu: "; - Text[ japanese ] = "梅侥剔郫競虘I戰: "; - Text[ chinese_traditional ] = "匡拒笆瓜ゅ栋 "; + Text[ japanese ] = "銉嗐偔銈广儓銉栥儹銉冦偗銇伕鎶: "; + Text[ chinese_traditional ] = "閬告搰鑷嫊鍦栨枃闆嗭細 "; Text[ arabic ] = "俏薯茄 阡昭 轻湔: "; Text[ greek ] = "硼殡镢 綮揿狒矧 赍殪蓓秕: "; - Text[ korean ] = "咆胶飘 葛点 急琶: "; + Text[ korean ] = "鞛愲彊 韰嶌姢韸 靹犿儩: "; Text[ turkish ] = "Metin bile㧐ni se: "; Text[ language_user1 ] = " "; - Text[ catalan ] = "Seleccionar m骴ulo de texto: "; + Text[ catalan ] = "Selecciona el m骴ulo de text: "; Text[ finnish ] = "Valitse automaattinen teksti: "; + Text[ thai ] = "喙喔ム阜喔竵喔傕箟喔竸喔о覆喔∴腑喔编笗喙傕笝喔∴副喔曕复: "; }; @@ -159,3 +161,14 @@ ModalDialog DLG_GLOSSARY_DECIDE_DLG + + + + + + + + + + + diff --git a/sw/source/ui/utlui/initui.src b/sw/source/ui/utlui/initui.src index 3b16202e69a1..fd9fa81535ea 100644 --- a/sw/source/ui/utlui/initui.src +++ b/sw/source/ui/utlui/initui.src @@ -2,9 +2,9 @@ * * $RCSfile: initui.src,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: os $ $Date: 2002-08-21 13:15:37 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:45:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,24 +77,25 @@ Resource RID_SW_SHELLRES TEXT [ italian ] = "Pagina" ; TEXT [ portuguese_brazilian ] = "P?gina" ; TEXT [ portuguese ] = "P醙ina" ; - TEXT [ finnish ] = "Sivu " ; + TEXT [ finnish ] = "Sivu" ; TEXT [ danish ] = "Side" ; TEXT [ french ] = "Page" ; TEXT [ swedish ] = "Sida" ; TEXT [ dutch ] = "Pagina" ; TEXT [ spanish ] = "P醙ina" ; TEXT [ english_us ] = "Page" ; - TEXT[ chinese_simplified ] = "页"; + TEXT[ chinese_simplified ] = "椤"; TEXT[ russian ] = "羊疣龛鲟"; TEXT[ polish ] = "Strona"; - TEXT[ japanese ] = "瓦凹"; - TEXT[ chinese_traditional ] = ""; + TEXT[ japanese ] = "銉氥兗銈"; + TEXT[ chinese_traditional ] = "闋"; TEXT[ arabic ] = "轻蛰蜕"; TEXT[ greek ] = "渝脒溽"; - TEXT[ korean ] = "其捞瘤"; + TEXT[ korean ] = "韼橃澊歆"; TEXT[ turkish ] = "Sayfa"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "P醙ina"; + TEXT[ catalan ] = "P鄃ina"; + TEXT[ thai ] = "喔笝喙夃覆"; }; String STR_POSTIT_LINE { @@ -109,18 +110,19 @@ Resource RID_SW_SHELLRES Text [ spanish ] = "L韓ea" ; Text [ french ] = "Ligne" ; Text [ dutch ] = "Regel" ; - Text[ chinese_simplified ] = "行"; + Text[ chinese_simplified ] = "琛"; Text[ russian ] = "羊痤赅"; Text[ polish ] = "Wiersz"; - Text[ japanese ] = "峴"; - Text[ chinese_traditional ] = "︽"; + Text[ japanese ] = "琛"; + Text[ chinese_traditional ] = "琛"; Text[ arabic ] = "轻迂"; Text[ greek ] = "民犰燹"; - Text[ korean ] = "青"; + Text[ korean ] = "欷"; Text[ turkish ] = "Sat齬"; Text[ language_user1 ] = " "; - Text[ catalan ] = "L韓ea"; + Text[ catalan ] = "L韓ia"; Text[ finnish ] = "Viiva"; + Text[ thai ] = "喔氞福喔｀笚喔编笖"; }; String STR_POSTIT_AUTHOR { @@ -130,24 +132,25 @@ Resource RID_SW_SHELLRES TEXT [ italian ] = "Autore" ; TEXT [ portuguese_brazilian ] = "Autor" ; TEXT [ portuguese ] = "Autor" ; - TEXT [ finnish ] = "Laatija" ; + TEXT [ finnish ] = "Tekij" ; TEXT [ danish ] = "Forfatter" ; TEXT [ french ] = "Auteur" ; TEXT [ swedish ] = "F鰎fattare" ; TEXT [ dutch ] = "Auteur" ; TEXT [ spanish ] = "Autor" ; TEXT [ english_us ] = "Author" ; - TEXT[ chinese_simplified ] = "作者"; + TEXT[ chinese_simplified ] = "浣滆"; TEXT[ russian ] = "棱蝾"; TEXT[ polish ] = "Autor"; - TEXT[ japanese ] = "嶌惉幰"; - TEXT[ chinese_traditional ] = ""; + TEXT[ japanese ] = "浣滄垚鑰"; + TEXT[ chinese_traditional ] = "浣滆"; TEXT[ arabic ] = "轻隳彷"; TEXT[ greek ] = "吁眙荜翮"; - TEXT[ korean ] = "累己磊"; + TEXT[ korean ] = "鞛戩劚鞛"; TEXT[ turkish ] = "Yazan"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "Autor"; + TEXT[ thai ] = "喔溹腹喙夃箑喔傕傅喔⑧笝"; }; String STR_CALC_SYNTAX { @@ -164,17 +167,18 @@ Resource RID_SW_SHELLRES TEXT [ spanish ] = "** Error de sintaxis **" ; TEXT [ english_us ] = "** Syntax Error **" ; TEXT = "** Syntax Fehler **" ; - TEXT[ chinese_simplified ] = "** 语法错误 **"; + TEXT[ chinese_simplified ] = "** 璇硶閿欒 **"; TEXT[ russian ] = "** 谚眚嚓耔麇耜 铠栳赅 **"; TEXT[ polish ] = "** B彻d w sk砤dni **"; - TEXT[ japanese ] = "**驾蜡附醋**"; - TEXT[ chinese_traditional ] = "** 粂猭岿粇 **"; + TEXT[ japanese ] = "**銈枫兂銈裤儍銈偣銈ㄣ儵銉**"; + TEXT[ chinese_traditional ] = "** 瑾炴硶閷 **"; TEXT[ arabic ] = "** 呜 蓓 蠕橇 轻蹄嵘 **"; TEXT[ greek ] = "** 吁眙彡糸挈 胲栾 **"; - TEXT[ korean ] = "** 备巩 坷幅 **"; + TEXT[ korean ] = "** 甑 鞓る **"; TEXT[ turkish ] = "** S鰖 dizimi hatas **"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "** Error de sintaxis **"; + TEXT[ catalan ] = "** Error de sintaxi **"; + TEXT[ thai ] = "** 喙勦抚喔⑧竵喔｀笓喙屶笢喔脆笖喔炧弗喔侧笖 **"; }; String STR_CALC_ZERODIV { @@ -191,17 +195,18 @@ Resource RID_SW_SHELLRES TEXT [ spanish ] = "** Dividir por cero **" ; TEXT [ english_us ] = "** Division by zero **" ; TEXT = "** Division durch Null **" ; - TEXT[ chinese_simplified ] = "** 除于零 **"; + TEXT[ chinese_simplified ] = "** 闄や簬闆 **"; TEXT[ russian ] = "** 腻脲龛 磬 眢朦 **"; TEXT[ polish ] = "** Dzielenie przez zero **"; - TEXT[ japanese ] = "**巨蹅艎剛**"; - TEXT[ chinese_traditional ] = "** 埃箂 **"; + TEXT[ japanese ] = "**銈笺儹銇у壊銈**"; + TEXT[ chinese_traditional ] = "** 闄ゆ柤闆 **"; TEXT[ arabic ] = "** 抻闵 卺 蛰 **"; TEXT[ greek ] = "** 拈徇皴箸 戾 麸 0 **"; - TEXT[ korean ] = "** 0栏肺 唱穿扁 **"; + TEXT[ korean ] = "** 0鞙茧 雮橂垊旮 **"; TEXT[ turkish ] = "** S齠齬 ile b鰈me **"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "** Dividir por cero **"; + TEXT[ catalan ] = "** Dividir per zero **"; + TEXT[ thai ] = "** 喔覆喔｀笖喙夃抚喔⑧辅喔灌笝喔⑧箤 **"; }; String STR_CALC_BRACK { @@ -218,17 +223,18 @@ Resource RID_SW_SHELLRES TEXT [ spanish ] = "** Error de par閚tesis **" ; TEXT [ english_us ] = "** Wrong use of brackets **" ; TEXT = "** Fehlerhafte Klammerung **" ; - TEXT[ chinese_simplified ] = "** 错误的括号 **"; + TEXT[ chinese_simplified ] = "** 閿欒鐨勬嫭鍙 **"; TEXT[ russian ] = "** 湾镳噔桦铄 镳桁屙屙桢 耜钺铌 **"; TEXT[ polish ] = "** Nieprawid硂wo u縴te nawiasy **"; - TEXT[ japanese ] = "**岆巊梡偺偐偭偙**"; - TEXT[ chinese_traditional ] = "** 岿粇珹腹 **"; + TEXT[ japanese ] = "**瑾や娇鐢ㄣ伄銇嬨仯銇**"; + TEXT[ chinese_traditional ] = "** 閷鐨勬嫭铏 **"; TEXT[ arabic ] = "** 怯饰锨 轻棉媲 仍哚 吻仄 **"; TEXT[ greek ] = "** 塑栾 黢摅 疳皴龛蒹妁 **"; - TEXT[ korean ] = "**肋给等 褒龋 **"; + TEXT[ korean ] = "**鞛橂霅 甏勴樃 **"; TEXT[ turkish ] = "** Hatal ayra kullan齧 **"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "** Error de par閚tesis **"; + TEXT[ catalan ] = "** Error de par鑞tesi **"; + TEXT[ thai ] = "** 喙冟笂喙夃抚喔囙箑喔ム箛喔氞竵喙夃覆喔∴笡喔灌笢喔脆笖 **"; }; String STR_CALC_POW { @@ -237,26 +243,27 @@ Resource RID_SW_SHELLRES TEXT [ italian ] = "** Overflow nella funzione quadrato **" ; TEXT [ portuguese_brazilian ] = "** Transbordo de fun??o quadr?tica **" ; TEXT [ portuguese ] = "** Transbordo da fun玢o quadr醫ica **" ; - TEXT [ finnish ] = "** Neli鰂unktion ylivuoto **" ; + TEXT [ finnish ] = "** Potenssifunktion ylivuoto **" ; TEXT [ danish ] = "** Overl鴅 i kvadratfunktion **" ; TEXT [ french ] = "** D閜assement de capacit de la fonction carr**" ; TEXT [ swedish ] = "** Spill i kvadratfunktion **" ; - TEXT [ dutch ] = "** Overflow in kwadraatfunctie **" ; - TEXT [ spanish ] = "** Desbordamiento en funci髇 al cuadrado **" ; + TEXT [ dutch ] = "** Overloop in kwadraatfunctie **" ; + TEXT [ spanish ] = "** Desbordamiento en la funci髇 al cuadrado **" ; TEXT [ english_us ] = "** Square function overflow **" ; /* ### ACHTUNG: Neuer Text in Resource? ** 躡erlauf in Quadratfunktion ** : ** 歜erlauf in Quadratfunktion ** */ TEXT = "** 躡erlauf in Quadratfunktion **" ; - TEXT[ chinese_simplified ] = "** 平方函数的溢值 **"; + TEXT[ chinese_simplified ] = "** 骞虫柟鍑芥暟鐨勬孩鍊 **"; TEXT[ russian ] = "** 襄疱镱腠屙桢 趔黻鲨 赈噤疣蜞 **"; TEXT[ polish ] = "** Przepe硁ienie w funkcji kwadratowej **"; - TEXT[ japanese ] = "**巐妏宍婡擻\偺蛋兽疤郯**"; - TEXT[ chinese_traditional ] = "** ㄧ计犯 **"; + TEXT[ japanese ] = "**鍥涜褰㈡鑳姐伄銈兗銉愩兗銉曘儹銉**"; + TEXT[ chinese_traditional ] = "** 鏍瑰嚱鏁告孩鍊 **"; TEXT[ arabic ] = "** 萸浦 蓓 轻锨嵘 轻恃软陧 **"; TEXT[ greek ] = "** 震羼麇唠轶 篝 脲轸秕胥哚 翦赳徙秕 **"; - TEXT[ korean ] = "**力蚌 窃荐 坷滚敲肺快 **"; + TEXT[ korean ] = "**鞝滉潮 頃垬 鞓る矂頂岆鞖 **"; TEXT[ turkish ] = "** Kare fonksiyonu taas **"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "** Desbordamiento en funci髇 al cuadrado **"; + TEXT[ catalan ] = "** Desbordament en funci al quadrat **"; + TEXT[ thai ] = "** 喔熰副喔囙竵喙屶笂喔编箞喔權釜喔掂箞喙喔弗喔掂箞喔⑧浮喔堗副喔曕父喔｀副喔弗喙夃笝 **"; }; String STR_CALC_VARNFND { @@ -273,17 +280,18 @@ Resource RID_SW_SHELLRES TEXT [ spanish ] = "** No se ha encontrado la variable **" ; TEXT [ english_us ] = "** Variable not found **" ; TEXT = "** Variable wurde nicht gefunden **" ; - TEXT[ chinese_simplified ] = "** 没有找到变量 **"; + TEXT[ chinese_simplified ] = "** 娌℃湁鎵惧埌鍙橀噺 **"; TEXT[ russian ] = "** 襄疱戾眄 礤 磬殇屙 **"; TEXT[ polish ] = "** Zmiennej nie znaleziono **"; - TEXT[ japanese ] = "**曄悢偑尒偮偐傝傑偣傫**"; - TEXT[ chinese_traditional ] = "** ⊿Τт跑秖 **"; + TEXT[ japanese ] = "**澶夋暟銇岃銇ゃ亱銈娿伨銇涖倱**"; + TEXT[ chinese_traditional ] = "** 娌掓湁鎵惧埌璁婇噺 **"; TEXT[ arabic ] = "** 授醒 轻谒嫜 卺 轻闶垌焉 **"; TEXT[ greek ] = "** 腻 怦蓁珀 戾翎怆玺 **"; - TEXT[ korean ] = "**函荐甫 茫瘤 给沁嚼聪促. **"; + TEXT[ korean ] = "** 氤靾橂ゼ 彀眷 氇豁枅鞀惦媹雼 **"; TEXT[ turkish ] = "** De餴⺧en bulunamad **"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "** No se ha encontrado la variable **"; + TEXT[ catalan ] = "** No s'ha trobat la variable **"; + TEXT[ thai ] = "** 喙勦浮喙堗笧喔氞笗喔编抚喙佮笡喔 **"; }; String STR_CALC_OVERFLOW { @@ -301,17 +309,18 @@ Resource RID_SW_SHELLRES TEXT [ english_us ] = "** Overflow **" ; /* ### ACHTUNG: Neuer Text in Resource? ** 躡erlauf ** : ** 歜erlauf ** */ TEXT = "** 躡erlauf **" ; - TEXT[ chinese_simplified ] = "** 溢值 **"; + TEXT[ chinese_simplified ] = "** 婧㈠ **"; TEXT[ russian ] = "** 襄疱镱腠屙桢 **"; TEXT[ polish ] = "** Przepe硁ienie **"; - TEXT[ japanese ] = "**蛋兽疤郯**"; + TEXT[ japanese ] = "**銈兗銉愩兗銉曘儹銉**"; TEXT[ language_user1 ] = " "; - TEXT[ chinese_traditional ] = "** 犯 **"; + TEXT[ chinese_traditional ] = "** 婧㈠ **"; TEXT[ arabic ] = "** 萸浦 **"; TEXT[ greek ] = "** 震羼麇唠轶 **"; - TEXT[ korean ] = "**坷滚 敲肺快 **"; + TEXT[ korean ] = "** 鞓る矂 頂岆鞖 **"; TEXT[ turkish ] = "** Taa **"; - TEXT[ catalan ] = "** Desbordamiento **"; + TEXT[ catalan ] = "** Sobreeximent **"; + TEXT[ thai ] = "** 喔ム箟喔 **"; }; String STR_CALC_WRONGTIME { @@ -320,25 +329,26 @@ Resource RID_SW_SHELLRES TEXT [ italian ] = "** Formato orario errato **" ; TEXT [ portuguese_brazilian ] = "** Formato de tempo errado**" ; TEXT [ portuguese ] = "** Formato de hora errado**" ; - TEXT [ finnish ] = "** V滗r aikamuoto **" ; + TEXT [ finnish ] = "** Ajan muoto ei kelpaa **" ; TEXT [ danish ] = "** Forkert tidsformat **" ; TEXT [ french ] = "** Format d'heure erron **" ; TEXT [ swedish ] = "** Fel tidsformat **" ; - TEXT [ dutch ] = "** Foutief tijdformaat **" ; + TEXT [ dutch ] = "** Foutieve tijdnotatie **" ; TEXT [ spanish ] = "** Formato de hora err髇eo **" ; TEXT [ english_us ] = "** Wrong time format **" ; TEXT = "** Falsches Zeitformat **" ; - TEXT[ chinese_simplified ] = "** 错误的时间格式 **"; + TEXT[ chinese_simplified ] = "** 閿欒鐨勬椂闂存牸寮 **"; TEXT[ russian ] = "** 湾镳噔桦 纛痨囹 怵屐屙 **"; TEXT[ polish ] = "** Nieprawid硂wy format czasu **"; - TEXT[ japanese ] = "**惓偟偔側偄帪娫偺彂幃**"; - TEXT[ chinese_traditional ] = "** 岿粇丁Α **"; + TEXT[ japanese ] = "**姝ｃ仐銇忋仾銇勬檪闁撱伄鏇稿紡**"; + TEXT[ chinese_traditional ] = "** 閷鏅傞枔鏍煎紡 **"; TEXT[ arabic ] = "** 输禹 孓 吻仄 **"; TEXT[ greek ] = "** 塑栾 祜聆 黢秕 **"; - TEXT[ korean ] = "**肋给等 矫埃 器杆 **"; + TEXT[ korean ] = "** 鞛橂霅 鞁滉皠 響滉赴 順曥嫕 **"; TEXT[ turkish ] = "** Yanl zaman format **"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "** Formato de hora err髇eo **"; + TEXT[ catalan ] = "** Format de temps erroni"; + TEXT[ thai ] = "** 喔｀腹喔涏箒喔氞笟喙喔о弗喔侧笢喔脆笖 **"; }; String STR_CALC_DEFAULT { @@ -355,17 +365,18 @@ Resource RID_SW_SHELLRES TEXT [ spanish ] = "** Error **" ; TEXT [ english_us ] = "** Error **" ; TEXT = "** Fehler **" ; - TEXT[ chinese_simplified ] = "**错误 **"; + TEXT[ chinese_simplified ] = "**閿欒 **"; TEXT[ russian ] = "** 硒栳赅 **"; TEXT[ polish ] = "** B彻d **"; - TEXT[ japanese ] = "**醋**"; - TEXT[ chinese_traditional ] = "**岿粇 **"; + TEXT[ japanese ] = "**銈ㄣ儵銉**"; + TEXT[ chinese_traditional ] = "**閷 **"; TEXT[ arabic ] = "** 呜 **"; TEXT[ greek ] = "** 遇茈灬 **"; - TEXT[ korean ] = "**坷幅 **"; + TEXT[ korean ] = "** 鞓る **"; TEXT[ turkish ] = "** Hata **"; TEXT[ language_user1 ] = " "; TEXT[ catalan ] = "** Error **"; + TEXT[ thai ] = "** 喔溹复喔斷笧喔ム覆喔 **"; }; String STR_CALC_ERROR { @@ -382,17 +393,18 @@ Resource RID_SW_SHELLRES TEXT [ dutch ] = "** Foutieve uitdrukking **" ; TEXT [ spanish ] = "** Expresi髇 err髇ea **" ; TEXT [ english_us ] = "** Expression is faulty **" ; - TEXT[ chinese_simplified ] = "** 错误的表达式 **"; + TEXT[ chinese_simplified ] = "** 閿欒鐨勮〃杈惧紡 **"; TEXT[ russian ] = "** 硒栳觇 恹疣驽龛 **"; TEXT[ polish ] = "** Nieprawid硂we wyra縠nie **"; - TEXT[ japanese ] = "**醋皶\\尰**"; - TEXT[ chinese_traditional ] = "** 岿粇笷Α **"; + TEXT[ japanese ] = "**銈ㄣ儵銉艰〃鐝**"; + TEXT[ chinese_traditional ] = "** 閷鐨勮〃閬斿紡 **"; TEXT[ arabic ] = "** 授软 吻仄 **"; TEXT[ greek ] = "** 朋鲠腱蓓 蓐鲴狍 **"; - TEXT[ korean ] = "**撇赴 钎泅 **"; + TEXT[ korean ] = "** 鞓る臧 鞛堧姅 鞁 **"; TEXT[ turkish ] = "** Yanl ifade **"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "** Expresi髇 err髇ea **"; + TEXT[ catalan ] = "** Expressi err騨ia **"; + TEXT[ thai ] = "** 喔勦赋喔笜喔脆笟喔侧涪喔溹复喔 **"; }; String STR_GETREFFLD_UP { @@ -402,23 +414,24 @@ Resource RID_SW_SHELLRES Text [ english_us ] = "above" ; Text [ italian ] = "Sopra" ; Text [ spanish ] = "arriba" ; - Text [ french ] = "en haut" ; + Text [ french ] = "En haut" ; Text [ swedish ] = "鰒er" ; Text [ danish ] = "foroven" ; Text [ portuguese ] = "acima" ; Text [ portuguese_brazilian ] = "oben" ; - Text[ chinese_simplified ] = "上"; + Text[ chinese_simplified ] = "涓"; Text[ russian ] = "忖屦躞"; Text[ polish ] = "w g髍ze"; - Text[ japanese ] = "忋"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "涓"; + Text[ chinese_traditional ] = "涓"; Text[ arabic ] = "泌犰"; Text[ greek ] = "疖睐"; - Text[ korean ] = "困俊"; + Text[ korean ] = "鞙"; Text[ turkish ] = "黶t"; Text[ language_user1 ] = " "; - Text[ catalan ] = "arriba"; + Text[ catalan ] = "a sobre"; Text[ finnish ] = "ylh滗ll"; + Text[ thai ] = "喔傕箟喔侧竾喔氞笝"; }; String STR_GETREFFLD_DOWN { @@ -428,23 +441,24 @@ Resource RID_SW_SHELLRES Text [ english_us ] = "below" ; Text [ italian ] = "Sotto" ; Text [ spanish ] = "abajo" ; - Text [ french ] = "en bas" ; + Text [ french ] = "En bas" ; Text [ swedish ] = "under" ; Text [ danish ] = "forneden" ; Text [ portuguese ] = "abaixo" ; Text [ portuguese_brazilian ] = "unten" ; - Text[ chinese_simplified ] = "下"; + Text[ chinese_simplified ] = "涓"; Text[ russian ] = "忭桤"; Text[ polish ] = "w dole"; - Text[ japanese ] = "壓"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "涓"; + Text[ chinese_traditional ] = "涓"; Text[ arabic ] = "糜葆"; Text[ greek ] = "贶豉"; - Text[ korean ] = "酒贰"; + Text[ korean ] = "鞎勲灅"; Text[ turkish ] = "alt"; Text[ language_user1 ] = " "; - Text[ catalan ] = "abajo"; + Text[ catalan ] = "sota"; Text[ finnish ] = "alhaalla"; + Text[ thai ] = "喔傕箟喔侧竾喙冟笗喙"; }; String STR_ALLPAGE_HEADFOOT { @@ -459,18 +473,19 @@ Resource RID_SW_SHELLRES Text [ danish ] = "Alle" ; Text [ portuguese ] = "Todos" ; Text [ portuguese_brazilian ] = "Alle" ; - Text[ chinese_simplified ] = "全部"; + Text[ chinese_simplified ] = "鍏ㄩ儴"; Text[ russian ] = "埋"; Text[ polish ] = "Wszystkie"; - Text[ japanese ] = "偡傋偰"; - Text[ chinese_traditional ] = "场"; + Text[ japanese ] = "銇欍伖銇"; + Text[ chinese_traditional ] = "鍏ㄩ儴"; Text[ arabic ] = "轻哚"; Text[ greek ] = "茧"; - Text[ korean ] = "傈眉"; + Text[ korean ] = "氇憪"; Text[ turkish ] = "T黰"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Todos"; + Text[ catalan ] = "Tot"; Text[ finnish ] = "Kaikki"; + Text[ thai ] = "喔椸副喙夃竾喔浮喔"; }; String STR_TEMPLATE_NONE { @@ -478,25 +493,26 @@ Resource RID_SW_SHELLRES Text [ ENGLISH ] = "none" ; Text [ dutch ] = "geen" ; Text [ english_us ] = "None" ; - Text [ swedish ] = "ingen" ; + Text [ swedish ] = "Ingen" ; Text [ danish ] = "Ingen" ; Text [ italian ] = "Senza" ; Text [ spanish ] = "Ninguno" ; Text [ french ] = "Aucun(e)" ; Text [ portuguese_brazilian ] = "keine" ; Text [ portuguese ] = "Nenhum" ; - Text[ chinese_simplified ] = "无"; - Text[ russian ] = "徨"; + Text[ chinese_simplified ] = "鏃"; + Text[ russian ] = "湾"; Text[ polish ] = "brak"; - Text[ japanese ] = "側偟"; - Text[ chinese_traditional ] = "礚"; + Text[ japanese ] = "銇仐"; + Text[ chinese_traditional ] = "鐒"; Text[ arabic ] = "认驿"; Text[ greek ] = "赆磔磲"; - Text[ korean ] = "绝澜"; + Text[ korean ] = "鞐嗢潓"; Text[ turkish ] = "yok"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ninguno"; + Text[ catalan ] = "Cap"; Text[ finnish ] = "Ei mit滗n"; + Text[ thai ] = "喙勦浮喙堗浮喔"; }; String STR_FIELD_FIXED { @@ -513,17 +529,18 @@ Resource RID_SW_SHELLRES TEXT [ dutch ] = "(vast)" ; TEXT [ spanish ] = "(fija)" ; TEXT [ english_us ] = "(fixed)" ; - TEXT[ chinese_simplified ] = "(固定)"; + TEXT[ chinese_simplified ] = "(鍥哄畾)"; TEXT[ russian ] = "(翳犟.)"; TEXT[ polish ] = "(sta硑)"; - TEXT[ japanese ] = "(曄峏晄壜)"; - TEXT[ chinese_traditional ] = "(㏕﹚)"; + TEXT[ japanese ] = "(澶夋洿涓嶅彲)"; + TEXT[ chinese_traditional ] = "(鍥哄畾)"; TEXT[ arabic ] = "(饲仁)"; TEXT[ greek ] = "(篝徼羼)"; - TEXT[ korean ] = "(绊沥凳)"; + TEXT[ korean ] = "(瓿犾爼)"; TEXT[ turkish ] = "(sabit)"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "(fija)"; + TEXT[ catalan ] = "(fix)"; + TEXT[ thai ] = "(喔勦竾喔椸傅喙)"; }; String STR_TOI { @@ -533,24 +550,25 @@ Resource RID_SW_SHELLRES TEXT [ italian ] = "Indice analitico" ; TEXT [ portuguese_brazilian ] = "?ndice" ; TEXT [ portuguese ] = "蚽dice remissivo" ; - TEXT [ finnish ] = "Aakkostettu hakemisto" ; + TEXT [ finnish ] = "Aakkosellinen hakemisto" ; TEXT [ danish ] = "Stikordsregister" ; TEXT [ french ] = "Index lexical" ; TEXT [ swedish ] = "Sakregister" ; TEXT [ dutch ] = "Index" ; TEXT [ spanish ] = "蚽dice alfab閠ico" ; TEXT [ english_us ] = "Alphabetical Index" ; - TEXT[ chinese_simplified ] = "索引"; - TEXT[ russian ] = "橡邃戾蝽 箨噻囹咫"; + TEXT[ chinese_simplified ] = "绱㈠紩鐩綍"; + TEXT[ russian ] = "离羿忤蝽 箨噻囹咫"; TEXT[ polish ] = "Skorowidz"; - TEXT[ japanese ] = "嶕堷"; - TEXT[ chinese_traditional ] = "まヘ魁"; + TEXT[ japanese ] = "绱㈠紩"; + TEXT[ chinese_traditional ] = "绱㈠紩鐩寗"; TEXT[ arabic ] = "蒎延 萌滔"; TEXT[ greek ] = "捧皴艮耖 胼铄"; - TEXT[ korean ] = "虐况靛 祸牢"; + TEXT[ korean ] = "靸夓澑"; TEXT[ turkish ] = "Alfabetik dizin"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "蚽dice alfab閠ico"; + TEXT[ catalan ] = "蚽dex alfab鑤ic"; + TEXT[ thai ] = "喔斷副喔娻笝喔掂箑喔｀傅喔⑧竾喔曕覆喔∴笗喔编抚喔副喔佮俯喔"; }; String STR_TOU @@ -568,17 +586,18 @@ Resource RID_SW_SHELLRES TEXT [ dutch ] = "Gebruikersindex" ; TEXT [ spanish ] = "蚽dice del usuario" ; TEXT [ english_us ] = "User-Defined" ; - TEXT[ chinese_simplified ] = "使用者自定"; + TEXT[ chinese_simplified ] = "浣跨敤鑰呰嚜瀹"; TEXT[ russian ] = "物疱溴屐 镱朦珙忄蝈脲"; TEXT[ polish ] = "Ustawienia indywidualne"; - TEXT[ japanese ] = "瞻晦皰鑻`"; - TEXT[ chinese_traditional ] = "ㄏノ璹"; + TEXT[ japanese ] = "銉︺兗銈躲兗瀹氱京"; + TEXT[ chinese_traditional ] = "浣跨敤鑰呰嚜瑷"; TEXT[ arabic ] = "沲谘 沅 奕 轻阌饰香"; TEXT[ greek ] = "像轶燧盹 狃 黢摅翮"; - TEXT[ korean ] = "荤侩磊 沥狼"; + TEXT[ korean ] = "靷毄鞛 鞝曥潣"; TEXT[ turkish ] = "Kullan齝 tan齧l"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "蚽dice del usuario"; + TEXT[ catalan ] = "Definit per l'usuari"; + TEXT[ thai ] = "喔｀赴喔氞父喔溹腹喙夃箖喔娻箟"; }; String STR_TOC @@ -596,17 +615,18 @@ Resource RID_SW_SHELLRES TEXT [ dutch ] = "Inhoudsopgave" ; TEXT [ spanish ] = "蚽dice de contenido" ; TEXT [ english_us ] = "Table of Contents" ; - TEXT[ chinese_simplified ] = "内容目录"; + TEXT[ chinese_simplified ] = "鍐呭鐩綍"; TEXT[ language_user1 ] = " "; TEXT[ russian ] = "毋豚怆屙桢"; TEXT[ polish ] = "Spis tre渃i"; - TEXT[ japanese ] = "栚師"; - TEXT[ chinese_traditional ] = "ず甧ヘ魁"; + TEXT[ japanese ] = "鐩"; + TEXT[ chinese_traditional ] = "鍏у鐩寗"; TEXT[ arabic ] = "蒎延 轻阃舒砬"; TEXT[ greek ] = "梳糗腼泔 疱耖鬻镬蓓"; - TEXT[ korean ] = "格瞒"; + TEXT[ korean ] = "氇╈皑"; TEXT[ turkish ] = "葭indekiler dizini"; - TEXT[ catalan ] = "蚽dice de contenido"; + TEXT[ catalan ] = "蚽dex de contingut"; + TEXT[ thai ] = "喔曕覆喔｀覆喔囙箑喔權阜喙夃箒喔覆"; }; String STR_TOX_AUTH @@ -615,7 +635,7 @@ Resource RID_SW_SHELLRES TEXT [ English ] = "Table of authorities" ; TEXT[ english_us ] = "Bibliography"; TEXT[ portuguese ] = "Bibliografia"; - TEXT[ russian ] = "扬桉铌 腓蝈疣蝮瘥"; + TEXT[ russian ] = "凌犭桀沭圄"; TEXT[ greek ] = "麻怆轱泷狯哚"; TEXT[ dutch ] = "Literatuurlijst"; TEXT[ french ] = "Bibliographie"; @@ -625,15 +645,16 @@ Resource RID_SW_SHELLRES TEXT[ swedish ] = "Litteraturf鰎teckning"; TEXT[ polish ] = "Bibliografia"; TEXT[ portuguese_brazilian ] = "Table of authorities"; - TEXT[ japanese ] = "嶲峫暥專昞\"; - TEXT[ korean ] = "曼绊巩清"; - TEXT[ chinese_simplified ] = "文献目录"; - TEXT[ chinese_traditional ] = "ゅ膍ヘ魁"; + TEXT[ japanese ] = "鍙傝冩枃鐚〃"; + TEXT[ korean ] = "彀戈碃氍疙棇"; + TEXT[ chinese_simplified ] = "鏂囩尞鐩綍"; + TEXT[ chinese_traditional ] = "鏂囩嵒鐩寗"; TEXT[ arabic ] = "蒎延 轻阊翘"; TEXT[ turkish ] = "Kaynak鏰 dizini"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Bibliograf韆"; - TEXT[ finnish ] = "Bibliografia"; + TEXT[ catalan ] = "Bibliografia"; + TEXT[ finnish ] = "L鋒deluettelo"; + TEXT[ thai ] = "喔氞福喔｀笓喔侧笝喔膏竵喔｀浮"; }; String STR_TOX_TBL { @@ -651,15 +672,16 @@ Resource RID_SW_SHELLRES TEXT[ swedish ] = "Tabellf鰎teckning"; TEXT[ polish ] = "Spis tabel"; TEXT[ portuguese_brazilian ] = "Table of tables"; - TEXT[ japanese ] = "昞\偺嶕堷"; - TEXT[ korean ] = "钎 祸牢"; - TEXT[ chinese_simplified ] = "表格目录"; - TEXT[ chinese_traditional ] = "ヘ魁"; + TEXT[ japanese ] = "琛ㄣ伄绱㈠紩"; + TEXT[ korean ] = "響 靸夓澑"; + TEXT[ chinese_simplified ] = "琛ㄦ牸鐩綍"; + TEXT[ chinese_traditional ] = "琛ㄦ牸鐩寗"; TEXT[ arabic ] = "蒎延 轻滔擎"; TEXT[ turkish ] = "Tablo dizini"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "蚽dice de tablas"; - TEXT[ finnish ] = "Taulukkohakemisto"; + TEXT[ catalan ] = "蚽dex de taules"; + TEXT[ finnish ] = "Taulukkolettelo"; + TEXT[ thai ] = "喔斷副喔娻笝喔掂笗喔侧福喔侧竾"; }; String STR_TOX_OBJ { @@ -669,7 +691,7 @@ Resource RID_SW_SHELLRES TEXT[ portuguese ] = "蚽dice de objectos"; TEXT[ russian ] = "扬桉铌 钺牝钼"; TEXT[ greek ] = "梳糗腼泔 犴糸赍殪蓓"; - TEXT[ dutch ] = "Objectenregister"; + TEXT[ dutch ] = "Objectregister"; TEXT[ french ] = "Index des objets"; TEXT[ spanish ] = "蚽dice de objetos"; TEXT[ italian ] = "Indice degli oggetti"; @@ -677,15 +699,16 @@ Resource RID_SW_SHELLRES TEXT[ swedish ] = "Objektf鰎teckning"; TEXT[ polish ] = "Spis obiekt體"; TEXT[ portuguese_brazilian ] = "Table of objects"; - TEXT[ japanese ] = "堤藜蕺改偺嶕堷"; - TEXT[ korean ] = "俺眉 祸牢"; - TEXT[ chinese_simplified ] = "对象目录"; - TEXT[ chinese_traditional ] = "ンヘ魁"; + TEXT[ japanese ] = "銈儢銈搞偋銈儓銇储寮"; + TEXT[ korean ] = "臧滌泊 靸夓澑"; + TEXT[ chinese_simplified ] = "瀵硅薄鐩綍"; + TEXT[ chinese_traditional ] = "鐗╀欢鐩寗"; TEXT[ arabic ] = "蒎延 轻咔其鞘"; TEXT[ turkish ] = "Nesne dizini"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "蚽dice de objetos"; + TEXT[ catalan ] = "Taula d'objectes"; TEXT[ finnish ] = "Objektiluettelo"; + TEXT[ thai ] = "喔曕覆喔｀覆喔囙抚喔编笗喔栢父"; }; String STR_TOX_ILL { @@ -693,7 +716,7 @@ Resource RID_SW_SHELLRES TEXT [ English ] = "Table of illustrations" ; TEXT[ english_us ] = "Illustration Index"; TEXT[ portuguese ] = "蚽dice de ilustra珲es"; - TEXT[ russian ] = "扬桉铌 痂耋黻钼"; + TEXT[ russian ] = "扬桉铌 桦膻耱疣鲨"; TEXT[ greek ] = "梳糗腼泔 彘挈睐"; TEXT[ dutch ] = "Afbeeldingenregister"; TEXT[ french ] = "Index des illustrations"; @@ -703,15 +726,16 @@ Resource RID_SW_SHELLRES TEXT[ swedish ] = "Illustrationsf鰎teckning"; TEXT[ polish ] = "Spis ilustracji"; TEXT[ portuguese_brazilian ] = "Table of illustrations"; - TEXT[ japanese ] = "恾偺嶕堷"; - TEXT[ korean ] = "火拳 祸牢"; - TEXT[ chinese_simplified ] = "插图目录"; - TEXT[ chinese_traditional ] = "础瓜ヘ魁"; + TEXT[ japanese ] = "鍥炽伄绱㈠紩"; + TEXT[ korean ] = "靷巾檾 靸夓澑"; + TEXT[ chinese_simplified ] = "鎻掑浘鐩綍"; + TEXT[ chinese_traditional ] = "鎻掑湒鐩寗"; TEXT[ arabic ] = "蒎延 轻真 轻彭智晚"; TEXT[ turkish ] = "Resim dizini"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "蚽dice de ilustraciones"; - TEXT[ finnish ] = "Kuvitushakemisto"; + TEXT[ catalan ] = "蚽dex d'il.lustracions"; + TEXT[ finnish ] = "Kuvitusluettelo"; + TEXT[ thai ] = "喔斷副喔娻笝喔掂笭喔侧笧喔涏福喔班竵喔笟"; }; @@ -732,17 +756,18 @@ Resource RID_SW_SHELLRES TEXT [ dutch ] = "Titel" ; TEXT [ spanish ] = "T韙ulo" ; TEXT [ english_us ] = "Title" ; - TEXT[ chinese_simplified ] = "标题"; + TEXT[ chinese_simplified ] = "鏍囬"; TEXT[ russian ] = "青汶噔桢"; TEXT[ polish ] = "Tytu"; - TEXT[ japanese ] = "啦馁"; - TEXT[ chinese_traditional ] = "夹肈"; + TEXT[ japanese ] = "銈裤偆銉堛儷"; + TEXT[ chinese_traditional ] = "妯欓"; TEXT[ arabic ] = "轻阡媲"; TEXT[ greek ] = "赃綦矧"; - TEXT[ korean ] = "力格"; + TEXT[ korean ] = "鞝滊"; TEXT[ turkish ] = "Ba齥"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "T韙ulo"; + TEXT[ catalan ] = "T韙ol"; + TEXT[ thai ] = "喔娻阜喙堗腑"; }; String FLD_DOCINFO_THEMA { @@ -757,19 +782,20 @@ Resource RID_SW_SHELLRES TEXT [ french ] = "Sujet" ; TEXT [ swedish ] = "Tema" ; TEXT [ dutch ] = "Onderwerp" ; - TEXT [ spanish ] = "Tema" ; + TEXT [ spanish ] = "Asunto" ; TEXT [ english_us ] = "Subject" ; - TEXT[ chinese_simplified ] = "主题"; + TEXT[ chinese_simplified ] = "涓婚"; TEXT[ russian ] = "义爨"; TEXT[ polish ] = "Temat"; - TEXT[ japanese ] = "冒"; - TEXT[ chinese_traditional ] = "肈"; + TEXT[ japanese ] = "銉嗐兗銉"; + TEXT[ chinese_traditional ] = "涓婚"; TEXT[ arabic ] = "轻沔宙"; TEXT[ greek ] = "容灬"; - TEXT[ korean ] = "林力"; + TEXT[ korean ] = "欤检牅"; TEXT[ turkish ] = "Konu"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Tema"; + TEXT[ catalan ] = "Assumpte"; + TEXT[ thai ] = "喔娻阜喙堗腑喙喔｀阜喙堗腑喔"; }; String FLD_DOCINFO_KEYS { @@ -787,21 +813,22 @@ Resource RID_SW_SHELLRES TEXT [ dutch ] = "Sleutelwoorden" ; TEXT [ spanish ] = "Palabras clave" ; TEXT [ english_us ] = "Keywords" ; - TEXT[ chinese_simplified ] = "关键字"; + TEXT[ chinese_simplified ] = "鍏抽敭瀛"; TEXT[ russian ] = "孰邂 耠钼"; TEXT[ polish ] = "S硂wa kluczowe"; - TEXT[ japanese ] = "钒馨霓"; - TEXT[ chinese_traditional ] = "闽龄"; + TEXT[ japanese ] = "銈兗銉兗銉"; + TEXT[ chinese_traditional ] = "闂滈嵉瀛"; TEXT[ arabic ] = "轻哚闱 轻糜怯砩"; TEXT[ greek ] = "溯铄轵 觌彘溟"; - TEXT[ korean ] = "虐 况靛"; + TEXT[ korean ] = "韨れ泴霌"; TEXT[ turkish ] = "Anahtar s鰖c黭"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Palabras clave"; + TEXT[ catalan ] = "Paraules clau"; + TEXT[ thai ] = "喔勦赋喔赋喔勦副喔"; }; String FLD_DOCINFO_COMMENT { - TEXT = "Beschreibung" ; + TEXT = "Kommentar" ; TEXT [ English ] = "Description" ; TEXT [ norwegian ] = "Beskrivelse" ; TEXT [ italian ] = "Descrizione" ; @@ -813,18 +840,19 @@ Resource RID_SW_SHELLRES TEXT [ swedish ] = "Beskrivning" ; TEXT [ dutch ] = "Beschrijving" ; TEXT [ spanish ] = "Descripci髇" ; - TEXT [ english_us ] = "Description" ; - TEXT[ chinese_simplified ] = "说明"; + TEXT [ english_us ] = "Comments" ; + TEXT[ chinese_simplified ] = "璇存槑"; TEXT[ russian ] = "物桉囗桢"; TEXT[ polish ] = "Opis"; - TEXT[ japanese ] = "阂菽"; - TEXT[ chinese_traditional ] = "磞瓃"; + TEXT[ japanese ] = "銈炽儭銉炽儓"; + TEXT[ chinese_traditional ] = "鎻忚堪"; TEXT[ arabic ] = "轻嬲"; TEXT[ greek ] = "绣耖泷狯"; - TEXT[ korean ] = "汲疙"; + TEXT[ korean ] = "靹る獏"; TEXT[ turkish ] = "Tan齧"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Descripci髇"; + TEXT[ catalan ] = "Descripci"; + TEXT[ thai ] = "喔勦赋喔笜喔脆笟喔侧涪"; }; String FLD_DOCINFO_INFO1 { @@ -841,17 +869,18 @@ Resource RID_SW_SHELLRES TEXT [ dutch ] = "Info 0" ; TEXT [ spanish ] = "Info 0" ; TEXT [ english_us ] = "Info 0" ; - TEXT[ chinese_simplified ] = "信息 0"; + TEXT[ chinese_simplified ] = "淇℃伅 0"; TEXT[ russian ] = "软纛 0"; TEXT[ polish ] = "Informacja 0"; - TEXT[ japanese ] = "忣曬 0"; - TEXT[ chinese_traditional ] = "戈癟 0"; + TEXT[ japanese ] = "鎯呭牨 0"; + TEXT[ chinese_traditional ] = "璩囪▕ 0"; TEXT[ arabic ] = "阙徭闵 0"; TEXT[ greek ] = "须珩秭锺咤 0"; - TEXT[ korean ] = "沥焊 0"; + TEXT[ korean ] = "鞝曤炒 0"; TEXT[ turkish ] = "Bilgi 0"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Info 0"; + TEXT[ catalan ] = "Informaci 0"; + TEXT[ thai ] = "喔傕箟喔浮喔灌弗 0"; }; String FLD_DOCINFO_INFO2 { @@ -868,17 +897,18 @@ Resource RID_SW_SHELLRES TEXT [ dutch ] = "Info 1" ; TEXT [ spanish ] = "Info 1" ; TEXT [ english_us ] = "Info 1" ; - TEXT[ chinese_simplified ] = "信息 1"; + TEXT[ chinese_simplified ] = "淇℃伅 1"; TEXT[ russian ] = "软纛 1"; TEXT[ polish ] = "Informacja 1"; - TEXT[ japanese ] = "忣曬 1"; - TEXT[ chinese_traditional ] = "戈癟 1"; + TEXT[ japanese ] = "鎯呭牨 1"; + TEXT[ chinese_traditional ] = "璩囪▕ 1"; TEXT[ arabic ] = "阙徭闵 1"; TEXT[ greek ] = "须珩秭锺咤 1"; - TEXT[ korean ] = "沥焊 1"; + TEXT[ korean ] = "鞝曤炒 1"; TEXT[ turkish ] = "Bilgi 1"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Info 1"; + TEXT[ catalan ] = "Informaci 1"; + TEXT[ thai ] = "喔傕箟喔浮喔灌弗 1"; }; String FLD_DOCINFO_INFO3 { @@ -895,17 +925,18 @@ Resource RID_SW_SHELLRES TEXT [ dutch ] = "Info 2" ; TEXT [ spanish ] = "Info 2" ; TEXT [ english_us ] = "Info 2" ; - TEXT[ chinese_simplified ] = "信息 2"; + TEXT[ chinese_simplified ] = "淇℃伅 2"; TEXT[ russian ] = "软纛 2"; TEXT[ polish ] = "Informacja 2"; - TEXT[ japanese ] = "忣曬 2"; - TEXT[ chinese_traditional ] = "戈癟 2"; + TEXT[ japanese ] = "鎯呭牨 2"; + TEXT[ chinese_traditional ] = "璩囪▕ 2"; TEXT[ arabic ] = "阙徭闵 2"; TEXT[ greek ] = "须珩秭锺咤 2"; - TEXT[ korean ] = "沥焊 2"; + TEXT[ korean ] = "鞝曤炒 2"; TEXT[ turkish ] = "Bilgi 2"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Info 2"; + TEXT[ catalan ] = "Informaci 2"; + TEXT[ thai ] = "喔傕箟喔浮喔灌弗 2"; }; String FLD_DOCINFO_INFO4 { @@ -922,17 +953,18 @@ Resource RID_SW_SHELLRES TEXT [ dutch ] = "Info 3" ; TEXT [ spanish ] = "Info 3" ; TEXT [ english_us ] = "Info 3" ; - TEXT[ chinese_simplified ] = "信息 3"; + TEXT[ chinese_simplified ] = "淇℃伅 3"; TEXT[ russian ] = "软纛 3"; TEXT[ polish ] = "Informacja 3"; - TEXT[ japanese ] = "忣曬 3"; - TEXT[ chinese_traditional ] = "戈癟 3"; + TEXT[ japanese ] = "鎯呭牨 3"; + TEXT[ chinese_traditional ] = "璩囪▕ 3"; TEXT[ arabic ] = "阙徭闵 3"; TEXT[ greek ] = "须珩秭锺咤 3"; - TEXT[ korean ] = "沥焊 3"; + TEXT[ korean ] = "鞝曤炒 3"; TEXT[ turkish ] = "Bilgi 3"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Info 3"; + TEXT[ catalan ] = "Informaci 3"; + TEXT[ thai ] = "喔傕箟喔浮喔灌弗 3"; }; String FLD_DOCINFO_CREATE { @@ -949,17 +981,18 @@ Resource RID_SW_SHELLRES TEXT [ dutch ] = "Gemaakt" ; TEXT [ spanish ] = "Creaci髇" ; TEXT [ english_us ] = "Created" ; - TEXT[ chinese_simplified ] = "建立"; + TEXT[ chinese_simplified ] = "寤虹珛"; TEXT[ russian ] = "杨玟囗桢"; TEXT[ polish ] = "Utworzenie"; - TEXT[ japanese ] = "嶌惉"; - TEXT[ chinese_traditional ] = "玻ネ"; + TEXT[ japanese ] = "浣滄垚"; + TEXT[ chinese_traditional ] = "鐢㈢敓"; TEXT[ arabic ] = "配郧"; TEXT[ greek ] = "溺扉秕胥哚"; - TEXT[ korean ] = "累己"; + TEXT[ korean ] = "毵岆摛旮"; TEXT[ turkish ] = "Olu⺶urma"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Creaci髇"; + TEXT[ catalan ] = "Creat"; + TEXT[ thai ] = "喔福喙夃覆喔"; }; String FLD_DOCINFO_CHANGE { @@ -977,17 +1010,18 @@ Resource RID_SW_SHELLRES TEXT [ dutch ] = "Wijziging" ; TEXT [ spanish ] = "Modificaci髇" ; TEXT [ english_us ] = "Modified" ; - TEXT[ chinese_simplified ] = "更改"; + TEXT[ chinese_simplified ] = "鏇存敼"; TEXT[ russian ] = "如戾礤龛"; TEXT[ polish ] = "Modyfikacja"; - TEXT[ japanese ] = "曄峏"; - TEXT[ chinese_traditional ] = "跑"; + TEXT[ japanese ] = "澶夋洿"; + TEXT[ chinese_traditional ] = "璁婃洿"; TEXT[ arabic ] = "授享"; TEXT[ greek ] = "岭脶戕"; - TEXT[ korean ] = "函版"; + TEXT[ korean ] = "氤瓴"; TEXT[ turkish ] = "De餴⺶irme"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Modificaci髇"; + TEXT[ catalan ] = "Modificat"; + TEXT[ thai ] = "喔斷副喔斷箒喔涏弗喔囙箒喔佮箟喙勦競"; }; String FLD_DOCINFO_PRINT { @@ -1004,17 +1038,18 @@ Resource RID_SW_SHELLRES TEXT [ dutch ] = "Laatste afdruk" ; TEXT [ spanish ] = "趌tima impresi髇" ; TEXT [ english_us ] = "Last printed" ; - TEXT[ chinese_simplified ] = "上一次打印"; + TEXT[ chinese_simplified ] = "涓婁竴娆℃墦鍗"; TEXT[ russian ] = "项耠邃 疣耧鬻囹赅"; TEXT[ polish ] = "Ostatni wydruk"; - TEXT[ japanese ] = "慜夞偺報嶞"; - TEXT[ chinese_traditional ] = "Ω"; + TEXT[ japanese ] = "鍓嶅洖銇嵃鍒"; + TEXT[ chinese_traditional ] = "涓婁竴娆″垪鍗"; TEXT[ arabic ] = "轻厝勤 轻梦硌"; TEXT[ greek ] = "藻脲豸徇 尻酏瘗箸"; - TEXT[ korean ] = "付瘤阜 牢尖"; + TEXT[ korean ] = "斓滉芳 鞚胳噭"; TEXT[ turkish ] = "Son yazd齬ma"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "趌tima impresi髇"; + TEXT[ catalan ] = "趌tima impressi"; + TEXT[ thai ] = "喔炧复喔∴笧喙屶竸喔｀副喙夃竾喔父喔斷笚喙夃覆喔"; }; String FLD_DOCINFO_DOCNO { @@ -1029,18 +1064,19 @@ Resource RID_SW_SHELLRES Text [ danish ] = "Dokumentnummer" ; Text [ portuguese ] = "N鷐ero do documento" ; Text [ portuguese_brazilian ] = "Dokumentnummer" ; - Text[ chinese_simplified ] = "文档号码"; + Text[ chinese_simplified ] = "鏂囨。鍙风爜"; Text[ russian ] = "皖戾 漕牦戾眚"; Text[ polish ] = "Numer dokumentu"; - Text[ japanese ] = "霓翻逸臄詬"; - Text[ chinese_traditional ] = "ゅン腹絏"; + Text[ japanese ] = "銉夈偔銉ャ儭銉炽儓鐣彿"; + Text[ chinese_traditional ] = "鏂囦欢铏熺⒓"; Text[ arabic ] = "艳 轻阌输"; Text[ greek ] = "榴殍禳 邈泷荟秕"; - Text[ korean ] = "巩辑 锅龋"; + Text[ korean ] = "氍胳劀 氩堩樃"; Text[ turkish ] = "Belge numaras"; Text[ language_user1 ] = " "; - Text[ catalan ] = "N鷐ero del documento"; + Text[ catalan ] = "N鷐ero del document"; Text[ finnish ] = "Asiakirjan numero"; + Text[ thai ] = "喙喔ム競喙喔竵喔覆喔"; }; String FLD_DOCINFO_EDIT { @@ -1055,18 +1091,19 @@ Resource RID_SW_SHELLRES Text [ danish ] = "Redigeringstid" ; Text [ portuguese ] = "Tempo de edi玢o" ; Text [ portuguese_brazilian ] = "Bearbeitungszeit" ; - Text[ chinese_simplified ] = "编辑时间"; - Text[ russian ] = "吗屐 钺疣犷蜿"; + Text[ chinese_simplified ] = "缂栬緫鏃堕棿"; + Text[ russian ] = "吗屐 镳噔觇"; Text[ polish ] = "Czas edycji"; - Text[ japanese ] = "曇廤帪崗"; - Text[ chinese_traditional ] = "絪胯丁"; + Text[ japanese ] = "绶ㄩ泦鏅傚埢"; + Text[ chinese_traditional ] = "绶ㄨ集鏅傞枔"; Text[ arabic ] = "孓 轻释秧"; Text[ greek ] = "遵矧 屦孱羼汜筮狎"; - Text[ korean ] = "祈笼 矫埃"; + Text[ korean ] = "韼胳 鞁滉皠"; Text[ turkish ] = "D鼁enleme s黵esi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Tiempo de edici髇"; + Text[ catalan ] = "Temps d'edici"; Text[ finnish ] = "Muokkausaika"; + Text[ thai ] = "喙佮竵喙夃箘喔傕箑喔о弗喔"; }; BITMAP BMP_FRAME_ANCHOR { FILE = "anchor.bmp" ; }; BITMAP BMP_FRAME_DRAG_ANCHOR { FILE = "danchor.bmp" ; }; @@ -1083,19 +1120,20 @@ Resource RID_SW_SHELLRES Text[ french ] = "Conversion $(ARG1)"; Text[ spanish ] = "Convertir $(ARG1)"; Text[ italian ] = "Conversione $(ARG1)"; - Text[ danish ] = "Convert $(ARG1)"; + Text[ danish ] = "Konvertering $(ARG1)"; Text[ swedish ] = "Konvertera $(ARG1)"; Text[ polish ] = "Konwersja $(ARG1)"; Text[ portuguese_brazilian ] = "Convert $(ARG1)"; - Text[ japanese ] = "$(ARG1) 傪曄姺"; - Text[ korean ] = "函券 $(ARG1)"; - Text[ chinese_simplified ] = "转换 $(ARG1)"; - Text[ chinese_traditional ] = "锣传 $(ARG1)"; + Text[ japanese ] = "$(ARG1) 銈掑鎻"; + Text[ korean ] = "$(ARG1)鞚(毳) 氤頇"; + Text[ chinese_simplified ] = "杞崲 $(ARG1)"; + Text[ chinese_traditional ] = "杞夋彌 $(ARG1)"; Text[ turkish ] = "Convert $(ARG1)"; Text[ arabic ] = "释骓 $(ARG1)"; - Text[ language_user1 ] = "DD (05.04.2001):Dieser String ist Teil eines Dialoges der erscheint wenn man ein Word- oder RTF- Dokument importiert welches verschiedene Layouts beinhaltet."; - Text[ catalan ] = "Convertir $(ARG1)"; - Text[ finnish ] = "Konvert $(ARG1)"; + Text[ language_user1 ] = "DD (; DD (05.04.2001):Dieser String ist Teil eines Dialoges der erscheint wenn man ein Word- oder RTF- Dokument importiert welches verschiedene Layouts beinhaltet."; + Text[ catalan ] = "Converteix $(ARG1)"; + Text[ finnish ] = "Muunna $(ARG1)"; + Text[ thai ] = "喙佮笡喔ム竾 $(ARG1)"; }; String STR_PAGEDESC_FIRSTNAME { @@ -1105,23 +1143,24 @@ Resource RID_SW_SHELLRES Text[ portuguese ] = "Primeira convers鉶 $(ARG1)"; Text[ russian ] = "襄疴铄 镳孱狃噻钼囗桢 $(ARG1)"; Text[ greek ] = "旭 体翎赳镳 $(ARG1)"; - Text[ dutch ] = "Eerste convertering $(ARG1)"; + Text[ dutch ] = "Eerste conversie $(ARG1)"; Text[ french ] = "Premi鑢e conversion $(ARG1)"; - Text[ spanish ] = "Primer Convertir $(ARG1)"; + Text[ spanish ] = "Primera conversi髇 $(ARG1)"; Text[ italian ] = "Prima conversione $(ARG1)"; - Text[ danish ] = "First convert $(ARG1)"; + Text[ danish ] = "F鴕ste konvertering $(ARG1)"; Text[ swedish ] = "F鰎sta konvertering $(ARG1)"; Text[ polish ] = "Pierwsza konwersja $(ARG1)"; Text[ portuguese_brazilian ] = "First convert $(ARG1)"; - Text[ japanese ] = "嵟弶偵 $(ARG1) 傪曄姺"; - Text[ korean ] = "霉锅掳 函券 $(ARG1)"; - Text[ chinese_simplified ] = "第一个转换 $(ARG1)"; - Text[ chinese_traditional ] = "材锣传 $(ARG1)"; + Text[ japanese ] = "鏈鍒濄伀 $(ARG1) 銈掑鎻"; + Text[ korean ] = "觳矆歆 $(ARG1)鞚(毳) 氤頇"; + Text[ chinese_simplified ] = "绗竴涓浆鎹 $(ARG1)"; + Text[ chinese_traditional ] = "绗竴鍊嬭綁鎻 $(ARG1)"; Text[ turkish ] = "First convert $(ARG1)"; Text[ arabic ] = "面 释骓$(ARG1)"; - Text[ language_user1 ] = "DD (05.04.2001):Dieser String ist Teil eines Dialoges der erscheint wenn man ein Word- oder RTF- Dokument importiert welches verschiedene Layouts beinhaltet. Mit $(ARG1) ist die Seitenzahl oder eine Folge von Seiten (z.B. 1-12) gemeint."; - Text[ catalan ] = "Primera conversi髇 $(ARG1)"; - Text[ finnish ] = "Erste Konvert $(ARG1)"; + Text[ language_user1 ] = "DD (; DD (05.04.2001):Dieser String ist Teil eines Dialoges der erscheint wenn man ein Word- oder RTF- Dokument importiert welches verschiedene Layouts beinhaltet. Mit $(ARG1) ist die Seitenzahl oder eine Folge von Seiten (z.B. 1-12) gemeint."; + Text[ catalan ] = "Primera conversi $(ARG1)"; + Text[ finnish ] = "Muunna ensin $(ARG1)"; + Text[ thai ] = "喙佮笡喔ム竾 $(ARG1) 喔勦福喔编箟喔囙箒喔｀竵"; }; String STR_PAGEDESC_FOLLOWNAME { @@ -1129,25 +1168,26 @@ Resource RID_SW_SHELLRES Text [ ENGLISH ] = "Convert follow $(ARG1)" ; Text[ english_us ] = "Next convert $(ARG1)"; Text[ portuguese ] = "Convers鉶 seguinte $(ARG1)"; - Text[ russian ] = "项耠邃钼囹咫铖螯 镳孱狃噻钼囗 $(ARG1)"; + Text[ russian ] = "央邃簋 镳孱狃噻钼囗桢 $(ARG1)"; Text[ greek ] = "体翎赳镳 吁磔麇獒 $(ARG1)"; - Text[ dutch ] = "Converteer volgende $(ARG1)"; + Text[ dutch ] = "Converteer volgorde $(ARG1)"; Text[ french ] = "Conversion suivante $(ARG1)"; - Text[ spanish ] = "Convertir, serie $(ARG1)"; + Text[ spanish ] = "Conversi髇 siguiente $(ARG1)"; Text[ italian ] = "Conversione seguente $(ARG1)"; - Text[ danish ] = "Convert follow $(ARG1)"; + Text[ danish ] = "Konvertering F鴏ge $(ARG1)"; Text[ swedish ] = "Konvertering f鰈jande $(ARG1)"; Text[ polish ] = "Kolejno滄 konwersji $(ARG1)"; Text[ portuguese_brazilian ] = "Convert follow $(ARG1)"; - Text[ japanese ] = "師偵 $(ARG1) 傪曄姺"; - Text[ korean ] = "函券 $(ARG1)"; - Text[ chinese_simplified ] = "转换组 $(ARG1)"; - Text[ chinese_traditional ] = "锣传舱 $(ARG1)"; + Text[ japanese ] = "娆°伀 $(ARG1) 銈掑鎻"; + Text[ korean ] = "雼れ潓鞙茧 $(ARG1)鞚(毳) 氤頇"; + Text[ chinese_simplified ] = "杞崲缁 $(ARG1)"; + Text[ chinese_traditional ] = "杞夋彌绲 $(ARG1)"; Text[ turkish ] = "Convert follow $(ARG1)"; Text[ arabic ] = "释骓 是犴 $(ARG1)"; - Text[ language_user1 ] = "DD (05.04.2001):Dieser String ist Teil eines Dialoges der erscheint wenn man ein Word- oder RTF- Dokument importiert welches verschiedene Layouts beinhaltet. Mit $(ARG1) ist die Seitenzahl oder eine Folge von Seiten (z.B. 1-12) gemeint."; - Text[ catalan ] = "Convertir serie $(ARG1)"; - Text[ finnish ] = "Konvert Folge $(ARG1)"; + Text[ language_user1 ] = "DD (; DD (05.04.2001):Dieser String ist Teil eines Dialoges der erscheint wenn man ein Word- oder RTF- Dokument importiert welches verschiedene Layouts beinhaltet. Mit $(ARG1) ist die Seitenzahl oder eine Folge von Seiten (z.B. 1-12) gemeint."; + Text[ catalan ] = "Converteix s鑢ie $(ARG1)"; + Text[ finnish ] = "Muunna seuraavaksi $(ARG1)"; + Text[ thai ] = "喙佮笡喔ム竾 $(ARG1) 喔栢副喔斷箘喔"; }; }; @@ -1155,26 +1195,27 @@ String STR_AUTH_TYPE_ARTICLE { Text = "Artikel" ; Text [ English ] = "Article" ; - Text[ english_us ] = "Magazine Article"; - Text[ portuguese ] = "Artigo de revista"; - Text[ russian ] = "羊囹 桤 汔珏螓/骟痦嚯"; + Text[ english_us ] = "Article"; + Text[ portuguese ] = "Artigo"; + Text[ russian ] = "羊囹"; Text[ greek ] = "Ⅰ桉 疱耖镤殛稞"; - Text[ dutch ] = "Krantenartikel"; - Text[ french ] = "Article (revue)"; - Text[ spanish ] = "Art韈ulo de revista"; + Text[ dutch ] = "Artikel"; + Text[ french ] = "Article"; + Text[ spanish ] = "Art韈ulo"; Text[ finnish ] = "Lehtiartikkeli"; Text[ italian ] = "Articolo di rivista"; - Text[ danish ] = "Tidsskriftsartikel"; + Text[ danish ] = "Artikel"; Text[ swedish ] = "Artikel"; Text[ polish ] = "Artyku"; Text[ portuguese_brazilian ] = "Article"; - Text[ japanese ] = "婰帠"; - Text[ korean ] = "棱瘤 扁荤"; - Text[ chinese_simplified ] = "文章"; - Text[ chinese_traditional ] = "ゅ彻"; + Text[ japanese ] = "瑷樹簨"; + Text[ korean ] = "旮办偓"; + Text[ chinese_simplified ] = "鏂囩珷"; + Text[ chinese_traditional ] = "鏂囩珷"; Text[ turkish ] = "Dergi makalesi"; Text[ arabic ] = "戕轻 蓓 闾嵘"; - Text[ catalan ] = "Art韈ulo de revista"; + Text[ catalan ] = "Article de revista"; + Text[ thai ] = "喔氞笚喔勦抚喔侧浮喙冟笝喔權复喔曕涪喔覆喔"; }; String STR_AUTH_TYPE_BOOK { @@ -1192,15 +1233,16 @@ String STR_AUTH_TYPE_BOOK Text[ swedish ] = "Bok"; Text[ polish ] = "Ksi箍ka"; Text[ portuguese_brazilian ] = "Book"; - Text[ japanese ] = "杮"; - Text[ korean ] = "氓"; - Text[ chinese_simplified ] = "书籍"; - Text[ chinese_traditional ] = "膟"; + Text[ japanese ] = "鏈"; + Text[ korean ] = "毂"; + Text[ chinese_simplified ] = "涔︾睄"; + Text[ chinese_traditional ] = "鏇哥睄"; Text[ arabic ] = "呤侨"; Text[ turkish ] = "Kitap"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Libro"; + Text[ catalan ] = "Llibre"; Text[ finnish ] = "Kirja"; + Text[ thai ] = "喔笝喔编竾喔阜喔"; }; String STR_AUTH_TYPE_BOOKLET { @@ -1218,15 +1260,16 @@ String STR_AUTH_TYPE_BOOKLET Text[ swedish ] = "Broschyr"; Text[ polish ] = "Broszura"; Text[ portuguese_brazilian ] = "Booklet"; - Text[ japanese ] = "嶜巕"; - Text[ korean ] = "剖敲房"; - Text[ chinese_simplified ] = "小册子"; - Text[ chinese_traditional ] = "も"; + Text[ japanese ] = "鍐婂瓙"; + Text[ korean ] = "韺滍攲霠"; + Text[ chinese_simplified ] = "灏忓唽瀛"; + Text[ chinese_traditional ] = "灏忔墜鍐"; Text[ arabic ] = "啧薯"; Text[ turkish ] = "Bror"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Folleto"; + Text[ catalan ] = "Fullets"; Text[ finnish ] = "Esitteet"; + Text[ thai ] = "喙傕笟喔｀笂喔编抚喔｀箤"; }; String STR_AUTH_TYPE_CONFERENCE { @@ -1236,23 +1279,24 @@ String STR_AUTH_TYPE_CONFERENCE Text[ portuguese ] = "Relat髍io de confer阯cia"; Text[ russian ] = "橡铗铌铍 耦忮龛"; Text[ greek ] = "另狯锺 簖箨屮珧"; - Text[ dutch ] = "Conferentierapport"; + Text[ dutch ] = "Notulen"; Text[ french ] = "Rapport de conf閞ence"; - Text[ spanish ] = "Informe de conferencia"; + Text[ spanish ] = "Informe sobre la conferencia"; Text[ italian ] = "Rapporto sulla conferenza"; Text[ danish ] = "Konferencerapport"; Text[ swedish ] = "Konferensrapport"; Text[ polish ] = "Sprawozdanie z konferencji"; Text[ portuguese_brazilian ] = "Conference report"; - Text[ japanese ] = "夛媍曬崘"; - Text[ korean ] = "雀狼 焊绊辑"; - Text[ chinese_simplified ] = "讨论会报告"; - Text[ chinese_traditional ] = "穦酵厨"; + Text[ japanese ] = "浼氳鍫卞憡"; + Text[ korean ] = "頃欗殞 氤搓碃靹"; + Text[ chinese_simplified ] = "璁ㄨ浼氭姤鍛"; + Text[ chinese_traditional ] = "鏈冭珖鍫卞憡"; Text[ arabic ] = "兽秧 阡 隳抒"; Text[ turkish ] = "Toplant raporu"; Text[ language_user1 ] = " "; Text[ catalan ] = "Informe de conferencia"; - Text[ finnish ] = "Konferenssimenettelyt"; + Text[ finnish ] = "Konferenssijulkaisut"; + Text[ thai ] = "喔斷赋喙喔權复喔權竵喔侧福喔涏福喔班笂喔膏浮"; }; String STR_AUTH_TYPE_INBOOK { @@ -1262,23 +1306,24 @@ String STR_AUTH_TYPE_INBOOK Text[ portuguese ] = "Extracto de livro"; Text[ russian ] = "蔓镨耜 桤 觏桡"; Text[ greek ] = "琉疳箪 忾怆唢"; - Text[ dutch ] = "Boekuittreksel"; + Text[ dutch ] = "Uittreksel"; Text[ french ] = "Extrait de livre"; - Text[ spanish ] = "Extracto de libro"; + Text[ spanish ] = "Extracto del libro"; Text[ italian ] = "Brano"; Text[ danish ] = "Boguddrag"; Text[ swedish ] = "Bokutdrag"; Text[ polish ] = "Wyci筭 z ksi箍ki"; Text[ portuguese_brazilian ] = "Book extract"; - Text[ japanese ] = "彺杮"; - Text[ korean ] = "惯瞄"; - Text[ chinese_simplified ] = "书籍摘录文"; - Text[ chinese_traditional ] = "膟ゅ彻篕璶"; + Text[ japanese ] = "鏈伄鎶滅矉"; + Text[ korean ] = "氚滌穼"; + Text[ chinese_simplified ] = "涔︾睄鎽樺綍鏂"; + Text[ chinese_traditional ] = "鏇哥睄鏂囩珷鎽樿"; Text[ arabic ] = "戕嗜忧 沅 呤侨"; Text[ turkish ] = "Kitap b鰈黰"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Extracto de libro"; + Text[ catalan ] = "Extracte del llibre"; Text[ finnish ] = "Kirjan otos"; + Text[ thai ] = "喔勦副喔斷弗喔竵喔∴覆喔堗覆喔佮斧喔權副喔囙釜喔粪腑"; }; String STR_AUTH_TYPE_INCOLLECTION { @@ -1288,7 +1333,7 @@ String STR_AUTH_TYPE_INCOLLECTION Text[ portuguese ] = "Extracto do livro com t韙ulo"; Text[ russian ] = "蔓镨耜 桤 觏桡 磬玮囗桢"; Text[ greek ] = "琉疳箪 忾怆唢 戾 暨綦"; - Text[ dutch ] = "Boekuittreksel met titel"; + Text[ dutch ] = "Uittreksel met titel"; Text[ french ] = "Extrait de livre avec titre"; Text[ spanish ] = "Extracto de libro con t韙ulo"; Text[ italian ] = "Brano con titolo"; @@ -1296,15 +1341,16 @@ String STR_AUTH_TYPE_INCOLLECTION Text[ swedish ] = "Bokutdrag med titel"; Text[ polish ] = "Wyci筭 z ksi箍ki z tytu砮m"; Text[ portuguese_brazilian ] = "Book extract with title"; - Text[ japanese ] = "啦馁晅偒偺彺杮"; - Text[ korean ] = "氓 惯瞄 (力格 器窃)"; - Text[ chinese_simplified ] = "注明标题的书籍摘录文"; - Text[ chinese_traditional ] = "Τ夹肈膟ゅ彻篕璶"; + Text[ japanese ] = "鏈伄鎶滅矉锛堥浠樸亶锛"; + Text[ korean ] = "氚滌穼(鞝滊 韽暔)"; + Text[ chinese_simplified ] = "娉ㄦ槑鏍囬鐨勪功绫嶆憳褰曟枃"; + Text[ chinese_traditional ] = "鍚湁妯欓鐨勬浉绫嶆枃绔犳憳瑕"; Text[ arabic ] = "戕嗜忧 沅 呤侨 星 阡媲"; Text[ turkish ] = "Ba齥l kitap b鰈黰"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Extracto de libro con t韙ulo"; + Text[ catalan ] = "Extracte de llibre amb t韙ol"; Text[ finnish ] = "Kirjan otos ja otsikko"; + Text[ thai ] = "喔勦副喔斷弗喔竵喔娻阜喙堗腑喙喔｀阜喙堗腑喔囙浮喔侧笀喔侧竵喔笝喔编竾喔阜喔"; }; String STR_AUTH_TYPE_INPROCEEDINGS { @@ -1314,49 +1360,51 @@ String STR_AUTH_TYPE_INPROCEEDINGS Text[ portuguese ] = "Relat髍io sobre reuni鉶"; Text[ russian ] = "悟麇 玎皴溧龛"; Text[ greek ] = "旭镫腼 篚礤漶哚箸"; - Text[ dutch ] = "Notulen van vergadering"; + Text[ dutch ] = "Notulen"; Text[ french ] = "Rapport de congr鑣"; - Text[ spanish ] = "Informe de reuni髇"; + Text[ spanish ] = "Informe sobre la conferencia"; Text[ italian ] = "Rapporto sulla conferenza"; Text[ danish ] = "Kongresberetning"; - Text[ swedish ] = "Konferensrapport"; + Text[ swedish ] = "Kongressrapport"; Text[ polish ] = "Sprawozdanie z obrady"; Text[ portuguese_brazilian ] = "Proceedings report"; - Text[ japanese ] = "夛曬"; - Text[ korean ] = "切雀 焊绊辑"; - Text[ chinese_simplified ] = "会议报告"; - Text[ chinese_traditional ] = "穦某厨"; + Text[ japanese ] = "浼氬牨"; + Text[ korean ] = "頃欗殞 氤搓碃靹"; + Text[ chinese_simplified ] = "浼氳鎶ュ憡"; + Text[ chinese_traditional ] = "鏈冭鍫卞憡"; Text[ arabic ] = "妊媸孢驷 翘抒勤"; Text[ turkish ] = "Konferans raporu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Informe de reuni髇"; - Text[ finnish ] = "Konferenssimenettelyt"; + Text[ catalan ] = "Informe de reuni"; + Text[ finnish ] = "Konferenssijulkaisut"; + Text[ thai ] = "喔斷赋喙喔權复喔權竵喔侧福喔涏福喔班笂喔膏浮"; }; String STR_AUTH_TYPE_JOURNAL { Text = "Zeitschrift" ; Text [ ENGLISH ] = "Journal" ; - Text[ english_us ] = "Magazine"; + Text[ english_us ] = "Journal"; Text[ portuguese ] = "Revista"; Text[ russian ] = "企痦嚯"; Text[ greek ] = "绣耖镤殛"; Text[ dutch ] = "Tijdschrift"; - Text[ french ] = "Revue"; + Text[ french ] = "Magazine"; Text[ spanish ] = "Revista"; Text[ italian ] = "Rivista"; Text[ danish ] = "Tidsskrift"; Text[ swedish ] = "Tidskrift"; Text[ polish ] = "Czasopismo"; Text[ portuguese_brazilian ] = "Journal"; - Text[ japanese ] = "嶨帍柤"; - Text[ korean ] = "棱瘤"; - Text[ chinese_simplified ] = "杂志"; - Text[ chinese_traditional ] = "馒粁"; + Text[ japanese ] = "闆戣獙"; + Text[ korean ] = "鞛§"; + Text[ chinese_simplified ] = "鏉傚織"; + Text[ chinese_traditional ] = "闆滆獙"; Text[ arabic ] = "轻闾嵘"; Text[ turkish ] = "Dergi"; Text[ language_user1 ] = " "; Text[ catalan ] = "Revista"; - Text[ finnish ] = "Lehti"; + Text[ finnish ] = "P鋓v鋕irja"; + Text[ thai ] = "喔權复喔曕涪喔覆喔"; }; String STR_AUTH_TYPE_MANUAL { @@ -1368,21 +1416,22 @@ String STR_AUTH_TYPE_MANUAL Text[ greek ] = "藻黜殛 邈麇轳咪轱"; Text[ dutch ] = "Technische documentatie"; Text[ french ] = "Documentation technique"; - Text[ spanish ] = "Manual"; + Text[ spanish ] = "Documentaci髇 t閏nica"; Text[ italian ] = "Documentazione tecnica"; Text[ danish ] = "Teknisk dokumentation"; Text[ swedish ] = "Teknisk dokumentation"; Text[ polish ] = "Dokumentacja techn."; Text[ portuguese_brazilian ] = "Manual"; - Text[ japanese ] = "掀"; - Text[ korean ] = "扁贱 巩辑"; - Text[ chinese_simplified ] = "技术文献"; - Text[ chinese_traditional ] = "м砃ゅ膍"; + Text[ japanese ] = "銉炪儖銉ャ偄銉"; + Text[ korean ] = "旮办垹 氍胳劀"; + Text[ chinese_simplified ] = "鎶鏈鏄庝功"; + Text[ chinese_traditional ] = "鎶琛撹鏄庢浉"; Text[ arabic ] = "厢磲 怯饰锨"; Text[ turkish ] = "Teknik dok黰antasyon"; Text[ language_user1 ] = " "; Text[ catalan ] = "Manual"; Text[ finnish ] = "Tekninen asiakirja"; + Text[ thai ] = "喙喔竵喔覆喔｀笚喔侧竾喙喔椸竸喔權复喔"; }; String STR_AUTH_TYPE_MASTERSTHESIS { @@ -1394,21 +1443,22 @@ String STR_AUTH_TYPE_MASTERSTHESIS Text[ greek ] = "拈痣狒殛 羼汜筮"; Text[ dutch ] = "Scriptie"; Text[ french ] = "M閙oire"; - Text[ spanish ] = "Diplomatura"; + Text[ spanish ] = "Tesina"; Text[ italian ] = "Tesi di laurea"; Text[ danish ] = "Eksamensopgave"; Text[ swedish ] = "Examensarbete"; Text[ polish ] = "Praca dyplomowa"; Text[ portuguese_brazilian ] = "Masters thesis"; - Text[ japanese ] = "懖嬈榑暥"; - Text[ korean ] = "切困稠巩"; - Text[ chinese_simplified ] = "大学毕业论文"; - Text[ chinese_traditional ] = "瞶厩拨穨阶ゅ"; + Text[ japanese ] = "鍗掓キ璜栨枃"; + Text[ korean ] = "頃欖渼 雲茧"; + Text[ chinese_simplified ] = "澶у姣曚笟璁烘枃"; + Text[ chinese_traditional ] = "鐞嗗伐绉戝ぇ瀛哥暍妤珫鏂"; Text[ arabic ] = "延轻 闱逃薯"; Text[ turkish ] = "Tez"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Diplomatura"; + Text[ catalan ] = "Tesi"; Text[ finnish ] = "Tutkielma"; + Text[ thai ] = "喔о复喔椸涪喔侧笝喔脆笧喔權笜喙"; }; String STR_AUTH_TYPE_MISC { @@ -1426,15 +1476,16 @@ String STR_AUTH_TYPE_MISC Text[ swedish ] = "Diverse"; Text[ polish ] = "R罂ne"; Text[ portuguese_brazilian ] = "Miscellaneous"; - Text[ japanese ] = "旛峫"; - Text[ korean ] = "咯矾 啊瘤"; - Text[ chinese_simplified ] = "其它"; - Text[ chinese_traditional ] = "ㄤ"; + Text[ japanese ] = "銇濄伄浠"; + Text[ korean ] = "旮绊儉"; + Text[ chinese_simplified ] = "鍏跺畠"; + Text[ chinese_traditional ] = "鍏朵粬"; Text[ arabic ] = "沅孚鞘"; Text[ turkish ] = "Muhtelif"; Text[ language_user1 ] = " "; Text[ catalan ] = "Diversos"; Text[ finnish ] = "Sekalaiset"; + Text[ thai ] = "喙喔氞箛喔斷箑喔曕弗喙囙笖"; }; String STR_AUTH_TYPE_PHDTHESIS { @@ -1452,15 +1503,16 @@ String STR_AUTH_TYPE_PHDTHESIS Text[ swedish ] = "Doktorsavhandling"; Text[ polish ] = "Praca doktorska"; Text[ portuguese_brazilian ] = "PhD thesis"; - Text[ japanese ] = "攷巑榑暥"; - Text[ korean ] = "冠荤切困 稠巩"; - Text[ chinese_simplified ] = "博士论文"; - Text[ chinese_traditional ] = "痴阶ゅ"; + Text[ japanese ] = "鍗氬＋璜栨枃"; + Text[ korean ] = "氚曥偓 頃欖渼 雲茧"; + Text[ chinese_simplified ] = "鍗氬＋璁烘枃"; + Text[ chinese_traditional ] = "鍗氬＋璜栨枃"; Text[ arabic ] = "延轻 线舒亚"; Text[ turkish ] = "Doktora 鏰lmas"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Tesis doctoral"; + Text[ catalan ] = "Tesi doctoral"; Text[ finnish ] = "V鋓t鰏kirja"; + Text[ thai ] = "喔覆喔｀笝喔脆笧喔權笜喙"; }; String STR_AUTH_TYPE_PROCEEDINGS { @@ -1472,21 +1524,22 @@ String STR_AUTH_TYPE_PROCEEDINGS Text[ greek ] = "旭镫腼 篚礤漶哚箸"; Text[ dutch ] = "Notulen"; Text[ french ] = "Rapport de congr鑣"; - Text[ spanish ] = "Informe de reuni髇"; + Text[ spanish ] = "Informe sobre la conferencia"; Text[ italian ] = "Rapporto sulla conferenza"; Text[ danish ] = "Kongresberetning"; - Text[ swedish ] = "Konferensrapport"; + Text[ swedish ] = "Kongressrapport"; Text[ polish ] = "Sprawozdanie z obrady"; Text[ portuguese_brazilian ] = "Proceedings"; - Text[ japanese ] = "夛曬"; - Text[ korean ] = "切雀 焊绊辑"; - Text[ chinese_simplified ] = "会议报告"; - Text[ chinese_traditional ] = "穦某厨"; + Text[ japanese ] = "浼氬牨"; + Text[ korean ] = "頃欗殞 氤搓碃靹"; + Text[ chinese_simplified ] = "浼氳鎶ュ憡"; + Text[ chinese_traditional ] = "鏈冭鍫卞憡"; Text[ arabic ] = "妊媸孢驷 翘抒勤"; Text[ turkish ] = "Konferans raporu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Informe de reuni髇"; - Text[ finnish ] = "Konferenssimenettelyt"; + Text[ catalan ] = "Informe de reuni"; + Text[ finnish ] = "Konferenssijulkaisut"; + Text[ thai ] = "喔斷赋喙喔權复喔權竵喔侧福喔涏福喔班笂喔膏浮"; }; String STR_AUTH_TYPE_TECHREPORT { @@ -1504,15 +1557,16 @@ String STR_AUTH_TYPE_TECHREPORT Text[ swedish ] = "Forskningsrapport"; Text[ polish ] = "Sprawozdanie naukowe"; Text[ portuguese_brazilian ] = "Technical report"; - Text[ japanese ] = "尋媶曬崘"; - Text[ korean ] = "楷备 焊绊辑"; - Text[ chinese_simplified ] = "科研报告"; - Text[ chinese_traditional ] = "厨"; + Text[ japanese ] = "鐮旂┒鍫卞憡"; + Text[ korean ] = "鞐瓣惮 氤搓碃靹"; + Text[ chinese_simplified ] = "绉戠爺鎶ュ憡"; + Text[ chinese_traditional ] = "绉戠爺鍫卞憡"; Text[ arabic ] = "兽秧 阡 阢犴 轻韧"; Text[ turkish ] = "Ara⺶齬ma raporu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Informe de investigaci髇"; + Text[ catalan ] = "Informe de recerca"; Text[ finnish ] = "Tutkimusraportti"; + Text[ thai ] = "喔｀覆喔⑧竾喔侧笝喔佮覆喔｀抚喔脆笀喔编涪"; }; String STR_AUTH_TYPE_UNPUBLISHED { @@ -1520,7 +1574,7 @@ String STR_AUTH_TYPE_UNPUBLISHED Text [ ENGLISH ] = "Unpublished" ; Text[ english_us ] = "Unpublished"; Text[ portuguese ] = "In閐ito"; - Text[ russian ] = "湾铒筢腓觐忄眍"; + Text[ russian ] = "湾 铒筢腓觐忄眍"; Text[ greek ] = "龄珈矬咤豸"; Text[ dutch ] = "Niet gepubliceerd"; Text[ french ] = "Non publi"; @@ -1530,15 +1584,16 @@ String STR_AUTH_TYPE_UNPUBLISHED Text[ swedish ] = "Opublicerad"; Text[ polish ] = "Nieopublikowany"; Text[ portuguese_brazilian ] = "Unpublished"; - Text[ japanese ] = "枹敪昞\"; - Text[ korean ] = "傍钎登瘤 臼篮"; - Text[ chinese_simplified ] = "未发表的"; - Text[ chinese_traditional ] = "﹟ゼ祇"; + Text[ japanese ] = "鏈櫤琛"; + Text[ korean ] = "牍勱车響"; + Text[ chinese_simplified ] = "灏氭湭鍙戣〃鐨"; + Text[ chinese_traditional ] = "灏氭湭鐧艰〃"; Text[ arabic ] = "徙 眭湓 融"; Text[ turkish ] = "Yay齧lanmam"; Text[ language_user1 ] = " "; - Text[ catalan ] = "In閐ito"; + Text[ catalan ] = "Sense publicar"; Text[ finnish ] = "Julkaisematon"; + Text[ thai ] = "喙勦浮喙堗笀喔编笖喔炧复喔∴笧喙"; }; String STR_AUTH_TYPE_EMAIL { @@ -1546,25 +1601,26 @@ String STR_AUTH_TYPE_EMAIL Text [ ENGLISH ] = "eMail" ; Text[ english_us ] = "e-mail"; Text[ portuguese ] = "e-mail"; - Text[ russian ] = "蓦.镱黩"; + Text[ russian ] = "蓦. 镱黩"; Text[ greek ] = "e-Mail"; 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[ chinese_simplified ] = "电子邮件"; - Text[ chinese_traditional ] = "筿秎ン"; + Text[ korean ] = "鞝勳瀽 氅旍澕"; + Text[ chinese_simplified ] = "鐢靛瓙閭欢"; + Text[ chinese_traditional ] = "闆诲瓙閮典欢"; Text[ arabic ] = "妊硐 裴呤焰漤"; Text[ turkish ] = "e-posta"; Text[ language_user1 ] = " "; - Text[ catalan ] = "E-mail"; + Text[ catalan ] = "correu electr騨ic"; Text[ finnish ] = "s鋒k鰌osti"; + Text[ thai ] = "喔傅喙喔∴弗喙"; }; String STR_AUTH_TYPE_WWW { @@ -1572,9 +1628,9 @@ String STR_AUTH_TYPE_WWW Text [ ENGLISH ] = "WWW document" ; Text[ english_us ] = "WWW document"; Text[ portuguese ] = "Documento WWW"; - Text[ russian ] = "念牦戾眚 WWW"; + Text[ russian ] = "洛-漕牦戾眚"; Text[ greek ] = "搞泷狯 WWW"; - Text[ dutch ] = "WWW document"; + Text[ dutch ] = "WWW-document"; Text[ french ] = "Document WWW"; Text[ spanish ] = "Documento WWW"; Text[ italian ] = "Documento Web"; @@ -1582,15 +1638,16 @@ String STR_AUTH_TYPE_WWW Text[ swedish ] = "WWW-dokument"; Text[ polish ] = "Dokument WWW"; Text[ portuguese_brazilian ] = "WWW document"; - Text[ japanese ] = "WWW霓翻逸"; - Text[ korean ] = "WWW 巩辑"; - Text[ chinese_simplified ] = "WWW 文档"; - Text[ chinese_traditional ] = "WWW ゅン"; + Text[ japanese ] = "WWW銉夈偔銉ャ儭銉炽儓"; + Text[ korean ] = "鞗 氍胳劀"; + Text[ chinese_simplified ] = "缃戦〉鏂囨。"; + Text[ chinese_traditional ] = "缍查爜鏂囦欢"; Text[ arabic ] = "阌输 骓"; Text[ turkish ] = "WWW belgesi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Documento WWW"; + Text[ catalan ] = "Document WWW"; Text[ finnish ] = "Web-asiakirja"; + Text[ thai ] = "喙喔竵喔覆喔 WWW "; }; String STR_AUTH_TYPE_CUSTOM1 { @@ -1601,22 +1658,23 @@ String STR_AUTH_TYPE_CUSTOM1 Text[ russian ] = "诣 镱朦珙忄蜞1"; Text[ greek ] = "札痫 黢摅翮1"; Text[ dutch ] = "Gebruikerstype1"; - Text[ french ] = "Type d'utilisateur1"; + Text[ french ] = "Utilisateur1"; Text[ spanish ] = "Usuario1"; - Text[ italian ] = "Tipo1"; + Text[ italian ] = "Utente1"; Text[ danish ] = "Brugerdefineret type1"; Text[ swedish ] = "Anv鋘dartyp1"; Text[ polish ] = "U縴tkownik1"; Text[ portuguese_brazilian ] = "Custom1"; - 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 ] = "Kullan齝 tipi1"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Usuario1"; + Text[ catalan ] = "Definit per l'usuari 1"; Text[ finnish ] = "K鋣tt鋔鋘 m滗ritt鋗1"; + Text[ thai ] = "喔｀赴喔氞父喔溹腹喙夃箖喔娻箟1"; }; String STR_AUTH_TYPE_CUSTOM2 { @@ -1627,22 +1685,23 @@ String STR_AUTH_TYPE_CUSTOM2 Text[ russian ] = "诣 镱朦珙忄蝈2"; Text[ greek ] = "札痫 黢摅翮2"; Text[ dutch ] = "Gebruikerstype2"; - Text[ french ] = "Type d'utilisateur2"; + Text[ french ] = "Utilisateur2"; Text[ spanish ] = "Usuario2"; - Text[ italian ] = "Tipo2"; + Text[ italian ] = "Utente2"; Text[ danish ] = "Brugerdefineret type2"; Text[ swedish ] = "Anv鋘dartyp2"; Text[ polish ] = "U縴tkownik2"; Text[ portuguese_brazilian ] = "Custom2"; - 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 ] = "Kullan齝 tipi2"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Usuario2"; + Text[ catalan ] = "Definit per l'usuari 2"; Text[ finnish ] = "K鋣tt鋔鋘 m滗ritt鋗2"; + Text[ thai ] = "喔｀赴喔氞父喔溹腹喙夃箖喔娻箟2"; }; String STR_AUTH_TYPE_CUSTOM3 { @@ -1653,22 +1712,23 @@ String STR_AUTH_TYPE_CUSTOM3 Text[ russian ] = "诣 镱朦珙忄蝈3"; Text[ greek ] = "札痫 黢摅翮3"; Text[ dutch ] = "Gebruikerstype3"; - Text[ french ] = "Type d'utilisateur3"; + Text[ french ] = "Utilisateur3"; Text[ spanish ] = "Usuario3"; - Text[ italian ] = "Tipo3"; + Text[ italian ] = "Utente3"; Text[ danish ] = "Brugerdefineret type3"; Text[ swedish ] = "Anv鋘dartyp3"; Text[ polish ] = "U縴tkownik3"; Text[ portuguese_brazilian ] = "Custom3"; - Text[ japanese ] = "瞻晦袄蔡3"; - Text[ korean ] = "荤侩磊 鸥涝3"; - Text[ chinese_simplified ] = "用户3"; - Text[ chinese_traditional ] = "璹摸 3"; + Text[ japanese ] = "銉︺兗銈躲兗銈裤偆銉 3"; + Text[ korean ] = "靷毄鞛 鞝曥潣3"; + Text[ chinese_simplified ] = "浣跨敤鑰呯被鍨3"; + Text[ chinese_traditional ] = "鑷▊椤炲瀷 3"; Text[ arabic ] = "沲谘 沅 奕 轻阌饰香3"; Text[ turkish ] = "Kullan齝 tipi3"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Usuario3"; + Text[ catalan ] = "Definit per l'usuari 3"; Text[ finnish ] = "K鋣tt鋔鋘 m滗ritt鋗3"; + Text[ thai ] = "喔｀赴喔氞父喔溹腹喙夃箖喔娻箟3"; }; String STR_AUTH_TYPE_CUSTOM4 { @@ -1679,22 +1739,23 @@ String STR_AUTH_TYPE_CUSTOM4 Text[ russian ] = "诣 镱朦珙忄蝈4"; Text[ greek ] = "札痫 黢摅翮4"; Text[ dutch ] = "Gebruikerstype4"; - Text[ french ] = "Type d'utilisateur4"; + Text[ french ] = "Utilisateur4"; Text[ spanish ] = "Usuario4"; - Text[ italian ] = "Tipo4"; + Text[ italian ] = "Utente4"; Text[ danish ] = "Brugerdefineret type4"; Text[ swedish ] = "Anv鋘dartyp4"; Text[ polish ] = "U縴tkownik4"; Text[ portuguese_brazilian ] = "Custom4"; - Text[ japanese ] = "瞻晦袄蔡4"; - Text[ korean ] = "荤侩磊 鸥涝4"; - Text[ chinese_simplified ] = "用户4"; - Text[ chinese_traditional ] = "璹摸 4"; + Text[ japanese ] = "銉︺兗銈躲兗銈裤偆銉 4"; + Text[ korean ] = "靷毄鞛 鞝曥潣4"; + Text[ chinese_simplified ] = "浣跨敤鑰呯被鍨4"; + Text[ chinese_traditional ] = "鑷▊椤炲瀷 4"; Text[ arabic ] = "沲谘 沅 奕 轻阌饰香4"; Text[ turkish ] = "Kullan齝 tipi4"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Usuario4"; + Text[ catalan ] = "Definit per l'usuari 4"; Text[ finnish ] = "K鋣tt鋔鋘 m滗ritt鋗4"; + Text[ thai ] = "喔｀赴喔氞父喔溹腹喙夃箖喔娻箟4"; }; String STR_AUTH_TYPE_CUSTOM5 { @@ -1705,22 +1766,23 @@ String STR_AUTH_TYPE_CUSTOM5 Text[ russian ] = "诣 镱朦珙忄蝈5"; Text[ greek ] = "札痫 黢摅翮5"; Text[ dutch ] = "Gebruikerstype5"; - Text[ french ] = "Type d'utilisateur5"; + Text[ french ] = "Utilisateur5"; Text[ spanish ] = "Usuario5"; - Text[ italian ] = "Tipo5"; + Text[ italian ] = "Utente5"; Text[ danish ] = "Brugerdefineret type5"; Text[ swedish ] = "Anv鋘dartyp5"; Text[ polish ] = "U縴tkownik5"; Text[ portuguese_brazilian ] = "Custom5"; - Text[ japanese ] = "瞻晦袄蔡5"; - Text[ korean ] = "荤侩磊 鸥涝5"; - Text[ chinese_simplified ] = "用户5"; - Text[ chinese_traditional ] = "璹摸 5"; + Text[ japanese ] = "銉︺兗銈躲兗銈裤偆銉 5"; + Text[ korean ] = "靷毄鞛 鞝曥潣5"; + Text[ chinese_simplified ] = "浣跨敤鑰呯被鍨5"; + Text[ chinese_traditional ] = "鑷▊椤炲瀷 5"; Text[ arabic ] = "沲谘 沅 奕 轻阌饰香5"; Text[ turkish ] = "Kullan齝 tipi5"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Usuario5"; + Text[ catalan ] = "Definit per l'usuari 5"; Text[ finnish ] = "K鋣tt鋔鋘 m滗ritt鋗5"; + Text[ thai ] = "喔｀赴喔氞父喔溹腹喙夃箖喔娻箟5"; }; String STR_AUTH_FIELD_IDENTIFIER @@ -1732,21 +1794,22 @@ String STR_AUTH_FIELD_IDENTIFIER Text[ russian ] = "杨牮帙屙桢"; Text[ greek ] = "~吁眙镬镢襻鲞"; Text[ dutch ] = "~Beknopte aanduiding"; - Text[ french ] = "~Abr間"; + Text[ french ] = "Abr間"; Text[ spanish ] = "~Abreviatura"; Text[ italian ] = "Abbreviazione"; Text[ danish ] = "Kort betegnelse"; - Text[ swedish ] = "~Kort beteckning"; + Text[ swedish ] = "Kort beteckning"; Text[ polish ] = "Skr髏"; Text[ portuguese_brazilian ] = "Identifier"; - Text[ japanese ] = "棯徧"; - Text[ korean ] = "陋篮 捞抚"; - Text[ chinese_simplified ] = "简称"; - Text[ chinese_traditional ] = "虏祏磞瓃ゅ"; + Text[ japanese ] = "鐣ョО"; + Text[ korean ] = "鞎届弓"; + Text[ chinese_simplified ] = "绠鐭鏄庢枃"; + Text[ chinese_traditional ] = "绨＄煭鎻忚堪鏂"; Text[ arabic ] = "怯 阄收"; Text[ turkish ] = "~K齭a ad"; - Text[ catalan ] = "~Abreviatura"; + Text[ catalan ] = "Nom curt"; Text[ finnish ] = "Lyhyt nimi"; + Text[ thai ] = "喔娻阜喙堗腑喔⑧箞喔"; }; String STR_AUTH_FIELD_AUTHORITY_TYPE { @@ -1757,72 +1820,75 @@ String STR_AUTH_FIELD_AUTHORITY_TYPE Text[ russian ] = "诣"; Text[ greek ] = "~札痫"; Text[ dutch ] = "~Type"; - Text[ french ] = "~Type"; + Text[ french ] = "Type"; Text[ spanish ] = "~Tipo"; Text[ italian ] = "~Tipo"; Text[ danish ] = "Type"; Text[ swedish ] = "Typ"; Text[ polish ] = "Typ"; Text[ portuguese_brazilian ] = "Type"; - Text[ japanese ] = "啦踢"; - Text[ korean ] = "蜡屈"; - Text[ chinese_simplified ] = "类型"; - Text[ chinese_traditional ] = "摸"; + Text[ japanese ] = "銈裤偆銉"; + Text[ korean ] = "鞙犿槙"; + Text[ chinese_simplified ] = "绫诲瀷"; + Text[ chinese_traditional ] = "椤炲瀷"; Text[ arabic ] = "轻滏"; Text[ turkish ] = "~Tip"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Tipo"; + Text[ catalan ] = "Tipus"; Text[ finnish ] = "Tyyppi"; + Text[ thai ] = "喔娻笝喔脆笖"; }; String STR_AUTH_FIELD_ADDRESS { Text = "Adresse"; Text [ENGLISH] = "Address"; - Text[ english_us ] = "Publisher address"; - Text[ portuguese ] = "~Endere鏾 da editora"; - Text[ russian ] = "冷疱 桤溧蝈朦耱忄"; + Text[ english_us ] = "Address"; + Text[ portuguese ] = "Endere鏾"; + Text[ russian ] = "冷疱"; Text[ greek ] = "拈妪桴眢 尻潼翮"; - Text[ dutch ] = "~Adres uitgeverij"; - Text[ french ] = "Adresse de l'閐ition"; - Text[ spanish ] = "~Direcci髇 editorial"; - Text[ finnish ] = "Julkaisijan osoite"; - Text[ italian ] = "Indirizzo editore"; - Text[ danish ] = "Forlagsadresse"; + Text[ dutch ] = "Adres"; + Text[ french ] = "Adresse"; + Text[ spanish ] = "Direcci髇"; + Text[ finnish ] = "Osoite"; + Text[ italian ] = "Indirizzo"; + Text[ danish ] = "Adresse"; Text[ swedish ] = "Adress"; Text[ polish ] = "Adres"; Text[ portuguese_brazilian ] = "Publisher address"; - Text[ japanese ] = "廧強"; - Text[ korean ] = "免魄荤 林家"; - Text[ chinese_simplified ] = "地址"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "浣忔墍"; + Text[ korean ] = "欤检唽"; + Text[ chinese_simplified ] = "鍦板潃"; + Text[ chinese_traditional ] = "鍦板潃"; Text[ turkish ] = "~Yay齨evi adresi"; Text[ arabic ] = "阡媲 锨 轻湓"; - Text[ catalan ] = "~Direcci髇 editorial"; + Text[ catalan ] = "~Direcci editorial"; + Text[ thai ] = "喔椸傅喙堗腑喔⑧腹喙堗笢喔灌箟喔堗副喔斷笧喔脆浮喔炧箤"; }; String STR_AUTH_FIELD_ANNOTE { Text = "~Anmerkung" ; Text [ ENGLISH ] = "Annotation" ; - Text[ english_us ] = "Notes"; - Text[ portuguese ] = "A~nota珲es"; + Text[ english_us ] = "Ann~otation"; + Text[ portuguese ] = "Ob~serva玢o"; Text[ russian ] = "暑祆屙蜞痂"; Text[ greek ] = "嗅襻艮耒箸"; - Text[ dutch ] = "~Commentaar"; - Text[ french ] = "~Commentaire"; - Text[ spanish ] = "~Notas"; - Text[ finnish ] = "Huomautukset"; - Text[ italian ] = "~Annotazione"; + Text[ dutch ] = "~Opmerkingen"; + Text[ french ] = "Annotation"; + Text[ spanish ] = "Observaci髇"; + Text[ finnish ] = "Huomautus"; + Text[ italian ] = "Annotazione"; Text[ danish ] = "Anm鎟kning"; Text[ swedish ] = "Anm鋜kning"; Text[ polish ] = "Adnotacja"; Text[ portuguese_brazilian ] = "Annotation"; - Text[ japanese ] = "拲庍"; - Text[ korean ] = "林"; - Text[ chinese_simplified ] = "说明(~M)"; - Text[ chinese_traditional ] = "称爹(~M)"; + Text[ japanese ] = "娉ㄩ噲"; + Text[ korean ] = "欤"; + Text[ chinese_simplified ] = "璇存槑"; + Text[ chinese_traditional ] = "鍌欒ɑ"; Text[ turkish ] = "~Not"; Text[ arabic ] = "汜峭偕"; - Text[ catalan ] = "~Notas"; + Text[ catalan ] = "Notes"; + Text[ thai ] = "喔氞副喔權笚喔多竵喔⑧箞喔"; }; String STR_AUTH_FIELD_AUTHOR { @@ -1833,22 +1899,23 @@ String STR_AUTH_FIELD_AUTHOR Text[ russian ] = "棱蝾()"; Text[ greek ] = "吁沣襻鲚狎(-彘)"; Text[ dutch ] = "A~uteur(s)"; - Text[ french ] = "A~uteur(s)"; - Text[ spanish ] = "A~utor(es)"; + Text[ french ] = "Auteur(s)"; + Text[ spanish ] = "Autor(es)"; Text[ italian ] = "A~utore/i"; Text[ danish ] = "Forfatter(e)"; Text[ swedish ] = "F鰎fattare"; Text[ polish ] = "Autor(zy)"; Text[ portuguese_brazilian ] = "Author(s)"; - Text[ japanese ] = "挊幰"; - Text[ korean ] = "累己磊(甸)"; - Text[ chinese_simplified ] = "作者"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "钁楄"; + Text[ korean ] = "鞝鞛"; + Text[ chinese_simplified ] = "浣滆"; + Text[ chinese_traditional ] = "浣滆"; Text[ arabic ] = "轻隳彷 (轻隳彷驿)"; Text[ turkish ] = "Ya~zan(lar)"; Text[ language_user1 ] = " "; - Text[ catalan ] = "A~utor(es)"; - Text[ finnish ] = "Laatijat"; + Text[ catalan ] = "Autor(s)"; + Text[ finnish ] = "Tekij(t)"; + Text[ thai ] = "喔溹腹喙夃箑喔傕傅喔⑧笝"; }; String STR_AUTH_FIELD_BOOKTITLE { @@ -1859,22 +1926,23 @@ String STR_AUTH_FIELD_BOOKTITLE Text[ russian ] = "袜玮囗桢 觏桡"; Text[ greek ] = "赃綦矧 忾怆唢"; Text[ dutch ] = "Boe~ktitel"; - Text[ french ] = "Titre de ~livre"; + Text[ french ] = "Titre du livre"; Text[ spanish ] = "T韙ulo del li~bro"; Text[ italian ] = "Titolo del libro"; Text[ danish ] = "Bogtitel"; Text[ swedish ] = "Boktitel"; Text[ polish ] = "Tytu ksi箍ki"; Text[ portuguese_brazilian ] = "Book title"; - Text[ japanese ] = "彂柤"; - Text[ korean ] = "氓 力格"; - Text[ chinese_simplified ] = "书籍名称"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "鏇稿悕"; + Text[ korean ] = "毂 鞝滊"; + Text[ chinese_simplified ] = "涔﹀悕"; + Text[ chinese_traditional ] = "鏇稿悕"; Text[ arabic ] = "阡媲 轻呤侨"; Text[ turkish ] = "Kitap ~ad"; Text[ language_user1 ] = " "; - Text[ catalan ] = "T韙ulo del li~bro"; + Text[ catalan ] = "T韙ol del lli~bre"; Text[ finnish ] = "Kirjan otsikko"; + Text[ thai ] = "喔娻阜喙堗腑喔笝喔编竾喔阜喔"; }; String STR_AUTH_FIELD_CHAPTER { @@ -1886,21 +1954,22 @@ String STR_AUTH_FIELD_CHAPTER Text[ greek ] = "叔鲕脶轱"; Text[ dutch ] = "Hoo~fdstuk"; Text[ french ] = "~Chapitre"; - Text[ spanish ] = "Cap韙~ulo"; + Text[ spanish ] = "Cap韙ulo"; Text[ italian ] = "Ca~pitolo"; Text[ danish ] = "Kapitel"; Text[ swedish ] = "Kapitel"; Text[ polish ] = "Rozdzia"; Text[ portuguese_brazilian ] = "Chapter"; - Text[ japanese ] = "復"; - Text[ korean ] = "厘"; - Text[ chinese_simplified ] = "章"; - Text[ chinese_traditional ] = "彻竊"; + Text[ japanese ] = "绔"; + Text[ korean ] = "鞛"; + Text[ chinese_simplified ] = "绔"; + Text[ chinese_traditional ] = "绔犵瘈"; Text[ arabic ] = "轻菡"; Text[ turkish ] = "B~鰈黰"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Cap韙~ulo"; + Text[ catalan ] = "Cap韙~ol"; Text[ finnish ] = "Luku"; + Text[ thai ] = "喔氞笚"; }; String STR_AUTH_FIELD_EDITION { @@ -1910,23 +1979,24 @@ String STR_AUTH_FIELD_EDITION Text[ portuguese ] = "Ed~i玢o"; Text[ russian ] = "如溧龛"; Text[ greek ] = "蓬醻泫戕"; - Text[ dutch ] = "~Editie"; - Text[ french ] = "蓗dition"; - Text[ spanish ] = "Edi~ci髇"; + Text[ dutch ] = "Uitgav~e"; + Text[ french ] = "蒬ition"; + Text[ spanish ] = "Edici髇"; Text[ italian ] = "Edizione"; Text[ danish ] = "Udgave"; Text[ swedish ] = "Utg鍁a"; Text[ polish ] = "Wydanie"; Text[ portuguese_brazilian ] = "Edition"; - Text[ japanese ] = "斉"; - Text[ korean ] = "魄"; - Text[ chinese_simplified ] = "版本"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "鐗"; + Text[ korean ] = "韺"; + Text[ chinese_simplified ] = "鐗堟湰"; + Text[ chinese_traditional ] = "鍑虹増"; Text[ arabic ] = "轻厝谏"; Text[ turkish ] = "Bas齸m"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Edi~ci髇"; + Text[ catalan ] = "Edi~ci"; Text[ finnish ] = "Laitos"; + Text[ thai ] = "喔夃笟喔编笟"; }; String STR_AUTH_FIELD_EDITOR { @@ -1938,21 +2008,22 @@ String STR_AUTH_FIELD_EDITOR Text[ greek ] = "抨~潼翮"; Text[ dutch ] = "~Uitgever"; Text[ french ] = "蒬iteur"; - Text[ spanish ] = "~Editor"; + Text[ spanish ] = "Editor"; Text[ italian ] = "Editore"; Text[ danish ] = "Udgiver"; Text[ swedish ] = "Utgivare"; Text[ polish ] = "Wydawca"; Text[ portuguese_brazilian ] = "Editor"; - Text[ japanese ] = "曇幰"; - Text[ korean ] = "祈笼磊"; - Text[ chinese_simplified ] = "出版者"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "绶ㄨ"; + Text[ korean ] = "韼胳鞚"; + Text[ chinese_simplified ] = "鍑虹増鑰"; + Text[ chinese_traditional ] = "鍑虹増鑰"; Text[ arabic ] = "轻淝匝"; Text[ turkish ] = "Yay齧~c"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Editor"; + Text[ catalan ] = "Editor"; Text[ finnish ] = "Muokkaaja"; + Text[ thai ] = "喔氞福喔｀笓喔侧笜喔脆竵喔侧福"; }; String STR_AUTH_FIELD_HOWPUBLISHED { @@ -1963,22 +2034,23 @@ String STR_AUTH_FIELD_HOWPUBLISHED Text[ russian ] = "诣 桤溧龛"; Text[ greek ] = "札痫~ 蓐滹箸"; Text[ dutch ] = "Wijze van ~publiceren"; - Text[ french ] = "~Type de publication"; - Text[ spanish ] = "Tip~o de edici髇"; + Text[ french ] = "Type de publication"; + Text[ spanish ] = "T~ipo de publicaci髇"; Text[ italian ] = "Tipo di edizione"; Text[ danish ] = "Udgivelsestype"; Text[ swedish ] = "Utgivningstyp"; Text[ polish ] = "Rodzaj edycji"; Text[ portuguese_brazilian ] = "How published"; - Text[ japanese ] = "妒薨啦踢"; - Text[ korean ] = "免魄 屈怕"; - Text[ chinese_simplified ] = "出版方式"; - Text[ chinese_traditional ] = "摸"; + Text[ japanese ] = "銈儛銉笺偪銈ゃ儣"; + Text[ korean ] = "於滍寪 鞙犿槙"; + Text[ chinese_simplified ] = "鍙戣鏂瑰紡"; + Text[ chinese_traditional ] = "鍑虹増椤炲瀷"; Text[ arabic ] = "匮磙 轻厝勤"; Text[ turkish ] = "Yay齧 ~t黵"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Tip~o de edici髇"; + Text[ catalan ] = "Tip~us d'edici"; Text[ finnish ] = "Julkaisutyyppi"; + Text[ thai ] = "喔娻笝喔脆笖喔佮覆喔｀笀喔编笖喔炧复喔∴笧喙"; }; String STR_AUTH_FIELD_INSTITUTION { @@ -1986,51 +2058,53 @@ String STR_AUTH_FIELD_INSTITUTION Text [ ENGLISH ] = "Institution" ; Text[ english_us ] = "Institution"; Text[ portuguese ] = "~Institui玢o"; - Text[ russian ] = "绣溧牿"; + Text[ russian ] = "喻疱驿屙桢"; Text[ greek ] = "轰聃灬"; Text[ dutch ] = "~Instelling"; - Text[ french ] = "~Institution"; + Text[ french ] = "Institution"; Text[ spanish ] = "Institu~ci髇"; - Text[ italian ] = "~Istituzione"; + Text[ italian ] = "Istituzione"; Text[ danish ] = "Institution"; Text[ swedish ] = "Institution"; Text[ polish ] = "Instytucja"; Text[ portuguese_brazilian ] = "Institution"; - Text[ japanese ] = "婡娭"; - Text[ korean ] = "背腊扁包"; - Text[ chinese_simplified ] = "机构"; - Text[ chinese_traditional ] = "诀篶"; + Text[ japanese ] = "姗熼枹鍚"; + Text[ korean ] = "旮瓣磤"; + Text[ chinese_simplified ] = "鏈烘瀯"; + Text[ chinese_traditional ] = "姗熸"; Text[ arabic ] = "轻屙粕"; Text[ turkish ] = "K~urum"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Institu~ci髇"; + Text[ catalan ] = "Institu~ci"; Text[ finnish ] = "Instituutio"; + Text[ thai ] = "喔笘喔侧笟喔编笝"; }; String STR_AUTH_FIELD_JOURNAL { Text = "~Zeitschrift" ; Text [ ENGLISH ] = "Journal" ; - Text[ english_us ] = "Magazine"; + Text[ english_us ] = "Journal"; Text[ portuguese ] = "~Revista"; Text[ russian ] = "企痦嚯"; Text[ greek ] = "绣耖镤殛"; Text[ dutch ] = "~Tijdschrift"; - Text[ french ] = "~Revue"; + Text[ french ] = "Magazine"; Text[ spanish ] = "~Revista"; Text[ italian ] = "Rivista"; Text[ danish ] = "Tidsskrift"; Text[ swedish ] = "Tidskrift"; Text[ polish ] = "Czasopismo"; Text[ portuguese_brazilian ] = "Journal"; - Text[ japanese ] = "嶨帍"; - Text[ korean ] = "棱瘤"; - Text[ chinese_simplified ] = "杂志"; - Text[ chinese_traditional ] = "馒粁"; + Text[ japanese ] = "闆戣獙"; + Text[ korean ] = "鞛§"; + Text[ chinese_simplified ] = "鏉傚織"; + Text[ chinese_traditional ] = "闆滆獙"; Text[ arabic ] = "轻闾嵘"; Text[ turkish ] = "De~rgi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Revista"; - Text[ finnish ] = "Lehti"; + Text[ catalan ] = "Revista"; + Text[ finnish ] = "P鋓v鋕irja"; + Text[ thai ] = "喔權复喔曕涪喔覆喔"; }; String STR_AUTH_FIELD_MONTH { @@ -2041,22 +2115,23 @@ String STR_AUTH_FIELD_MONTH Text[ russian ] = "体"; Text[ greek ] = "剔磲"; Text[ dutch ] = "~Maand"; - Text[ french ] = "~Mois"; + Text[ french ] = "Mois"; Text[ spanish ] = "~Mes"; Text[ italian ] = "~Mese"; Text[ danish ] = "M錸ed"; Text[ swedish ] = "M錸ad"; Text[ polish ] = "Miesi筩"; Text[ portuguese_brazilian ] = "Month"; - Text[ japanese ] = "寧"; - Text[ korean ] = "岿"; - Text[ chinese_simplified ] = "月"; - Text[ chinese_traditional ] = "る"; + Text[ japanese ] = "鏈"; + Text[ korean ] = "鞗"; + Text[ chinese_simplified ] = "鏈"; + Text[ chinese_traditional ] = "鏈"; Text[ arabic ] = "藻"; Text[ turkish ] = "~Ay"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Mes"; + Text[ catalan ] = "Mes"; Text[ finnish ] = "Kuukausi"; + Text[ thai ] = "喙喔斷阜喔笝"; }; String STR_AUTH_FIELD_NOTE { @@ -2066,23 +2141,24 @@ String STR_AUTH_FIELD_NOTE Text[ portuguese ] = "~Anota玢o"; Text[ russian ] = "橡桁鬻囗桢"; Text[ greek ] = "隅戾啭箸"; - Text[ dutch ] = "~Notitie"; - Text[ french ] = "~Note"; - Text[ spanish ] = "~Nota"; + Text[ dutch ] = "Aa~ntekening"; + Text[ french ] = "Note"; + Text[ spanish ] = "Nota"; Text[ italian ] = "~Nota"; Text[ danish ] = "Note"; - Text[ swedish ] = "Not"; + Text[ swedish ] = "Anteckning"; Text[ polish ] = "Notatka"; Text[ portuguese_brazilian ] = "Note"; - Text[ japanese ] = "阂菽(~E)"; - Text[ korean ] = "皋葛(~E)"; - Text[ chinese_simplified ] = "备注(~E)"; - Text[ chinese_traditional ] = "称爹(~E)"; + Text[ japanese ] = "銉°儮(~E)"; + Text[ korean ] = "氅旊(~E)"; + Text[ chinese_simplified ] = "澶囨敞(~E)"; + Text[ chinese_traditional ] = "鍌欒ɑ(~E)"; Text[ arabic ] = "汜峭偕"; Text[ turkish ] = "~Not"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Nota"; - Text[ finnish ] = "Huomau~tus"; + Text[ catalan ] = "No~ta"; + Text[ finnish ] = "Kommentti"; + Text[ thai ] = "喔氞副喔權笚喔多竵~喔⑧箞喔"; }; String STR_AUTH_FIELD_NUMBER { @@ -2093,22 +2169,23 @@ String STR_AUTH_FIELD_NUMBER Text[ russian ] = "皖戾"; Text[ greek ] = "榴殍禳"; Text[ dutch ] = "Numme~r"; - Text[ french ] = "N~um閞o"; - Text[ spanish ] = "N鷡mero"; + Text[ french ] = "Num閞o"; + Text[ spanish ] = "N鷐ero"; Text[ italian ] = "Nume~ro"; Text[ danish ] = "Nummer"; Text[ swedish ] = "Nummer"; Text[ polish ] = "Numer"; Text[ portuguese_brazilian ] = "Number"; - Text[ japanese ] = "斣崋"; - Text[ korean ] = "锅龋"; - Text[ chinese_simplified ] = "编号"; - Text[ chinese_traditional ] = "絪腹"; + Text[ japanese ] = "鐣彿"; + Text[ korean ] = "氩堩樃"; + Text[ chinese_simplified ] = "缂栧彿"; + Text[ chinese_traditional ] = "绶ㄨ櫉"; Text[ arabic ] = "轻艳"; Text[ turkish ] = "Numa~ra"; Text[ language_user1 ] = " "; Text[ catalan ] = "N鷡mero"; - Text[ finnish ] = "Luku"; + Text[ finnish ] = "Numero"; + Text[ thai ] = "喔曕副喔о箑喔ム競"; }; String STR_AUTH_FIELD_ORGANIZATIONS { @@ -2126,67 +2203,70 @@ String STR_AUTH_FIELD_ORGANIZATIONS Text[ swedish ] = "Organisation"; Text[ polish ] = "Organizacja"; Text[ portuguese_brazilian ] = "Organization"; - Text[ japanese ] = "慻怐抍懱"; - Text[ korean ] = "扁备"; - Text[ chinese_simplified ] = "组织"; - Text[ chinese_traditional ] = "诀篶"; + Text[ japanese ] = "绲勭箶鍥ｄ綋鍚"; + Text[ korean ] = "臁办 雼泊"; + Text[ chinese_simplified ] = "缁勭粐"; + Text[ chinese_traditional ] = "姗熸"; Text[ arabic ] = "沅巽"; Text[ turkish ] = "~Organizasyon"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Organizaci髇"; + Text[ catalan ] = "~Organitzaci"; Text[ finnish ] = "Organisaatio"; + Text[ thai ] = "喔竾喔勦箤喔佮福"; }; String STR_AUTH_FIELD_PAGES { Text = "Seite(n)" ; Text [ ENGLISH ] = "Pages" ; - Text[ english_us ] = "Pages"; + Text[ english_us ] = "Page(s)"; Text[ portuguese ] = "P醙inas"; Text[ russian ] = "暑腓麇耱忸 耱疣龛"; Text[ greek ] = "渝脒溴"; Text[ dutch ] = "Pagina's"; - Text[ french ] = "Pages"; - Text[ spanish ] = "P醙inas"; - Text[ italian ] = "Pagine"; + Text[ french ] = "Page(s)"; + Text[ spanish ] = "P醙ina(s)"; + Text[ italian ] = "Pagina/e"; Text[ danish ] = "Sider"; - Text[ swedish ] = "Sidor"; + Text[ swedish ] = "Sida/sidor"; Text[ polish ] = "Strony"; Text[ portuguese_brazilian ] = "Pages"; - Text[ japanese ] = "瓦凹"; - Text[ korean ] = "率"; - Text[ chinese_simplified ] = "页"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "銉氥兗銈"; + Text[ korean ] = "韼橃澊歆"; + Text[ chinese_simplified ] = "椤"; + Text[ chinese_traditional ] = "闋"; Text[ arabic ] = "蛰颓"; Text[ turkish ] = "Sayfa"; Text[ language_user1 ] = " "; - Text[ catalan ] = "P醙inas"; + Text[ catalan ] = "P鄃ines"; Text[ finnish ] = "Sivut"; + Text[ thai ] = "喔笝喙夃覆"; }; String STR_AUTH_FIELD_PUBLISHER { Text = "Ver~lag" ; Text [ ENGLISH ] = "Publisher" ; - Text[ english_us ] = "Publishers"; + Text[ english_us ] = "Publisher"; Text[ portuguese ] = "E~ditora"; Text[ russian ] = "如溧蝈朦耱忸"; Text[ greek ] = "抨滹糸挈 镞觑"; Text[ dutch ] = "~Uitgeverij"; - Text[ french ] = "蓗dition"; - Text[ spanish ] = "~Editorial"; + Text[ french ] = "Maison d'閐ition"; + Text[ spanish ] = "Editorial"; Text[ italian ] = "Casa editrice"; Text[ danish ] = "Forlag"; Text[ swedish ] = "F鰎lag"; Text[ polish ] = "Wydawnictwo"; Text[ portuguese_brazilian ] = "Publisher"; - Text[ japanese ] = "弌斉幮"; - Text[ korean ] = "免魄荤"; - Text[ chinese_simplified ] = "出版社"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "鍑虹増绀"; + Text[ korean ] = "於滍寪靷"; + Text[ chinese_simplified ] = "鍑虹増绀"; + Text[ chinese_traditional ] = "鍑虹増绀"; Text[ arabic ] = "锨 轻湓"; Text[ turkish ] = "Yay齨ev~i"; Text[ language_user1 ] = " "; - Text[ catalan ] = "~Editorial"; - Text[ finnish ] = "Julkaisijat"; + Text[ catalan ] = "Editors"; + Text[ finnish ] = "Julkaisija"; + Text[ thai ] = "喔溹腹喙夃笀喔编笖喔炧复喔∴笧喙"; }; String STR_AUTH_FIELD_SCHOOL { @@ -2194,50 +2274,52 @@ String STR_AUTH_FIELD_SCHOOL Text [ ENGLISH ] = "University" ; Text[ english_us ] = "University"; Text[ portuguese ] = "Escola superior/Uni~versidade"; - Text[ russian ] = "掠"; + Text[ russian ] = "禹桠屦耔蝈"; Text[ greek ] = "../..."; Text[ dutch ] = "Hogeschool/~Universiteit"; Text[ french ] = "蒫ole sup閞ieure/Universit"; - Text[ spanish ] = "Colegio/~Universidad"; + Text[ spanish ] = "~Universidad"; Text[ italian ] = "Universit"; Text[ danish ] = "Universitet/l鎟eanstalt"; Text[ swedish ] = "H鰃skola/universitet"; Text[ polish ] = "Szko砤 wy縮za/Uniwersytet"; Text[ portuguese_brazilian ] = "University"; - Text[ japanese ] = "戝妛"; - Text[ korean ] = "措切"; - Text[ chinese_simplified ] = "大学"; - Text[ chinese_traditional ] = "蔼单皘"; + Text[ japanese ] = "澶у"; + Text[ korean ] = "雽頃"; + Text[ chinese_simplified ] = "澶у"; + Text[ chinese_traditional ] = "楂樼瓑闄㈡牎"; Text[ arabic ] = "糖阙"; Text[ turkish ] = "躰iversite"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Colegio/~Universidad"; + Text[ catalan ] = "Universitat"; Text[ finnish ] = "Yliopisto"; + Text[ thai ] = "喔∴斧喔侧抚喔脆笚喔⑧覆喔ム副喔"; }; String STR_AUTH_FIELD_SERIES { Text = "Ser~ie"; Text[English]= "Series"; - Text[ english_us ] = "Series name"; - Text[ portuguese ] = "Nome da ~s閞ie"; - Text[ russian ] = "袜玮囗桢 皴痂"; + Text[ english_us ] = "Series"; + Text[ portuguese ] = "~S閞ie"; + Text[ russian ] = "彦痂"; Text[ greek ] = "柬镬 箦轳茯"; - Text[ dutch ] = "Naam van de ~serie"; - Text[ french ] = "Nom de la s閞ie"; - Text[ spanish ] = "No~mbre de la serie"; + Text[ dutch ] = "~Serie"; + Text[ french ] = "S閞ie"; + Text[ spanish ] = "Serie"; Text[ finnish ] = "Sarjan nimi"; - Text[ italian ] = "Nome ~della serie"; - Text[ danish ] = "Seriens navn"; - Text[ swedish ] = "Ser~ie"; + Text[ italian ] = "~Serie"; + Text[ danish ] = "Ser~ie"; + Text[ swedish ] = "Serie"; Text[ polish ] = "Seria"; Text[ portuguese_brazilian ] = "Series name"; - Text[ japanese ] = "憄彂"; - Text[ korean ] = "矫府令 捞抚"; - Text[ chinese_simplified ] = "系列"; - Text[ chinese_traditional ] = "╰"; + Text[ japanese ] = "鍙㈡浉"; + Text[ korean ] = "臧勴枆氍"; + Text[ chinese_simplified ] = "绯诲垪"; + Text[ chinese_traditional ] = "绯诲垪"; Text[ turkish ] = "Seri ~ad"; Text[ arabic ] = "怯 轻俞俞"; - Text[ catalan ] = "No~mbre de la serie"; + Text[ catalan ] = "No~m de la s鑢ie"; + Text[ thai ] = "喔娻阜喙堗腑喔娻父喔"; }; String STR_AUTH_FIELD_TITLE { @@ -2249,31 +2331,32 @@ String STR_AUTH_FIELD_TITLE Text[ greek ] = "赃綦矧"; Text[ dutch ] = "Tit~el"; Text[ french ] = "Titre"; - Text[ spanish ] = "T韙~ulo"; + Text[ spanish ] = "T韙ulo"; Text[ italian ] = "Titolo"; Text[ danish ] = "Titel"; Text[ swedish ] = "Titel"; Text[ polish ] = "Tytu"; Text[ portuguese_brazilian ] = "Title"; - Text[ japanese ] = "啦馁"; - Text[ korean ] = "力格"; - Text[ chinese_simplified ] = "标题"; - Text[ chinese_traditional ] = "夹肈"; + Text[ japanese ] = "銈裤偆銉堛儷"; + Text[ korean ] = "鞝滊"; + Text[ chinese_simplified ] = "鏍囬"; + Text[ chinese_traditional ] = "妯欓"; Text[ arabic ] = "轻阡媲"; Text[ turkish ] = "A~d"; Text[ language_user1 ] = " "; - Text[ catalan ] = "T韙~ulo"; + Text[ catalan ] = "T韙~ol"; Text[ finnish ] = "Otsikko"; + Text[ thai ] = "喔娻阜喙堗腑喙喔｀阜喙堗腑喔"; }; String STR_AUTH_FIELD_TYPE { Text = "Art des Berichts" ; Text [ ENGLISH ] = "Type of proceedings" ; - Text[ english_us ] = "Report type"; + Text[ english_us ] = "Type of report"; Text[ portuguese ] = "Tipo de relat髍io"; Text[ russian ] = "诣 铗麇蜞"; Text[ greek ] = "札痫 蓐桢箸"; - Text[ dutch ] = "Soort bericht"; + Text[ dutch ] = "Soort rapport"; Text[ french ] = "Type de rapport"; Text[ spanish ] = "Tipo de informe"; Text[ italian ] = "Tipo di relazione"; @@ -2281,65 +2364,68 @@ String STR_AUTH_FIELD_TYPE Text[ swedish ] = "Typ av rapport"; Text[ polish ] = "Rodzaj raportu"; Text[ portuguese_brazilian ] = "Type of proceedings"; - Text[ japanese ] = "曬崘偺庬椶"; - Text[ korean ] = "焊绊辑 屈怕"; - Text[ chinese_simplified ] = "报表的类型"; - Text[ chinese_traditional ] = "厨摸"; + Text[ japanese ] = "鍫卞憡銇ó椤"; + Text[ korean ] = "氤搓碃靹 鞙犿槙"; + Text[ chinese_simplified ] = "鎶ヨ〃鐨勭被鍨"; + Text[ chinese_traditional ] = "鍫辫〃鐨勯鍨"; Text[ arabic ] = "滏 轻兽秧"; Text[ turkish ] = "Rapor t黵"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Tipo de informe"; - Text[ finnish ] = "Raporttityyppi"; + Text[ catalan ] = "Tipus d'informe"; + Text[ finnish ] = "Raportin tyyppi"; + Text[ thai ] = "喔娻笝喔脆笖喔｀覆喔⑧竾喔侧笝"; }; String STR_AUTH_FIELD_VOLUME { Text = "Band" ; Text [ ENGLISH ] = "Volume" ; - Text[ english_us ] = "Volume number"; + Text[ english_us ] = "Volume"; Text[ portuguese ] = "Volume"; - Text[ russian ] = "皖戾 蝾爨"; + Text[ russian ] = "翌"; Text[ greek ] = "榴殍禳 酎祜"; - Text[ dutch ] = "Deel nummer"; - Text[ french ] = "No. de volume"; - Text[ spanish ] = "N鷐ero de tomo"; + Text[ dutch ] = "Deel"; + Text[ french ] = "Volume"; + Text[ spanish ] = "Tomo"; Text[ finnish ] = "Osan numero"; - Text[ italian ] = "Numero del volume"; + Text[ italian ] = "Volume"; Text[ danish ] = "Bind"; Text[ swedish ] = "Band"; Text[ polish ] = "Tom"; Text[ portuguese_brazilian ] = "Volume"; - Text[ japanese ] = "姫"; - Text[ korean ] = "鼻 锅龋"; - Text[ chinese_simplified ] = "册"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "宸"; + Text[ korean ] = "甓"; + Text[ chinese_simplified ] = "鍐"; + Text[ chinese_traditional ] = "鍐"; Text[ turkish ] = "Cilt say齭"; Text[ arabic ] = "艳 轻闾嵯"; - Text[ catalan ] = "N鷐ero de tomo"; + Text[ catalan ] = "N鷐ero de volum"; + Text[ thai ] = "喔堗赋喔權抚喔權箑喔ム箞喔"; }; String STR_AUTH_FIELD_YEAR { Text = "~Jahr" ; Text [ ENGLISH ] = "Year" ; - Text[ english_us ] = "Year of publication"; - Text[ portuguese ] = "~Ano de publica玢o"; - Text[ russian ] = "妙 桤溧龛"; + Text[ english_us ] = "Year"; + Text[ portuguese ] = "~Ano"; + Text[ russian ] = "妙"; Text[ greek ] = "隔矧 蓐滹箸"; - Text[ dutch ] = "Verschijnings~jaar"; - Text[ french ] = "Ann閑 de parution"; - Text[ spanish ] = "A駉 de publi~caci髇"; - Text[ finnish ] = "Julkaisuvuosi"; - Text[ italian ] = "Anno di pubblicazione"; - Text[ danish ] = "Udgivelses錼"; - Text[ swedish ] = "舿r"; + Text[ dutch ] = "~Jaar"; + Text[ french ] = "Ann閑"; + Text[ spanish ] = "A駉"; + Text[ finnish ] = "Vuosi"; + Text[ italian ] = "Anno"; + Text[ danish ] = "~舝"; + Text[ swedish ] = "舝"; Text[ polish ] = "Rok"; Text[ portuguese_brazilian ] = "Year"; - Text[ japanese ] = "擭"; - Text[ korean ] = "免魄斥档"; - Text[ chinese_simplified ] = "年份"; - Text[ chinese_traditional ] = ""; + Text[ japanese ] = "骞"; + Text[ korean ] = "鞐半弰"; + Text[ chinese_simplified ] = "骞翠唤"; + Text[ chinese_traditional ] = "骞翠唤"; Text[ turkish ] = "Yay齧 y齦"; Text[ arabic ] = "愉 轻耪锨"; - Text[ catalan ] = "A駉 de publi~caci髇"; + Text[ catalan ] = "Any de publi~caci"; + Text[ thai ] = "喔涏傅喔椸傅喙堗笀喔编笖喔炧复喔∴笧"; }; String STR_AUTH_FIELD_URL { @@ -2366,6 +2452,7 @@ String STR_AUTH_FIELD_URL Text[ language_user1 ] = " "; Text[ catalan ] = "URL"; Text[ finnish ] = "URL-osoite"; + Text[ thai ] = "URL"; }; String STR_AUTH_FIELD_CUSTOM1 { @@ -2383,15 +2470,16 @@ String STR_AUTH_FIELD_CUSTOM1 Text[ swedish ] = "Anv鋘darf鋖t1"; Text[ polish ] = "Pole u縴tkownika~1"; Text[ portuguese_brazilian ] = "Custom1"; - 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 ] = "Kullan齝 alan齸1"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Campo de usuario~1"; - Text[ finnish ] = "K鋣tt鋔鋘 m滗ritt鋗鋨1"; + Text[ catalan ] = "Definit per l'usuari~1"; + Text[ finnish ] = "K鋣tt鋔鋘 m滗ritt鋗1"; + Text[ thai ] = "喔｀赴喔氞父喔溹腹喙夃箖喔娻箟~1"; }; String STR_AUTH_FIELD_CUSTOM2 { @@ -2409,15 +2497,16 @@ String STR_AUTH_FIELD_CUSTOM2 Text[ swedish ] = "Anv鋘darf鋖t2"; Text[ polish ] = "Pole u縴tkownika~2"; Text[ portuguese_brazilian ] = "Custom2"; - 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 ] = "Kullan齝 alan齸2"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Campo de usuario~2"; - Text[ finnish ] = "K鋣tt鋔鋘 m滗ritt鋗鋨2"; + Text[ catalan ] = "Definit per l'usuari~2"; + Text[ finnish ] = "K鋣tt鋔鋘 m滗ritt鋗2"; + Text[ thai ] = "喔｀赴喔氞父喔溹腹喙夃箖喔娻箟~2"; }; String STR_AUTH_FIELD_CUSTOM3 { @@ -2435,15 +2524,16 @@ String STR_AUTH_FIELD_CUSTOM3 Text[ swedish ] = "Anv鋘darf鋖t3"; Text[ polish ] = "Pole u縴tkownika~3"; Text[ portuguese_brazilian ] = "Custom3"; - Text[ japanese ] = "瞻晦疤ò倌3"; - Text[ korean ] = "荤侩磊 鞘靛3"; - Text[ chinese_simplified ] = "用户栏3"; - Text[ chinese_traditional ] = "璹逆 3"; + Text[ japanese ] = "銉︺兗銈躲兗娆 ~3"; + Text[ korean ] = "靷毄鞛 鞝曥潣3"; + Text[ chinese_simplified ] = "浣跨敤鑰呮爮浣3"; + Text[ chinese_traditional ] = "鑷▊娆勪綅 3"; Text[ arabic ] = "娃 轻阌饰香3"; Text[ turkish ] = "Kullan齝 alan齸3"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Campo de usuario~3"; - Text[ finnish ] = "K鋣tt鋔鋘 m滗ritt鋗鋨3"; + Text[ catalan ] = "Definit per l'usuari~3"; + Text[ finnish ] = "K鋣tt鋔鋘 m滗ritt鋗3"; + Text[ thai ] = "喔｀赴喔氞父喔溹腹喙夃箖喔娻箟~3"; }; String STR_AUTH_FIELD_CUSTOM4 { @@ -2461,15 +2551,16 @@ String STR_AUTH_FIELD_CUSTOM4 Text[ swedish ] = "Anv鋘darf鋖t4"; Text[ polish ] = "Pole u縴tkownika~4"; Text[ portuguese_brazilian ] = "Custom4"; - Text[ japanese ] = "瞻晦疤ò倌4"; - Text[ korean ] = "荤侩磊 鞘靛4"; - Text[ chinese_simplified ] = "用户栏4"; - Text[ chinese_traditional ] = "璹逆 4"; + Text[ japanese ] = "銉︺兗銈躲兗娆 ~4"; + Text[ korean ] = "靷毄鞛 鞝曥潣4"; + Text[ chinese_simplified ] = "浣跨敤鑰呮爮浣4"; + Text[ chinese_traditional ] = "鑷▊娆勪綅 4"; Text[ arabic ] = "娃 轻阌饰香4"; Text[ turkish ] = "Kullan齝 alan齸4"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Campo de usuario~4"; - Text[ finnish ] = "K鋣tt鋔鋘 m滗ritt鋗鋨4"; + Text[ catalan ] = "Definit per l'usuari~4"; + Text[ finnish ] = "K鋣tt鋔鋘 m滗ritt鋗4"; + Text[ thai ] = "喔｀赴喔氞父喔溹腹喙夃箖喔娻箟~4"; }; String STR_AUTH_FIELD_CUSTOM5 { @@ -2487,15 +2578,16 @@ String STR_AUTH_FIELD_CUSTOM5 Text[ swedish ] = "Anv鋘darf鋖t5"; Text[ polish ] = "Pole u縴tkownika~5"; Text[ portuguese_brazilian ] = "Custom5"; - Text[ japanese ] = "瞻晦疤ò倌5"; - Text[ korean ] = "荤侩磊 鞘靛5"; - Text[ chinese_simplified ] = "用户栏5"; - Text[ chinese_traditional ] = "璹逆 5"; + Text[ japanese ] = "銉︺兗銈躲兗娆 ~5"; + Text[ korean ] = "靷毄鞛 鞝曥潣5"; + Text[ chinese_simplified ] = "浣跨敤鑰呮爮浣5"; + Text[ chinese_traditional ] = "鑷▊娆勪綅 5"; Text[ arabic ] = "娃 轻阌饰香5"; Text[ turkish ] = "Kullan齝 alan齸5"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Campo de usuario~5"; - Text[ finnish ] = "K鋣tt鋔鋘 m滗ritt鋗鋨5"; + Text[ catalan ] = "Definit per l'usuari~5"; + Text[ finnish ] = "K鋣tt鋔鋘 m滗ritt鋗5"; + Text[ thai ] = "喔｀赴喔氞父喔溹腹喙夃箖喔娻箟~5"; }; String STR_AUTH_FIELD_ISBN { @@ -2522,6 +2614,7 @@ String STR_AUTH_FIELD_ISBN Text[ language_user1 ] = " "; Text[ catalan ] = "ISBN"; Text[ finnish ] = "ISBN"; + Text[ thai ] = "ISBN"; }; @@ -2530,3 +2623,24 @@ String STR_AUTH_FIELD_ISBN + + + + + + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/utlui/navipi.src b/sw/source/ui/utlui/navipi.src index 6066f318fee8..9e4f7c76d0b5 100644 --- a/sw/source/ui/utlui/navipi.src +++ b/sw/source/ui/utlui/navipi.src @@ -2,9 +2,9 @@ * * $RCSfile: navipi.src,v $ * - * $Revision: 1.43 $ + * $Revision: 1.44 $ * - * last change: $Author: os $ $Date: 2002-09-06 13:54:39 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:45:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,7 +88,7 @@ Window DLG_NAVIGATION_PI Text [ italian ] = "Navigatore" ; Text [ portuguese_brazilian ] = "Navegador" ; Text [ portuguese ] = "Navegador" ; - Text [ finnish ] = "Navigaattori" ; + Text [ finnish ] = "Etsin" ; Text [ danish ] = "Navigator" ; Text [ french ] = "Navigateur" ; Text [ swedish ] = "Navigator" ; @@ -199,7 +199,7 @@ Window DLG_NAVIGATION_PI Text[ chinese_traditional ] = "鐎忚"; Text[ arabic ] = "轻汜峭"; Text[ greek ] = "体翎赀礴箸"; - Text[ korean ] = "雱る箘瓴岇澊靺"; + Text[ korean ] = "韮愳儔"; Text[ turkish ] = "Dolaa"; Text[ catalan ] = "Navegaci"; Text[ finnish ] = "Siirtyminen"; @@ -239,7 +239,7 @@ Window DLG_NAVIGATION_PI Text [ french ] = "Pr閏閐ent" ; Text [ swedish ] = "Bak錿" ; Text [ dutch ] = "Achteruit" ; - Text [ spanish ] = "Retroceder" ; + Text [ spanish ] = "Regresar" ; Text [ english_us ] = "Back" ; Text[ chinese_simplified ] = "鍚戝悗"; Text[ russian ] = "袜玎"; @@ -304,7 +304,7 @@ Window DLG_NAVIGATION_PI Text [ italian ] = "Modo drag" ; Text [ spanish ] = "Modo Arrastrar" ; Text [ french ] = "Mode Glisser" ; - Text [ dutch ] = "Modus Slepen" ; + Text [ dutch ] = "Sleepmodus" ; Text [ swedish ] = "Dral鋑e" ; Text [ danish ] = "Tr鎘modus" ; Text [ portuguese_brazilian ] = "Dragmodus" ; @@ -337,7 +337,7 @@ Window DLG_NAVIGATION_PI Text [ italian ] = "Capitolo superiore" ; Text [ portuguese_brazilian ] = "Cap?tulo acima" ; Text [ portuguese ] = "Subir um cap韙ulo" ; - Text [ finnish ] = "Pienenn kappaleen sisennyst" ; + Text [ finnish ] = "Siirr luku ylemm鋖le tasolle" ; Text [ danish ] = "Kapitel op" ; Text [ french ] = "Chapitre vers le haut" ; Text [ swedish ] = "Kapitel upp錿" ; @@ -346,13 +346,13 @@ Window DLG_NAVIGATION_PI Text [ english_us ] = "Promote Chapter" ; //HelpText[english_us-wrong] = "Move chapter down";//"Move chapter up" Text[ chinese_simplified ] = "绔犲崌绾"; - Text[ russian ] = "秒噔 忖屦"; + Text[ russian ] = "襄疱礤耱 忖屦"; Text[ polish ] = "Rozdzia do g髍y"; Text[ japanese ] = "绔犮倰涓娿伀绉诲嫊"; Text[ chinese_traditional ] = "绔犲崌绱"; Text[ arabic ] = "菡 崦卺"; Text[ greek ] = "旭镡殁狍禳 赍鲠脶唢"; - Text[ korean ] = "鞛 鞀龟博"; + Text[ korean ] = "鞛レ潉 鞙勲 鞚措彊"; Text[ turkish ] = "B鰈黰 yukar al"; Text[ catalan ] = "Un cap韙ol cap amunt"; Text[ thai ] = "喙喔ム阜喙堗腑喔權笟喔"; @@ -368,7 +368,7 @@ Window DLG_NAVIGATION_PI Text [ italian ] = "Capitolo inferiore" ; Text [ portuguese_brazilian ] = "Cap?tulo abaixo" ; Text [ portuguese ] = "Descer um cap韙ulo" ; - Text [ finnish ] = "Suurenna kappaleen sisennyst" ; + Text [ finnish ] = "Siirr luku alemmalle tasolle" ; Text [ danish ] = "Kapitel ned" ; Text [ french ] = "Chapitre vers le bas" ; Text [ swedish ] = "Kapitel ned錿" ; @@ -376,13 +376,13 @@ Window DLG_NAVIGATION_PI Text [ spanish ] = "Un cap韙ulo hacia abajo" ; Text [ english_us ] = "Demote Chapter" ; Text[ chinese_simplified ] = "绔犻檷绾"; - Text[ russian ] = "秒噔 忭桤"; + Text[ russian ] = "襄疱礤耱 忭桤"; Text[ polish ] = "Rozdzia w d蟪"; Text[ japanese ] = "绔犮倰涓嬨伀绉诲嫊"; Text[ chinese_traditional ] = "绔犻檷绱"; Text[ arabic ] = "菡 崦虞"; Text[ greek ] = "震镡殁狍禳 赍鲠脶唢"; - Text[ korean ] = "鞛 雮稊旮"; + Text[ korean ] = "鞛レ潉 鞎勲灅搿 鞚措彊"; Text[ turkish ] = "B鰈黰 a瘕 鏴k"; Text[ catalan ] = "Un cap韙ol cap avall"; Text[ thai ] = "喔ム笖喔氞笚"; @@ -401,13 +401,13 @@ Window DLG_NAVIGATION_PI Text [ italian ] = "Mostra/nascondi la casella di selezione" ; Text [ spanish ] = "Mostrar/ocultar cuadro de selecci髇" ; Text [ french ] = "Afficher/masquer la bo顃e de s閘ection" ; - Text [ dutch ] = "Keuzebox in-/uitschakelen" ; + Text [ dutch ] = "Keuzevak in-/uitschakelen" ; Text [ swedish ] = "Urvalsbox p/av" ; Text [ danish ] = "Vis/skjul liste" ; Text [ portuguese_brazilian ] = "Auswahlbox an-/ausschalten" ; Text [ portuguese ] = "Act./Desactivar caixa de selec玢o" ; Text[ chinese_simplified ] = "鏄剧ず/闅愬叆鍒楄〃妗"; - Text[ russian ] = "玛./恹觌. 铌眍 耧桉赅"; + Text[ russian ] = "扬桉铌"; Text[ polish ] = "W彻cz/Wy彻cz pole listy"; Text[ japanese ] = "銉偣銉堛儨銉冦偗銈 銈兂/銈儠"; Text[ chinese_traditional ] = "椤ず/闅卞叆娓呭柈鏂瑰"; @@ -416,7 +416,7 @@ Window DLG_NAVIGATION_PI Text[ korean ] = "氇╇靸侅瀽 響滌嫓/靾赴旮"; Text[ turkish ] = "Liste kutusu a琮k/kapal"; Text[ catalan ] = "Quadre de llista activat/desactivat"; - Text[ finnish ] = "Luetteloruutu on/off"; + Text[ finnish ] = "Luetteloruutu k鋣t鰏s / poissa k鋣t鰏t"; Text[ thai ] = "喔佮弗喙堗腑喔囙福喔侧涪喔佮覆喔 喙喔涏复喔/喔涏复喔"; }; ToolBoxItem @@ -435,13 +435,13 @@ Window DLG_NAVIGATION_PI Text [ portuguese_brazilian ] = "Inhaltsansicht umschalten" ; Text [ portuguese ] = "Comutar vista do conte鷇o" ; Text[ chinese_simplified ] = "鍒囨崲鍐呭瑙嗗浘"; - Text[ russian ] = "襄疱觌栩 忤 耦溴疰桁钽"; + Text[ russian ] = "橡邃耱噔脲龛"; Text[ polish ] = "Prze彻cz widok tre渃i"; Text[ japanese ] = "鍐呭銉撱儱銉笺伄鍒囥倞鎻涖亪"; Text[ chinese_traditional ] = "鍒囨彌鍏у妾㈣"; Text[ arabic ] = "嗜享 匮磙 谘 轻阃舒砬"; Text[ greek ] = "旭镡镫 疱耖鬻镬蓓 歪/槛"; - Text[ korean ] = "雮挫毄氤搓赴 鞝勴櫂"; + Text[ korean ] = "雮挫毄 氤搓赴"; Text[ turkish ] = "葭erik g鰎黱黰黱 de餴⺶ir"; Text[ catalan ] = "Commuta visualitzaci del contingut"; Text[ finnish ] = "Sis鋖t鰊鋕ym"; @@ -470,13 +470,13 @@ Window DLG_NAVIGATION_PI Text [ spanish ] = "Insertar marca" ; Text [ english_us ] = "Set Reminder" ; Text[ chinese_simplified ] = "璁剧疆鏍囪"; - Text[ russian ] = "玉蜞眍忤螯 镱戾蜿"; + Text[ russian ] = "项耱噔栩 怵屐屙眢 玎觌噤牦"; Text[ polish ] = "Osad znaczniki"; Text[ japanese ] = "瑕氥亪姝€倎銈掍粯銇戙倠"; Text[ chinese_traditional ] = "瑷畾鎻愰啋"; Text[ arabic ] = "嬷 卺倾 市唔"; Text[ greek ] = "像轶禳 躔屙椠扉箸"; - Text[ korean ] = "響滌嫓鞛 靹れ爼"; + Text[ korean ] = "氙鸽Μ 鞎岆 靹れ爼"; Text[ turkish ] = "An齧sat齝 yerle⺶ir"; Text[ catalan ] = "Defineix un recordatori"; Text[ thai ] = "喔曕副喙夃竾喔勦箞喔侧笗喔编抚喙喔曕阜喔笝"; @@ -496,7 +496,7 @@ Window DLG_NAVIGATION_PI Text [ italian ] = "Intestazione" ; Text [ portuguese_brazilian ] = "Cabe?alho" ; Text [ portuguese ] = "Cabe鏰lho" ; - Text [ finnish ] = "Yl鋙tsikko" ; + Text [ finnish ] = "Yl鋞unniste" ; Text [ danish ] = "Sidehoved" ; Text [ french ] = "En-t阾e " ; Text [ swedish ] = "Sidhuvud" ; @@ -527,7 +527,7 @@ Window DLG_NAVIGATION_PI 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" ; @@ -567,13 +567,13 @@ Window DLG_NAVIGATION_PI Text [ english_us ] = "Anchor<->Text" ; /* ### ACHTUNG: Neuer Text in Resource? Springen zwischen Fu遪otenankern und dem Fu遪otentext : Springen zwischen Fu榥otenankern und dem Fu榥otentext */ Text[ chinese_simplified ] = "鏍囪<->姝ｆ枃"; - Text[ russian ] = "橡桠珀<->义犟"; + Text[ russian ] = "哧铕<->义犟"; Text[ polish ] = "Kotwica<->Tekst"; Text[ japanese ] = "鑴氭敞"; Text[ chinese_traditional ] = "妯欒櫉<->鍏ф枃"; Text[ arabic ] = "阊忧<->湔"; Text[ greek ] = "零挲聩箸<->叔哽屙"; - Text[ korean ] = "瓿犾爼<->韰嶌姢韸"; + Text[ korean ] = "旮办 鞙勳箻<->韰嶌姢韸"; Text[ turkish ] = "Sabitleyici<->Metin"; Text[ catalan ] = "Ancora<->Text"; Text[ thai ] = "喔浮喔<->喔傕箟喔竸喔о覆喔"; @@ -600,13 +600,13 @@ Window DLG_NAVIGATION_PI Text [ portuguese_brazilian ] = "Angezeigte ?berschriftenebenen" ; Text [ portuguese ] = "N韛eis de t韙ulos mostrados" ; Text[ chinese_simplified ] = "鏄剧ず鐨勫ぇ绾茬骇"; - Text[ russian ] = "项赅 箴钼礤 玎泐腩怅钼"; + Text[ russian ] = "项赅玎螯 玎泐腩怅 漕 箴钼"; Text[ polish ] = "Wy渨ietlone poziomy konspektu"; Text[ japanese ] = "瑕嬪嚭銇椼儸銉欍儷"; Text[ chinese_traditional ] = "椤ず鐨勫ぇ缍辩礆"; Text[ arabic ] = "阌舒砬 轻阡擎礓 轻偾逖"; Text[ greek ] = "澎鲠黹纥戾磲 屦唣邃 屦殛弼犭咪"; - Text[ korean ] = "雮橅儉雮橂姅 響滌牅 靾橃"; + Text[ korean ] = "響滌嫓霅橂姅 鞝滊 靾橃"; Text[ turkish ] = "G鰎黱t黮enen ba齥 d鼁eyleri"; Text[ catalan ] = "Nivells d'encap鏰lament mostrats"; Text[ finnish ] = "Otsikkotasojen n鋣tt"; @@ -627,7 +627,7 @@ Window DLG_NAVIGATION_PI Text [ italian ] = "Livello superiore" ; Text [ portuguese_brazilian ] = "Aumentar N?vel" ; Text [ portuguese ] = "Subir um n韛el" ; - Text [ finnish ] = "Pienenn tason sisennyst" ; + Text [ finnish ] = "Korota tasoa" ; Text [ danish ] = "Niveau op" ; Text [ french ] = "Hausser d'un niveau" ; Text [ swedish ] = "En niv upp" ; @@ -635,13 +635,13 @@ Window DLG_NAVIGATION_PI Text [ spanish ] = "Subir un nivel" ; Text [ english_us ] = "Promote Level" ; Text[ chinese_simplified ] = "鍗囩骇"; - Text[ russian ] = "袜 钿桧 箴钼屙 忖屦"; + Text[ russian ] = "项恹耔螯 箴钼屙"; Text[ polish ] = "Poziom wy縠j"; Text[ japanese ] = "銉儥銉倰涓娿亽銈"; Text[ chinese_traditional ] = "鍗囩礆"; Text[ arabic ] = "阌舒 崦卺"; Text[ greek ] = "旭镡殁狍禳 屦轲蒌秕"; - Text[ korean ] = "靾橃 雴掛澊旮"; + Text[ korean ] = "靾橃 鞓"; Text[ turkish ] = "D鼁eyi yukar al"; Text[ catalan ] = "Promou el nivell"; Text[ thai ] = "喙喔ム阜喙堗腑喔權福喔班笖喔编笟"; @@ -657,7 +657,7 @@ Window DLG_NAVIGATION_PI Text [ italian ] = "Livello inferiore" ; Text [ portuguese_brazilian ] = "Diminuir N?vel" ; Text [ portuguese ] = "Descer um n韛el" ; - Text [ finnish ] = "Suurenna tason sisennyst" ; + Text [ finnish ] = "Alenna tasoa" ; Text [ danish ] = "Niveau ned" ; Text [ french ] = "Abaisser d'un niveau" ; Text [ swedish ] = "En niv ner" ; @@ -665,7 +665,7 @@ Window DLG_NAVIGATION_PI Text [ spanish ] = "Bajar un nivel" ; Text [ english_us ] = "Demote Level" ; Text[ chinese_simplified ] = "闄嶇骇"; - Text[ russian ] = "袜 钿桧 箴钼屙 忭桤"; + Text[ russian ] = "项龛玷螯 箴钼屙"; Text[ polish ] = "Poziom ni縠j"; Text[ japanese ] = "銉儥銉倰涓嬨亽銈"; Text[ chinese_traditional ] = "闄嶇礆"; @@ -734,7 +734,7 @@ Window DLG_NAVIGATION_PI Text [ dutch ] = "Bewerken" ; Text [ portuguese ] = "Editar" ; Text[ chinese_simplified ] = "缂栬緫"; - Text[ russian ] = "橡噔赅"; + Text[ russian ] = "如戾龛螯"; Text[ polish ] = "Edytuj"; Text[ japanese ] = "绶ㄩ泦"; Text[ chinese_traditional ] = "绶ㄨ集"; @@ -759,7 +759,7 @@ Window DLG_NAVIGATION_PI Text [ italian ] = "Aggiorna" ; Text [ spanish ] = "Actualizar" ; Text [ french ] = "Actualiser" ; - Text [ dutch ] = "Actualiseren" ; + Text [ dutch ] = "Bijwerken" ; Text [ portuguese ] = "Actualizar" ; Text[ chinese_simplified ] = "鏇存柊"; Text[ russian ] = "吾眍忤螯"; @@ -822,7 +822,7 @@ Window DLG_NAVIGATION_PI Text [ french ] = "Enregistrer le contenu" ; Text [ dutch ] = "Inhoud opslaan" ; Text [ portuguese ] = "Guardar tamb閙 conte鷇os" ; - Text[ russian ] = "杨躔囗栩 耦溴疰桁铄"; + Text[ russian ] = "杨躔囗螯 耦溴疰桁铄 耦耱噔眍 漕牦戾眚"; Text[ polish ] = "Zapisz zawarto滄"; Text[ japanese ] = "鍐呭銈掍繚瀛樸仚銈"; Text[ chinese_simplified ] = "瀛樼洏鍐呭"; @@ -865,7 +865,7 @@ Window DLG_NAVIGATION_PI Text[ korean ] = "鞙勲 鞚措彊"; Text[ turkish ] = "Yukar ta"; Text[ catalan ] = "Mou cap amunt"; - Text[ finnish ] = "Siirr yl鰏"; + Text[ finnish ] = "Siirr ylemm鋝"; Text[ thai ] = "喔⑧箟喔侧涪喔傕付喙夃笝"; }; ToolBoxItem @@ -891,10 +891,10 @@ Window DLG_NAVIGATION_PI Text[ chinese_traditional ] = "鍚戜笅绉诲嫊"; Text[ arabic ] = "乓峭 裴 糜葆"; Text[ greek ] = "体翎鲲褴 瘃矧 翎 贶豉"; - Text[ korean ] = "鞎勲灅搿 鞚措彊"; + Text[ korean ] = "鞎勲灅搿"; Text[ turkish ] = "A瘕 ta"; Text[ catalan ] = "Mou cap avall"; - Text[ finnish ] = "Siirr alas"; + Text[ finnish ] = "Siirr alemmas"; Text[ thai ] = "喔⑧箟喔侧涪喔ム竾"; }; }; @@ -963,7 +963,7 @@ Window DLG_NAVIGATION_PI Text[ chinese_traditional ] = "澶х侗绱"; Text[ arabic ] = "阌舒砬 轻兽禹"; Text[ greek ] = "硼唣邃 溟荞桉珧"; - Text[ korean ] = "鞎勳泝韸鸽澕鞚"; + Text[ korean ] = "臧滌殧 靾橃"; Text[ turkish ] = "Anahat d鼁eyleri"; Text[ catalan ] = "Nivell de contorn"; Text[ finnish ] = "J鋝ennystaso"; @@ -973,7 +973,7 @@ Window DLG_NAVIGATION_PI { Text = "Dragmodus" ; Text [ English ] = "Drag mode" ; - Text [ dutch ] = "Dragmodus" ; + Text [ dutch ] = "Sleepmodus" ; Text [ english_us ] = "Drag Mode" ; Text [ italian ] = "Modo drag" ; Text [ spanish ] = "Modo Arrastrar" ; @@ -1043,7 +1043,7 @@ Window DLG_NAVIGATION_PI Text[ chinese_traditional ] = "鐣朵綔鎹峰緫鎻掑叆"; Text[ arabic ] = "畔亚 咔咽惹"; Text[ greek ] = "砰筢泫戕 簖礓弩"; - Text[ korean ] = "鞐瓣舶搿 靷届瀰"; + Text[ korean ] = "毵來伂搿 靷届瀰"; Text[ turkish ] = "Ba餷ant olarak ekle"; Text[ catalan ] = "Insereix com a enlla"; Text[ finnish ] = "Lis滗 linkkin"; @@ -1149,7 +1149,7 @@ Window DLG_NAVIGATION_PI Text[ chinese_traditional ] = "闅卞叆"; Text[ arabic ] = "阄蓓"; Text[ greek ] = "犟貊"; - Text[ korean ] = "靾赴旮"; + Text[ korean ] = "靾箑"; Text[ turkish ] = "gizli"; Text[ catalan ] = "ocult"; Text[ finnish ] = "piilotettu"; @@ -1175,7 +1175,7 @@ Window DLG_NAVIGATION_PI Text[ chinese_traditional ] = "浣跨敤涓殑"; Text[ arabic ] = "湓"; Text[ greek ] = "屙羼泓"; - Text[ korean ] = "頇滌劚"; + Text[ korean ] = "頇滌劚 欷"; Text[ turkish ] = "etkin"; Text[ catalan ] = "actiu"; Text[ finnish ] = "aktiivinen"; @@ -1230,14 +1230,14 @@ Window DLG_NAVIGATION_PI Text[ korean ] = "韼胳..."; Text[ turkish ] = "~D鼁enle..."; Text[ catalan ] = "Edita..."; - Text[ finnish ] = "Muokkaa"; + Text[ finnish ] = "Muokkaa..."; Text[ thai ] = "喙佮竵喙夃箘喔..."; }; String ST_UPDATE { Text = "~Aktualisieren" ; Text [ English ] = "Update" ; - Text [ dutch ] = "~Actualiseren" ; + Text [ dutch ] = "~Bijwerken" ; Text [ english_us ] = "~Update" ; Text [ italian ] = "~Aggiorna" ; Text [ spanish ] = "Actuali~zar" ; @@ -1296,14 +1296,14 @@ Window DLG_NAVIGATION_PI Text[ dutch ] = "Koppeling bewerken"; Text[ french ] = "蒬iter le lien"; Text[ spanish ] = "Editar v韓culo"; - Text[ finnish ] = "Edit link"; + Text[ finnish ] = "Muokkaa linkki"; Text[ italian ] = "Modifica collegamento"; Text[ danish ] = "Rediger k鎑e"; Text[ swedish ] = "Redigera l鋘k"; Text[ polish ] = "Edytuj 彻cze"; Text[ portuguese_brazilian ] = "Edit link"; Text[ japanese ] = "銉兂銈伄绶ㄩ泦"; - Text[ korean ] = "鞐瓣舶 韼胳"; + Text[ korean ] = "毵來伂 韼胳"; Text[ chinese_simplified ] = "缂栬緫閾炬帴"; Text[ chinese_traditional ] = "绶ㄨ集鎹峰緫"; Text[ turkish ] = "Edit link"; @@ -1356,7 +1356,7 @@ Window DLG_NAVIGATION_PI Text[ polish ] = "Indeks"; Text[ portuguese_brazilian ] = "?n~ice"; Text[ japanese ] = "鐩銇ㄧ储寮(~I)"; - Text[ korean ] = "靸夓澑(~I)"; + Text[ korean ] = "靸夓澑 氚 氇╈皑(~I)"; Text[ chinese_simplified ] = "鐩綍(~I)"; Text[ chinese_traditional ] = "绱㈠紩(~I)"; Text[ arabic ] = "蒎延"; @@ -1400,12 +1400,12 @@ Window DLG_NAVIGATION_PI Text [ swedish ] = "Nytt dokument" ; Text [ danish ] = "Nyt dokument" ; Text [ italian ] = "Nuovo documento" ; - Text [ spanish ] = "Nuevo documento" ; + Text [ spanish ] = "Documento nuevo" ; Text [ french ] = "Nouveau document" ; Text [ dutch ] = "Nieuw document" ; Text [ portuguese ] = "Novo documento" ; Text[ chinese_simplified ] = "鏂板缓鏂囨。"; - Text[ russian ] = "皖恹 漕牦戾眚"; + Text[ russian ] = "杨玟囹 漕牦戾眚"; Text[ polish ] = "Nowy dokument"; Text[ japanese ] = "鏂般仐銇勩儔銈儱銉°兂銉"; Text[ chinese_traditional ] = "鏂板鏂囦欢"; @@ -1457,7 +1457,7 @@ Window DLG_NAVIGATION_PI Text [ french ] = "Supprimer" ; Text [ swedish ] = "Radera" ; Text [ dutch ] = "Wissen" ; - Text [ spanish ] = "Eliminar" ; + Text [ spanish ] = "Borrar" ; Text [ english_us ] = "Delete" ; Text[ chinese_simplified ] = "鍒犻櫎"; Text[ russian ] = "愉嚯栩"; @@ -1484,7 +1484,7 @@ Window DLG_NAVIGATION_PI Text [ french ] = "Supprimer" ; Text [ swedish ] = "~Radera" ; Text [ dutch ] = "Wis~sen" ; - Text [ spanish ] = "~Eliminar" ; + Text [ spanish ] = "~Borrar" ; Text [ english_us ] = "~Delete" ; Text[ chinese_simplified ] = "鍒犻櫎(~D)"; Text[ russian ] = "愉嚯栩"; @@ -1512,7 +1512,7 @@ Window DLG_NAVIGATION_PI Text [ dutch ] = "Selectie" ; Text [ portuguese ] = "Selec玢o" ; Text[ chinese_simplified ] = "閫変腑"; - Text[ russian ] = "蔓溴脲龛"; + Text[ russian ] = "蔓溴脲眄铄"; Text[ polish ] = "Selekcja"; Text[ japanese ] = "閬告姙绡勫洸"; Text[ chinese_traditional ] = "閬稿彇"; @@ -1544,7 +1544,7 @@ Window DLG_NAVIGATION_PI Text[ chinese_traditional ] = "鐩寗"; Text[ arabic ] = "蒎茄"; Text[ greek ] = "捧皴艮耖"; - Text[ korean ] = "靸夓澑"; + Text[ korean ] = "靸夓澑 氚 氇╈皑"; Text[ turkish ] = "Dizin"; Text[ catalan ] = "蚽dex"; Text[ finnish ] = "Hakemistot"; @@ -1571,7 +1571,7 @@ Window DLG_NAVIGATION_PI Text[ chinese_traditional ] = "鎹峰緫"; Text[ arabic ] = "茄嗜秦鞘"; Text[ greek ] = "吁礓蒹彘"; - Text[ korean ] = "鞐瓣舶"; + Text[ korean ] = "毵來伂"; Text[ turkish ] = "Ba餷ant"; Text[ catalan ] = "Enlla鏾s"; Text[ finnish ] = "Linkit"; @@ -1597,7 +1597,7 @@ Window DLG_NAVIGATION_PI Text[ chinese_traditional ] = "鍏ㄩ儴"; Text[ arabic ] = "轻哚"; Text[ greek ] = "茧"; - Text[ korean ] = "鞝勳泊"; + Text[ korean ] = "氇憪"; Text[ turkish ] = "T黰"; Text[ catalan ] = "Tot"; Text[ finnish ] = "Kaikki"; @@ -1612,18 +1612,18 @@ Window DLG_NAVIGATION_PI Text [ swedish ] = "Upph鋨v f鰎teckning" ; Text [ danish ] = "Oph鎣 indeks" ; Text [ italian ] = "Rimuovi indice" ; - Text [ spanish ] = "Eliminar dire~ctorio" ; + Text [ spanish ] = "Borrar el dire~ctorio" ; Text [ french ] = "~Supprimer l'index" ; Text [ dutch ] = "~Index opheffen" ; Text [ portuguese ] = "~Remover 韓dice" ; Text[ chinese_simplified ] = "鍙栨秷鐩綍(~R)"; - Text[ russian ] = "俞疣螯 箨噻囹咫"; + Text[ russian ] = "愉嚯栩 箨噻囹咫"; Text[ polish ] = "Usu indeks"; Text[ japanese ] = "瑙ｉ櫎(~R)"; Text[ chinese_traditional ] = "鍙栨秷鐩寗(~R)"; Text[ arabic ] = "乓轻 轻蒎延"; Text[ greek ] = "梳糗胥珞 艴皴翮襁秕"; - Text[ korean ] = "靸夓澑 頃挫牅(~R)"; + Text[ korean ] = "靸夓澑 鞝滉卑(~R)"; Text[ turkish ] = "D~izini kald齬"; Text[ catalan ] = "Elimina el dire~ctori"; Text[ finnish ] = "~Poista hakemisto"; @@ -1673,7 +1673,7 @@ Window DLG_NAVIGATION_PI Text[ polish ] = "schowany"; Text[ portuguese_brazilian ] = "hidden"; Text[ japanese ] = "闅犮仐"; - Text[ korean ] = "靾赴旮"; + Text[ korean ] = "靾箑"; Text[ chinese_simplified ] = "闅愬叆鐨"; Text[ chinese_traditional ] = "闅卞叆"; Text[ arabic ] = "阄蓓"; @@ -1742,7 +1742,7 @@ Window DLG_NAVIGATION_PI Text[ portuguese ] = "S ~leitura"; Text[ russian ] = "翌朦觐 潆 黩屙"; Text[ greek ] = "M 汩 犴茔睐箸"; - Text[ dutch ] = "~Schrijfbeveiligd"; + Text[ dutch ] = "~Alleen-lezen"; Text[ french ] = "en ~lecture seule"; Text[ spanish ] = "Solo le~ctura"; Text[ italian ] = "A sola lettura"; @@ -1751,7 +1751,7 @@ Window DLG_NAVIGATION_PI Text[ polish ] = "Tylko do odczytu"; Text[ portuguese_brazilian ] = "Readonly"; Text[ japanese ] = "瑾伩鍙栥倞灏傜敤(~O)"; - Text[ korean ] = "鞚疥赴鞝勳毄(~O)"; + Text[ korean ] = "鞚疥赴 鞝勳毄(~O)"; Text[ chinese_simplified ] = "闃叉敼鍐(~O)"; Text[ chinese_traditional ] = "鍞畝(~O)"; Text[ arabic ] = "後扪橇 蒉"; @@ -1807,3 +1807,18 @@ ImageList IMG_NAVI_ENTRYBMPH }; + + + + + + + + + + + + + + + diff --git a/sw/source/ui/utlui/poolfmt.src b/sw/source/ui/utlui/poolfmt.src index d576562e7c75..4f655286d49a 100644 --- a/sw/source/ui/utlui/poolfmt.src +++ b/sw/source/ui/utlui/poolfmt.src @@ -2,9 +2,9 @@ * * $RCSfile: poolfmt.src,v $ * - * $Revision: 1.39 $ + * $Revision: 1.40 $ * - * last change: $Author: os $ $Date: 2002-06-05 12:27:02 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:45:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,7 +78,7 @@ String STR_POOLCHR_FOOTNOTE Text [ portuguese ] = "S韒bolo de nota de rodap" ; Text [ portuguese_brazilian ] = "Fu?notenzeichen" ; Text[ chinese_simplified ] = "娉ㄨ剼绗"; - Text[ russian ] = "琼嚓 耥铖觇"; + Text[ russian ] = "谚焘铍 耥铖觇"; Text[ polish ] = "Symbol przypis體 doln."; Text[ japanese ] = "鑴氭敞鐣彿"; Text[ chinese_traditional ] = "瑷昏叧绗"; @@ -87,8 +87,9 @@ String STR_POOLCHR_FOOTNOTE Text[ korean ] = "臧侅＜ 旮绊樃"; Text[ turkish ] = "Dipnot karakterleri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "S韒bolo de nota al pie"; + Text[ catalan ] = "Car郼ters de nota al peu"; Text[ finnish ] = "Alaviitemerkit"; + Text[ thai ] = "喔曕副喔о腑喔编竵喔傕福喔班競喔竾喙喔娻复喔囙腑喔｀福喔"; }; String STR_POOLCHR_PAGENO { @@ -106,15 +107,16 @@ String STR_POOLCHR_PAGENO Text[ chinese_simplified ] = "椤电爜"; Text[ russian ] = "皖戾 耱疣龛鳆"; Text[ polish ] = "Ilo滄 stron"; - Text[ japanese ] = "锞嶏緹锝帮郊锞炵暘鍙"; + Text[ japanese ] = "銉氥兗銈哥暘鍙"; Text[ chinese_traditional ] = "闋佺⒓"; Text[ arabic ] = "艳 轻蛰蜕"; Text[ greek ] = "榴殍禳 箦脒溽"; - Text[ korean ] = "飒 氩堩樃"; + Text[ korean ] = "韼橃澊歆 氩堩樃"; Text[ turkish ] = "Sayfa say齭"; Text[ language_user1 ] = " "; - Text[ catalan ] = "N鷐ero de p醙ina"; + Text[ catalan ] = "N鷐ero de p鄃ina"; Text[ finnish ] = "Sivunumero"; + Text[ thai ] = "喙喔ム競喔笝喙夃覆"; }; String STR_POOLCHR_LABEL { @@ -130,7 +132,7 @@ String STR_POOLCHR_LABEL Text [ portuguese ] = "Caracteres para etiqueta" ; Text [ portuguese_brazilian ] = "Beschriftungszeichen" ; Text[ chinese_simplified ] = "鏍囩鏂"; - Text[ russian ] = "义犟 磬玮囗"; + Text[ russian ] = "谚焘铍 磬玮囗"; Text[ polish ] = "Tekst etykiety"; Text[ japanese ] = "鍥宠〃鐣彿鏂囧瓧"; Text[ chinese_traditional ] = "妯欑堡鏂"; @@ -139,8 +141,9 @@ String STR_POOLCHR_LABEL Text[ korean ] = "旌§厴 氍胳瀽"; Text[ turkish ] = "Etiket karakterleri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Caracteres de etiqueta"; + Text[ catalan ] = "Car郼ters de la llegenda"; Text[ finnish ] = "Kuvaotsikon merkit"; + Text[ thai ] = "喔曕副喔о腑喔编竵喔傕福喔班競喔竾喔勦赋喔氞福喔｀涪喔侧涪喔犩覆喔"; }; String STR_POOLCHR_DROPCAPS { @@ -156,17 +159,18 @@ String STR_POOLCHR_DROPCAPS Text [ portuguese ] = "Caracteres capitulares" ; Text [ portuguese_brazilian ] = "Initialenzeichen" ; Text[ chinese_simplified ] = "瀛楅澶у啓"; - Text[ russian ] = "软桷栲臌"; + Text[ russian ] = "馏赈桷"; Text[ polish ] = "Inicja硑"; - Text[ japanese ] = "锞勶緸锞涳蒋锞岋緹锝凤浆锝緦锞"; + Text[ japanese ] = "銉夈儹銉冦儣銈儯銉冦儣"; Text[ chinese_traditional ] = "瀛楅澶у"; Text[ arabic ] = "轻猛演 轻怯叔崆犴"; Text[ greek ] = "叔鲠脶哚 泷莒灬翎"; - Text[ korean ] = "雼澖鞚 觳鞛 鞛レ嫕"; + Text[ korean ] = "雼澖 觳鞛 鞛レ嫕"; Text[ turkish ] = "Ba㭎arfler"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Iniciales"; + Text[ catalan ] = "Caplletres"; Text[ finnish ] = "Anfangit"; + Text[ thai ] = "喔曕副喔о腑喔编竵喔┼福喔傕付喙夃笝喔曕箟喔權笚喔掂箞喔∴傅喔傕笝喔侧笖喙冟斧喔嵿箞"; }; String STR_POOLCHR_NUM_LEVEL { @@ -176,13 +180,13 @@ String STR_POOLCHR_NUM_LEVEL Text [ italian ] = "Carattere di numerazione" ; Text [ spanish ] = "Car醕ter de numeraci髇" ; Text [ french ] = "Caract鑢es de num閞otation" ; - Text [ dutch ] = "Nummeringsteken" ; + Text [ dutch ] = "Opsommingstekens" ; Text [ swedish ] = "Numreringstecken" ; Text [ danish ] = "Nummereringstegn" ; Text [ portuguese ] = "Caracteres de numera玢o" ; Text [ portuguese_brazilian ] = "Numerierungszeichen" ; Text[ chinese_simplified ] = "缂栧彿瀛楃"; - Text[ russian ] = "琼嚓 眢戾疣鲨"; + Text[ russian ] = "谚焘铍 眢戾疣鲨"; Text[ polish ] = "Znaki numeracji"; Text[ japanese ] = "鐣彿浠樸亼瑷樺彿"; Text[ chinese_traditional ] = "绶ㄨ櫉瀛楀厓"; @@ -191,15 +195,16 @@ String STR_POOLCHR_NUM_LEVEL Text[ korean ] = "氩堩樃 毵り赴旮 旮绊樃"; Text[ turkish ] = "Numaralama karakterleri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Car醕ter de numeraci髇"; + Text[ catalan ] = "S韒bols de numeraci"; Text[ finnish ] = "Numerointisymbolit"; + Text[ thai ] = "喔副喔嵿弗喔编竵喔┼笓喙屶弗喔赤笖喔编笟喔曕副喔о箑喔ム競"; }; String STR_POOLCHR_BUL_LEVEL { /* ### ACHTUNG: Neuer Text in Resource? Aufz鋒lungszeichen : Aufz鮤lungszeichen */ Text = "Aufz鋒lungszeichen" ; Text [ English ] = "Bullet" ; - Text [ english_us ] = "Bullet Symbols" ; + Text [ english_us ] = "Bullets" ; Text [ italian ] = "Carattere per numerazione" ; Text [ spanish ] = "Vi馿tas" ; Text [ french ] = "Puces" ; @@ -218,8 +223,9 @@ String STR_POOLCHR_BUL_LEVEL Text[ korean ] = "旮毹鸽Μ 旮绊樃"; Text[ turkish ] = "Madde iretleri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Vi馿tas"; + Text[ catalan ] = "S韒bols de pic"; Text[ finnish ] = "Luettelomerkkisymbolit"; + Text[ thai ] = "喔副喔嵿弗喔编竵喔┼笓喙屶箒喔笖喔囙斧喔编抚喔傕箟喔涪喙堗腑喔"; }; String STR_POOLCHR_INET_NORMAL { @@ -227,25 +233,26 @@ String STR_POOLCHR_INET_NORMAL Text [ English ] = "Internet link" ; Text [ english_us ] = "Internet Link" ; Text [ italian ] = "Link Internet" ; - Text [ spanish ] = "V韓culo Internet" ; + Text [ spanish ] = "V韓culo de Internet" ; Text [ french ] = "Lien Internet" ; - Text [ dutch ] = "Internet Link" ; + Text [ dutch ] = "Internetkoppeling" ; Text [ swedish ] = "Internetl鋘k" ; Text [ danish ] = "Hyperlink" ; Text [ portuguese ] = "Link Internet" ; Text [ portuguese_brazilian ] = "Internet Link" ; Text[ chinese_simplified ] = "鍥介檯浜掕仈缃戦摼鎺"; - Text[ russian ] = "疡赅 软蝈痦弪"; + Text[ russian ] = "软蝈痦弪-耨赅"; Text[ polish ] = "９cze internetowe"; - Text[ japanese ] = "锝诧緷锞锝帮緢锝緞 锞橈緷锝"; + Text[ japanese ] = "銈ゃ兂銈裤兗銉嶃儍銉堛儶銉炽偗"; Text[ chinese_traditional ] = "Internet 鎹峰緫"; Text[ arabic ] = "茄嗜秦 配恃涫"; Text[ greek ] = "育礓弩 麸 Internet"; Text[ korean ] = "鞚疙劙雱 毵來伂"; Text[ turkish ] = "Internet ba餷ant齭"; Text[ language_user1 ] = " "; - Text[ catalan ] = "V韓culo Internet"; + Text[ catalan ] = "Enlla d'Internet"; Text[ finnish ] = "Internet-linkki"; + Text[ thai ] = "喙喔娻阜喙堗腑喔∴箓喔⑧竾喔复喔權箑喔曕腑喔｀箤喙喔權箛喔"; }; String STR_POOLCHR_INET_VISIT { @@ -255,25 +262,26 @@ String STR_POOLCHR_INET_VISIT Text [ English ] = "Visit internet link" ; Text [ english_us ] = "Visited Internet Link" ; Text [ italian ] = "Link Internet visitato" ; - Text [ spanish ] = "P醙ina Internet visitada" ; + Text [ spanish ] = "Enlace de Internet visitado" ; Text [ french ] = "Lien Internet visit" ; - Text [ dutch ] = "Bezochte Internet Link" ; + Text [ dutch ] = "Bezochte internetkoppeling" ; Text [ swedish ] = "Anv鋘d Internetl鋘k" ; Text [ danish ] = "Bes鴊t hyperlink" ; Text [ portuguese ] = "Link Internet visitado" ; Text [ portuguese_brazilian ] = "Besuchter Internet Link" ; Text[ chinese_simplified ] = "璁块棶杩囩殑鍥介檯浜掕仈缃戦摼鎺"; - Text[ russian ] = "项皴眄 耨赅 软蝈痦弪"; + Text[ russian ] = "橡铖祛蝠屙磬 汨镥瘃覃腙"; Text[ polish ] = "Odwiedzone 彻cze internetowe"; - Text[ japanese ] = "瑷倢銇燂讲锞濓線锝帮緢锝緞 锞橈緷锝"; + Text[ japanese ] = "瑷倢銇熴偆銉炽偪銉笺儘銉冦儓銉兂銈"; Text[ chinese_traditional ] = "瑷晱閬庣殑 Internet 鎹峰緫"; Text[ arabic ] = "茄嗜秦 轻配恃涫 轻许 抒 翼茄叔"; Text[ greek ] = "育礓弩 Internet 痫 屦轶赍鲨揸狒"; Text[ korean ] = "氚╇頃 鞚疙劙雱 毵來伂"; Text[ turkish ] = "Kullan齦m Internet ba餷ant齭"; Text[ language_user1 ] = " "; - Text[ catalan ] = "P醙ina Internet visitada"; - Text[ finnish ] = "K鋣ty Internet-linkki"; + Text[ catalan ] = "Enlla d'Internet visitat"; + Text[ finnish ] = "Avattu Internet-linkki"; + Text[ thai ] = "喔斷腹喔佮覆喔｀箑喔娻阜喙堗腑喔∴箓喔⑧竾喔复喔權箑喔曕腑喔｀箤喙喔權箛喔"; }; String STR_POOLCHR_JUMPEDIT { @@ -289,17 +297,18 @@ String STR_POOLCHR_JUMPEDIT Text [ portuguese ] = "Marcador de posi玢o" ; Text [ portuguese_brazilian ] = "Platzhalter" ; Text[ chinese_simplified ] = "閫氶厤绗"; - Text[ russian ] = "体耱铉囡铍龛蝈朦"; + Text[ russian ] = "项脲 镱漶蜞眍怅"; Text[ polish ] = "Znak-wype硁iacz"; - Text[ japanese ] = "锞岋緹锞氾桨锝斤編锞欙線锞"; - Text[ chinese_traditional ] = "閫氶厤绗"; + Text[ japanese ] = "銉椼儸銉笺偣銉涖儷銉"; + Text[ chinese_traditional ] = "钀敤瀛楀厓"; Text[ arabic ] = "阡昭 淝迫"; Text[ greek ] = "育焘镫 犟荇珞珧 栎箸"; Text[ korean ] = "頂岆爤鞚挫姢頇雿"; Text[ turkish ] = "Genel arama karakteri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Comod韓"; + Text[ catalan ] = "Marcador"; Text[ finnish ] = "Paikkamerkki"; + Text[ thai ] = "喔曕副喔о涪喔多笖喔曕赋喙佮斧喔權箞喔"; }; String STR_POOLCHR_TOXJUMP { @@ -317,15 +326,16 @@ String STR_POOLCHR_TOXJUMP Text[ chinese_simplified ] = "鐩綍閾炬帴"; Text[ russian ] = "疡赅 箨噻囹咫"; Text[ polish ] = "Skok w indeksie"; - Text[ japanese ] = "绱㈠紩锝硷緸锝緷锞岋緹"; + Text[ japanese ] = "绱㈠紩銈搞儯銉炽儣"; Text[ chinese_traditional ] = "鐩寗鎹峰緫"; Text[ arabic ] = "茄嗜秦 蒎延"; Text[ greek ] = "育礓弩 艴皴翮襁秕"; - Text[ korean ] = "靸夓澑 鞐瓣舶"; + Text[ korean ] = "靸夓澑 毵來伂"; Text[ turkish ] = "Dizin ba餷ant齭"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Salto de 韓dice"; + Text[ catalan ] = "Salt d'韓dex"; Text[ finnish ] = "Hakemistolinkki"; + Text[ thai ] = "喙喔娻阜喙堗腑喔∴箓喔⑧竾喔斷副喔娻笝喔"; }; String STR_POOLCHR_ENDNOTE { @@ -341,7 +351,7 @@ String STR_POOLCHR_ENDNOTE Text [ french ] = "Caract鑢e de note de fin" ; Text [ dutch ] = "Eindnootteken" ; Text[ chinese_simplified ] = "灏炬爣绗"; - Text[ russian ] = "琼嚓 觐眦邂铋 耥铖觇"; + Text[ russian ] = "谚焘铍 觐眦邂铋 耥铖觇"; Text[ polish ] = "Symbol przypis體 ko馽."; Text[ japanese ] = "鏂囨湯鑴氭敞鐣彿"; Text[ chinese_traditional ] = "灏捐ɑ绗﹁櫉"; @@ -350,8 +360,9 @@ String STR_POOLCHR_ENDNOTE Text[ korean ] = "氙胳＜ 旮绊樃"; Text[ turkish ] = "Sonnot karakterleri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "S韒bolo de nota final"; - Text[ finnish ] = "Loppuhuomautusmerkit"; + Text[ catalan ] = "Car郼ters de nota final"; + Text[ finnish ] = "Loppuviitemerkit"; + Text[ thai ] = "喔曕副喔о腑喔编竵喔傕福喔班腑喙夃覆喔囙腑喔脆竾喔椸箟喔侧涪喙喔｀阜喙堗腑喔"; }; String STR_POOLCHR_LINENUM { @@ -373,11 +384,12 @@ String STR_POOLCHR_LINENUM Text[ chinese_traditional ] = "琛岀法铏"; Text[ arabic ] = "恃揄 轻糜匮"; Text[ greek ] = "榴哞扃箸 泷犰忐"; - Text[ korean ] = "頄 氩堩樃 毵り赴旮"; + Text[ korean ] = "欷 氩堩樃 毵り赴旮"; Text[ turkish ] = "Sat齬 numaralamas"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇 de l韓eas"; + Text[ catalan ] = "Numeraci de l韓ies"; Text[ finnish ] = "Rivien numerointi"; + Text[ thai ] = "喔ム赋喔斷副喔氞笗喔编抚喙喔ム競喔氞福喔｀笚喔编笖"; }; String STR_POOLCHR_IDX_MAIN_ENTRY { @@ -385,7 +397,7 @@ String STR_POOLCHR_IDX_MAIN_ENTRY Text [ English ] = "Main index entry" ; Text[ english_us ] = "Main index entry"; Text[ portuguese ] = "Entrada principal de 韓dice remissivo"; - Text[ russian ] = "橡邃戾蝽 箨噻囹咫: 铖眍忭铋 屐屙"; + Text[ russian ] = "务眍忭铋 屐屙 箨噻囹咫"; Text[ greek ] = "数耖 赆翎齄耖箸 艴皴翮襁秕 胼铄"; Text[ dutch ] = "Index hoofditem"; Text[ french ] = "Index lexical : entr閑 principale"; @@ -402,8 +414,9 @@ String STR_POOLCHR_IDX_MAIN_ENTRY Text[ arabic ] = "畔吻 哑碛 蓓 轻蒎延 轻萌滔"; Text[ turkish ] = "Alfabetik dizin ana giri㱮"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Entrada principal 韓dice alfab閠ico"; + Text[ catalan ] = "Entrada principal de l'韓dex"; Text[ finnish ] = "P滗hakemistomerkint"; + Text[ thai ] = "喔｀覆喔⑧竵喔侧福喔斷副喔娻笝喔掂斧喔ム副喔"; }; String STR_POOLCHR_FOOTNOTE_ANCHOR { @@ -411,7 +424,7 @@ String STR_POOLCHR_FOOTNOTE_ANCHOR Text [ English ] = "Footnote anchor" ; Text[ english_us ] = "Footnote anchor"; Text[ portuguese ] = "耼cora para nota de rodap"; - Text[ russian ] = "橡桠珀 耥铖觇"; + Text[ russian ] = "哧铕 耥铖觇"; Text[ greek ] = "零挲聩箸 躔矬珈暹珧"; Text[ dutch ] = "Voetnootanker"; Text[ french ] = "Appel de note de bas de page"; @@ -422,13 +435,14 @@ String STR_POOLCHR_FOOTNOTE_ANCHOR Text[ polish ] = "Zakotwiczenie przypis體 doln."; Text[ portuguese_brazilian ] = "Footnote anchor"; Text[ japanese ] = "鑴氭敞鍙傜収鐣彿"; - Text[ korean ] = "臧侅＜ 瓿犾爼 旮办"; + Text[ korean ] = "臧侅＜ 旮办 鞙勳箻"; Text[ chinese_simplified ] = "娉ㄨ剼鏍囪"; Text[ chinese_traditional ] = "瑷昏叧妯欒櫉"; Text[ arabic ] = "阊忧 轻颓皂 轻虞犴"; Text[ turkish ] = "Dipnot sabitleyicisi"; - Text[ catalan ] = "Ancla de nota al pie"; + Text[ catalan ] = "纍cora de nota al peu"; Text[ finnish ] = "Alaviitteen ankkuri"; + Text[ thai ] = "喔浮喔箑喔娻复喔囙腑喔｀福喔"; }; String STR_POOLCHR_ENDNOTE_ANCHOR { @@ -436,24 +450,25 @@ String STR_POOLCHR_ENDNOTE_ANCHOR Text [ English ] = "Endnote anchor" ; Text[ english_us ] = "Endnote anchor"; Text[ portuguese ] = "耼cora de nota final"; - Text[ russian ] = "橡桠珀 觐眦邂铋 耥铖觇"; + Text[ russian ] = "哧铕 觐眦邂铋 耥铖觇"; Text[ greek ] = "零挲聩箸 箸戾辋箦 糨腼躜"; Text[ dutch ] = "Eindnootanker"; Text[ french ] = "Appel de note de fin"; - Text[ spanish ] = "Ancla de nota al final"; + Text[ spanish ] = "Ancla de nota final"; Text[ italian ] = "Richiamo di nota di chiusura"; Text[ danish ] = "Slutnoteanker"; Text[ swedish ] = "Slutnotsankare"; Text[ polish ] = "Zakotwiczenie przypis體 ko馽."; Text[ portuguese_brazilian ] = "Endnote anchor"; Text[ japanese ] = "鏂囨湯鑴氭敞鍙傜収瑷樺彿"; - Text[ korean ] = "氙胳＜ 瓿犾爼 旮办"; + Text[ korean ] = "氙胳＜ 旮办 鞙勳箻"; Text[ chinese_simplified ] = "灏炬敞鏍囪"; Text[ chinese_traditional ] = "灏捐ɑ妯欒櫉"; Text[ arabic ] = "阊忧 轻授犴 轻问倾"; Text[ turkish ] = "Sonnot sabitleyicisi"; - Text[ catalan ] = "Ancla de nota al final"; + Text[ catalan ] = "纍cora de nota final"; Text[ finnish ] = "Loppuviitteen ankkuri"; + Text[ thai ] = "喔浮喔腑喙夃覆喔囙腑喔脆竾喔椸箟喔侧涪喙喔｀阜喙堗腑喔"; }; // Zeichenvorlagen fuer HTML @@ -480,8 +495,9 @@ String STR_POOLCHR_HTML_EMPHASIS Text[ korean ] = "臧曥“"; Text[ turkish ] = "Vurgu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Destacado"; + Text[ catalan ] = "萴fasi"; Text[ finnish ] = "Painotus"; + Text[ thai ] = "喙喔權箟喔"; }; String STR_POOLCHR_HTML_CITIATION { @@ -506,8 +522,9 @@ String STR_POOLCHR_HTML_CITIATION Text[ korean ] = "鞚胳毄"; Text[ turkish ] = "Al齨t"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Cita"; + Text[ catalan ] = "Citaci"; Text[ finnish ] = "Lainaus"; + Text[ thai ] = "喔佮覆喔｀腑喙夃覆喔囙腑喔脆竾"; }; String STR_POOLCHR_HTML_STRONG { @@ -532,8 +549,9 @@ String STR_POOLCHR_HTML_STRONG Text[ korean ] = "臧曧暅 臧曥“"; Text[ turkish ] = "Kuvvetli vurgu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Muy destacado"; + Text[ catalan ] = "萴fasi fort"; Text[ finnish ] = "Vahva painotus"; + Text[ thai ] = "喙喔權箟喔權斧喔權副喔"; }; String STR_POOLCHR_HTML_CODE { @@ -551,15 +569,16 @@ String STR_POOLCHR_HTML_CODE Text[ chinese_simplified ] = "婧愭枃鏈"; Text[ russian ] = "锐躅漤 蝈犟"; Text[ polish ] = "Tekst 焤骴硂wy"; - Text[ japanese ] = "锝匡桨锝斤緝锝凤浇锞"; + Text[ japanese ] = "銈姐兗銈广儐銈偣銉"; Text[ chinese_traditional ] = "鍘熷妾"; Text[ arabic ] = "湔 轻阏涎"; Text[ greek ] = "叔哽屙 瘃镙脲躞珧"; - Text[ korean ] = "靻岇姢 韰嶌姢韸"; + Text[ korean ] = "鞗愲掣 韰嶌姢韸"; Text[ turkish ] = "Kaynak kodu"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Texto fuente"; + Text[ catalan ] = "Text font"; Text[ finnish ] = "L鋒deteksti"; + Text[ thai ] = "喙佮斧喔ム箞喔囙競喙夃腑喔勦抚喔侧浮"; }; String STR_POOLCHR_HTML_SAMPLE { @@ -584,14 +603,15 @@ String STR_POOLCHR_HTML_SAMPLE Text[ korean ] = "鞓"; Text[ turkish ] = "謗nek"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ejemplo"; + Text[ catalan ] = "Exemple"; Text[ finnish ] = "Esimerkki"; + Text[ thai ] = "喔曕副喔о腑喔⑧箞喔侧竾"; }; String STR_POOLCHR_HTML_KEYBOARD { Text = "Benutzereingabe" ; Text [ English ] = "User typed text" ; - Text [ dutch ] = "Gebruikergegevens" ; + Text [ dutch ] = "Gebruikersgegevens" ; Text [ english_us ] = "User Entry" ; Text [ swedish ] = "Anv鋘darinmatning" ; Text [ danish ] = "Brugerinput" ; @@ -603,15 +623,16 @@ String STR_POOLCHR_HTML_KEYBOARD Text[ chinese_simplified ] = "浣跨敤鑰呰緭鍏"; Text[ russian ] = "骡钿 镱朦珙忄蝈"; Text[ polish ] = "Wpis u縴tkownika"; - Text[ japanese ] = "锞曪桨锝伙緸锝板叆鍔"; + Text[ japanese ] = "銉︺兗銈躲兗鍏ュ姏"; Text[ chinese_traditional ] = "浣跨敤鑰呰几鍏"; Text[ arabic ] = "畔吻 轻阌饰香"; Text[ greek ] = "砰筢泫戕 黢摅翮"; Text[ korean ] = "靷毄鞛 頃"; Text[ turkish ] = "Kullan齝 giri㱮"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Entrada del usuario"; + Text[ catalan ] = "Entrada de l'usuari"; Text[ finnish ] = "K鋣tt鋔鋗erkint"; + Text[ thai ] = "喔｀覆喔⑧竵喔侧福喔溹腹喙夃箖喔娻箟"; }; String STR_POOLCHR_HTML_VARIABLE { @@ -638,6 +659,7 @@ String STR_POOLCHR_HTML_VARIABLE Text[ language_user1 ] = " "; Text[ catalan ] = "Variable"; Text[ finnish ] = "Muuttuja"; + Text[ thai ] = "喔曕副喔о箒喔涏福"; }; String STR_POOLCHR_HTML_DEFINSTANCE { @@ -662,8 +684,9 @@ String STR_POOLCHR_HTML_DEFINSTANCE Text[ korean ] = "鞝曥潣"; Text[ turkish ] = "Tan齧"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Definici髇"; + Text[ catalan ] = "Definici"; Text[ finnish ] = "M滗ritys"; + Text[ thai ] = "喔勦赋喔堗赋喔佮副喔斷竸喔о覆喔"; }; String STR_POOLCHR_HTML_TELETYPE { @@ -681,15 +704,16 @@ String STR_POOLCHR_HTML_TELETYPE Text[ chinese_simplified ] = "闈炴垚姣斾緥鏂囧瓧"; Text[ russian ] = "湾镳铒铕鲨铐嚯 蝈犟"; Text[ polish ] = "Tekst nieproporcjonalny"; - Text[ japanese ] = "涓嶅潎鏁淬仾锞冿椒锝斤緞"; + Text[ japanese ] = "绛夊箙銉曘偐銉炽儓"; Text[ chinese_traditional ] = "闈炴垚姣斾緥鏂囧瓧"; Text[ arabic ] = "湔 垌 输怯软"; Text[ greek ] = "嚏 狁祜黹挈 赍哽屙"; Text[ korean ] = "韰旊爤韮鞚错攧"; Text[ turkish ] = "Orant齭齴 yaz齮ipi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Texto no proporcional"; + Text[ catalan ] = "Teletip"; Text[ finnish ] = "Konekirjoitusteksti"; + Text[ thai ] = "喙傕笚喔｀箑喔ム競"; }; // Rahmenvorlagen @@ -707,7 +731,7 @@ String STR_POOLFRM_FRAME Text [ portuguese ] = "Moldura" ; Text [ portuguese_brazilian ] = "Rahmen" ; Text[ chinese_simplified ] = "妗"; - Text[ russian ] = "朽礻"; + Text[ russian ] = "吗彗赅"; Text[ polish ] = "Ramka"; Text[ japanese ] = "鏋"; Text[ language_user1 ] = " "; @@ -716,8 +740,9 @@ String STR_POOLFRM_FRAME Text[ greek ] = "绣襁泷犰灬"; Text[ korean ] = "頂勲爤鞛"; Text[ turkish ] = "莈r鏴ve"; - Text[ catalan ] = "Marco"; + Text[ catalan ] = "Marc"; Text[ finnish ] = "Kehys"; + Text[ thai ] = "喔佮福喔笟"; }; String STR_POOLFRM_GRAPHIC { @@ -739,11 +764,12 @@ String STR_POOLFRM_GRAPHIC Text[ chinese_traditional ] = "鍦栧舰"; Text[ arabic ] = "真焉"; Text[ greek ] = "民狯殛"; - Text[ korean ] = "攴鸽灅頂"; + Text[ korean ] = "攴鸽"; Text[ turkish ] = "Grafik"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Imagen"; - Text[ finnish ] = "Kuvat"; + Text[ catalan ] = "Gr鄁ic"; + Text[ finnish ] = "Grafiikka"; + Text[ thai ] = "喔佮福喔侧笩喔脆竸"; }; String STR_POOLFRM_OLE { @@ -770,6 +796,7 @@ String STR_POOLFRM_OLE Text[ language_user1 ] = " "; Text[ catalan ] = "OLE"; Text[ finnish ] = "OLE"; + Text[ thai ] = "OLE"; }; String STR_POOLFRM_FORMEL { @@ -796,6 +823,7 @@ String STR_POOLFRM_FORMEL Text[ language_user1 ] = " "; Text[ catalan ] = "F髍mula"; Text[ finnish ] = "Kaava"; + Text[ thai ] = "喔腹喔曕福喔勦赋喔權抚喔"; }; String STR_POOLFRM_MARGINAL { @@ -811,7 +839,7 @@ String STR_POOLFRM_MARGINAL Text [ portuguese ] = "Notas margem" ; Text [ portuguese_brazilian ] = "Marginalie" ; Text[ chinese_simplified ] = "鏃佹敞"; - Text[ russian ] = "锑疸桧嚯梃"; + Text[ russian ] = "青戾蜿"; Text[ polish ] = "Marginesy"; Text[ japanese ] = "鍌嶆敞"; Text[ chinese_traditional ] = "鏃佽ɑ"; @@ -820,8 +848,9 @@ String STR_POOLFRM_MARGINAL Text[ korean ] = "鞐氨"; Text[ turkish ] = "Derkenar"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nota al margen"; + Text[ catalan ] = "Comentaris al marge"; Text[ finnish ] = "Reunahuomautukset"; + Text[ thai ] = "喔浮喔侧涪喙喔笗喔膏競喙夃覆喔 喙"; }; String STR_POOLFRM_WATERSIGN { @@ -830,7 +859,7 @@ String STR_POOLFRM_WATERSIGN Text [ dutch ] = "Watermerk" ; Text [ english_us ] = "Watermark" ; Text [ italian ] = "Filigrana" ; - Text [ spanish ] = "Marca de agua" ; + Text [ spanish ] = "Filigrana" ; Text [ french ] = "Filigrane" ; Text [ swedish ] = "Vattenm鋜ke" ; Text [ danish ] = "Vandm鎟ke" ; @@ -843,11 +872,12 @@ String STR_POOLFRM_WATERSIGN Text[ chinese_traditional ] = "姘村嵃"; Text[ arabic ] = "卺倾 闱祈"; Text[ greek ] = "珍狒珈"; - Text[ korean ] = "氚瓣步氍措姮"; + Text[ korean ] = "鞗岉劙毵堩伂"; Text[ turkish ] = "Filigran"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Marca de agua"; + Text[ catalan ] = "Marca a l'aigua"; Text[ finnish ] = "Vesileima"; + Text[ thai ] = "喔ム覆喔⑧笝喙夃赋"; }; String STR_POOLFRM_LABEL { @@ -857,7 +887,7 @@ String STR_POOLFRM_LABEL Text [ italian ] = "Etichette" ; Text [ portuguese_brazilian ] = "Etiquetas" ; Text [ portuguese ] = "Etiquetas" ; - Text [ finnish ] = "Nimi鰐" ; + Text [ finnish ] = "Selitteet" ; Text [ danish ] = "Etiketter" ; Text [ french ] = "蓆iquettes" ; Text [ swedish ] = "Etiketter" ; @@ -865,16 +895,17 @@ String STR_POOLFRM_LABEL Text [ spanish ] = "Etiquetas" ; Text [ english_us ] = "Labels" ; Text[ chinese_simplified ] = "鏍囩"; - Text[ russian ] = "袜觌彘觇"; + Text[ russian ] = "项滹桉"; Text[ polish ] = "Etykiety"; - Text[ japanese ] = "锞楋緧锞烇緳"; + Text[ japanese ] = "銉┿儥銉浉銇"; Text[ chinese_traditional ] = "璨兼"; Text[ arabic ] = "蓉寝鞘 阡驿"; Text[ greek ] = "鹏殛蒴弪"; - Text[ korean ] = "霛茧波"; + Text[ korean ] = "霠堨澊敫"; Text[ turkish ] = "Etiket"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Etiquetas"; + Text[ catalan ] = "Etiquetes"; + Text[ thai ] = "喔涏箟喔侧涪喔娻阜喙堗腑"; }; // ----------------- // Vorlagen-Namen @@ -893,17 +924,18 @@ String STR_POOLCOLL_STANDARD Text [ portuguese ] = "Padr鉶" ; Text [ portuguese_brazilian ] = "Standard" ; Text[ chinese_simplified ] = "鏍囧噯"; - Text[ russian ] = "羊囗溧痱"; + Text[ russian ] = "吾睇"; Text[ polish ] = "Domy渓nie"; Text[ japanese ] = "妯欐簴"; Text[ chinese_traditional ] = "妯欐簴"; Text[ arabic ] = "揄怯"; Text[ greek ] = "旭镥痖腼戕"; - Text[ korean ] = "響滌"; + Text[ korean ] = "旮半掣臧"; Text[ turkish ] = "Standart"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Predeterminado"; - Text[ finnish ] = "Vakio"; + Text[ catalan ] = "Per defecte"; + Text[ finnish ] = "Oletus"; + Text[ thai ] = "喔勦箞喔侧箑喔｀复喙堗浮喔曕箟喔"; }; String STR_POOLCOLL_TEXT { @@ -926,11 +958,12 @@ String STR_POOLCOLL_TEXT Text[ chinese_traditional ] = "鍏ф枃"; Text[ arabic ] = "逃 轻湔"; Text[ greek ] = "誉灬 赍殪蓓秕"; - Text[ korean ] = "韰嶌姢韸 氤鸽"; + Text[ korean ] = "氤鸽"; Text[ turkish ] = "Metin g鰒desi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Cuerpo de texto"; + Text[ catalan ] = "Cos del text"; Text[ finnish ] = "Leip鋞eksti"; + Text[ thai ] = "喙喔權阜喙夃腑喔勦抚喔侧浮"; }; String STR_POOLCOLL_TEXT_IDENT { @@ -949,15 +982,16 @@ String STR_POOLCOLL_TEXT_IDENT Text[ chinese_simplified ] = "姝ｆ枃缂╄繘"; Text[ russian ] = "襄疴 耱痤赅 铗耱箫铎"; Text[ polish ] = "Wci阠ie pierwszego wiersza"; - Text[ japanese ] = "鏈枃锝诧緷锞冿緸锞濓緞"; + Text[ japanese ] = "鏈枃銈ゃ兂銉囥兂銉"; Text[ chinese_traditional ] = "鍏ф枃绺帓"; Text[ arabic ] = "乓峭 逃 轻湔"; Text[ greek ] = "朋秣 瘃珧 泷犰燹"; Text[ korean ] = "觳 欷 霌れ棳鞊瓣赴"; Text[ turkish ] = "輑k sat齬 girintisi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sangr韆 de primera l韓ea"; + Text[ catalan ] = "Sagnat de primera l韓ia"; Text[ finnish ] = "Ensimm鋓sen rivin sisennys"; + Text[ thai ] = "喔｀赴喔⑧赴喙喔⑧阜喙夃腑喔囙笟喔｀福喔椸副喔斷箒喔｀竵"; }; String STR_POOLCOLL_TEXT_NEGIDENT { @@ -976,15 +1010,16 @@ String STR_POOLCOLL_TEXT_NEGIDENT Text[ chinese_simplified ] = "姝ｆ枃鍙嶅悜缂╄繘"; Text[ russian ] = "吾疣蝽 铗耱箫"; Text[ polish ] = "Wysuni阠ie tekstu"; - Text[ japanese ] = "鏈枃锞忥讲锞咃浇锝诧緷锞冿緸锞濓緞"; + Text[ japanese ] = "鏈枃銉炪偆銉娿偣銈ゃ兂銉囥兂銉"; Text[ chinese_traditional ] = "鍏ф枃鍙嶅悜绺帓"; Text[ arabic ] = "乓峭 逃 湔 俞软"; Text[ greek ] = "榴礴糸贽 弩秣 簋灬麸 赍殪蓓秕"; Text[ korean ] = "雮挫柎鞊瓣赴"; Text[ turkish ] = "As齦 girinti"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Sangr韆 negativa de primera l韓ea"; + Text[ catalan ] = "Sagnat negatiu"; Text[ finnish ] = "Riippuva sisennys"; + Text[ thai ] = "喔｀赴喔⑧赴喙喔⑧阜喙夃腑喔囙弗喔涪"; }; String STR_POOLCOLL_TEXT_MOVE { @@ -1003,15 +1038,16 @@ String STR_POOLCOLL_TEXT_MOVE Text[ chinese_simplified ] = "姝ｆ枃缂╄繘"; Text[ russian ] = "务眍忭铋 蝈犟 铗耱箫铎"; Text[ polish ] = "Wci阠ie tekstu"; - Text[ japanese ] = "锝诧緷锞冿緸锞濓緞"; + Text[ japanese ] = "銈ゃ兂銉囥兂銉"; Text[ language_user1 ] = " "; Text[ chinese_traditional ] = "鍏ф枃绺帓"; Text[ arabic ] = "乓峭 逃 轻湔 (轻迂 轻面)"; Text[ greek ] = "朋秣 簋灬麸 赍殪蓓秕"; - Text[ korean ] = "韰嶌姢韸 氤鸽 霌れ棳鞊瓣赴"; + Text[ korean ] = "氤鸽 霌れ棳鞊瓣赴"; Text[ turkish ] = "Metin g鰒desi girintisi"; - Text[ catalan ] = "Cuerpo de texto con sangr韆"; + Text[ catalan ] = "Sagnat del cos del text"; Text[ finnish ] = "Sisennetty leip鋞eksti"; + Text[ thai ] = "喔｀赴喔⑧赴喙喔⑧阜喙夃腑喔囙箑喔權阜喙夃腑喔勦抚喔侧浮"; }; String STR_POOLCOLL_GREETING { @@ -1021,7 +1057,7 @@ String STR_POOLCOLL_GREETING Text [ dutch ] = "Aanhef" ; Text [ english_us ] = "Complimentary close" ; Text [ italian ] = "Formula di saluto" ; - Text [ spanish ] = "F髍mula de saludo" ; + Text [ spanish ] = "F髍mula de despedida" ; Text [ french ] = "Formule finale" ; Text [ swedish ] = "H鋖sningsfras" ; Text [ danish ] = "Sluthilsen" ; @@ -1037,8 +1073,9 @@ String STR_POOLCOLL_GREETING Text[ korean ] = "鞚胳偓毵"; Text[ turkish ] = "Selamlama"; Text[ language_user1 ] = " "; - Text[ catalan ] = "F髍mula de saludo"; - Text[ finnish ] = "Tervehdys"; + Text[ catalan ] = "Tancament complementari"; + Text[ finnish ] = "Loppusanat"; + Text[ thai ] = "喔ム竾喔椸箟喔侧涪喙佮釜喔斷竾喔勦抚喔侧浮喙喔勦覆喔｀笧"; }; String STR_POOLCOLL_SIGNATURE { @@ -1063,8 +1100,9 @@ String STR_POOLCOLL_SIGNATURE Text[ korean ] = "靹滊獏"; Text[ turkish ] = "輒za"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Firma"; + Text[ catalan ] = "Signatura"; Text[ finnish ] = "Allekirjoitus"; + Text[ thai ] = "喔ム覆喔⑧箑喔嬥箛喔"; }; String STR_POOLCOLL_HEADLINE_BASE { @@ -1090,8 +1128,9 @@ String STR_POOLCOLL_HEADLINE_BASE Text[ korean ] = "鞝滊"; Text[ turkish ] = "Ba齥"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado"; + Text[ catalan ] = "Encap鏰lament"; Text[ finnish ] = "Otsikko"; + Text[ thai ] = "喔副喔о競喙夃腑"; }; String STR_POOLCOLL_NUMBUL_BASE { @@ -1109,15 +1148,16 @@ String STR_POOLCOLL_NUMBUL_BASE Text[ chinese_simplified ] = "鍒楀崟"; Text[ russian ] = "扬桉铌"; Text[ polish ] = "Lista"; - Text[ japanese ] = "锞橈浇锞"; + Text[ japanese ] = "銉偣銉"; Text[ chinese_traditional ] = "娓呭柈"; Text[ arabic ] = "耷沏"; Text[ greek ] = "诉篝"; Text[ korean ] = "氇╇"; Text[ turkish ] = "Liste"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Lista"; + Text[ catalan ] = "Llista"; Text[ finnish ] = "Luettelo"; + Text[ thai ] = "喔｀覆喔⑧竵喔侧福"; }; String STR_POOLCOLL_REGISTER_BASE { @@ -1133,7 +1173,7 @@ String STR_POOLCOLL_REGISTER_BASE Text [ portuguese ] = "蚽dice" ; Text [ portuguese_brazilian ] = "Verzeichnis" ; Text[ chinese_simplified ] = "鐩綍"; - Text[ russian ] = "毋豚怆屙桢"; + Text[ russian ] = "雨噻囹咫"; Text[ polish ] = "Indeks"; Text[ japanese ] = "绱㈠紩"; Text[ chinese_traditional ] = "鐩寗"; @@ -1142,8 +1182,9 @@ String STR_POOLCOLL_REGISTER_BASE Text[ korean ] = "靸夓澑"; Text[ turkish ] = "Dizin"; Text[ language_user1 ] = " "; - Text[ catalan ] = "蚽dice"; + Text[ catalan ] = "蚽dex"; Text[ finnish ] = "Hakemisto"; + Text[ thai ] = "喔斷副喔娻笝喔"; }; String STR_POOLCOLL_CONFRONTATION { @@ -1162,15 +1203,16 @@ String STR_POOLCOLL_CONFRONTATION Text[ chinese_simplified ] = "缂╄繘"; Text[ russian ] = "悟耱箫"; Text[ polish ] = "Wci阠ie i wysuni阠ie"; - Text[ japanese ] = "锝诧緷锞冿緸锞濓緞"; + Text[ japanese ] = "銉偣銉堛偆銉炽儑銉炽儓"; Text[ chinese_traditional ] = "绺帓"; Text[ arabic ] = "沔翘迳"; Text[ language_user1 ] = " "; Text[ greek ] = "另糸疳襻怙朕"; - Text[ korean ] = "雽臁"; + Text[ korean ] = "霌れ棳鞊瓣赴 牍勱祼 瓴韱"; Text[ turkish ] = "Karla⺶齬ma"; - Text[ catalan ] = "Confrontaci髇"; + Text[ catalan ] = "Sagnat de la llista"; Text[ finnish ] = "Luettelon sisennys"; + Text[ thai ] = "喔｀赴喔⑧赴喙喔⑧阜喙夃腑喔囙福喔侧涪喔佮覆喔"; }; String STR_POOLCOLL_MARGINAL { @@ -1186,7 +1228,7 @@ String STR_POOLCOLL_MARGINAL Text [ portuguese ] = "Notas margem" ; Text [ portuguese_brazilian ] = "Marginalie" ; Text[ chinese_simplified ] = "鏃佹敞"; - Text[ russian ] = "锑疸桧嚯梃"; + Text[ russian ] = "青戾蜿"; Text[ polish ] = "Marginesy"; Text[ japanese ] = "鍌嶆敞"; Text[ language_user1 ] = " "; @@ -1195,8 +1237,9 @@ String STR_POOLCOLL_MARGINAL Text[ greek ] = "隅戾辋箦轵 篝 疱耖棹耖"; Text[ korean ] = "鞐氨"; Text[ turkish ] = "Derkenar"; - Text[ catalan ] = "Nota al margen"; + Text[ catalan ] = "Comentaris al marge"; Text[ finnish ] = "Reunahuomautukset"; + Text[ thai ] = "喔浮喔侧涪喙喔笗喔膏競喙夃覆喔 喙"; }; String STR_POOLCOLL_HEADLINE1 { @@ -1222,8 +1265,9 @@ String STR_POOLCOLL_HEADLINE1 Text[ korean ] = "鞝滊 1"; Text[ turkish ] = "Ba齥 1"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado 1"; + Text[ catalan ] = "Encap鏰lament 1"; Text[ finnish ] = "Otsikko 1"; + Text[ thai ] = "喔副喔о競喙夃腑 1"; }; String STR_POOLCOLL_HEADLINE2 { @@ -1249,8 +1293,9 @@ String STR_POOLCOLL_HEADLINE2 Text[ korean ] = "鞝滊 2"; Text[ turkish ] = "Ba齥 2"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado 2"; + Text[ catalan ] = "Encap鏰lament 2"; Text[ finnish ] = "Otsikko 2"; + Text[ thai ] = "喔副喔о競喙夃腑 2"; }; String STR_POOLCOLL_HEADLINE3 { @@ -1276,8 +1321,9 @@ String STR_POOLCOLL_HEADLINE3 Text[ korean ] = "鞝滊 3"; Text[ turkish ] = "Ba齥 3"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado 3"; + Text[ catalan ] = "Encap鏰lament 3"; Text[ finnish ] = "Otsikko 3"; + Text[ thai ] = "喔副喔о競喙夃腑 3"; }; String STR_POOLCOLL_HEADLINE4 { @@ -1303,8 +1349,9 @@ String STR_POOLCOLL_HEADLINE4 Text[ korean ] = "鞝滊 4"; Text[ turkish ] = "Ba齥 4"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado 4"; + Text[ catalan ] = "Encap鏰lament 4"; Text[ finnish ] = "Otsikko 4"; + Text[ thai ] = "喔副喔о競喙夃腑 4"; }; String STR_POOLCOLL_HEADLINE5 { @@ -1330,8 +1377,9 @@ String STR_POOLCOLL_HEADLINE5 Text[ korean ] = "鞝滊 5"; Text[ turkish ] = "Ba齥 5"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado 5"; + Text[ catalan ] = "Encap鏰lament 5"; Text[ finnish ] = "Otsikko 5"; + Text[ thai ] = "喔副喔о競喙夃腑 5"; }; String STR_POOLCOLL_HEADLINE6 { @@ -1357,8 +1405,9 @@ String STR_POOLCOLL_HEADLINE6 Text[ korean ] = "鞝滊 6"; Text[ turkish ] = "Ba齥 6"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado 6"; + Text[ catalan ] = "Encap鏰lament 6"; Text[ finnish ] = "Otsikko 6"; + Text[ thai ] = "喔副喔о競喙夃腑 6"; }; String STR_POOLCOLL_HEADLINE7 { @@ -1384,8 +1433,9 @@ String STR_POOLCOLL_HEADLINE7 Text[ korean ] = "鞝滊 7"; Text[ turkish ] = "Ba齥 7"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado 7"; + Text[ catalan ] = "Encap鏰lament 7"; Text[ finnish ] = "Otsikko 7"; + Text[ thai ] = "喔副喔о競喙夃腑 7"; }; String STR_POOLCOLL_HEADLINE8 { @@ -1411,8 +1461,9 @@ String STR_POOLCOLL_HEADLINE8 Text[ korean ] = "鞝滊 8"; Text[ turkish ] = "Ba齥 8"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado 8"; + Text[ catalan ] = "Encap鏰lament 8"; Text[ finnish ] = "Otsikko 8"; + Text[ thai ] = "喔副喔о競喙夃腑 8"; }; String STR_POOLCOLL_HEADLINE9 { @@ -1435,11 +1486,12 @@ String STR_POOLCOLL_HEADLINE9 Text[ chinese_traditional ] = "妯欓 9"; Text[ arabic ] = "轻阡媲 9"; Text[ greek ] = "硼殛弼犭咪 9"; - Text[ korean ] = "鞝滊 锛"; + Text[ korean ] = "鞝滊 9"; Text[ turkish ] = "Ba齥 9"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado 9"; + Text[ catalan ] = "Encap鏰lament 9"; Text[ finnish ] = "Otsikko 9"; + Text[ thai ] = "喔副喔о競喙夃腑 9"; }; String STR_POOLCOLL_HEADLINE10 { @@ -1465,8 +1517,9 @@ String STR_POOLCOLL_HEADLINE10 Text[ korean ] = "鞝滊 10"; Text[ turkish ] = "Ba齥 10"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado 10"; + Text[ catalan ] = "Encap鏰lament 10"; Text[ finnish ] = "Otsikko 10"; + Text[ thai ] = "喔副喔о競喙夃腑 10"; }; String STR_POOLCOLL_NUM_LEVEL1S { @@ -1491,8 +1544,9 @@ String STR_POOLCOLL_NUM_LEVEL1S Text[ korean ] = "氩堩樃 毵り赴旮 1 鞁滌瀾"; Text[ turkish ] = "Numaralama 1 Baang"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇 1 inicio"; + Text[ catalan ] = "Numeraci 1 inici"; Text[ finnish ] = "Numeroinnin 1 alku"; + Text[ thai ] = "喙喔｀复喙堗浮喔ム赋喔斷副喔氞笗喔编抚喙喔ム競 1"; }; String STR_POOLCOLL_NUM_LEVEL1 { @@ -1515,10 +1569,11 @@ String STR_POOLCOLL_NUM_LEVEL1 Text[ chinese_traditional ] = "绶ㄨ櫉 1"; Text[ arabic ] = "轻恃揄 1"; Text[ greek ] = "榴哞扃箸 1"; - Text[ korean ] = "氩堩樃1"; + Text[ korean ] = "氩堩樃 毵り赴旮 1"; Text[ turkish ] = "Numaralama 1"; - Text[ catalan ] = "Numeraci髇 1"; + Text[ catalan ] = "Numeraci 1"; Text[ finnish ] = "Numerointi 1"; + Text[ thai ] = "喔ム赋喔斷副喔氞笗喔编抚喙喔ム競 1"; }; String STR_POOLCOLL_NUM_LEVEL1E { @@ -1540,11 +1595,12 @@ String STR_POOLCOLL_NUM_LEVEL1E Text[ chinese_traditional ] = "绶ㄨ櫉 1 绲愬熬"; Text[ arabic ] = "轻恃揄 1 溴琼"; Text[ greek ] = "榴哞扃箸 1 暂腼"; - Text[ korean ] = "氩堩樃 毵り赴旮 1 膦呺"; + Text[ korean ] = "氩堩樃 毵り赴旮 1 雭"; Text[ turkish ] = "Numaralama 1 Son"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇 1 fin"; + Text[ catalan ] = "Numeraci 1 final"; Text[ finnish ] = "Numeroinnin 1 loppu"; + Text[ thai ] = "喔复喙夃笝喔父喔斷弗喔赤笖喔编笟喔曕副喔о箑喔ム競 1 "; }; String STR_POOLCOLL_NUM_NONUM1 { @@ -1554,7 +1610,7 @@ String STR_POOLCOLL_NUM_NONUM1 Text [ italian ] = "Numerazione 1 succ." ; Text [ spanish ] = "Numeraci髇 1 continuaci髇" ; Text [ french ] = "Num閞otation 1 suite" ; - Text [ dutch ] = "Nummering 1 voortzetting" ; + Text [ dutch ] = "Nummering 1 vervolg" ; Text [ swedish ] = "Numrering 1 forts鋞tning" ; Text [ danish ] = "Nummerering 1 forts鎡telse" ; Text [ portuguese ] = "Numera玢o 1 Continua玢o" ; @@ -1566,11 +1622,12 @@ String STR_POOLCOLL_NUM_NONUM1 Text[ chinese_traditional ] = "绶ㄨ櫉 1 绻肩簩"; Text[ arabic ] = "轻恃揄 1 闶侨谏"; Text[ greek ] = "榴哞扃箸 1 吁磔麇獒"; - Text[ korean ] = "氩堩樃 1 瓿勳啀"; + Text[ korean ] = "氩堩樃 毵り赴旮 1 瓿勳啀"; Text[ turkish ] = "Numaralama 1 Devam"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇 1 continuaci髇"; + Text[ catalan ] = "Numeraci 1 continuaci"; Text[ finnish ] = "Numeroinnin 1 jatko"; + Text[ thai ] = "喔ム赋喔斷副喔氞笗喔编抚喙喔ム競 1 Cont."; }; String STR_POOLCOLL_NUM_LEVEL2S { @@ -1592,11 +1649,12 @@ String STR_POOLCOLL_NUM_LEVEL2S Text[ chinese_traditional ] = "绶ㄨ櫉 2 璧峰"; Text[ arabic ] = "轻恃揄 2 认琼"; Text[ greek ] = "榴哞扃箸 2 榴鬓"; - Text[ korean ] = "氩堩樃 2 鞁滌瀾"; + Text[ korean ] = "氩堩樃 毵り赴旮 2 鞁滌瀾"; Text[ turkish ] = "Numaralama 2 Baang"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇 2 inicio"; + Text[ catalan ] = "Numeraci 2 inici"; Text[ finnish ] = "Numeroinnin 2 alku"; + Text[ thai ] = "喙喔｀复喙堗浮喔ム赋喔斷副喔氞笗喔编抚喙喔ム競 2 "; }; String STR_POOLCOLL_NUM_LEVEL2 { @@ -1618,11 +1676,12 @@ String STR_POOLCOLL_NUM_LEVEL2 Text[ chinese_traditional ] = "绶ㄨ櫉 2"; Text[ arabic ] = "轻恃揄 2"; Text[ greek ] = "榴哞扃箸 2"; - Text[ korean ] = "氩堩樃2"; + Text[ korean ] = "氩堩樃 毵り赴旮 2"; Text[ turkish ] = "Numaralama 2"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇 2"; + Text[ catalan ] = "Numeraci 2"; Text[ finnish ] = "Numerointi 2"; + Text[ thai ] = "喔ム赋喔斷副喔氞笗喔编抚喙喔ム競 2"; }; String STR_POOLCOLL_NUM_LEVEL2E { @@ -1644,11 +1703,12 @@ String STR_POOLCOLL_NUM_LEVEL2E Text[ chinese_traditional ] = "绶ㄨ櫉 2 绲愬熬"; Text[ arabic ] = "轻恃揄 2 溴琼"; Text[ greek ] = "榴哞扃箸 2 暂腼"; - Text[ korean ] = "氩堩樃 毵り赴旮 2 膦呺"; + Text[ korean ] = "氩堩樃 毵り赴旮 2 雭"; Text[ turkish ] = "Numaralama 2 Son"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇 2 fin"; + Text[ catalan ] = "Numeraci 2 final"; Text[ finnish ] = "Numeroinnin 2 loppu"; + Text[ thai ] = "喔复喙夃笝喔父喔斷弗喔赤笖喔编笟喔曕副喔о箑喔ム競 2 "; }; String STR_POOLCOLL_NUM_NONUM2 { @@ -1658,7 +1718,7 @@ String STR_POOLCOLL_NUM_NONUM2 Text [ italian ] = "Numerazione 2 succ." ; Text [ spanish ] = "Numeraci髇 2 continuaci髇" ; Text [ french ] = "Num閞otation 2 suite" ; - Text [ dutch ] = "Nummering 2 voortzetting" ; + Text [ dutch ] = "Nummering 2 vervolg" ; Text [ swedish ] = "Numrering 2 forts鋞tning" ; Text [ danish ] = "Nummerering 2 forts鎡telse" ; Text [ portuguese ] = "Numera玢o 2 Continua玢o" ; @@ -1670,11 +1730,12 @@ String STR_POOLCOLL_NUM_NONUM2 Text[ chinese_traditional ] = "绶ㄨ櫉 2 绻肩簩"; Text[ arabic ] = "轻恃揄 2 闶侨谏"; Text[ greek ] = "榴哞扃箸 2 吁磔麇獒"; - Text[ korean ] = "氩堩樃 2 瓿勳啀"; + Text[ korean ] = "氩堩樃 毵り赴旮 2 瓿勳啀"; Text[ turkish ] = "Numaralama 2 Devam"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇 2 continuaci髇"; + Text[ catalan ] = "Numeraci 2 continuaci"; Text[ finnish ] = "Numeroinnin 2 jatko"; + Text[ thai ] = "喔ム赋喔斷副喔氞笗喔编抚喙喔ム競 2 Cont."; }; String STR_POOLCOLL_NUM_LEVEL3S { @@ -1696,11 +1757,12 @@ String STR_POOLCOLL_NUM_LEVEL3S Text[ chinese_traditional ] = "绶ㄨ櫉 3 璧峰"; Text[ arabic ] = "轻恃揄 3 认琼"; Text[ greek ] = "榴哞扃箸 3 榴鬓"; - Text[ korean ] = "氩堩樃 3 鞁滌瀾"; + Text[ korean ] = "氩堩樃 毵り赴旮 3 鞁滌瀾"; Text[ turkish ] = "Numaralama 3 Baang"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇 3 inicio"; + Text[ catalan ] = "Numeraci 3 inici"; Text[ finnish ] = "Numeroinnin 3 alku"; + Text[ thai ] = "喙喔｀复喙堗浮喔ム赋喔斷副喔氞笗喔编抚喙喔ム競 3 "; }; String STR_POOLCOLL_NUM_LEVEL3 { @@ -1722,11 +1784,12 @@ String STR_POOLCOLL_NUM_LEVEL3 Text[ chinese_traditional ] = "绶ㄨ櫉 3"; Text[ arabic ] = "轻恃揄 3"; Text[ greek ] = "榴哞扃箸 3"; - Text[ korean ] = "氩堩樃 3"; + Text[ korean ] = "氩堩樃 毵り赴旮 3"; Text[ turkish ] = "Numaralama 3"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇 3"; + Text[ catalan ] = "Numeraci 3"; Text[ finnish ] = "Numerointi 3"; + Text[ thai ] = "喔ム赋喔斷副喔氞笗喔编抚喙喔ム競 3"; }; String STR_POOLCOLL_NUM_LEVEL3E { @@ -1748,11 +1811,12 @@ String STR_POOLCOLL_NUM_LEVEL3E Text[ chinese_traditional ] = "绶ㄨ櫉 3 绲愬熬"; Text[ arabic ] = "轻恃揄 3 溴琼"; Text[ greek ] = "榴哞扃箸 3 暂腼"; - Text[ korean ] = "氩堩樃 毵り赴旮 3 膦呺"; + Text[ korean ] = "氩堩樃 毵り赴旮 3 雭"; Text[ turkish ] = "Numaralama 3 Son"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇 3 fin"; + Text[ catalan ] = "Numeraci 3 final"; Text[ finnish ] = "Numeroinnin 3 loppu"; + Text[ thai ] = "喔复喙夃笝喔父喔斷弗喔赤笖喔编笟喔曕副喔о箑喔ム競 3 "; }; String STR_POOLCOLL_NUM_NONUM3 { @@ -1762,7 +1826,7 @@ String STR_POOLCOLL_NUM_NONUM3 Text [ italian ] = "Numerazione 3 succ." ; Text [ spanish ] = "Numeraci髇 3 continuaci髇" ; Text [ french ] = "Num閞otation 3 suite" ; - Text [ dutch ] = "Nummering 3 voortzetting" ; + Text [ dutch ] = "Nummering 3 vervolg" ; Text [ swedish ] = "Numrering 3 forts鋞tning" ; Text [ danish ] = "Nummerering 3 forts鎡telse" ; Text [ portuguese ] = "Numera玢o 3 Continua玢o" ; @@ -1774,11 +1838,12 @@ String STR_POOLCOLL_NUM_NONUM3 Text[ chinese_traditional ] = "绶ㄨ櫉 3 绻肩簩"; Text[ arabic ] = "轻恃揄 3 闶侨谏"; Text[ greek ] = "榴哞扃箸 3 吁磔麇獒"; - Text[ korean ] = "氩堩樃 3 瓿勳啀"; + Text[ korean ] = "氩堩樃 毵り赴旮 3 瓿勳啀"; Text[ turkish ] = "Numaralama 3 Devam"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇 3 continuaci髇"; + Text[ catalan ] = "Numeraci 3 continuaci"; Text[ finnish ] = "Numeroinnin 3 jatko"; + Text[ thai ] = "喔ム赋喔斷副喔氞笗喔编抚喙喔ム競 3 Cont."; }; String STR_POOLCOLL_NUM_LEVEL4S { @@ -1800,11 +1865,12 @@ String STR_POOLCOLL_NUM_LEVEL4S Text[ chinese_traditional ] = "绶ㄨ櫉 4 璧峰"; Text[ arabic ] = "轻恃揄 4 认琼"; Text[ greek ] = "榴哞扃箸 4 榴鬓"; - Text[ korean ] = "氩堩樃 4 鞁滌瀾"; + Text[ korean ] = "氩堩樃 毵り赴旮 4 鞁滌瀾"; Text[ turkish ] = "Numaralama 4 Baang"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇 4 inicio"; + Text[ catalan ] = "Numeraci 4 inici"; Text[ finnish ] = "Numeroinnin 4 alku"; + Text[ thai ] = "喙喔｀复喙堗浮喔ム赋喔斷副喔氞笗喔编抚喙喔ム競 4 "; }; String STR_POOLCOLL_NUM_LEVEL4 { @@ -1826,11 +1892,12 @@ String STR_POOLCOLL_NUM_LEVEL4 Text[ chinese_traditional ] = "绶ㄨ櫉 4"; Text[ arabic ] = "轻恃揄 4"; Text[ greek ] = "榴哞扃箸 4"; - Text[ korean ] = "氩堩樃 4"; + Text[ korean ] = "氩堩樃 毵り赴旮 4"; Text[ turkish ] = "Numaralama 4"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇 4"; + Text[ catalan ] = "Numeraci 4"; Text[ finnish ] = "Numerointi 4"; + Text[ thai ] = "喔ム赋喔斷副喔氞笗喔编抚喙喔ム競 4"; }; String STR_POOLCOLL_NUM_LEVEL4E { @@ -1852,11 +1919,12 @@ String STR_POOLCOLL_NUM_LEVEL4E Text[ chinese_traditional ] = "绶ㄨ櫉 4 绲愬熬"; Text[ arabic ] = "轻恃揄 4 溴琼"; Text[ greek ] = "榴哞扃箸 4 暂腼"; - Text[ korean ] = "氩堩樃 毵り赴旮 4 膦呺"; + Text[ korean ] = "氩堩樃 毵り赴旮 4 雭"; Text[ turkish ] = "Numaralama 4 Son"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇 4 fin"; + Text[ catalan ] = "Numeraci 4 final"; Text[ finnish ] = "Numeroinnin 4 loppu"; + Text[ thai ] = "喔复喙夃笝喔父喔斷弗喔赤笖喔编笟喔曕副喔о箑喔ム競 4 "; }; String STR_POOLCOLL_NUM_NONUM4 { @@ -1866,7 +1934,7 @@ String STR_POOLCOLL_NUM_NONUM4 Text [ italian ] = "Numerazione 4 succ." ; Text [ spanish ] = "Numeraci髇 4 continuaci髇" ; Text [ french ] = "Num閞otation 4 suite" ; - Text [ dutch ] = "Nummering 4 voortzetting" ; + Text [ dutch ] = "Nummering 4 vervolg" ; Text [ swedish ] = "Numrering 4 forts鋞tning" ; Text [ danish ] = "Nummerering 4 forts鎡telse" ; Text [ portuguese ] = "Numera玢o 4 Continua玢o" ; @@ -1878,11 +1946,12 @@ String STR_POOLCOLL_NUM_NONUM4 Text[ chinese_traditional ] = "绶ㄨ櫉 4 绻肩簩"; Text[ arabic ] = "轻恃揄 4 闶侨谏"; Text[ greek ] = "榴哞扃箸 4 吁磔麇獒"; - Text[ korean ] = "氩堩樃 4 瓿勳啀"; + Text[ korean ] = "氩堩樃 毵り赴旮 4 瓿勳啀"; Text[ turkish ] = "Numaralama 4 Devam"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇 4 continuaci髇"; + Text[ catalan ] = "Numeraci 4 continuaci"; Text[ finnish ] = "Numeroinnin 4 jatko"; + Text[ thai ] = "喔ム赋喔斷副喔氞笗喔编抚喙喔ム競 4 Cont."; }; String STR_POOLCOLL_NUM_LEVEL5S { @@ -1904,11 +1973,12 @@ String STR_POOLCOLL_NUM_LEVEL5S Text[ chinese_traditional ] = "绶ㄨ櫉 5 璧峰"; Text[ arabic ] = "轻恃揄 5 认琼"; Text[ greek ] = "榴哞扃箸 5 榴鬓"; - Text[ korean ] = "氩堩樃 5 鞁滌瀾"; + Text[ korean ] = "氩堩樃 毵り赴旮 5 鞁滌瀾"; Text[ turkish ] = "Numaralama 5 Baang"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇 5 inicio"; + Text[ catalan ] = "Numeraci 5 inici"; Text[ finnish ] = "Numeroinnin 5 alku"; + Text[ thai ] = "喙喔｀复喙堗浮喔ム赋喔斷副喔氞笗喔编抚喙喔ム競 5 "; }; String STR_POOLCOLL_NUM_LEVEL5 { @@ -1930,11 +2000,12 @@ String STR_POOLCOLL_NUM_LEVEL5 Text[ chinese_traditional ] = "绶ㄨ櫉 5"; Text[ arabic ] = "轻恃揄 5"; Text[ greek ] = "榴哞扃箸 5"; - Text[ korean ] = "氩堩樃 5"; + Text[ korean ] = "氩堩樃 毵り赴旮 5"; Text[ turkish ] = "Numaralama 5"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇 5"; + Text[ catalan ] = "Numeraci 5"; Text[ finnish ] = "Numerointi 5"; + Text[ thai ] = "喔ム赋喔斷副喔氞笗喔编抚喙喔ム競 5"; }; String STR_POOLCOLL_NUM_LEVEL5E { @@ -1956,11 +2027,12 @@ String STR_POOLCOLL_NUM_LEVEL5E Text[ chinese_traditional ] = "绶ㄨ櫉 5 绲愬熬"; Text[ arabic ] = "轻恃揄 5 溴琼"; Text[ greek ] = "榴哞扃箸 5 暂腼"; - Text[ korean ] = "氩堩樃 毵り赴旮 5 膦呺"; + Text[ korean ] = "氩堩樃 毵り赴旮 5 雭"; Text[ turkish ] = "Numaralama 5 Son"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇 5 fin"; + Text[ catalan ] = "Numeraci 5 final"; Text[ finnish ] = "Numeroinnin 5 loppu"; + Text[ thai ] = "喔复喙夃笝喔父喔斷弗喔赤笖喔编笟喔曕副喔о箑喔ム競 5 "; }; String STR_POOLCOLL_NUM_NONUM5 { @@ -1970,7 +2042,7 @@ String STR_POOLCOLL_NUM_NONUM5 Text [ italian ] = "Numerazione 5 succ." ; Text [ spanish ] = "Numeraci髇 5 continuaci髇" ; Text [ french ] = "Num閞otation 5 suite" ; - Text [ dutch ] = "Nummering 5 voortzetting" ; + Text [ dutch ] = "Nummering 5 vervolg" ; Text [ swedish ] = "Numrering 5 forts鋞tning" ; Text [ danish ] = "Nummerering 5 forts鎡telse" ; Text [ portuguese ] = "Numera玢o 5 Continua玢o" ; @@ -1982,11 +2054,12 @@ String STR_POOLCOLL_NUM_NONUM5 Text[ chinese_traditional ] = "绶ㄨ櫉 5 绻肩簩"; Text[ arabic ] = "轻恃揄 5 闶侨谏"; Text[ greek ] = "榴哞扃箸 5 吁磔麇獒"; - Text[ korean ] = "氩堩樃 5 瓿勳啀"; + Text[ korean ] = "氩堩樃 毵り赴旮 5 瓿勳啀"; Text[ turkish ] = "Numaralama 5 Devam"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇 5 continuaci髇"; + Text[ catalan ] = "Numeraci 5 continuaci"; Text[ finnish ] = "Numeroinnin 5 jatko"; + Text[ thai ] = "喔ム赋喔斷副喔氞笗喔编抚喙喔ム競 5 Cont."; }; String STR_POOLCOLL_BUL_LEVEL1S { @@ -2012,8 +2085,9 @@ String STR_POOLCOLL_BUL_LEVEL1S Text[ korean ] = "旮毹鸽Μ 旮绊樃 1 鞁滌瀾"; Text[ turkish ] = "Liste 1 Baang"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeraci髇 1 inicio"; + Text[ catalan ] = "Inici de la llista 1"; Text[ finnish ] = "Luettelon 1 alku"; + Text[ thai ] = "喙喔｀复喙堗浮喔｀覆喔⑧竵喔侧福 1 "; }; String STR_POOLCOLL_BUL_LEVEL1 { @@ -2039,8 +2113,9 @@ String STR_POOLCOLL_BUL_LEVEL1 Text[ korean ] = "旮毹鸽Μ 旮绊樃 1"; Text[ turkish ] = "Liste 1"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeraci髇 1"; + Text[ catalan ] = "Llista 1"; Text[ finnish ] = "Luettelo 1"; + Text[ thai ] = "喔｀覆喔⑧竵喔侧福 1"; }; String STR_POOLCOLL_BUL_LEVEL1E { @@ -2066,8 +2141,9 @@ String STR_POOLCOLL_BUL_LEVEL1E Text[ korean ] = "旮毹鸽Μ 旮绊樃 1 膦呺"; Text[ turkish ] = "Liste 1 Son"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeraci髇 1 fin"; + Text[ catalan ] = "Fi de la llista 1"; Text[ finnish ] = "Luettelon 1 loppu"; + Text[ thai ] = "喔复喙夃笝喔父喔斷福喔侧涪喔佮覆喔 1 "; }; String STR_POOLCOLL_BUL_NONUM1 { @@ -2078,7 +2154,7 @@ String STR_POOLCOLL_BUL_NONUM1 Text [ italian ] = "Elenco 1 succ." ; Text [ spanish ] = "Enumeraci髇 1 continuaci髇" ; Text [ french ] = "Puce 1 suivante" ; - Text [ dutch ] = "Opsomming 1 voortzetting" ; + Text [ dutch ] = "Opsomming 1 vervolg" ; Text [ swedish ] = "Punktuppst鋖lning 1 forts鋞tning" ; Text [ danish ] = "Punktopstilling 1 forts鎡telse" ; Text [ portuguese ] = "Marca 1 Continua玢o" ; @@ -2093,8 +2169,9 @@ String STR_POOLCOLL_BUL_NONUM1 Text[ korean ] = "旮毹鸽Μ 旮绊樃 1 瓿勳啀"; Text[ turkish ] = "Liste 1 Devam"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeraci髇 1 continuaci髇"; + Text[ catalan ] = "Enumeraci 1 continuaci"; Text[ finnish ] = "Luettelo 1 jatkuu"; + Text[ thai ] = "喔｀覆喔⑧竵喔侧福 1 Cont."; }; String STR_POOLCOLL_BUL_LEVEL2S { @@ -2120,8 +2197,9 @@ String STR_POOLCOLL_BUL_LEVEL2S Text[ korean ] = "旮毹鸽Μ 旮绊樃 2 鞁滌瀾"; Text[ turkish ] = "Liste 2 Baang"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeraci髇 2 inicio"; + Text[ catalan ] = "Inici de la llista 2"; Text[ finnish ] = "Luettelon 2 alku"; + Text[ thai ] = "喙喔｀复喙堗浮喔｀覆喔⑧竵喔侧福 2 "; }; String STR_POOLCOLL_BUL_LEVEL2 { @@ -2147,8 +2225,9 @@ String STR_POOLCOLL_BUL_LEVEL2 Text[ korean ] = "旮毹鸽Μ 旮绊樃 2"; Text[ turkish ] = "Liste 2"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeraci髇 2"; + Text[ catalan ] = "Llista 2"; Text[ finnish ] = "Luettelo 2"; + Text[ thai ] = "喔｀覆喔⑧竵喔侧福 2"; }; String STR_POOLCOLL_BUL_LEVEL2E { @@ -2165,7 +2244,7 @@ String STR_POOLCOLL_BUL_LEVEL2E Text [ portuguese ] = "Marca 2 Fim" ; Text [ portuguese_brazilian ] = "Aufz?hlung 2 Ende" ; Text[ chinese_simplified ] = "椤圭洰绗﹀彿 2 缁撴潫"; - Text[ russian ] = "觐礤 耧桉赅 2"; + Text[ russian ] = "暑礤 耧桉赅 2"; Text[ polish ] = "Koniec listy 2 "; Text[ japanese ] = "绠囨潯鏇搞亶 2 绲傘倞"; Text[ language_user1 ] = " "; @@ -2174,8 +2253,9 @@ String STR_POOLCOLL_BUL_LEVEL2E Text[ greek ] = "梳糗腼泔 2 暂腼"; Text[ korean ] = "旮毹鸽Μ 旮绊樃 2 膦呺"; Text[ turkish ] = "Liste 2 Son"; - Text[ catalan ] = "Enumeraci髇 2 fin"; + Text[ catalan ] = "Fi de la llista 2"; Text[ finnish ] = "Luettelon 2 loppu"; + Text[ thai ] = "喔复喙夃笝喔父喔斷福喔侧涪喔佮覆喔 2 "; }; String STR_POOLCOLL_BUL_NONUM2 { @@ -2186,7 +2266,7 @@ String STR_POOLCOLL_BUL_NONUM2 Text [ italian ] = "Elenco 2 succ." ; Text [ spanish ] = "Enumeraci髇 2 continuaci髇" ; Text [ french ] = "Puce 2 suivante" ; - Text [ dutch ] = "Opsomming 2 voortzetting" ; + Text [ dutch ] = "Opsomming 2 vervolg" ; Text [ swedish ] = "Punktuppst鋖lning 2 forts鋞tning" ; Text [ danish ] = "Punktopstilling 2 forts鎡telse" ; Text [ portuguese ] = "Marca 2 Continua玢o" ; @@ -2201,8 +2281,9 @@ String STR_POOLCOLL_BUL_NONUM2 Text[ korean ] = "旮毹鸽Μ 旮绊樃 2 瓿勳啀"; Text[ turkish ] = "Liste 2 Devam"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeraci髇 2 continuaci髇"; + Text[ catalan ] = "Enumeraci 2 continuaci"; Text[ finnish ] = "Luettelo 2 jatkuu"; + Text[ thai ] = "喔｀覆喔⑧竵喔侧福 2 Cont."; }; String STR_POOLCOLL_BUL_LEVEL3S { @@ -2228,8 +2309,9 @@ String STR_POOLCOLL_BUL_LEVEL3S Text[ korean ] = "旮毹鸽Μ 旮绊樃 3 鞁滌瀾"; Text[ turkish ] = "Liste 3 Baang"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeraci髇 3 inicio"; + Text[ catalan ] = "Inici de la llista 3"; Text[ finnish ] = "Luettelon 3 alku"; + Text[ thai ] = "喙喔｀复喙堗浮喔｀覆喔⑧竵喔侧福 3 "; }; String STR_POOLCOLL_BUL_LEVEL3 { @@ -2255,8 +2337,9 @@ String STR_POOLCOLL_BUL_LEVEL3 Text[ korean ] = "旮毹鸽Μ 旮绊樃 3"; Text[ turkish ] = "Liste 3"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeraci髇 3"; + Text[ catalan ] = "Llista 3"; Text[ finnish ] = "Luettelo 3"; + Text[ thai ] = "喔｀覆喔⑧竵喔侧福 3"; }; String STR_POOLCOLL_BUL_LEVEL3E { @@ -2282,8 +2365,9 @@ String STR_POOLCOLL_BUL_LEVEL3E Text[ korean ] = "旮毹鸽Μ 旮绊樃 3 膦呺"; Text[ turkish ] = "Liste 3 Son"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeraci髇 3 fin"; + Text[ catalan ] = "Fi de la llista 3"; Text[ finnish ] = "Luettelon 3 loppu"; + Text[ thai ] = "喔复喙夃笝喔父喔斷福喔侧涪喔佮覆喔 3 "; }; String STR_POOLCOLL_BUL_NONUM3 { @@ -2294,7 +2378,7 @@ String STR_POOLCOLL_BUL_NONUM3 Text [ italian ] = "Elenco 3 succ." ; Text [ spanish ] = "Enumeraci髇 3 continuaci髇" ; Text [ french ] = "Puce 3 suivante" ; - Text [ dutch ] = "Opsomming 3 voortzetting" ; + Text [ dutch ] = "Opsomming 3 vervolg" ; Text [ swedish ] = "Punktuppst鋖lning 3 forts鋞tning" ; Text [ danish ] = "Punktopstilling 3 forts鎡telse" ; Text [ portuguese ] = "Marca 3 Continua玢o" ; @@ -2309,8 +2393,9 @@ String STR_POOLCOLL_BUL_NONUM3 Text[ korean ] = "旮毹鸽Μ 旮绊樃 3 瓿勳啀"; Text[ turkish ] = "Liste 3 Devam"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeraci髇 3 continuaci髇"; + Text[ catalan ] = "Enumeraci 3 continuaci"; Text[ finnish ] = "Luettelo 3 jatkuu"; + Text[ thai ] = "喔｀覆喔⑧竵喔侧福 3 Cont."; }; String STR_POOLCOLL_BUL_LEVEL4S { @@ -2336,8 +2421,9 @@ String STR_POOLCOLL_BUL_LEVEL4S Text[ korean ] = "旮毹鸽Μ 旮绊樃 4 鞁滌瀾"; Text[ turkish ] = "Liste 4 Baang"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeraci髇 4 inicio"; + Text[ catalan ] = "Inici de la llista 4"; Text[ finnish ] = "Luettelon 4 alku"; + Text[ thai ] = "喙喔｀复喙堗浮喔｀覆喔⑧竵喔侧福 4 "; }; String STR_POOLCOLL_BUL_LEVEL4 { @@ -2363,8 +2449,9 @@ String STR_POOLCOLL_BUL_LEVEL4 Text[ korean ] = "旮毹鸽Μ 旮绊樃 4"; Text[ turkish ] = "Liste 4"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeraci髇 4"; + Text[ catalan ] = "Llista 4"; Text[ finnish ] = "Luettelo 4"; + Text[ thai ] = "喔｀覆喔⑧竵喔侧福 4"; }; String STR_POOLCOLL_BUL_LEVEL4E { @@ -2390,8 +2477,9 @@ String STR_POOLCOLL_BUL_LEVEL4E Text[ korean ] = "旮毹鸽Μ 旮绊樃 4 膦呺"; Text[ turkish ] = "Liste 4 Son"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeraci髇 4 fin"; + Text[ catalan ] = "Fi de la llista 4"; Text[ finnish ] = "Luettelon 4 loppu"; + Text[ thai ] = "喔复喙夃笝喔父喔斷福喔侧涪喔佮覆喔 4 "; }; String STR_POOLCOLL_BUL_NONUM4 { @@ -2402,7 +2490,7 @@ String STR_POOLCOLL_BUL_NONUM4 Text [ italian ] = "Elenco 4 succ." ; Text [ spanish ] = "Enumeraci髇 4 continuaci髇" ; Text [ french ] = "Puce 4 suivante" ; - Text [ dutch ] = "Opsomming 4 voortzetting" ; + Text [ dutch ] = "Opsomming 4 vervolg" ; Text [ swedish ] = "Punktuppst鋖lning 4 forts鋞tning" ; Text [ danish ] = "Punktopstilling 4 forts鎡telse" ; Text [ portuguese ] = "Marca 4 Continua玢o" ; @@ -2417,8 +2505,9 @@ String STR_POOLCOLL_BUL_NONUM4 Text[ korean ] = "旮毹鸽Μ 旮绊樃 4 瓿勳啀"; Text[ turkish ] = "Liste 4 Devam"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeraci髇 4 continuaci髇"; + Text[ catalan ] = "Enumeraci 4 continuaci"; Text[ finnish ] = "Luettelo 4 jatkuu"; + Text[ thai ] = "喔｀覆喔⑧竵喔侧福 4 Cont."; }; String STR_POOLCOLL_BUL_LEVEL5S { @@ -2444,8 +2533,9 @@ String STR_POOLCOLL_BUL_LEVEL5S Text[ korean ] = "旮毹鸽Μ 旮绊樃 5 鞁滌瀾"; Text[ turkish ] = "Liste 5 Baang"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeraci髇 5 inicio"; + Text[ catalan ] = "Inici de la llista 5"; Text[ finnish ] = "Luettelon 5 alku"; + Text[ thai ] = "喙喔｀复喙堗浮喔｀覆喔⑧竵喔侧福 5 "; }; String STR_POOLCOLL_BUL_LEVEL5 { @@ -2471,8 +2561,9 @@ String STR_POOLCOLL_BUL_LEVEL5 Text[ korean ] = "旮毹鸽Μ 旮绊樃 5"; Text[ turkish ] = "Liste 5"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeraci髇 5"; + Text[ catalan ] = "Llista 5"; Text[ finnish ] = "Luettelo 5"; + Text[ thai ] = "喔｀覆喔⑧竵喔侧福 5"; }; String STR_POOLCOLL_BUL_LEVEL5E { @@ -2495,11 +2586,12 @@ String STR_POOLCOLL_BUL_LEVEL5E Text[ chinese_traditional ] = "闋呯洰绗﹁櫉 5 绲愭潫"; Text[ arabic ] = "授锨 5 溴琼"; Text[ greek ] = "梳糗腼泔 5 暂腼"; - Text[ korean ] = "旮毹鸽Μ 旮绊樃 锛 膦呺"; + Text[ korean ] = "旮毹鸽Μ 旮绊樃 5 膦呺"; Text[ turkish ] = "Liste 5 Son"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeraci髇 5 fin"; + Text[ catalan ] = "Fi de la llista 5"; Text[ finnish ] = "Luettelon 5 loppu"; + Text[ thai ] = "喔复喙夃笝喔父喔斷福喔侧涪喔佮覆喔 5 "; }; String STR_POOLCOLL_BUL_NONUM5 { @@ -2510,7 +2602,7 @@ String STR_POOLCOLL_BUL_NONUM5 Text [ italian ] = "Elenco 5 succ." ; Text [ spanish ] = "Enumeraci髇 5 continuaci髇" ; Text [ french ] = "Puce 5 suivante" ; - Text [ dutch ] = "Opsomming 5 voortzetting" ; + Text [ dutch ] = "Opsomming 5 vervolg" ; Text [ swedish ] = "Punktuppst鋖lning 5 forts鋞tning" ; Text [ danish ] = "Punktopstilling 5 forts鎡telse" ; Text [ portuguese ] = "Marca 5 Continua玢o" ; @@ -2525,8 +2617,9 @@ String STR_POOLCOLL_BUL_NONUM5 Text[ korean ] = "旮毹鸽Μ 旮绊樃 5 瓿勳啀"; Text[ turkish ] = "Liste 5 Devam"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeraci髇 5 continuaci髇"; + Text[ catalan ] = "Enumeraci 5 continuaci"; Text[ finnish ] = "Luettelo 5 jatkuu"; + Text[ thai ] = "喔｀覆喔⑧竵喔侧福 5 Cont."; }; String STR_POOLCOLL_HEADER { @@ -2544,15 +2637,16 @@ String STR_POOLCOLL_HEADER Text[ chinese_simplified ] = "椤电湁"; Text[ russian ] = "洛瘐龛 觐腩眚栩箅"; Text[ polish ] = "Nag丑wek"; - Text[ japanese ] = "锞嶏蒋锞锞"; + Text[ japanese ] = "銉樸儍銉"; Text[ chinese_traditional ] = "闋侀"; Text[ arabic ] = "衙 轻蛰蜕"; Text[ greek ] = "叔鲠脒溽"; Text[ korean ] = "毹鸽Μ旮"; Text[ turkish ] = "躶tbilgi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezamiento"; - Text[ finnish ] = "Yl鋙tsikko"; + Text[ catalan ] = "Cap鏰lera"; + Text[ finnish ] = "Yl鋞unniste"; + Text[ thai ] = "喔箞喔о笝喔副喔"; }; String STR_POOLCOLL_HEADERL { @@ -2570,15 +2664,16 @@ String STR_POOLCOLL_HEADERL Text[ chinese_simplified ] = "宸﹂〉鐪"; Text[ russian ] = "洛瘐龛 觐腩眚栩箅 耠邂"; Text[ polish ] = "Nag丑wek z lewej strony"; - Text[ japanese ] = "锞嶏蒋锞锞炲乏"; + Text[ japanese ] = "銉樸儍銉宸"; Text[ chinese_traditional ] = "宸﹂爜棣"; Text[ arabic ] = "衙 轻蛰蜕 裴 轻碛茄"; Text[ greek ] = "叔鲠脒溴 狁轶翦褴"; Text[ korean ] = "毹鸽Μ旮 鞕检"; Text[ turkish ] = "Sol 黶tbilgi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezamiento izquierdo"; - Text[ finnish ] = "Yl鋙tsikko vasemmalla"; + Text[ catalan ] = "Cap鏰lera esquerra"; + Text[ finnish ] = "Yl鋞unniste vasemmalla"; + Text[ thai ] = "喔箞喔о笝喔副喔о笖喙夃覆喔權笅喙夃覆喔"; }; String STR_POOLCOLL_HEADERR { @@ -2596,15 +2691,16 @@ String STR_POOLCOLL_HEADERR Text[ chinese_simplified ] = "鍙抽〉鐪"; Text[ russian ] = "洛瘐龛 觐腩眚栩箅 耧疣忄"; Text[ polish ] = "Nag丑wek z prawej strony"; - Text[ japanese ] = "锞嶏蒋锞锞炲彸"; + Text[ japanese ] = "銉樸儍銉鍙"; Text[ chinese_traditional ] = "鍙抽爜棣"; Text[ arabic ] = "衙 轻蛰蜕 裴 轻磴礓"; Text[ greek ] = "叔鲠脒溴 溴铋"; Text[ korean ] = "毹鸽Μ旮 鞓るジ飒"; Text[ turkish ] = "Sa 黶tbilgi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezamiento derecho"; - Text[ finnish ] = "Yl鋙tsikko oikealla"; + Text[ catalan ] = "Cap鏰lera dreta"; + Text[ finnish ] = "Yl鋞unniste oikealla"; + Text[ thai ] = "喔箞喔о笝喔副喔о笖喙夃覆喔權競喔о覆"; }; String STR_POOLCOLL_FOOTER { @@ -2623,15 +2719,16 @@ String STR_POOLCOLL_FOOTER Text[ chinese_simplified ] = "椤佃剼"; Text[ russian ] = "丸骓栝 觐腩眚栩箅"; Text[ polish ] = "Stopka"; - Text[ japanese ] = "锞岋蒋锞"; + Text[ japanese ] = "銉曘儍銈"; Text[ chinese_traditional ] = "闋佸熬"; Text[ arabic ] = "市眄 轻蛰蜕"; Text[ greek ] = "震矬蓦殇"; Text[ korean ] = "氚旊嫢旮"; Text[ turkish ] = "Altbilgi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Pie de p醙ina"; - Text[ finnish ] = "Alaselite"; + Text[ catalan ] = "Peu de p鄃ina"; + Text[ finnish ] = "Alatunniste"; + Text[ thai ] = "喔箞喔о笝喔椸箟喔侧涪"; }; String STR_POOLCOLL_FOOTERL { @@ -2650,15 +2747,16 @@ String STR_POOLCOLL_FOOTERL Text[ chinese_simplified ] = "宸﹂〉鑴"; Text[ russian ] = "丸骓栝 觐腩眚栩箅 耠邂"; Text[ polish ] = "Stopka z lewej strony"; - Text[ japanese ] = "锞岋蒋锞 宸"; + Text[ japanese ] = "銉曘儍銈 宸"; Text[ chinese_traditional ] = "宸﹂爜灏"; Text[ arabic ] = "市眄 轻蛰蜕 裴 轻碛茄"; Text[ greek ] = "震矬蓦殇 狁轶翦褴"; Text[ korean ] = "氚旊嫢旮 鞕检"; Text[ turkish ] = "Sol altbilgi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Pie de p醙ina izquierdo"; - Text[ finnish ] = "Alaselite vasemmalla"; + Text[ catalan ] = "Peu de p鄃ina esquerre"; + Text[ finnish ] = "Alatunniste vasemmalla"; + Text[ thai ] = "喔箞喔о笝喔椸箟喔侧涪喔斷箟喔侧笝喔嬥箟喔侧涪"; }; String STR_POOLCOLL_FOOTERR { @@ -2677,15 +2775,16 @@ String STR_POOLCOLL_FOOTERR Text[ chinese_simplified ] = "鍙抽〉鑴"; Text[ russian ] = "丸骓栝 觐腩眚栩箅 耧疣忄"; Text[ polish ] = "Stopka z prawej strony"; - Text[ japanese ] = "锞岋蒋锞 鍙"; + Text[ japanese ] = "銉曘儍銈 鍙"; Text[ chinese_traditional ] = "鍙抽爜灏"; Text[ arabic ] = "市眄 轻蛰蜕 裴 轻磴礓"; Text[ greek ] = "震矬蓦殇 溴铋"; Text[ korean ] = "氚旊嫢旮 鞓るジ飒"; Text[ turkish ] = "Sa altbilgi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Pie de p醙ina derecho"; - Text[ finnish ] = "Alaselite oikealla"; + Text[ catalan ] = "Peu de p鄃ina dret"; + Text[ finnish ] = "Alatunniste oikealla"; + Text[ thai ] = "喔箞喔о笝喔椸箟喔侧涪喔斷箟喔侧笝喔傕抚喔"; }; String STR_POOLCOLL_TABLE { @@ -2707,11 +2806,12 @@ String STR_POOLCOLL_TABLE Text[ chinese_traditional ] = "琛ㄦ牸鍏у"; Text[ arabic ] = "阃舒砬 轻滔驷"; Text[ greek ] = "绣耖鬻屙 疬磲赆"; - Text[ korean ] = "響 雮挫毄"; + Text[ korean ] = "響 氇╈皑"; Text[ turkish ] = "Tablo i鏴ri餴"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Contenido de la tabla"; + Text[ catalan ] = "Contingut de la taula"; Text[ finnish ] = "Taulukon sis鋖t"; + Text[ thai ] = "喙喔權阜喙夃腑喔覆喔曕覆喔｀覆喔"; }; String STR_POOLCOLL_TABLE_HDLN { @@ -2734,17 +2834,18 @@ String STR_POOLCOLL_TABLE_HDLN Text[ chinese_traditional ] = "琛ㄦ牸妯欓"; Text[ arabic ] = "阡媲 轻滔驷"; Text[ greek ] = "硼殛弼犭咪 疬磲赆"; - Text[ korean ] = "響滌牅氇"; + Text[ korean ] = "響 鞝滊"; Text[ turkish ] = "Tablo ba"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado de la tabla"; + Text[ catalan ] = "Encap鏰lament de la taula"; Text[ finnish ] = "Taulukon otsikko"; + Text[ thai ] = "喔副喔о競喙夃腑喔曕覆喔｀覆喔"; }; String STR_POOLCOLL_FRAME { Text = "Rahmeninhalt" ; Text [ English ] = "Frame body" ; - Text [ dutch ] = "Inhoud kader" ; + Text [ dutch ] = "Kaderinhoud" ; Text [ english_us ] = "Frame contents" ; Text [ italian ] = "Contenuto cornice" ; Text [ spanish ] = "Contenido del marco" ; @@ -2754,7 +2855,7 @@ String STR_POOLCOLL_FRAME Text [ portuguese ] = "Conte鷇o da moldura" ; Text [ portuguese_brazilian ] = "Rahmeninhalt" ; Text[ chinese_simplified ] = "妗嗗唴瀹"; - Text[ russian ] = "杨溴疰桁铄 疣礻"; + Text[ russian ] = "杨溴疰桁铄 怵彗觇"; Text[ polish ] = "Zawarto滄 ramki"; Text[ japanese ] = "鏋犮伄鍐呭"; Text[ chinese_traditional ] = "瑷婃鍏у"; @@ -2763,8 +2864,9 @@ String STR_POOLCOLL_FRAME Text[ korean ] = "頂勲爤鞛 雮挫毄"; Text[ turkish ] = "莈r鏴ve i鏴ri餴"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Contenido del marco"; + Text[ catalan ] = "Contingut del marc"; Text[ finnish ] = "Kehyksen sis鋖t"; + Text[ thai ] = "喙喔權阜喙夃腑喔覆喔佮福喔笟"; }; String STR_POOLCOLL_FOOTNOTE { @@ -2790,8 +2892,9 @@ String STR_POOLCOLL_FOOTNOTE Text[ korean ] = "臧侅＜"; Text[ turkish ] = "Dipnot"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nota al pie"; + Text[ catalan ] = "Nota al peu"; Text[ finnish ] = "Alaviite"; + Text[ thai ] = "喙喔娻复喔囙腑喔｀福喔"; }; String STR_POOLCOLL_ENDNOTE { @@ -2803,7 +2906,7 @@ String STR_POOLCOLL_ENDNOTE Text [ swedish ] = "Slutnot" ; Text [ danish ] = "Slutnote" ; Text [ italian ] = "Nota di chiusura" ; - Text [ spanish ] = "Nota al final" ; + Text [ spanish ] = "Nota final" ; Text [ french ] = "Note de fin" ; Text [ dutch ] = "Eindnoot" ; Text[ chinese_simplified ] = "灏炬敞"; @@ -2816,8 +2919,9 @@ String STR_POOLCOLL_ENDNOTE Text[ korean ] = "氙胳＜"; Text[ turkish ] = "Sonnot"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nota al final"; - Text[ finnish ] = "Loppuhuomautus"; + Text[ catalan ] = "Nota final"; + Text[ finnish ] = "Loppuviite"; + Text[ thai ] = "喔箟喔侧竾喔复喔囙笚喙夃覆喔⑧箑喔｀阜喙堗腑喔"; }; String STR_POOLCOLL_LABEL { @@ -2833,7 +2937,7 @@ String STR_POOLCOLL_LABEL Text [ portuguese ] = "Legenda" ; Text [ portuguese_brazilian ] = "Beschriftung" ; Text[ chinese_simplified ] = "鏍囩"; - Text[ russian ] = "袜滹桉"; + Text[ russian ] = "袜玮囗桢"; Text[ polish ] = "Etykieta"; Text[ japanese ] = "鍥宠〃鐣彿"; Text[ chinese_traditional ] = "妯欑堡"; @@ -2842,8 +2946,9 @@ String STR_POOLCOLL_LABEL Text[ korean ] = "旌§厴"; Text[ turkish ] = "Yaz"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Etiqueta"; + Text[ catalan ] = "Llegenda"; Text[ finnish ] = "Kuvaotsikko"; + Text[ thai ] = "喔勦赋喔笜喔脆笟喔侧涪喙喔夃笧喔侧赴"; }; String STR_POOLCOLL_LABEL_ABB { @@ -2861,15 +2966,16 @@ String STR_POOLCOLL_LABEL_ABB Text[ chinese_simplified ] = "鎻掑浘"; Text[ russian ] = "入膻耱疣鲨"; Text[ polish ] = "Ilustracja"; - Text[ japanese ] = "锝诧緱锝斤緞锞氾桨锝硷疆锞"; + Text[ japanese ] = "鍥"; Text[ chinese_traditional ] = "鎻掑湒"; Text[ arabic ] = "延 舒猪晚"; Text[ greek ] = "砰挈磲"; - Text[ korean ] = "攴鸽"; + Text[ korean ] = "靷巾檾"; Text[ turkish ] = "Resim"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Ilustraci髇"; + Text[ catalan ] = "Il.lustraci"; Text[ finnish ] = "Kuvitus"; + Text[ thai ] = "喔犩覆喔炧笡喔｀赴喔佮腑喔"; }; String STR_POOLCOLL_LABEL_TABLE { @@ -2894,8 +3000,9 @@ String STR_POOLCOLL_LABEL_TABLE Text[ korean ] = "響"; Text[ turkish ] = "Tablo"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Tabla"; + Text[ catalan ] = "Taula"; Text[ finnish ] = "Taulukko"; + Text[ thai ] = "喔曕覆喔｀覆喔"; }; String STR_POOLCOLL_LABEL_FRAME { @@ -2913,15 +3020,16 @@ String STR_POOLCOLL_LABEL_FRAME Text[ chinese_simplified ] = "鏂囧瓧"; Text[ russian ] = "义犟"; Text[ polish ] = "Tekst"; - Text[ japanese ] = "锞冿椒锝斤緞"; + Text[ japanese ] = "銉嗐偔銈广儓"; Text[ chinese_traditional ] = "鍏ф枃"; Text[ arabic ] = "湔"; Text[ greek ] = "叔哽屙"; Text[ korean ] = "韰嶌姢韸"; Text[ turkish ] = "Metin"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Texto"; + Text[ catalan ] = "Text"; Text[ finnish ] = "Teksti"; + Text[ thai ] = "喔傕箟喔竸喔о覆喔"; }; String STR_POOLCOLL_LABEL_DRAWING { @@ -2946,8 +3054,9 @@ String STR_POOLCOLL_LABEL_DRAWING Text[ korean ] = "攴鸽Μ旮"; Text[ turkish ] = "莍zim"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Dibujo"; - Text[ finnish ] = "Piirustus"; + Text[ catalan ] = "Dibuix"; + Text[ finnish ] = "Piirros"; + Text[ thai ] = "喔о覆喔斷福喔灌笡"; }; String STR_POOLCOLL_JAKETADRESS { @@ -2973,8 +3082,9 @@ String STR_POOLCOLL_JAKETADRESS Text[ korean ] = "氚涬姅 靷瀸"; Text[ turkish ] = "Al齝"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Destinatario"; + Text[ catalan ] = "Destinatari"; Text[ finnish ] = "Saaja"; + Text[ thai ] = "喔溹腹喙夃福喔编笟"; }; String STR_POOLCOLL_SENDADRESS { @@ -2999,8 +3109,9 @@ String STR_POOLCOLL_SENDADRESS Text[ korean ] = "氤措偢 靷瀸"; Text[ turkish ] = "G鰊deren"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Remitente"; + Text[ catalan ] = "Remitent"; Text[ finnish ] = "L鋒ett鋔"; + Text[ thai ] = "喔溹腹喙夃釜喙堗竾"; }; String STR_POOLCOLL_TOX_IDXH { @@ -3023,11 +3134,12 @@ String STR_POOLCOLL_TOX_IDXH Text[ chinese_traditional ] = "绱㈠紩鐩寗 妯欓"; Text[ arabic ] = "阡媲 轻蒎延 轻萌滔"; Text[ greek ] = "硼殛弼犭咪 艴皴翮襁秕 胼铄"; - Text[ korean ] = "響滌牅鞏 靸夓澑"; + Text[ korean ] = "靸夓澑 鞝滊"; Text[ turkish ] = "Alfabetik dizin ba"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado del 韓dice alfab閠ico"; + Text[ catalan ] = "Encap鏰lament de l'韓dex"; Text[ finnish ] = "Hakemiston otsikko"; + Text[ thai ] = "喔副喔о箑喔｀阜喙堗腑喔囙笖喔编笂喔權傅"; }; String STR_POOLCOLL_TOX_IDX1 { @@ -3052,8 +3164,9 @@ String STR_POOLCOLL_TOX_IDX1 Text[ korean ] = "靸夓澑 1"; Text[ turkish ] = "Alfabetik dizin 1"; Text[ language_user1 ] = " "; - Text[ catalan ] = "蚽dice afab閠ico 1"; + Text[ catalan ] = "蚽dex 1"; Text[ finnish ] = "Hakemisto 1"; + Text[ thai ] = "喔斷副喔娻笝喔 1"; }; String STR_POOLCOLL_TOX_IDX2 { @@ -3078,8 +3191,9 @@ String STR_POOLCOLL_TOX_IDX2 Text[ korean ] = "靸夓澑 2"; Text[ turkish ] = "Alfabetik dizin 2"; Text[ language_user1 ] = " "; - Text[ catalan ] = "蚽dice alfab閠ico 2"; + Text[ catalan ] = "蚽dex 2"; Text[ finnish ] = "Hakemisto 2"; + Text[ thai ] = "喔斷副喔娻笝喔 2"; }; String STR_POOLCOLL_TOX_IDX3 { @@ -3104,8 +3218,9 @@ String STR_POOLCOLL_TOX_IDX3 Text[ korean ] = "靸夓澑 3"; Text[ turkish ] = "Alfabetik dizin 3"; Text[ language_user1 ] = " "; - Text[ catalan ] = "蚽dice alfab閠ico 3"; + Text[ catalan ] = "蚽dex 3"; Text[ finnish ] = "Hakemisto 3"; + Text[ thai ] = "喔斷副喔娻笝喔 3"; }; String STR_POOLCOLL_TOX_IDXBREAK { @@ -3123,15 +3238,16 @@ String STR_POOLCOLL_TOX_IDXBREAK Text[ chinese_simplified ] = "绱㈠紩鐩綍 鍒嗛殧绗"; Text[ russian ] = "朽玟咫栩咫 镳邃戾蝽钽 箨噻囹咫"; Text[ polish ] = "Separator skorowidza"; - Text[ japanese ] = "绱㈠紩 锝撅緤锞燂練锝帮線"; + Text[ japanese ] = "绱㈠紩 銈汇儜銉兗銈"; Text[ chinese_traditional ] = "绱㈠紩鐩寗 鍒嗛殧绗"; Text[ arabic ] = "萸蔗 轻蒎延 轻萌滔"; Text[ greek ] = "拈狩轶糸挈 艴皴翮襁秕 胼铄"; - Text[ korean ] = "靸夓澑 甑秳鞛"; + Text[ korean ] = "甑秳 旮绊樃 靸夓澑"; Text[ turkish ] = "Alfabetik dizin ay齬ma ireti"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Separador del 韓dice alfab閠ico"; + Text[ catalan ] = "Separador de l'韓dex"; Text[ finnish ] = "Hakemistoerotin"; + Text[ thai ] = "喔曕副喔о箒喔⑧竵喔斷副喔娻笝喔"; }; String STR_POOLCOLL_TOX_CNTNTH { @@ -3157,8 +3273,9 @@ String STR_POOLCOLL_TOX_CNTNTH Text[ korean ] = "氇╈皑 鞝滊"; Text[ turkish ] = "葭indekiler dizini ba"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado del 韓dice"; + Text[ catalan ] = "Encap鏰lament de l'韓dex"; Text[ finnish ] = "Sis鋖t鰋tsikko"; + Text[ thai ] = "喔副喔о箑喔｀阜喙堗腑喔囙箑喔權阜喙夃腑喔覆"; }; String STR_POOLCOLL_TOX_CNTNT1 { @@ -3183,8 +3300,9 @@ String STR_POOLCOLL_TOX_CNTNT1 Text[ korean ] = "氇╈皑 1"; Text[ turkish ] = "葭indekiler dizini 1"; Text[ language_user1 ] = " "; - Text[ catalan ] = "蚽dice 1"; + Text[ catalan ] = "Contingut 1"; Text[ finnish ] = "Sis鋖t 1"; + Text[ thai ] = "喙喔權阜喙夃腑喔覆 1"; }; String STR_POOLCOLL_TOX_CNTNT2 { @@ -3209,8 +3327,9 @@ String STR_POOLCOLL_TOX_CNTNT2 Text[ korean ] = "氇╈皑 2"; Text[ turkish ] = "葭indekiler dizini 2"; Text[ language_user1 ] = " "; - Text[ catalan ] = "蚽dice 2"; + Text[ catalan ] = "Contingut 2"; Text[ finnish ] = "Sis鋖t 2"; + Text[ thai ] = "喙喔權阜喙夃腑喔覆 2"; }; String STR_POOLCOLL_TOX_CNTNT3 { @@ -3235,8 +3354,9 @@ String STR_POOLCOLL_TOX_CNTNT3 Text[ korean ] = "氇╈皑 3"; Text[ turkish ] = "葭indekiler dizini 3"; Text[ language_user1 ] = " "; - Text[ catalan ] = "蚽dice 3"; + Text[ catalan ] = "Contingut 3"; Text[ finnish ] = "Sis鋖t 3"; + Text[ thai ] = "喙喔權阜喙夃腑喔覆 3"; }; String STR_POOLCOLL_TOX_CNTNT4 { @@ -3261,8 +3381,9 @@ String STR_POOLCOLL_TOX_CNTNT4 Text[ korean ] = "氇╈皑 4"; Text[ turkish ] = "葭indekiler dizini 4"; Text[ language_user1 ] = " "; - Text[ catalan ] = "蚽dice 4"; + Text[ catalan ] = "Contingut 4"; Text[ finnish ] = "Sis鋖t 4"; + Text[ thai ] = "喙喔權阜喙夃腑喔覆 4"; }; String STR_POOLCOLL_TOX_CNTNT5 { @@ -3287,8 +3408,9 @@ String STR_POOLCOLL_TOX_CNTNT5 Text[ korean ] = "氇╈皑 5"; Text[ turkish ] = "葭indekiler dizini 5"; Text[ language_user1 ] = " "; - Text[ catalan ] = "蚽dice 5"; + Text[ catalan ] = "Contingut 5"; Text[ finnish ] = "Sis鋖t 5"; + Text[ thai ] = "喙喔權阜喙夃腑喔覆 5"; }; String STR_POOLCOLL_TOX_CNTNT6 { @@ -3313,8 +3435,9 @@ String STR_POOLCOLL_TOX_CNTNT6 Text[ korean ] = "氇╈皑 6"; Text[ turkish ] = "葭indekiler dizini 6"; Text[ language_user1 ] = " "; - Text[ catalan ] = "蚽dice 6"; + Text[ catalan ] = "Contingut 6"; Text[ finnish ] = "Sis鋖t 6"; + Text[ thai ] = "喙喔權阜喙夃腑喔覆 6"; }; String STR_POOLCOLL_TOX_CNTNT7 { @@ -3339,8 +3462,9 @@ String STR_POOLCOLL_TOX_CNTNT7 Text[ korean ] = "氇╈皑 7"; Text[ turkish ] = "葭indekiler dizini 7"; Text[ language_user1 ] = " "; - Text[ catalan ] = "蚽dice 7"; + Text[ catalan ] = "Contingut 7"; Text[ finnish ] = "Sis鋖t 7"; + Text[ thai ] = "喙喔權阜喙夃腑喔覆 7"; }; String STR_POOLCOLL_TOX_CNTNT8 { @@ -3365,8 +3489,9 @@ String STR_POOLCOLL_TOX_CNTNT8 Text[ korean ] = "氇╈皑 8"; Text[ turkish ] = "葭indekiler dizini 8"; Text[ language_user1 ] = " "; - Text[ catalan ] = "蚽dice 8"; + Text[ catalan ] = "Contingut 8"; Text[ finnish ] = "Sis鋖t 8"; + Text[ thai ] = "喙喔權阜喙夃腑喔覆 8"; }; String STR_POOLCOLL_TOX_CNTNT9 { @@ -3391,8 +3516,9 @@ String STR_POOLCOLL_TOX_CNTNT9 Text[ korean ] = "氇╈皑 9"; Text[ turkish ] = "葭indekiler dizini 9"; Text[ language_user1 ] = " "; - Text[ catalan ] = "蚽dice 9"; + Text[ catalan ] = "Contingut 9"; Text[ finnish ] = "Sis鋖t 9"; + Text[ thai ] = "喙喔權阜喙夃腑喔覆 9"; }; String STR_POOLCOLL_TOX_CNTNT10 { @@ -3417,8 +3543,9 @@ String STR_POOLCOLL_TOX_CNTNT10 Text[ korean ] = "氇╈皑 10"; Text[ turkish ] = "葭indekiler dizini 10"; Text[ language_user1 ] = " "; - Text[ catalan ] = "蚽dicel 10"; + Text[ catalan ] = "Contingut 10"; Text[ finnish ] = "Sis鋖t 10"; + Text[ thai ] = "喙喔權阜喙夃腑喔覆 10"; }; String STR_POOLCOLL_TOX_USERH { @@ -3435,17 +3562,18 @@ String STR_POOLCOLL_TOX_USERH Text [ portuguese ] = "T韙ulo do 韓dice do utilizador" ; Text [ portuguese_brazilian ] = "Benutzerverzeichnis ?berschrift" ; Text[ chinese_simplified ] = "浣跨敤鑰呯洰褰 鏍囬"; - Text[ russian ] = "青泐腩忸 镱朦珙忄蝈朦耜钽 箨噻囹咫"; + Text[ russian ] = "青泐腩忸 箨噻囹咫彘 镱朦珙忄蝈"; Text[ polish ] = "Tytu indeksu u縴tkownika"; - Text[ japanese ] = "锞曪桨锝伙緸锝板畾缇┿伄绱㈠紩 瑕嬪嚭銇"; + Text[ japanese ] = "銉︺兗銈躲兗瀹氱京銇储寮 瑕嬪嚭銇"; Text[ chinese_traditional ] = "鑷▊鐩寗妯欓"; Text[ arabic ] = "阡媲 蒎延 轻阌饰香"; Text[ greek ] = "硼殛弼犭咪 艴皴翮襁秕 黢珞酤"; Text[ korean ] = "靷毄鞛 靸夓澑 鞝滊"; Text[ turkish ] = "Kullan齝 dizini ba"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado del 韓dice del usuario"; + Text[ catalan ] = "Encap鏰lament de l'韓dex d'usuari"; Text[ finnish ] = "K鋣tt鋔鋒akemiston otsikko"; + Text[ thai ] = "喔副喔о箑喔｀阜喙堗腑喔囙笖喔编笂喔權傅喔溹腹喙夃箖喔娻箟"; }; String STR_POOLCOLL_TOX_USER1 { @@ -3461,17 +3589,18 @@ String STR_POOLCOLL_TOX_USER1 Text [ portuguese ] = "蚽dice do utilizador 1" ; Text [ portuguese_brazilian ] = "Benutzerverzeichnis 1" ; Text[ chinese_simplified ] = "浣跨敤鑰呯洰褰 1"; - Text[ russian ] = "项朦珙忄蝈朦耜栝 箨噻囹咫 1"; + Text[ russian ] = "雨噻囹咫 镱朦珙忄蝈 1"; Text[ polish ] = "Indeks u縴tkownika 1"; - Text[ japanese ] = "锞曪桨锝伙緸锝板畾缇┿伄绱㈠紩 1"; + Text[ japanese ] = "銉︺兗銈躲兗瀹氱京銇储寮 1"; Text[ chinese_traditional ] = "鑷▊鐩寗 1"; Text[ arabic ] = "蒎延 轻阌饰香 1"; Text[ greek ] = "捧皴艮耖 黢珞酤 1"; Text[ korean ] = "靷毄鞛 靸夓澑 1"; Text[ turkish ] = "Kullan齝 dizini 1"; Text[ language_user1 ] = " "; - Text[ catalan ] = "蚽dice del usuario 1"; + Text[ catalan ] = "蚽dex d'usuari 1"; Text[ finnish ] = "K鋣tt鋔鋒akemisto 1"; + Text[ thai ] = "喔斷副喔娻笝喔掂笢喔灌箟喙冟笂喙 1"; }; String STR_POOLCOLL_TOX_USER2 { @@ -3487,17 +3616,18 @@ String STR_POOLCOLL_TOX_USER2 Text [ portuguese ] = "蚽dice do utilizador 2" ; Text [ portuguese_brazilian ] = "Benutzerverzeichnis 2" ; Text[ chinese_simplified ] = "浣跨敤鑰呯洰褰 2"; - Text[ russian ] = "项朦珙忄蝈朦耜栝 箨噻囹咫 2"; + Text[ russian ] = "雨噻囹咫 镱朦珙忄蝈 2"; Text[ polish ] = "Indeks u縴tkownika 2"; - Text[ japanese ] = "锞曪桨锝伙緸锝板畾缇┿伄绱㈠紩 2"; + Text[ japanese ] = "銉︺兗銈躲兗瀹氱京銇储寮 2"; Text[ chinese_traditional ] = "鑷▊鐩寗 2"; Text[ arabic ] = "蒎延 轻阌饰香 2"; Text[ greek ] = "捧皴艮耖 黢珞酤 2"; Text[ korean ] = "靷毄鞛 靸夓澑 2"; Text[ turkish ] = "Kullan齝 dizini 2"; Text[ language_user1 ] = " "; - Text[ catalan ] = "蚽dice del usuario 2"; + Text[ catalan ] = "蚽dex d'usuari 2"; Text[ finnish ] = "K鋣tt鋔鋒akemisto 2"; + Text[ thai ] = "喔斷副喔娻笝喔掂笢喔灌箟喙冟笂喙 2"; }; String STR_POOLCOLL_TOX_USER3 { @@ -3513,17 +3643,18 @@ String STR_POOLCOLL_TOX_USER3 Text [ portuguese ] = "蚽dice do utilizador 3" ; Text [ portuguese_brazilian ] = "Benutzerverzeichnis 3" ; Text[ chinese_simplified ] = "浣跨敤鑰呯洰褰 3"; - Text[ russian ] = "项朦珙忄蝈朦耜栝 箨噻囹咫 3"; + Text[ russian ] = "雨噻囹咫 镱朦珙忄蝈 3"; Text[ polish ] = "Indeks u縴tkownika 3"; - Text[ japanese ] = "锞曪桨锝伙緸锝板畾缇┿伄绱㈠紩 3"; + Text[ japanese ] = "銉︺兗銈躲兗瀹氱京銇储寮 3"; Text[ chinese_traditional ] = "鑷▊鐩寗 3"; Text[ arabic ] = "蒎延 轻阌饰香 3"; Text[ greek ] = "捧皴艮耖 黢珞酤 3"; Text[ korean ] = "靷毄鞛 靸夓澑 3"; Text[ turkish ] = "Kullan齝 dizini 3"; Text[ language_user1 ] = " "; - Text[ catalan ] = "蚽dice del usuario 3"; + Text[ catalan ] = "蚽dex d'usuari 3"; Text[ finnish ] = "K鋣tt鋔鋒akemisto 3"; + Text[ thai ] = "喔斷副喔娻笝喔掂笢喔灌箟喙冟笂喙 3"; }; String STR_POOLCOLL_TOX_USER4 { @@ -3539,17 +3670,18 @@ String STR_POOLCOLL_TOX_USER4 Text [ portuguese ] = "蚽dice do utilizador 4" ; Text [ portuguese_brazilian ] = "Benutzerverzeichnis 4" ; Text[ chinese_simplified ] = "浣跨敤鑰呯洰褰 4"; - Text[ russian ] = "项朦珙忄蝈朦耜栝 箨噻囹咫 4"; + Text[ russian ] = "雨噻囹咫 镱朦珙忄蝈 4"; Text[ polish ] = "Indeks u縴tkownika 4"; - Text[ japanese ] = "锞曪桨锝伙緸锝板畾缇┿伄绱㈠紩 4"; + Text[ japanese ] = "銉︺兗銈躲兗瀹氱京銇储寮 4"; Text[ chinese_traditional ] = "鑷▊鐩寗 4"; Text[ arabic ] = "蒎延 轻阌饰香 4"; Text[ greek ] = "捧皴艮耖 黢珞酤 4"; Text[ korean ] = "靷毄鞛 靸夓澑 4"; Text[ turkish ] = "Kullan齝 dizini 4"; Text[ language_user1 ] = " "; - Text[ catalan ] = "蚽dice del usuario 4"; + Text[ catalan ] = "蚽dex d'usuari 4"; Text[ finnish ] = "K鋣tt鋔鋒akemisto 4"; + Text[ thai ] = "喔斷副喔娻笝喔掂笢喔灌箟喙冟笂喙 4"; }; String STR_POOLCOLL_TOX_USER5 { @@ -3565,17 +3697,18 @@ String STR_POOLCOLL_TOX_USER5 Text [ portuguese ] = "蚽dice do utilizador 5" ; Text [ portuguese_brazilian ] = "Benutzerverzeichnis 5" ; Text[ chinese_simplified ] = "浣跨敤鑰呯洰褰 5"; - Text[ russian ] = "项朦珙忄蝈朦耜栝 箨噻囹咫 5"; + Text[ russian ] = "雨噻囹咫 镱朦珙忄蝈 5"; Text[ polish ] = "Indeks u縴tkownika 5"; - Text[ japanese ] = "锞曪桨锝伙緸锝板畾缇┿伄绱㈠紩 5"; + Text[ japanese ] = "銉︺兗銈躲兗瀹氱京銇储寮 5"; Text[ chinese_traditional ] = "鑷▊鐩寗 5"; Text[ arabic ] = "蒎延 轻阌饰香 5"; Text[ greek ] = "捧皴艮耖 黢珞酤 5"; Text[ korean ] = "靷毄鞛 靸夓澑 5"; Text[ turkish ] = "Kullan齝 dizini 5"; Text[ language_user1 ] = " "; - Text[ catalan ] = "蚽dice del usuario 5"; + Text[ catalan ] = "蚽dex d'usuari 5"; Text[ finnish ] = "K鋣tt鋔鋒akemisto 5"; + Text[ thai ] = "喔斷副喔娻笝喔掂笢喔灌箟喙冟笂喙 5"; }; String STR_POOLCOLL_TOX_USER6 { @@ -3590,9 +3723,9 @@ String STR_POOLCOLL_TOX_USER6 Text [ danish ] = "Brugerindeks 6" ; Text [ portuguese ] = "蚽dice personalizado 6" ; Text [ portuguese_brazilian ] = "Benutzerverzeichnis 6" ; - Text[ russian ] = "项朦珙忄蝈朦耜栝 箨噻囹咫 6"; + Text[ russian ] = "雨噻囹咫 镱朦珙忄蝈 6"; Text[ polish ] = "Indeks u縴tkownika 6"; - Text[ japanese ] = "锞曪桨锝伙緸锝板畾缇┿伄绱㈠紩 6"; + Text[ japanese ] = "銉︺兗銈躲兗瀹氱京銇储寮 6"; Text[ arabic ] = "蒎延 轻阌饰香 6"; Text[ greek ] = "捧皴艮耖 黢珞酤 6"; Text[ korean ] = "靷毄鞛 靸夓澑 6"; @@ -3600,8 +3733,9 @@ String STR_POOLCOLL_TOX_USER6 Text[ chinese_traditional ] = "鑷▊鐩寗 6"; Text[ turkish ] = "Kullan齝 dizini 6"; Text[ language_user1 ] = " "; - Text[ catalan ] = "蚽dice del usuario 6"; + Text[ catalan ] = "蚽dex d'usuari 6"; Text[ finnish ] = "K鋣tt鋔鋒akemisto 6"; + Text[ thai ] = "喔斷副喔娻笝喔掂笢喔灌箟喙冟笂喙 6"; }; String STR_POOLCOLL_TOX_USER7 { @@ -3616,9 +3750,9 @@ String STR_POOLCOLL_TOX_USER7 Text [ danish ] = "Brugerindeks 7" ; Text [ portuguese ] = "蚽dice personalizado 7" ; Text [ portuguese_brazilian ] = "Benutzerverzeichnis 7" ; - Text[ russian ] = "项朦珙忄蝈朦耜栝 箨噻囹咫 7"; + Text[ russian ] = "雨噻囹咫 镱朦珙忄蝈 7"; Text[ polish ] = "Indeks u縴tkownika 7"; - Text[ japanese ] = "锞曪桨锝伙緸锝板畾缇┿伄绱㈠紩 7"; + Text[ japanese ] = "銉︺兗銈躲兗瀹氱京銇储寮 7"; Text[ arabic ] = "蒎延 轻阌饰香 7"; Text[ greek ] = "捧皴艮耖 黢珞酤 7"; Text[ korean ] = "靷毄鞛 靸夓澑 7"; @@ -3626,8 +3760,9 @@ String STR_POOLCOLL_TOX_USER7 Text[ chinese_traditional ] = "鑷▊鐩寗 7"; Text[ turkish ] = "Kullan齝 dizini 7"; Text[ language_user1 ] = " "; - Text[ catalan ] = "蚽dice del usuario 7"; + Text[ catalan ] = "蚽dex d'usuari 7"; Text[ finnish ] = "K鋣tt鋔鋒akemisto 7"; + Text[ thai ] = "喔斷副喔娻笝喔掂笢喔灌箟喙冟笂喙 7"; }; String STR_POOLCOLL_TOX_USER8 { @@ -3642,9 +3777,9 @@ String STR_POOLCOLL_TOX_USER8 Text [ danish ] = "Brugerindeks 8" ; Text [ portuguese ] = "蚽dice personalizado 8" ; Text [ portuguese_brazilian ] = "Benutzerverzeichnis 8" ; - Text[ russian ] = "项朦珙忄蝈朦耜栝 箨噻囹咫 8"; + Text[ russian ] = "雨噻囹咫 镱朦珙忄蝈 8"; Text[ polish ] = "Indeks u縴tkownika 8"; - Text[ japanese ] = "锞曪桨锝伙緸锝板畾缇┿伄绱㈠紩 8"; + Text[ japanese ] = "銉︺兗銈躲兗瀹氱京銇储寮 8"; Text[ arabic ] = "蒎延 轻阌饰香 8"; Text[ greek ] = "捧皴艮耖 黢珞酤 8"; Text[ korean ] = "靷毄鞛 靸夓澑 8"; @@ -3652,8 +3787,9 @@ String STR_POOLCOLL_TOX_USER8 Text[ chinese_traditional ] = "鑷▊鐩寗 8"; Text[ turkish ] = "Kullan齝 dizini 8"; Text[ language_user1 ] = " "; - Text[ catalan ] = "蚽dice del usuario 8"; + Text[ catalan ] = "蚽dex d'usuari 8"; Text[ finnish ] = "K鋣tt鋔鋒akemisto 8"; + Text[ thai ] = "喔斷副喔娻笝喔掂笢喔灌箟喙冟笂喙 8"; }; String STR_POOLCOLL_TOX_USER9 { @@ -3668,9 +3804,9 @@ String STR_POOLCOLL_TOX_USER9 Text [ danish ] = "Brugerindeks 9" ; Text [ portuguese ] = "蚽dice personalizado 9" ; Text [ portuguese_brazilian ] = "Benutzerverzeichnis 9" ; - Text[ russian ] = "项朦珙忄蝈朦耜栝 箨噻囹咫 9"; + Text[ russian ] = "雨噻囹咫 镱朦珙忄蝈 9"; Text[ polish ] = "Indeks u縴tkownika 9"; - Text[ japanese ] = "锞曪桨锝伙緸锝板畾缇┿伄绱㈠紩 9"; + Text[ japanese ] = "銉︺兗銈躲兗瀹氱京銇储寮 9"; Text[ arabic ] = "蒎延 轻阌饰香 9"; Text[ greek ] = "捧皴艮耖 黢珞酤 9"; Text[ korean ] = "靷毄鞛 靸夓澑 9"; @@ -3678,8 +3814,9 @@ String STR_POOLCOLL_TOX_USER9 Text[ chinese_traditional ] = "鑷▊鐩寗 9"; Text[ turkish ] = "Kullan齝 dizini 9"; Text[ language_user1 ] = " "; - Text[ catalan ] = "蚽dice del usuario 9"; + Text[ catalan ] = "蚽dex d'usuari 9"; Text[ finnish ] = "K鋣tt鋔鋒akemisto 9"; + Text[ thai ] = "喔斷副喔娻笝喔掂笢喔灌箟喙冟笂喙 9"; }; String STR_POOLCOLL_TOX_USER10 { @@ -3694,9 +3831,9 @@ String STR_POOLCOLL_TOX_USER10 Text [ danish ] = "Brugerindeks 10" ; Text [ portuguese ] = "蚽dice personalizado 10" ; Text [ portuguese_brazilian ] = "Benutzerverzeichnis 10" ; - Text[ russian ] = "项朦珙忄蝈朦耜栝 箨噻囹咫 10"; + Text[ russian ] = "雨噻囹咫 镱朦珙忄蝈 10"; Text[ polish ] = "Indeks u縴tkownika 10"; - Text[ japanese ] = "锞曪桨锝伙緸锝板畾缇┿伄绱㈠紩 10"; + Text[ japanese ] = "銉︺兗銈躲兗瀹氱京銇储寮 10"; Text[ arabic ] = "蒎延 轻阌饰香 10"; Text[ greek ] = "捧皴艮耖 黢珞酤 10"; Text[ korean ] = "靷毄鞛 靸夓澑 10"; @@ -3704,8 +3841,9 @@ String STR_POOLCOLL_TOX_USER10 Text[ chinese_traditional ] = "鑷▊鐩寗 10"; Text[ turkish ] = "Kullan齝 dizini 10"; Text[ language_user1 ] = " "; - Text[ catalan ] = "蚽dice del usuario 10"; + Text[ catalan ] = "蚽dex d'usuari 10"; Text[ finnish ] = "K鋣tt鋔鋒akemisto 10"; + Text[ thai ] = "喔斷副喔娻笝喔掂笢喔灌箟喙冟笂喙 10"; }; String STR_POOLCOLL_TOX_ILLUSH { @@ -3713,9 +3851,9 @@ String STR_POOLCOLL_TOX_ILLUSH Text [ English ] = "Illustration index heading" ; Text[ english_us ] = "Illustration Index Heading"; Text[ portuguese ] = "T韙ulo - 蚽dice de ilustra珲es"; - Text[ russian ] = "扬桉铌 痂耋黻钼: 玎泐腩忸"; + Text[ russian ] = "青泐腩忸 耧桉赅 桦膻耱疣鲨"; Text[ greek ] = "硼殛弼犭咪 赆翎朦泔 彘挈睐"; - Text[ dutch ] = "Opschrift afbeeldingenregister"; + Text[ dutch ] = "Titel afbeeldingenregister"; Text[ french ] = "Titre de l'index des illustrations"; Text[ spanish ] = "Encabezado 蚽dice de ilustraciones"; Text[ italian ] = "Intestazione indice illustrazioni"; @@ -3730,8 +3868,9 @@ String STR_POOLCOLL_TOX_ILLUSH Text[ arabic ] = "阡媲 蒎延 轻真 轻彭智晚"; Text[ turkish ] = "Resim dizini ba"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado 蚽dice de ilustraciones"; - Text[ finnish ] = "Kuvitushakemiston otsikko"; + Text[ catalan ] = "Encap鏰lament de l'韓dex d'il.lustracions"; + Text[ finnish ] = "Kuvitusluettelon otsikko"; + Text[ thai ] = "喔副喔о箑喔｀阜喙堗腑喔囙笖喔编笂喔權傅喔犩覆喔炧笡喔｀赴喔佮腑喔"; }; String STR_POOLCOLL_TOX_ILLUS1 { @@ -3739,7 +3878,7 @@ String STR_POOLCOLL_TOX_ILLUS1 Text [ English ] = "Illustration index 1" ; Text[ english_us ] = "Illustration Index 1"; Text[ portuguese ] = "蚽dice de ilustra珲es 1"; - Text[ russian ] = "扬桉铌 痂耋黻钼 1"; + Text[ russian ] = "扬桉铌 桦膻耱疣鲨 1"; Text[ greek ] = "梳糗腼泔 彘挈睐 1"; Text[ dutch ] = "Afbeeldingenregister 1"; Text[ french ] = "Index des illustrations 1"; @@ -3756,8 +3895,9 @@ String STR_POOLCOLL_TOX_ILLUS1 Text[ arabic ] = "蒎延 轻真 轻彭智晚 1"; Text[ turkish ] = "Resim dizini 1"; Text[ language_user1 ] = " "; - Text[ catalan ] = "蚽dice de ilustraciones 1"; - Text[ finnish ] = "Kuvitushakemisto 1"; + Text[ catalan ] = "蚽dex d'il.lustracions 1"; + Text[ finnish ] = "Kuvitusluettelo 1"; + Text[ thai ] = "喔斷副喔娻笝喔掂笭喔侧笧喔涏福喔班竵喔笟 1"; }; String STR_POOLCOLL_TOX_OBJECTH { @@ -3765,25 +3905,26 @@ String STR_POOLCOLL_TOX_OBJECTH Text [ English ] = "Object index heading" ; Text[ english_us ] = "Object index heading"; Text[ portuguese ] = "T韙ulo - 蚽dice de objectos"; - Text[ russian ] = "扬桉铌 钺牝钼: 玎泐腩忸"; + Text[ russian ] = "青泐腩忸 耧桉赅 钺牝钼"; Text[ greek ] = "硼殛弼犭咪 赆翎朦泔 犴糸赍殪蓓"; - Text[ dutch ] = "Opschrift objectenregister"; - Text[ french ] = "Titre d'index d'objets"; + Text[ dutch ] = "Titel objectregister"; + Text[ french ] = "Titre d'index des objets"; Text[ spanish ] = "Encabezado 韓dice de objetos"; Text[ italian ] = "Intestazione indice degli oggetti"; Text[ danish ] = "Objektindeks overskrift"; Text[ swedish ] = "Objektf鰎teckning 鰒erskrift"; Text[ polish ] = "Indeks obiekt體 Tytu"; Text[ portuguese_brazilian ] = "Object index heading"; - Text[ japanese ] = "锝碉緦锞烇郊锞烇姜锝革緞绱㈠紩瑕嬪嚭銇"; + Text[ japanese ] = "銈儢銈搞偋銈儓绱㈠紩瑕嬪嚭銇"; Text[ korean ] = "臧滌泊 靸夓澑 鞝滊"; Text[ chinese_simplified ] = "瀵硅薄鐩綍鏍囬"; Text[ chinese_traditional ] = "鐗╀欢鐩寗妯欓"; Text[ arabic ] = "阡媲 蒎延 轻咔其鞘"; Text[ turkish ] = "Nesne dizini ba"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado 韓dice de objetos"; + Text[ catalan ] = "Encap鏰lament de l'韓dex d'objectes"; Text[ finnish ] = "Objektihakemiston otsikko"; + Text[ thai ] = "喔副喔о箑喔｀阜喙堗腑喔囙笖喔编笂喔權傅喔о副喔曕笘喔"; }; String STR_POOLCOLL_TOX_OBJECT1 { @@ -3793,23 +3934,24 @@ String STR_POOLCOLL_TOX_OBJECT1 Text[ portuguese ] = "蚽dice de objectos 1"; Text[ russian ] = "扬桉铌 钺牝钼 1"; Text[ greek ] = "梳糗腼泔 犴糸赍殪蓓 1"; - Text[ dutch ] = "Objectenregister 1"; - Text[ french ] = "Index d'objet 1"; + Text[ dutch ] = "Objectregister 1"; + Text[ french ] = "Index des objets 1"; Text[ spanish ] = "蚽dice de objetos 1"; Text[ italian ] = "Indice degli oggetti 1"; Text[ danish ] = "Objektindeks 1"; Text[ swedish ] = "Objektf鰎teckning 1"; Text[ polish ] = "Indeks obiekt體 1"; Text[ portuguese_brazilian ] = "Object index 1"; - Text[ japanese ] = "锝碉緦锞烇郊锞烇姜锝革緞绱㈠紩 1"; + Text[ japanese ] = "銈儢銈搞偋銈儓绱㈠紩 1"; Text[ korean ] = "臧滌泊 靸夓澑 1"; Text[ chinese_simplified ] = "瀵硅薄鐩綍 1"; Text[ chinese_traditional ] = "鐗╀欢鐩寗 1"; Text[ arabic ] = "蒎延 轻咔其鞘 1"; Text[ turkish ] = "Nesne dizini 1"; Text[ language_user1 ] = " "; - Text[ catalan ] = "蚽dice de objetos 1"; + Text[ catalan ] = "蚽dex d'objectes 1"; Text[ finnish ] = "Objektihakemisto 1"; + Text[ thai ] = "喔斷副喔娻笝喔掂抚喔编笗喔栢父 1"; }; String STR_POOLCOLL_TOX_TABLESH { @@ -3817,7 +3959,7 @@ String STR_POOLCOLL_TOX_TABLESH Text [ English ] = "Table index heading" ; Text[ english_us ] = "Table index heading"; Text[ portuguese ] = "T韙ulo - 蚽dice de tabelas"; - Text[ russian ] = "扬桉铌 蜞犭桷: 玎泐腩忸"; + Text[ russian ] = "青泐腩忸 耧桉赅 蜞犭桷"; Text[ greek ] = "硼殛弼犭咪 艴皴艮耖 疬磲赆"; Text[ dutch ] = "Opschrift tabellenregister"; Text[ french ] = "Titre d'index de tables"; @@ -3834,8 +3976,9 @@ String STR_POOLCOLL_TOX_TABLESH Text[ arabic ] = "阡媲 蒎延 轻滔驷"; Text[ turkish ] = "Tablo dizini ba"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado 韓dice de tablas"; + Text[ catalan ] = "Encap鏰lament de l'韓dex de taules"; Text[ finnish ] = "Taulukkohakemiston otsikko"; + Text[ thai ] = "喔副喔о箑喔｀阜喙堗腑喔囙笖喔编笂喔權傅喔曕覆喔｀覆喔"; }; String STR_POOLCOLL_TOX_TABLES1 { @@ -3860,8 +4003,9 @@ String STR_POOLCOLL_TOX_TABLES1 Text[ arabic ] = "蒎延 滔驷 1"; Text[ turkish ] = "Tablo dizini 1"; Text[ language_user1 ] = " "; - Text[ catalan ] = "蚽dice de tablas 1"; + Text[ catalan ] = "蚽dex de taules 1"; Text[ finnish ] = "Taulukkohakemisto 1"; + Text[ thai ] = "喔斷副喔娻笝喔掂笗喔侧福喔侧竾 1"; }; String STR_POOLCOLL_TOX_AUTHORITIESH { @@ -3869,25 +4013,26 @@ String STR_POOLCOLL_TOX_AUTHORITIESH Text [ English ] = "Index of authorities heading" ; Text[ english_us ] = "Bibliography Heading"; Text[ portuguese ] = "T韙ulo - Bibliografia"; - Text[ russian ] = "扬桉铌 腓蝈疣蝮瘥: 玎泐腩忸"; + Text[ russian ] = "青泐腩忸 徼犭桀沭圄梃"; Text[ greek ] = "硼殛弼犭咪 忾怆轱泷狯哚"; - Text[ dutch ] = "Opschrift literatuurlijst"; + Text[ dutch ] = "Titel literatuurlijst"; Text[ french ] = "Titre de bibliographie"; - Text[ spanish ] = "Encabezado Bibliograf韆"; + Text[ spanish ] = "Encabezado de bibliograf韆"; Text[ italian ] = "Intestazione bibliografia"; Text[ danish ] = "Litteraturliste overskrift"; Text[ swedish ] = "Litteraturf鰎teckning 鰒erskrift"; Text[ polish ] = "Bibliografia - Tytu"; Text[ portuguese_brazilian ] = "Index of authorities heading"; Text[ japanese ] = "鍙傝冩枃鐚〃瑕嬪嚭銇"; - Text[ korean ] = "彀戈碃氍疙棇 毹鸽Μ旮"; + Text[ korean ] = "彀戈碃 氍疙棇 鞝滊"; Text[ chinese_simplified ] = "鏂囩尞鐩綍鏍囬"; Text[ chinese_traditional ] = "鏂囩嵒鐩寗妯欓"; Text[ arabic ] = "阡媲 蒎延 轻阊翘"; Text[ turkish ] = "Kaynak鏰 dizini ba"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Encabezado Bibliograf韆"; - Text[ finnish ] = "Bibliografian otsikko"; + Text[ catalan ] = "Encap鏰lament de la bibliografia"; + Text[ finnish ] = "L鋒deluettelon otsikko"; + Text[ thai ] = "喔副喔о箑喔｀阜喙堗腑喔囙笟喔｀福喔撪覆喔權父喔佮福喔"; }; String STR_POOLCOLL_TOX_AUTHORITIES1 { @@ -3895,7 +4040,7 @@ String STR_POOLCOLL_TOX_AUTHORITIES1 Text [ English ] = "Index of authorities 1" ; Text[ english_us ] = "Bibliography 1"; Text[ portuguese ] = "Bibliografia 1"; - Text[ russian ] = "扬桉铌 腓蝈疣蝮瘥 1"; + Text[ russian ] = "凌犭桀沭圄 1"; Text[ greek ] = "麻怆轱泷狯哚 1"; Text[ dutch ] = "Literatuurlijst 1"; Text[ french ] = "Bibliographie 1"; @@ -3912,8 +4057,9 @@ String STR_POOLCOLL_TOX_AUTHORITIES1 Text[ arabic ] = "蒎延 轻阊翘 1"; Text[ turkish ] = "Kaynak鏰 dizini 1"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Bibliograf韆 1"; - Text[ finnish ] = "Bibliografia 1"; + Text[ catalan ] = "Bibliografia 1"; + Text[ finnish ] = "L鋒deluettelo 1"; + Text[ thai ] = "喔氞福喔｀笓喔侧笝喔膏竵喔｀浮 1"; }; String STR_POOLCOLL_DOC_TITEL @@ -3924,7 +4070,7 @@ String STR_POOLCOLL_DOC_TITEL Text [ english_us ] = "Title" ; Text [ italian ] = "Titolo" ; Text [ spanish ] = "T韙ulo" ; - Text [ french ] = "Titre" ; + Text [ french ] = "Titre principal" ; Text [ swedish ] = "Rubrik" ; Text [ danish ] = "Titel" ; Text [ portuguese ] = "T韙ulo principal" ; @@ -3932,15 +4078,16 @@ String STR_POOLCOLL_DOC_TITEL Text[ chinese_simplified ] = "澶ф爣棰"; Text[ russian ] = "青泐腩忸"; Text[ polish ] = "Tytu"; - Text[ japanese ] = "锞锝诧緞锞"; + Text[ japanese ] = "銈裤偆銉堛儷"; Text[ chinese_traditional ] = "澶ф椤"; Text[ arabic ] = "轻阡媲"; Text[ greek ] = "赃綦矧"; - Text[ korean ] = "Title"; + Text[ korean ] = "欤检牅"; Text[ turkish ] = "B鰈黰 ba"; Text[ language_user1 ] = " "; - Text[ catalan ] = "T韙ulo"; + Text[ catalan ] = "T韙ol"; Text[ finnish ] = "Otsikko"; + Text[ thai ] = "喔娻阜喙堗腑喙喔｀阜喙堗腑喔"; }; String STR_POOLCOLL_DOC_SUBTITEL { @@ -3965,8 +4112,9 @@ String STR_POOLCOLL_DOC_SUBTITEL Text[ korean ] = "攵鞝"; Text[ turkish ] = "Alt ba齥"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Subt韙ulo"; - Text[ finnish ] = "Aliotsikko"; + Text[ catalan ] = "Subt韙ol"; + Text[ finnish ] = "Alaotsikko"; + Text[ thai ] = "喔娻阜喙堗腑喙喔｀阜喙堗腑喔囙福喔竾"; }; String STR_POOLCOLL_HTML_BLOCKQUOTE { @@ -3991,8 +4139,9 @@ String STR_POOLCOLL_HTML_BLOCKQUOTE Text[ korean ] = "鞚胳毄"; Text[ turkish ] = "Al齨t"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Cita"; + Text[ catalan ] = "Citacions"; Text[ finnish ] = "Lainaukset"; + Text[ thai ] = "喔佮覆喔｀腑喙夃覆喔囙腑喔脆竾"; }; String STR_POOLCOLL_HTML_PRE { @@ -4010,15 +4159,16 @@ String STR_POOLCOLL_HTML_PRE Text[ chinese_simplified ] = "棰勬牸寮忓寲鐨勬鏂"; Text[ russian ] = "义犟 玎溧眄铎 纛痨囹"; Text[ polish ] = "Tekst niesformatowany"; - Text[ japanese ] = "鏇稿紡瑷畾鍓嶃伄锞冿椒锝斤緞"; + Text[ japanese ] = "鏇稿紡瑷畾鍓嶃伄銉嗐偔銈广儓"; Text[ chinese_traditional ] = "闋愭牸寮忓寲鐨勫収鏂"; Text[ arabic ] = "湔 沅愚 阌绒丘"; Text[ greek ] = "旭镬锺鲲痫殓燧盹 赍哽屙"; - Text[ korean ] = "靷爠銆韽Х霅 韰嶌姢韸"; + Text[ korean ] = "靷爠 靹滌嫕霅 韰嶌姢韸"; Text[ turkish ] = "謓ceden formatlanm metin"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Texto preformateado"; + Text[ catalan ] = "Text preformatat"; Text[ finnish ] = "Esimuotoiltu teksti"; + Text[ thai ] = "喔傕箟喔竸喔о覆喔∴笚喔掂箞喔堗副喔斷福喔灌笡喙佮笟喔氞箘喔о箟喙佮弗喙夃抚"; }; String STR_POOLCOLL_HTML_HR { @@ -4040,11 +4190,12 @@ String STR_POOLCOLL_HTML_HR Text[ chinese_traditional ] = "姘村钩绶"; Text[ arabic ] = "呜 幂揄"; Text[ greek ] = "像殒糸 泷犰燹"; - Text[ korean ] = "靾橅弶 靹"; + Text[ korean ] = "臧搿滌劆"; Text[ turkish ] = "Yatay 鏸zgi"; Text[ language_user1 ] = " "; - Text[ catalan ] = "L韓ea horizontal"; + Text[ catalan ] = "L韓ia horitzontal"; Text[ finnish ] = "Vaakaviiva"; + Text[ thai ] = "喔氞福喔｀笚喔编笖喔曕覆喔∴箒喔權抚喔權腑喔"; }; String STR_POOLCOLL_HTML_DD { @@ -4055,22 +4206,23 @@ String STR_POOLCOLL_HTML_DD Text [ swedish ] = "Listinneh錶l" ; Text [ danish ] = "Listeindhold" ; Text [ italian ] = "Contenuto elenco" ; - Text [ spanish ] = "Contenido de lista" ; + Text [ spanish ] = "Contenido de la lista" ; Text [ french ] = "Contenu de liste" ; Text [ portuguese ] = "Conte鷇o da lista" ; Text [ portuguese_brazilian ] = "Listeninhalt" ; Text[ chinese_simplified ] = "鍒楄〃鍐呭"; - Text[ russian ] = "扬桉铌 耦溴疰囗"; + Text[ russian ] = "杨溴疰桁铄 耧桉赅"; Text[ polish ] = "Zawarto滄 listy"; - Text[ japanese ] = "锞橈浇锞勩伄鍐呭"; + Text[ japanese ] = "銉偣銉堛伄鍐呭"; Text[ chinese_traditional ] = "娓呭柈鍏у"; Text[ arabic ] = "阃舒砬 轻耷沏"; Text[ greek ] = "绣耖鬻屙 脒篝狎"; Text[ korean ] = "氇╇ 雮挫毄"; Text[ turkish ] = "Liste i鏴ri餴"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Contenido de lista"; + Text[ catalan ] = "Contingut de la llista"; Text[ finnish ] = "Luetteloiden sis鋖l鰐"; + Text[ thai ] = "喔｀覆喔⑧竵喔侧福喙喔權阜喙夃腑喔覆"; }; String STR_POOLCOLL_HTML_DT { @@ -4088,15 +4240,16 @@ String STR_POOLCOLL_HTML_DT Text[ chinese_simplified ] = "鍒楄〃鏍囬"; Text[ russian ] = "青泐腩忸 耧桉赅"; Text[ polish ] = "Nag丑wek listy"; - Text[ japanese ] = "锞橈浇锞勩伄瑕嬪嚭銇"; + Text[ japanese ] = "銉偣銉堛伄瑕嬪嚭銇"; Text[ language_user1 ] = " "; Text[ chinese_traditional ] = "娓呭柈妯欓"; Text[ arabic ] = "阡媲 轻耷沏"; Text[ greek ] = "叔鲠脒溽 赆翎朦泔"; Text[ korean ] = "氇╇ 鞝滊"; Text[ turkish ] = "Liste ba"; - Text[ catalan ] = "Encabezamiento de lista"; + Text[ catalan ] = "Encap鏰lament de llista"; Text[ finnish ] = "Luettelon otsikko"; + Text[ thai ] = "喔｀覆喔⑧竵喔侧福喔副喔о箑喔｀阜喙堗腑喔"; }; //page style names String STR_POOLPAGE_STANDARD @@ -4113,17 +4266,18 @@ String STR_POOLPAGE_STANDARD Text [ portuguese ] = "Padr鉶" ; Text [ portuguese_brazilian ] = "Standard" ; Text[ chinese_simplified ] = "鏍囧噯"; - Text[ russian ] = "羊囗溧痱"; + Text[ russian ] = "吾睇"; Text[ polish ] = "Domy渓nie"; Text[ japanese ] = "妯欐簴"; Text[ chinese_traditional ] = "妯欐簴"; Text[ arabic ] = "揄怯"; Text[ greek ] = "旭镥痖腼戕"; - Text[ korean ] = "響滌"; + Text[ korean ] = "旮半掣臧"; Text[ turkish ] = "Standart"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Predeterminado"; - Text[ finnish ] = "Vakio"; + Text[ catalan ] = "Per defecte"; + Text[ finnish ] = "Oletus"; + Text[ thai ] = "喔勦箞喔侧箑喔｀复喙堗浮喔曕箟喔"; }; String STR_POOLPAGE_FIRST { @@ -4141,15 +4295,16 @@ String STR_POOLPAGE_FIRST Text[ chinese_simplified ] = "棣栭〉"; Text[ russian ] = "襄疴 耱疣龛鲟"; Text[ polish ] = "Pierwsza strona"; - Text[ japanese ] = "鏈鍒濄伄锞嶏緹锝帮郊锞"; + Text[ japanese ] = "鏈鍒濄伄銉氥兗銈"; Text[ chinese_traditional ] = "棣栭爜"; Text[ arabic ] = "轻蛰蜕 轻面犰"; Text[ greek ] = "旭 箦脒溽"; Text[ korean ] = "觳 韼橃澊歆"; Text[ turkish ] = "輑k sayfa"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Primera p醙ina"; + Text[ catalan ] = "Primera p鄃ina"; Text[ finnish ] = "Ensimm鋓nen sivu"; + Text[ thai ] = "喔笝喙夃覆喙佮福喔"; }; String STR_POOLPAGE_LEFT { @@ -4158,7 +4313,7 @@ String STR_POOLPAGE_LEFT Text [ english_us ] = "Left Page" ; Text [ italian ] = "Pagina sinistra" ; Text [ spanish ] = "P醙ina izquierda" ; - Text [ french ] = "Page gauche" ; + Text [ french ] = "Page de gauche" ; Text [ dutch ] = "Linkerpagina" ; Text [ swedish ] = "V鋘stersida" ; Text [ danish ] = "Venstre side" ; @@ -4167,15 +4322,16 @@ String STR_POOLPAGE_LEFT Text[ chinese_simplified ] = "宸﹂〉"; Text[ russian ] = "隋忄 耱疣龛鲟"; Text[ polish ] = "Strona nieparzysta"; - Text[ japanese ] = "宸︼緧锞燂桨锝硷緸"; + Text[ japanese ] = "宸︺儦銉笺偢"; Text[ chinese_traditional ] = "宸﹂爜"; Text[ arabic ] = "轻蛰蜕 轻碛鸯"; Text[ greek ] = "榴轶翦褶 箦脒溽"; Text[ korean ] = "鞕检"; Text[ turkish ] = "Sol sayfa"; Text[ language_user1 ] = " "; - Text[ catalan ] = "P醙ina izquierda"; + Text[ catalan ] = "P鄃ina esquerra"; Text[ finnish ] = "Vasen sivu"; + Text[ thai ] = "喔笝喙夃覆喔嬥箟喔侧涪"; }; String STR_POOLPAGE_RIGHT { @@ -4193,15 +4349,16 @@ String STR_POOLPAGE_RIGHT Text[ chinese_simplified ] = "鍙抽〉"; Text[ russian ] = "橡噔 耱疣龛鲟"; Text[ polish ] = "Strona parzysta"; - Text[ japanese ] = "鍙筹緧锞燂桨锝硷緸"; + Text[ japanese ] = "鍙炽儦銉笺偢"; Text[ chinese_traditional ] = "鍙抽爜"; Text[ arabic ] = "轻蛰蜕 轻磴潇"; Text[ greek ] = "腻铋 箦脒溽"; Text[ korean ] = "鞓るジ飒"; Text[ turkish ] = "Sa sayfa"; Text[ language_user1 ] = " "; - Text[ catalan ] = "P醙ina derecha"; + Text[ catalan ] = "P鄃ina dreta"; Text[ finnish ] = "Oikea sivu"; + Text[ thai ] = "喔笝喙夃覆喔傕抚喔"; }; String STR_POOLPAGE_JAKET { @@ -4227,7 +4384,8 @@ String STR_POOLPAGE_JAKET Text[ turkish ] = "Zarf"; Text[ language_user1 ] = " "; Text[ catalan ] = "Sobre"; - Text[ finnish ] = "Kirjekuori (Envelope)"; + Text[ finnish ] = "Kirjekuori"; + Text[ thai ] = "喔嬥腑喔囙笀喔斷斧喔∴覆喔"; }; String STR_POOLPAGE_REGISTER { @@ -4243,7 +4401,7 @@ String STR_POOLPAGE_REGISTER Text [ portuguese ] = "蚽dice" ; Text [ portuguese_brazilian ] = "Verzeichnis" ; Text[ chinese_simplified ] = "鐩綍"; - Text[ russian ] = "毋豚怆屙桢"; + Text[ russian ] = "雨噻囹咫"; Text[ polish ] = "Indeks"; Text[ japanese ] = "绱㈠紩"; Text[ chinese_traditional ] = "鐩寗"; @@ -4252,8 +4410,9 @@ String STR_POOLPAGE_REGISTER Text[ korean ] = "靸夓澑"; Text[ turkish ] = "Dizin"; Text[ language_user1 ] = " "; - Text[ catalan ] = "蚽dice"; + Text[ catalan ] = "蚽dex"; Text[ finnish ] = "Hakemisto"; + Text[ thai ] = "喔斷副喔娻笝喔"; }; String STR_POOLPAGE_HTML { @@ -4280,6 +4439,7 @@ String STR_POOLPAGE_HTML Text[ language_user1 ] = " "; Text[ catalan ] = "HTML"; Text[ finnish ] = "HTML"; + Text[ thai ] = "HTML"; }; String STR_POOLPAGE_FOOTNOTE { @@ -4304,8 +4464,9 @@ String STR_POOLPAGE_FOOTNOTE Text[ korean ] = "臧侅＜"; Text[ turkish ] = "Dipnot"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nota al pie"; + Text[ catalan ] = "Nota al peu"; Text[ finnish ] = "Alaviite"; + Text[ thai ] = "喙喔娻复喔囙腑喔｀福喔"; }; String STR_POOLPAGE_ENDNOTE { @@ -4317,7 +4478,7 @@ String STR_POOLPAGE_ENDNOTE Text [ swedish ] = "Slutnot" ; Text [ danish ] = "Slutnote" ; Text [ italian ] = "Nota di chiusura" ; - Text [ spanish ] = "Nota al final" ; + Text [ spanish ] = "Nota final" ; Text [ french ] = "Note de fin" ; Text [ dutch ] = "Eindnoot" ; Text[ chinese_simplified ] = "灏炬敞"; @@ -4330,8 +4491,9 @@ String STR_POOLPAGE_ENDNOTE Text[ korean ] = "氙胳＜"; Text[ turkish ] = "Sonnot"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nota al final"; - Text[ finnish ] = "Loppuhuomautus"; + Text[ catalan ] = "Nota final"; + Text[ finnish ] = "Loppuviite"; + Text[ thai ] = "喔箟喔侧竾喔复喔囙笚喙夃覆喔⑧箑喔｀阜喙堗腑喔"; }; /* Numerierungs Regeln @@ -4356,11 +4518,12 @@ String STR_POOLNUMRULE_NUM1 Text[ chinese_traditional ] = "绶ㄨ櫉 1"; Text[ arabic ] = "轻恃揄 1"; Text[ greek ] = "榴哞扃箸 1"; - Text[ korean ] = "氩堩樃 1"; + Text[ korean ] = "氩堩樃 毵り赴旮 1"; Text[ turkish ] = "Numaralama 1"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇 1"; + Text[ catalan ] = "Numeraci 1"; Text[ finnish ] = "Numerointi 1"; + Text[ thai ] = "喔ム赋喔斷副喔氞斧喔∴覆喔⑧箑喔ム競 1"; }; String STR_POOLNUMRULE_NUM2 { @@ -4382,11 +4545,12 @@ String STR_POOLNUMRULE_NUM2 Text[ chinese_traditional ] = "绶ㄨ櫉 2"; Text[ arabic ] = "轻恃揄 2"; Text[ greek ] = "榴哞扃箸 2"; - Text[ korean ] = "氩堩樃 2"; + Text[ korean ] = "氩堩樃 毵り赴旮 2"; Text[ turkish ] = "Numaralama 2"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇 2"; + Text[ catalan ] = "Numeraci 2"; Text[ finnish ] = "Numerointi 2"; + Text[ thai ] = "喔ム赋喔斷副喔氞斧喔∴覆喔⑧箑喔ム競 2"; }; String STR_POOLNUMRULE_NUM3 { @@ -4408,11 +4572,12 @@ String STR_POOLNUMRULE_NUM3 Text[ chinese_traditional ] = "绶ㄨ櫉 3"; Text[ arabic ] = "轻恃揄 3"; Text[ greek ] = "榴哞扃箸 3"; - Text[ korean ] = "氩堩樃 3"; + Text[ korean ] = "氩堩樃 毵り赴旮 3"; Text[ turkish ] = "Numaralama 3"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇 3"; + Text[ catalan ] = "Numeraci 3"; Text[ finnish ] = "Numerointi 3"; + Text[ thai ] = "喔ム赋喔斷副喔氞斧喔∴覆喔⑧箑喔ム競 3"; }; String STR_POOLNUMRULE_NUM4 { @@ -4434,11 +4599,12 @@ String STR_POOLNUMRULE_NUM4 Text[ chinese_traditional ] = "绶ㄨ櫉 4"; Text[ arabic ] = "轻恃揄 4"; Text[ greek ] = "榴哞扃箸 4"; - Text[ korean ] = "氩堩樃 4"; + Text[ korean ] = "氩堩樃 毵り赴旮 4"; Text[ turkish ] = "Numaralama 4"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇 4"; + Text[ catalan ] = "Numeraci 4"; Text[ finnish ] = "Numerointi 4"; + Text[ thai ] = "喔ム赋喔斷副喔氞斧喔∴覆喔⑧箑喔ム競 4"; }; String STR_POOLNUMRULE_NUM5 { @@ -4460,11 +4626,12 @@ String STR_POOLNUMRULE_NUM5 Text[ chinese_traditional ] = "绶ㄨ櫉 5"; Text[ arabic ] = "轻恃揄 5"; Text[ greek ] = "榴哞扃箸 5"; - Text[ korean ] = "氩堩樃 5"; + Text[ korean ] = "氩堩樃 毵り赴旮 5"; Text[ turkish ] = "Numaralama 5"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Numeraci髇 5"; + Text[ catalan ] = "Numeraci 5"; Text[ finnish ] = "Numerointi 5"; + Text[ thai ] = "喔ム赋喔斷副喔氞斧喔∴覆喔⑧箑喔ム競 5"; }; String STR_POOLNUMRULE_BUL1 { @@ -4490,8 +4657,9 @@ String STR_POOLNUMRULE_BUL1 Text[ korean ] = "旮毹鸽Μ 旮绊樃 1"; Text[ turkish ] = "Liste 1"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeraci髇 1"; + Text[ catalan ] = "Llista 1"; Text[ finnish ] = "Luettelo 1"; + Text[ thai ] = "喔｀覆喔⑧竵喔侧福 1"; }; String STR_POOLNUMRULE_BUL2 { @@ -4517,8 +4685,9 @@ String STR_POOLNUMRULE_BUL2 Text[ korean ] = "旮毹鸽Μ 旮绊樃 2"; Text[ turkish ] = "Liste 2"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeraci髇 2"; + Text[ catalan ] = "Llista 2"; Text[ finnish ] = "Luettelo 2"; + Text[ thai ] = "喔｀覆喔⑧竵喔侧福 2"; }; String STR_POOLNUMRULE_BUL3 { @@ -4544,8 +4713,9 @@ String STR_POOLNUMRULE_BUL3 Text[ korean ] = "旮毹鸽Μ 旮绊樃 3"; Text[ turkish ] = "Liste 3"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeraci髇 3"; + Text[ catalan ] = "Llista 3"; Text[ finnish ] = "Luettelo 3"; + Text[ thai ] = "喔｀覆喔⑧竵喔侧福 3"; }; String STR_POOLNUMRULE_BUL4 { @@ -4571,8 +4741,9 @@ String STR_POOLNUMRULE_BUL4 Text[ korean ] = "旮毹鸽Μ 旮绊樃 4"; Text[ turkish ] = "Liste 4"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeraci髇 4"; + Text[ catalan ] = "Llista 4"; Text[ finnish ] = "Luettelo 4"; + Text[ thai ] = "喔｀覆喔⑧竵喔侧福 4"; }; String STR_POOLNUMRULE_BUL5 { @@ -4598,8 +4769,9 @@ String STR_POOLNUMRULE_BUL5 Text[ korean ] = "旮毹鸽Μ 旮绊樃 5"; Text[ turkish ] = "Liste 5"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Enumeraci髇 5"; + Text[ catalan ] = "Llista 5"; Text[ finnish ] = "Luettelo 5"; + Text[ thai ] = "喔｀覆喔⑧竵喔侧福 5"; }; String STR_POOLCHR_RUBYTEXT @@ -4608,32 +4780,54 @@ String STR_POOLCHR_RUBYTEXT Text [ English ] = "Rubies" ; Text[ english_us ] = "Rubies"; Text[ portuguese ] = "Rubys"; - Text[ russian ] = "灶礤蜩麇耜桢 珥嚓"; + Text[ russian ] = "茵囗耠栩屦圉"; Text[ greek ] = "柱礴糸贶 簖焘镫"; Text[ dutch ] = "Fonetische tekens"; Text[ french ] = "Rubys"; Text[ spanish ] = "Rubys"; - Text[ finnish ] = "Foneettiset merkit"; + Text[ finnish ] = "Ruby-tekstit"; Text[ italian ] = "Testo Ruby"; - Text[ danish ] = "Phonetic Symbols"; + Text[ danish ] = "Fonetisk tekst"; Text[ swedish ] = "Rubytext"; Text[ polish ] = "Znaki Ruby"; Text[ portuguese_brazilian ] = "Phonetic Symbols"; Text[ japanese ] = "銇点倞銇屻仾"; - Text[ korean ] = "耄箘"; + Text[ korean ] = "雿щ"; Text[ chinese_simplified ] = "鎷奸煶鍜屾敞闊崇鍙"; Text[ chinese_traditional ] = "娉ㄩ煶绗﹁櫉"; Text[ turkish ] = "Phonetic Symbols"; Text[ arabic ] = "雁嬉 真薯"; - Text[ catalan ] = "S韒bolos fon閠icos"; + Text[ catalan ] = "S韒bols fon鑤ics"; + Text[ thai ] = "喔曕副喔о笧喔脆浮喔炧箤喙喔ム箛喔"; }; String STR_POOLCHR_VERT_NUM { Text = "Vertikale Nummerierungszeichen" ; Text [ English ] = "Vertical Numbering Symbols" ; + Text[ english_us ] = "Vertical Numbering Symbols"; + Text[ portuguese ] = "Vertical Numbering Symbols"; + Text[ russian ] = "Vertical Numbering Symbols"; + Text[ greek ] = "Vertical Numbering Symbols"; + Text[ dutch ] = "Vertical Numbering Symbols"; + Text[ french ] = "Caract鑢es de num閞otation verticaux"; + Text[ spanish ] = "Caracteres de numeraci髇 vertical"; + Text[ finnish ] = "Vertical Numbering Symbols"; + Text[ italian ] = "Carattere di numerazione verticale"; + Text[ danish ] = "Vertical Numbering Symbols"; + Text[ swedish ] = "Vertikala numreringstecken"; + Text[ polish ] = "Vertical Numbering Symbols"; + Text[ japanese ] = "绺︽浉銇嶇暘鍙蜂粯銇戣鍙"; + Text[ korean ] = "靹鸽 氩堩樃 毵り赴旮 旮绊樃"; + Text[ chinese_simplified ] = "绔栧啓寮忕紪鍙峰瓧绗"; + Text[ chinese_traditional ] = "鐩存浉寮忕法铏熷瓧鍏"; + Text[ turkish ] = "Vertical Numbering Symbols"; + Text[ arabic ] = "Vertical Numbering Symbols"; }; + + + diff --git a/sw/source/ui/utlui/unotools.src b/sw/source/ui/utlui/unotools.src index 92ca7e36efab..9d98385a8adf 100644 --- a/sw/source/ui/utlui/unotools.src +++ b/sw/source/ui/utlui/unotools.src @@ -2,9 +2,9 @@ * * $RCSfile: unotools.src,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: kz $ $Date: 2001-07-14 20:24:47 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:45:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,25 +80,26 @@ ModalDialog DLG_RENAME_XNAMED Text [ ENGLISH ] = "New name" ; Text[ english_us ] = "New name"; Text[ portuguese ] = "Novo nome"; - Text[ russian ] = "橡桉忸栩 桁"; + Text[ russian ] = "皖忸 桁"; Text[ greek ] = "洼 镬"; Text[ dutch ] = "Nieuwe naam"; Text[ french ] = "Nouveau nom"; - Text[ spanish ] = "Nuevo nombre"; + Text[ spanish ] = "Nombre nuevo"; Text[ italian ] = "Nome nuovo"; Text[ danish ] = "Nyt navn"; Text[ swedish ] = "Nytt namn"; Text[ polish ] = "Nowa nazwa"; Text[ portuguese_brazilian ] = "New name"; - Text[ japanese ] = "怴偟偄柤慜"; - Text[ korean ] = "货 捞抚"; - Text[ chinese_simplified ] = "新名称"; - Text[ chinese_traditional ] = "穝嘿"; + Text[ japanese ] = "鏂般仐銇勫悕鍓"; + Text[ korean ] = "靸 鞚措"; + Text[ chinese_simplified ] = "鏂板悕绉"; + Text[ chinese_traditional ] = "鏂板悕绋"; Text[ arabic ] = "轻怯 轻滔硐"; Text[ turkish ] = "Yeni ad"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Nuevo nombre"; + Text[ catalan ] = "Nom nou"; Text[ finnish ] = "Uusi nimi"; + Text[ thai ] = "喔娻阜喙堗腑喙冟斧喔∴箞"; }; Edit ED_NEW_NAME { @@ -120,19 +121,20 @@ ModalDialog DLG_RENAME_XNAMED Text[ french ] = "Modifier le nom"; Text[ spanish ] = "Cambiar nombre"; Text[ italian ] = "Cambia nome"; - Text[ danish ] = "Modificer navn"; + Text[ danish ] = "Rediger navn"; Text[ swedish ] = "膎dra namn"; Text[ polish ] = "Zmie nazw"; Text[ portuguese_brazilian ] = "Change name"; - Text[ japanese ] = "柤慜偺曄峏"; - Text[ korean ] = "捞抚 函版"; - Text[ chinese_simplified ] = "更改名称"; - Text[ chinese_traditional ] = "跑嘿"; + Text[ japanese ] = "鍚嶅墠銇鏇"; + Text[ korean ] = "鞚措 氤瓴"; + Text[ chinese_simplified ] = "鏇存敼鍚嶇О"; + Text[ chinese_traditional ] = "璁婃洿鍚嶇ū"; Text[ arabic ] = "授享 轻怯"; Text[ turkish ] = "Ad de餴⺶ir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Cambiar nombre"; + Text[ catalan ] = "Canvia el nom"; Text[ finnish ] = "Muuta nimi"; + Text[ thai ] = "喙喔涏弗喔掂箞喔⑧笝喔娻阜喙堗腑"; }; OKButton PB_OK { @@ -168,15 +170,16 @@ ModalDialog DLG_RENAME_XNAMED Text[ swedish ] = "Byt namn p objekt: "; Text[ polish ] = "Zmie nazw obiektu: "; Text[ portuguese_brazilian ] = "Rename object: "; - Text[ japanese ] = "堤藜蕺改柤偺曄峏: "; - Text[ korean ] = "俺眉 捞抚 官操扁: "; - Text[ chinese_simplified ] = "重命名对象： "; - Text[ chinese_traditional ] = "穝㏑ン "; + Text[ japanese ] = "銈儢銈搞偋銈儓鍚嶃伄澶夋洿: "; + Text[ korean ] = "臧滌泊 鞚措 氚旉靖旮: "; + Text[ chinese_simplified ] = "閲嶅懡鍚嶅璞★細 "; + Text[ chinese_traditional ] = "閲嶆柊鍛藉悕鐗╀欢锛 "; Text[ arabic ] = "炮窍 视沩 轻咔其: "; Text[ turkish ] = "Nesneyi yeniden adland齬: "; Text[ language_user1 ] = " "; - Text[ catalan ] = "Cambiar nombre de objeto: "; + Text[ catalan ] = "Reanomena l'objecte: "; Text[ finnish ] = "Nime objekti uudelleen: "; + Text[ thai ] = "喙喔涏弗喔掂箞喔⑧笝喔娻阜喙堗腑喔о副喔曕笘喔: "; }; String STR_SERVICE_UNAVAILABLE { @@ -184,9 +187,9 @@ String STR_SERVICE_UNAVAILABLE Text [ English ] = "The following service is not available: " ; Text[ english_us ] = "The following service is not available: "; Text[ portuguese ] = "O seguinte servi鏾 n鉶 est dispon韛el: "; - Text[ russian ] = "央邃簋 耠箧徉 礤 漕耱箫磬: "; + Text[ russian ] = "湾漕耱箫磬 耠邃簋 耠箧徉: "; Text[ greek ] = " 彡秕桤 躔珩弩哚 溴 暹磲 溟徼蒹殪: "; - Text[ dutch ] = "De volgende service is niet beschikbaar: "; + Text[ dutch ] = "De volgende service is niet beschikbaar:"; Text[ french ] = "Le service suivant n'est pas disponible : "; Text[ spanish ] = "El siguiente servicio no est disponible: "; Text[ italian ] = "Il seguente servizio non disponibile. "; @@ -194,15 +197,16 @@ String STR_SERVICE_UNAVAILABLE Text[ swedish ] = "F鰈jande service 鋜 inte tillg鋘glig: "; Text[ polish ] = "Nast阷uj筩y serwis jest niedost阷ny: "; Text[ portuguese_brazilian ] = "The following service is not available: "; - Text[ japanese ] = "師偺话宿絺蛶g梡偱偒傑偣傫: "; - Text[ korean ] = "促澜苞 鞍篮 辑厚胶绰 啊瓷窍瘤 臼嚼聪促: "; - Text[ chinese_simplified ] = "不存在下列服务功能： "; - Text[ chinese_traditional ] = "硂狝叭\ぃ "; + Text[ japanese ] = "娆°伄銈点兗銉撱偣銇娇鐢ㄣ仹銇嶃伨銇涖倱: "; + Text[ korean ] = "雼れ潓瓿 臧欖潃 靹滊箘鞀る姅 靷毄頃 靾 鞐嗢姷雼堧嫟: "; + Text[ chinese_simplified ] = "涓嶅瓨鍦ㄤ笅鍒楁湇鍔″姛鑳斤細 "; + Text[ chinese_traditional ] = "閫欏嬫湇鍕欏姛鑳戒笉瀛樺湪锛 "; Text[ arabic ] = "轻蜗闵 轻是犴 垌 闶孑焉: "; Text[ turkish ] = "A瘕daki hizmet kullan齦am齳or: "; Text[ language_user1 ] = " "; - Text[ catalan ] = "El siguiente servicio no est disponible: "; + Text[ catalan ] = "El seg黣nt servei no est disponible: "; Text[ finnish ] = "Seuraava palvelu ei ole k鋣tett鋠iss: "; + Text[ thai ] = "喔氞福喔脆竵喔侧福喔權傅喙夃箖喔娻箟喙勦浮喙堗箘喔斷箟: "; }; Resource RES_FRMEX_MENU { @@ -260,7 +264,7 @@ Resource RES_FRMEX_MENU { < "~蒫helle" ; ST_MENU_ZOOM; > ; < "Vers le ~haut" ; ST_MENU_UP; > ; - < "Vers le ~bas" ; ST_MENU_DOWN; > ; + < "Vers le bas" ; ST_MENU_DOWN; > ; }; ItemList [ spanish ] = { @@ -300,27 +304,27 @@ Resource RES_FRMEX_MENU }; ItemList [ japanese ] = { - < "睫把(~Z)" ; ST_MENU_ZOOM; > ; - < "忋傊(~U)" ; ST_MENU_UP; > ; - < "壓傊(~W)" ; ST_MENU_DOWN; > ; + < "銈恒兗銉(~Z)" ; ST_MENU_ZOOM; > ; + < "涓娿伕(~U)" ; ST_MENU_UP; > ; + < "涓嬨伕(~W)" ; ST_MENU_DOWN; > ; }; ItemList [ korean ] = { - < "绵家/犬措(~Z)" ; ST_MENU_ZOOM; > ; - < "困肺(~U)" ; ST_MENU_UP; > ; - < "酒贰肺(~W)" ; ST_MENU_DOWN; > ; + < "於曥唽/頇曤寑(~Z)" ; ST_MENU_ZOOM; > ; + < "鞙勲(~U)" ; ST_MENU_UP; > ; + < "鞎勲灅搿(~W)" ; ST_MENU_DOWN; > ; }; ItemList [ chinese_simplified ] = { - < "比例(~Z)" ; ST_MENU_ZOOM; > ; - < "向上(~U)" ; ST_MENU_UP; > ; - < "向下(~W)" ; ST_MENU_DOWN; > ; + < "鏄剧ず姣斾緥(~Z)" ; ST_MENU_ZOOM; > ; + < "鍚戜笂(~U)" ; ST_MENU_UP; > ; + < "鍚戜笅(~W)" ; ST_MENU_DOWN; > ; }; ItemList [ chinese_traditional ] = { - < "陪ボゑㄒ(~Z)" ; ST_MENU_ZOOM; > ; - < "(~U)" ; ST_MENU_UP; > ; - < "(~W)" ; ST_MENU_DOWN; > ; + < "椤ず姣斾緥(~Z)" ; ST_MENU_ZOOM; > ; + < "鍚戜笂(~U)" ; ST_MENU_UP; > ; + < "鍚戜笅(~W)" ; ST_MENU_DOWN; > ; }; ItemList [ arabic ] = { @@ -336,15 +340,21 @@ Resource RES_FRMEX_MENU }; ItemList [ catalan ] = { - < "~Escala" ; ST_MENU_ZOOM; > ; - < "Hacia ~arriba" ; ST_MENU_UP; > ; - < "Hacia a~bajo" ; ST_MENU_DOWN; > ; + < "~Zoom" ; ST_MENU_ZOOM; > ; + < "~Cap amunt" ; ST_MENU_UP; > ; + < "Cap ~avall" ; ST_MENU_DOWN; > ; }; ItemList [ finnish ] = { - < "~Zoomaa" ; ST_MENU_ZOOM; > ; + < "~Zoomaus" ; ST_MENU_ZOOM; > ; < "~Yl鰏" ; ST_MENU_UP; > ; - < "A~las" ; ST_MENU_DOWN; > ; + < "Al~as" ; ST_MENU_DOWN; > ; + }; + ItemList [ thai ] = + { + < "~Ma喔縮tab" ; ST_MENU_ZOOM; > ; + < "Nach ~oben" ; ST_MENU_UP; > ; + < "Nach ~unten" ; ST_MENU_DOWN; > ; }; }; }; @@ -352,3 +362,18 @@ Resource RES_FRMEX_MENU + + + + + + + + + + + + + + + diff --git a/sw/source/ui/utlui/utlui.src b/sw/source/ui/utlui/utlui.src index eceaac1c0bdc..93f01c191374 100644 --- a/sw/source/ui/utlui/utlui.src +++ b/sw/source/ui/utlui/utlui.src @@ -2,9 +2,9 @@ * * $RCSfile: utlui.src,v $ * - * $Revision: 1.37 $ + * $Revision: 1.38 $ * - * last change: $Author: kz $ $Date: 2002-11-27 16:53:07 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:45:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,7 +75,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text [ swedish ] = "Ta bort tomma stycken" ; Text [ danish ] = "Fjern tomme afsnit" ; Text [ italian ] = "Elimina paragrafi vuoti" ; - Text [ spanish ] = "Eliminar p醨rafos vac韔s" ; + Text [ spanish ] = "Borrar p醨rafos vac韔s" ; Text [ french ] = "Supprimer les paragraphes vides" ; Text [ dutch ] = "Lege alinea's verwijderen" ; Text [ portuguese_brazilian ] = "Leere Abs?tze entfernen" ; @@ -114,7 +114,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text[ chinese_traditional ] = "浣跨敤鏇夸唬娓呭柈"; Text[ arabic ] = "怯饰锨 耷沏 轻怯嗜锨"; Text[ greek ] = "碰狁祜戕 麸 疬磲赆 犴糸赆糗篝狍珧"; - Text[ korean ] = "雽觳 響 鞝侅毄"; + Text[ korean ] = "雽觳 韰岇澊敫 靷毄"; Text[ turkish ] = "De餴⺶irme tablosunu kullan"; Text[ language_user1 ] = " "; Text[ catalan ] = "Utilitza la taula de reempla鏰ment"; @@ -144,7 +144,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text[ chinese_traditional ] = "鏍℃瀛楅闆欏ぇ瀵瓧姣"; Text[ arabic ] = "收晚 脱蓓 怯叔崆犴礓 蓓 认琼 轻哚闵"; Text[ greek ] = "拈棂箸 恼 赍鲠脶啭 泷犰燔豉 篝珥 裂鬓 翮 胼铉"; - Text[ korean ] = "雼柎 鞁滌瀾攵攵勳棎靹 霊 雽氍胳瀽 靾橃爼"; + Text[ korean ] = "雼柎 鞏措憪鞐 雽氍胳瀽臧 霊愱皽鞚 瓴届毎 靾橃爼"; Text[ turkish ] = "S謟c黭 bandaki 軰i b鼀黭 harfi d鼁elt"; Text[ language_user1 ] = " "; Text[ catalan ] = "Corregeix DUes MAj鷖cules al COmen鏰ment de PAraula"; @@ -201,7 +201,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text[ chinese_traditional ] = "鐩村瀷寮曡櫉鐢%1瀛楀瀷寮曡櫉%2 鏇夸唬"; Text[ arabic ] = "怯嗜锨 卺倾鞘 输枕 \"谇享蒤" 溶卺倾鞘 输枕%1厝孥亚蓓%2"; Text[ greek ] = "另糸赆糗篝狍 \"唧\" 彘筢泫汩掰 戾 %1趱痫泷狯殛%2"; - Text[ korean ] = "\"歆侅劆\" 鞚胳毄 攵順鸽ゼ %1鞚胳噭觳%2 鞚胳毄 攵順鸽 氚旉靖旮"; + Text[ korean ] = "\"響滌\" 鞚胳毄 攵順鸽ゼ %1鞚胳噭觳%2 鞚胳毄 攵順鸽 氚旉靖旮"; Text[ turkish ] = "\"D鼁\" t齬nak iretlerini %1tipografik iretler ile%2 de餴⺶ir"; Text[ catalan ] = "Reempla鏰 les cometes \"est鄋dard\" per cometes %1personalitzades%2"; Text[ thai ] = "喙佮笚喔權笚喔掂箞 \"喔∴覆喔曕福喔愢覆喔橽" 喔箟喔侧竾喔勦赋喔炧腹喔斷笖喙夃抚喔 %1喔勦赋喔炧腹喔%2 喔椸傅喙堗竵喔赤斧喔權笖喙喔竾"; @@ -227,7 +227,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text[ chinese_traditional ] = "鏇夸唬鑷▊妯ｅ紡"; Text[ arabic ] = "怯嗜锨 轻娩闱 轻阄照"; Text[ greek ] = "另糸赆糗篝狍 瘃矬狁祜箪蓓 瘃雉"; - Text[ korean ] = "靷毄鞛 韰滍攲毽 氚旉靖旮"; + Text[ korean ] = "靷毄鞛 鞝曥潣 鞀ろ儉鞚 氚旉靖旮"; Text[ turkish ] = "Kullan齝 bi鏸mini de餴⺶ir"; Text[ catalan ] = "Reempla鏰 els estils personalitzats"; Text[ finnish ] = "Korvaa mukautetut tyylit"; @@ -280,7 +280,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text[ chinese_traditional ] = "鑷嫊鍔犲簳绶"; Text[ arabic ] = "_呜 释薯_ 梳耷祈丘"; Text[ greek ] = "刘酎灬翮 _躔镢褴祆轶鏮"; - Text[ korean ] = "鞛愲彊 _氚戩_"; + Text[ korean ] = "鞛愲彊鞙茧 _氚戩_"; Text[ turkish ] = "Alt齨齙otomatik_鏸z_"; Text[ language_user1 ] = " "; Text[ catalan ] = "_Subratllat_ autom鄑ic"; @@ -328,7 +328,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text [ french ] = "Remplacer 1/2 ... par ..." ; Text [ portuguese ] = "Substituir 1/2 ... por ..." ; Text[ chinese_simplified ] = "鐢 陆 ... 鏇挎崲 1/2 ..."; - Text[ russian ] = "青戾螯 1/2 ... 磬 ? ..."; + Text[ russian ] = "青戾螯 1/2 ... 磬 漯钺 ..."; Text[ polish ] = "Zamie 1/2 ... na ? ... "; Text[ japanese ] = "1/2 ...銈 陆 ...銇疆鎻"; Text[ chinese_traditional ] = "鐢 陆 ... 浠ｆ浛 1/2 ..."; @@ -409,7 +409,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text [ portuguese_brazilian ] = "1st ... gegen 1^st ... ersetzen" ; Text [ portuguese ] = "Substituir 1o... por 1..." ; Text[ chinese_simplified ] = "鐢 1^st... 鏇挎崲 1st..."; - Text[ russian ] = "青戾龛螯 1st ... 磬 1^st ..."; + Text[ russian ] = "青戾龛螯 囗汶栝耜桢 镱潢钼 (1st) ... 磬 忮瘐龛 桧溴犟 (1^st)..."; Text[ polish ] = "Zamie 1st ... na 1^st ... "; Text[ japanese ] = "1st ...銈 1^st ... 銇疆銇嶆彌銇堛倠"; Text[ chinese_traditional ] = "鐢 1^st... 浠ｆ浛 1st..."; @@ -442,7 +442,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text[ chinese_traditional ] = "鍚堜降鍠娈佃惤"; Text[ arabic ] = "香 轻蒉亚 猛窍砩 轻糜匮"; Text[ greek ] = "疙 祜睃泷犰禊 疳襻泷荟"; - Text[ korean ] = "頃滌 雼澖 頃╈箻旮"; + Text[ korean ] = "頃滌 雼澖鞚 瓴绊暕"; Text[ turkish ] = "Tek sat齬l paragraflar birle⺶ir"; Text[ language_user1 ] = " "; Text[ catalan ] = "Combina els par鄃rafs de l韓ia 鷑ica"; @@ -470,7 +470,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text[ chinese_traditional ] = "瑷畾妯ｅ紡<鍏ф枃>"; Text[ arabic ] = "授眄 轻溷 \"逃 轻湔\""; Text[ greek ] = "像轶禳 瘃雉秕 \"誉灬 赍殪蓓秕\""; - Text[ korean ] = "韰滍攲毽 \"氤鸽\" 靹れ爼"; + Text[ korean ] = "\"氤鸽\" 鞀ろ儉鞚 靹れ爼"; Text[ turkish ] = "\"Metin g鰒desi\" bi鏸mini uygula"; Text[ language_user1 ] = " "; Text[ catalan ] = "Defineix l'estil del \"cos de text\""; @@ -497,7 +497,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text[ chinese_traditional ] = "瑷畾妯ｅ紡<鍏ф枃绺帓>"; Text[ arabic ] = "授眄 轻溷 \"乓峭 逃 轻湔\""; Text[ greek ] = "像轶禳 瘃雉秕 \"朋秣 瘃珧 泷犰燹騖""; - Text[ korean ] = "韰滍攲毽 \"觳 欷 霌れ棳鞊瓣赴\" 靹れ爼"; + Text[ korean ] = "[氤鸽 霌れ棳鞊瓣赴] 鞀ろ儉鞚 靹れ爼"; Text[ turkish ] = "\"Metin g鰒desi - girinti\" bi鏸mini uygula"; Text[ language_user1 ] = " "; Text[ catalan ] = "Defineix l'estil del \"sagnat del cos de text\""; @@ -524,7 +524,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text[ chinese_traditional ] = "瑷畾妯ｅ紡<鍏ф枃璨犵府鎺>"; Text[ arabic ] = "授眄 轻溷 \"乓峭 逃 湔 俞软蒤""; Text[ greek ] = "像轶禳 瘃雉秕 \"榴礴糸贽 弩秣 簋灬麸 赍殪蓓秕\""; - Text[ korean ] = "韰滍攲毽 \"觳 欷勳潉 旮办鞙茧 雮橂ǜ歆 氤鸽 霌れ棳鞊瓣赴\" 靹れ爼"; + Text[ korean ] = "[氤鸽 雮挫柎鞊瓣赴] 鞀ろ儉鞚 靹れ爼"; Text[ turkish ] = "\"As齦 girinti\" bi鏸mini uygula"; Text[ language_user1 ] = " "; Text[ catalan ] = "Defineix l'estil del \"sagnat negatiu\""; @@ -551,7 +551,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text[ chinese_traditional ] = "瑷畾妯ｅ紡<鍏ф枃绺帓>"; Text[ arabic ] = "授眄 轻溷 \"乓峭 逃 轻湔 (轻迂 轻面)\""; Text[ greek ] = "像轶禳 瘃雉秕 \"朋秣 簋灬麸 赍殪蓓秕\""; - Text[ korean ] = "韰滍攲毽 \"氤鸽 霌れ棳鞊瓣赴\" 靹れ爼"; + Text[ korean ] = "[氤鸽 霌れ棳鞊瓣赴] 鞀ろ儉鞚 靹れ爼"; Text[ turkish ] = "\"Metin g鰒desi - sat齬ba\" bi鏸mini uygula"; Text[ language_user1 ] = " "; Text[ catalan ] = "Defineix l'estil del \"sagnat del cos de text\""; @@ -578,7 +578,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text[ chinese_traditional ] = "瑷畾妯ｅ紡<妯欓 $(ARG1)>"; Text[ arabic ] = "授眄 轻溷 \"阡媲 $(ARG1)\""; Text[ greek ] = "像轶禳 瘃雉秕 \"硼殛弼犭咪 $(ARG1)\""; - Text[ korean ] = "韰滍攲毽 \"鞝滊 $(ARG1)\" 靹れ爼"; + Text[ korean ] = "\"鞝滊 $(ARG1)\" 鞀ろ儉鞚 靹れ爼"; Text[ turkish ] = "\"Ba齥 $(ARG1)\" bi鏸mini uygula"; Text[ language_user1 ] = " "; Text[ catalan ] = "Defineix l'estil \"Encap鏰lament $(ARG1)\""; @@ -605,7 +605,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text[ chinese_traditional ] = "瑷畾妯ｅ紡<闋呯洰绗﹁櫉>鍜<绶ㄨ櫉>"; Text[ arabic ] = "授眄 轻溷 \"授锨蟎" 面 \"恃揄鉢""; Text[ greek ] = "像轶禳 篝蹼 \"曙蹶咪醆" \"榴哞扃箸\""; - Text[ korean ] = "韰滍攲毽 \"旮毹鸽Μ 旮绊樃\" 霕愲姅 \"氩堩樃 毵り赴旮癨" 靹れ爼"; + Text[ korean ] = "\"旮毹鸽Μ 旮绊樃\" 霕愲姅 \"氩堩樃 毵り赴旮癨" 鞀ろ儉鞚 靹れ爼"; Text[ turkish ] = "\"Madde\" ya da \"numaralama\" bi鏸mini uygula"; Text[ language_user1 ] = " "; Text[ catalan ] = "Defineix l'estil \"pics\" o \"numeraci骪""; @@ -624,7 +624,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text[ french ] = "Fusionner des paragraphes"; Text[ swedish ] = "Sammanfoga stycken"; Text[ dutch ] = "Alinea's samenvoegen"; - Text[ spanish ] = "Unir p醨rafos"; + Text[ spanish ] = "Combinar p醨rafos"; Text[ english_us ] = "Combine paragraphs"; Text[ chinese_simplified ] = "鍚堝苟娈佃惤"; Text[ russian ] = "吾滂礤龛 噌玎鲥"; @@ -633,7 +633,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS Text[ chinese_traditional ] = "鍚堜降娈佃惤"; Text[ arabic ] = "帚 轻蒉亚"; Text[ greek ] = "疙 疳襻泷荟"; - Text[ korean ] = "雼澖 頃╈箻旮"; + Text[ korean ] = "雼澖 瓴绊暕"; Text[ turkish ] = "Paragraflar birle⺶ir"; Text[ language_user1 ] = " "; Text[ catalan ] = "Combina els par鄃rafs"; @@ -666,7 +666,7 @@ String STR_EVENT_OBJECT_SELECT Text[ chinese_traditional ] = "鎸変竴涓嬬墿浠"; Text[ arabic ] = "轻滢 萱 轻咔其"; Text[ greek ] = "硼殡镢 犴糸赍殪蓓秕"; - Text[ korean ] = "臧滌泊 靹犿儩"; + Text[ korean ] = "臧滌泊 韥措Ν"; Text[ turkish ] = "Nesneye t齥la"; Text[ language_user1 ] = " "; Text[ catalan ] = "Feu clic a l'objecte"; @@ -684,14 +684,14 @@ String STR_EVENT_START_INS_GLOSSARY TEXT[ greek ] = "旭轫 狃 翮 瘃矬柁赙 麸 刘麸叔哽屙"; TEXT[ dutch ] = "Voor het invoegen van AutoTekst"; TEXT[ french ] = "Avant insertion de l'AutoTexte"; - TEXT[ spanish ] = "Antes de insertar el AutoTexto"; + TEXT[ spanish ] = "Antes de insertar el Texto autom醫ico"; TEXT[ italian ] = "Prima d'inserire il testo automatico"; TEXT[ danish ] = "Inden input af AutoTekst"; TEXT[ swedish ] = "Innan AutoText infogas"; TEXT[ polish ] = "Wstaw przed autotekstem"; TEXT[ portuguese_brazilian ] = "Vor AutoText einf?en"; TEXT[ japanese ] = "鍏ュ姏鏀彺銈掓尶鍏ャ仚銈嬪墠"; - TEXT[ korean ] = "鞛愲彊韰嶌姢韸 靷届瀰 鞝"; + TEXT[ korean ] = "鞛愲彊 韰嶌姢韸 靷届瀰 鞝"; TEXT[ chinese_simplified ] = "鍦ㄦ彃鍏ヨ嚜鍔ㄥ浘鏂囬泦涔嬪墠"; TEXT[ chinese_traditional ] = "鍦ㄦ彃鍏ヨ嚜鍕曞湒鏂囬泦涔嬪墠"; TEXT[ arabic ] = "奕 畔亚 轻湔 轻梳耷祈"; @@ -712,14 +712,14 @@ String STR_EVENT_END_INS_GLOSSARY TEXT[ greek ] = "体糗 翮 瘃矬柁赙 麸 刘麸叔哽屙"; TEXT[ dutch ] = "Na invoegen van AutoTekst"; TEXT[ french ] = "Apr鑣 insertion de l'AutoTexte"; - TEXT[ spanish ] = "Tras insertar el AutoTexto"; + TEXT[ spanish ] = "Tras insertar el Texto autom醫ico"; TEXT[ italian ] = "Dopo aver inserito il testo automatico"; TEXT[ danish ] = "Efter input af AutoTekst"; TEXT[ swedish ] = "N鋜 AutoText har infogats"; TEXT[ polish ] = "Wstaw za autotekstem"; TEXT[ portuguese_brazilian ] = "Nach AutoText einf?en"; TEXT[ japanese ] = "鍏ュ姏鏀彺銈掓尶鍏ャ仐銇熷緦"; - TEXT[ korean ] = "鞛愲彊韰嶌姢韸 靷届瀰 頉"; + TEXT[ korean ] = "鞛愲彊 韰嶌姢韸 靷届瀰 頉"; TEXT[ chinese_simplified ] = "鍦ㄦ彃鍏ヨ嚜鍔ㄥ浘鏂囬泦涔嬪悗"; TEXT[ chinese_traditional ] = "鍦ㄨ嚜鍕曞湒鏂囬泦鎻掑叆涔嬪緦"; TEXT[ arabic ] = "融 畔亚 轻湔 轻梳耷祈"; @@ -833,7 +833,7 @@ String STR_EVENT_IMAGE_LOAD Text[ chinese_traditional ] = "杓夊叆鍦栧舰鎴愬姛"; Text[ arabic ] = "释沩 轻真焉 蠕糖"; Text[ greek ] = " 鳇耵 豉 泷狯殛 疠趱麇"; - Text[ korean ] = "攴鸽灅頂届潉 靹标车鞝侅溂搿 搿滊摐頃"; + Text[ korean ] = "攴鸽 搿滊摐毳 靹标车鞝侅溂搿 鞕勲 "; Text[ turkish ] = "Grafik bar齳la y黭lendi"; Text[ language_user1 ] = " "; Text[ catalan ] = "Els gr鄁ics s'han carregat amb 鑨it"; @@ -860,7 +860,7 @@ String STR_EVENT_IMAGE_ABORT Text[ chinese_traditional ] = "涓柗杓夊叆鍦栧舰"; Text[ arabic ] = "卿挢勤 阢犴 释沩 轻真焉"; Text[ greek ] = "拈彡镳 鳇耵珧 泷狯殛稞"; - Text[ korean ] = "攴鸽灅頂 搿滊摐 欷戨嫧霅"; + Text[ korean ] = "攴鸽 搿滊摐 欷戨嫧霅"; Text[ turkish ] = "Grafik y黭lemesi kesildi"; Text[ language_user1 ] = " "; Text[ catalan ] = "S'ha interromput la c鄏rega dels gr鄁ics"; @@ -887,7 +887,7 @@ String STR_EVENT_IMAGE_ERROR Text[ chinese_traditional ] = "杓夊叆鍦栧舰涓嶅畬鏁"; Text[ arabic ] = "呜 蓓 阢犴 释沩 轻真焉"; Text[ greek ] = "遇茈灬 赆糗 翮 鳇耵 泷狯殛稞"; - Text[ korean ] = "攴鸽灅頂 搿滊摐 鞓る"; + Text[ korean ] = "攴鸽 搿滊摐 鞓る"; Text[ turkish ] = "Grafik y黭lemede hata"; Text[ language_user1 ] = " "; Text[ catalan ] = "Els gr鄁ics s'han carregat de manera defectuosa"; @@ -908,7 +908,7 @@ String STR_EVENT_FRM_KEYINPUT_A Text [ french ] = "Saisie de caract鑢es alphanum閞iques" ; Text [ dutch ] = "Invoer van alfanumerieke tekens" ; Text[ chinese_simplified ] = "杈撳叆甯岃厞璇瓧姣嶉樋灏旀硶"; - Text[ russian ] = "骡钿 嚯羿忤蝽-鲨麴钼 耔焘铍钼"; + Text[ russian ] = "骡钿 嚯.-鲨麴. 耔焘铍钼"; Text[ polish ] = "Wpisz znaki alfanumeryczne"; Text[ japanese ] = "銈€儷銉曘偂銉欍儍銉堟枃瀛椼伄鍏ュ姏"; Text[ chinese_traditional ] = "杓稿叆甯岃嚇瑾炵涓鍊嬪瓧姣"; @@ -935,7 +935,7 @@ String STR_EVENT_FRM_KEYINPUT_NOA Text [ portuguese_brazilian ] = "Eingabe von nicht Alphazeichen" ; Text [ danish ] = "Input af ikke-alfategn" ; Text[ chinese_simplified ] = "杈撳叆鐨勪笉鏄笇鑵婅瀛楁瘝闃垮皵娉"; - Text[ russian ] = "骡钿 礤 嚯羿忤蝽-鲨麴钼 耔焘铍钼"; + Text[ russian ] = "骡钿 礤 嚯.-鲨麴. 耔焘铍钼"; Text[ polish ] = "Wpisz znaki nie b阣筩e znakami alfanumerycznymi"; Text[ japanese ] = "銈€儷銉曘偂銉欍儍銉堛仹銇亜鏂囧瓧銇叆鍔"; Text[ chinese_traditional ] = "杓稿叆鐨勪笉鏄笇鑷樿獮绗竴鍊嬪瓧姣"; @@ -1078,7 +1078,7 @@ String STR_CONTENT_TYPE_FRAME Text[ chinese_traditional ] = "鏂囧瓧鏂瑰"; Text[ arabic ] = "哝窍 湔"; Text[ greek ] = "须徇箝 赍殪蓓秕"; - Text[ korean ] = "韰嶌姢韸 韹"; + Text[ korean ] = "韰嶌姢韸 頂勲爤鞛"; Text[ turkish ] = "Metin kutusu"; Text[ language_user1 ] = " "; Text[ catalan ] = "Marc de text"; @@ -1105,7 +1105,7 @@ String STR_CONTENT_TYPE_GRAPHIC Text[ chinese_traditional ] = "鍦栧舰"; Text[ arabic ] = "真"; Text[ greek ] = "民狯殛"; - Text[ korean ] = "攴鸽灅頂"; + Text[ korean ] = "攴鸽"; Text[ turkish ] = "Grafik"; Text[ language_user1 ] = " "; Text[ catalan ] = "Gr鄁ics"; @@ -1172,7 +1172,7 @@ String STR_CONTENT_TYPE_REGION TEXT [ English ] = "Regions" ; Text [ english_us ] = "Sections" ; Text [ italian ] = "Sezioni" ; - Text [ spanish ] = "Categor韆s" ; + Text [ spanish ] = "Secciones" ; Text [ french ] = "Sections" ; Text [ dutch ] = "Bereiken" ; Text [ swedish ] = "Kategorier" ; @@ -1186,7 +1186,7 @@ String STR_CONTENT_TYPE_REGION Text[ chinese_traditional ] = "鍗鍩"; Text[ arabic ] = "湄寝鞘"; Text[ greek ] = "梳翮泔襁弪"; - Text[ korean ] = "鞓侅棴"; + Text[ korean ] = "甑棴"; Text[ turkish ] = "B鰈黰"; Text[ language_user1 ] = " "; Text[ catalan ] = "Seccions"; @@ -1349,7 +1349,7 @@ String STR_CONTENT_TYPE_SINGLE_OUTLINE Text[ chinese_traditional ] = "妯欓"; Text[ arabic ] = "阡媲"; Text[ greek ] = "硼殛弼犭咪"; - Text[ korean ] = "響滌牅"; + Text[ korean ] = "鞝滊"; Text[ turkish ] = "Ba齥"; Text[ language_user1 ] = " "; Text[ catalan ] = "Encap鏰lament"; @@ -1376,7 +1376,7 @@ String STR_CONTENT_TYPE_SINGLE_TABLE Text[ chinese_traditional ] = "琛ㄦ牸"; Text[ arabic ] = "滔驷"; Text[ greek ] = "羞磲赆"; - Text[ korean ] = "鞁滍姼"; + Text[ korean ] = "響"; Text[ turkish ] = "Tablo"; Text[ language_user1 ] = " "; Text[ catalan ] = "Taula"; @@ -1403,7 +1403,7 @@ String STR_CONTENT_TYPE_SINGLE_FRAME Text[ chinese_traditional ] = "鏂囧瓧鏂瑰"; Text[ arabic ] = "咔涎 湔"; Text[ greek ] = "须徇箝 赍殪蓓秕"; - Text[ korean ] = "韰嶌姢韸 韹"; + Text[ korean ] = "韰嶌姢韸 頂勲爤鞛"; Text[ turkish ] = "Metin kutusu"; Text[ language_user1 ] = " "; Text[ catalan ] = "Marc de text"; @@ -1430,7 +1430,7 @@ String STR_CONTENT_TYPE_SINGLE_GRAPHIC Text[ chinese_traditional ] = "鍦栧舰"; Text[ arabic ] = "真焉"; Text[ greek ] = "民狯殛"; - Text[ korean ] = "攴鸽灅頂"; + Text[ korean ] = "攴鸽"; Text[ turkish ] = "Grafik"; Text[ language_user1 ] = " "; Text[ catalan ] = "Gr鄁ics"; @@ -1497,7 +1497,7 @@ String STR_CONTENT_TYPE_SINGLE_REGION TEXT [ English ] = "Region" ; Text [ english_us ] = "Section" ; Text [ italian ] = "Area" ; - Text [ spanish ] = "羠ea" ; + Text [ spanish ] = "Secci髇" ; Text [ french ] = "Section" ; Text [ dutch ] = "Bereik" ; Text [ swedish ] = "Kategori" ; @@ -1511,7 +1511,7 @@ String STR_CONTENT_TYPE_SINGLE_REGION Text[ chinese_traditional ] = "鍗鍩"; Text[ arabic ] = "湄寝"; Text[ greek ] = "彭玺"; - Text[ korean ] = "鞓侅棴"; + Text[ korean ] = "甑棴"; Text[ turkish ] = "B鰈黰"; Text[ language_user1 ] = " "; Text[ catalan ] = "Secci"; @@ -1673,7 +1673,7 @@ String STR_DEFINE_NUMBERFORMAT Text[ chinese_traditional ] = "鍏跺畠鏍煎紡..."; Text[ arabic ] = "...输禹耷 胖禽砩"; Text[ greek ] = "硼轲顸箬弭弪 祜聆蒡..."; - Text[ korean ] = "攵臧鞝侅澑 靹滌嫕..."; + Text[ korean ] = "於旉皜 靹滌嫕..."; Text[ turkish ] = "Di餰r formatlar..."; Text[ language_user1 ] = " "; Text[ catalan ] = "Formats addicionals..."; @@ -1922,3 +1922,8 @@ String STR_HYPERCTRL_HYP Text[ thai ] = "HYP"; }; + + + + + diff --git a/sw/source/ui/web/web.src b/sw/source/ui/web/web.src index 8def4ad0753f..28d3875315bc 100644 --- a/sw/source/ui/web/web.src +++ b/sw/source/ui/web/web.src @@ -2,9 +2,9 @@ * * $RCSfile: web.src,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: kz $ $Date: 2002-12-09 09:58:25 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:45:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -117,7 +117,7 @@ String STR_WRITER_WEBDOC_FULLTYPE_40 Text [ swedish ] = "%PRODUCTNAME 4.0 HTML" ; Text [ danish ] = "%PRODUCTNAME 4.0 HTML" ; Text [ italian ] = "HTML %PRODUCTNAME 4.0" ; - Text [ spanish ] = "%PRODUCTNAME 4.0 HTML" ; + Text [ spanish ] = "%PRODUCTNAME 4.0 - HTML" ; Text [ french ] = "%PRODUCTNAME 4.0 HTML" ; Text [ dutch ] = "%PRODUCTNAME 4.0 HTML" ; Text [ portuguese ] = "HTML (%PRODUCTNAME 4.0)" ; @@ -146,7 +146,7 @@ String STR_WRITER_WEBDOC_FULLTYPE_50 Text [ swedish ] = "%PRODUCTNAME 5.0 HTML" ; Text [ danish ] = "%PRODUCTNAME 5.0 HTML" ; Text [ italian ] = "HTML %PRODUCTNAME 5.0" ; - Text [ spanish ] = "%PRODUCTNAME 5.0 HTML" ; + Text [ spanish ] = "%PRODUCTNAME 5.0 - HTML" ; Text [ french ] = "%PRODUCTNAME 5.0 HTML" ; Text [ dutch ] = "%PRODUCTNAME 5.0 HTML" ; Text [ portuguese ] = "%PRODUCTNAME 5.0 HTML" ; @@ -172,11 +172,11 @@ String STR_WRITER_WEBDOC_FULLTYPE Text [ English ] = "%PRODUCTNAME 6.0 HTML Document" ; Text[ english_us ] = "%PRODUCTNAME 6.0 HTML Document"; Text[ portuguese ] = "%PRODUCTNAME 6.0 Documento HTML"; - Text[ russian ] = "HTML-漕牦戾眚 (%PRODUCTNAME 6.0) "; + Text[ russian ] = "洛-耱疣龛鲟 (%PRODUCTNAME 6.0) "; Text[ greek ] = "%PRODUCTNAME 6.0 HTML - 搞泷狯"; Text[ dutch ] = "%PRODUCTNAME 6.0 HTML Document"; Text[ french ] = "%PRODUCTNAME 6.0 Document HTML"; - Text[ spanish ] = "%PRODUCTNAME 6.0 Documento HTML"; + Text[ spanish ] = "%PRODUCTNAME 6.0 - Documento HTML"; Text[ italian ] = "%PRODUCTNAME 6.0 Documento HTML"; Text[ danish ] = "%PRODUCTNAME 6,0 HTML-dokument"; Text[ swedish ] = "HTML-dokument %PRODUCTNAME 6.0"; @@ -272,7 +272,7 @@ String RID_WEBTOOLS_TOOLBOX Text[ dutch ] = "Werktuigbalk/Web"; Text[ chinese_simplified ] = "涓诲伐鍏锋爮/涓囩淮缃"; Text[ greek ] = "民犰燹 羼汜脲辋/Web"; - Text[ korean ] = "欤 霃勱惮 氇潓/鞗"; + Text[ korean ] = "欤 霃勱惮氇潓/鞗"; Text[ turkish ] = "Ana ara 鐄bu饀/Web"; Text[ language_user1 ] = " "; Text[ catalan ] = "Barra d'eines principal/Web"; @@ -449,6 +449,29 @@ ToolBox RID_WEBTEXT_TOOLBOX MN_TEMPLATE MN_FONT MN_TEXT1(TRUE) + MN_TEXT_LTR_RTL + MN_TEXT_LINESPACE + MN_TEXT2 + MN_TEXT_BACKGROUND + MN_TEXT_DIALOGS(TRUE) + }; + ItemList[arabic] = + { + MN_TEMPLATE + MN_FONT + MN_TEXT1_RTL(TRUE) + MN_TEXT_RTL_LTR + MN_TEXT_LINESPACE + MN_TEXT2 + MN_TEXT_BACKGROUND + MN_TEXT_DIALOGS(TRUE) + }; + ItemList[hebrew] = + { + MN_TEMPLATE + MN_FONT + MN_TEXT1_RTL(TRUE) + MN_TEXT_RTL_LTR MN_TEXT_LINESPACE MN_TEXT2 MN_TEXT_BACKGROUND @@ -548,7 +571,7 @@ String RID_WEBGRAPHIC_TOOLBOX Text[ dutch ] = "Objectbalk afbeeldingen/Web"; Text[ chinese_simplified ] = "鍥惧舰瀵硅薄鏍/Web"; Text[ greek ] = "民犰燹 犴糸赍殪蓓 篦邃獒箪稞/Web"; - Text[ korean ] = "攴鸽灅頂 臧滌泊 氇潓/鞗"; + Text[ korean ] = "攴鸽 臧滌泊 氇潓/鞗"; Text[ turkish ] = "Grafik nesne 鐄bu饀/Web"; Text[ language_user1 ] = " "; Text[ catalan ] = "Barra de objectes gr鄁ics/Web"; @@ -593,24 +616,24 @@ String RID_WEBOLE_TOOLBOX Text = "Objekt/Web" ; Text [ English ] = "Object/Web" ; Text [ norwegian ] = "Object" ; - Text [ italian ] = "Oggetto" ; + Text [ italian ] = "Oggetto/Web" ; Text [ portuguese_brazilian ] = "Objeto" ; Text [ portuguese ] = "Objecto" ; Text [ finnish ] = "Objekti" ; Text [ danish ] = "Objekt" ; - Text [ french ] = "Objet" ; - Text [ swedish ] = "Objekt" ; + Text [ french ] = "Objet/Web" ; + Text [ swedish ] = "Objekt/Webb" ; Text [ dutch ] = "Object" ; - Text [ spanish ] = "Objeto" ; + Text [ spanish ] = "Objeto/Web" ; Text [ english_us ] = "Object/Web" ; - Text[ chinese_simplified ] = "瀵硅薄"; + Text[ chinese_simplified ] = "瀵硅薄/涓囩淮缃"; Text[ russian ] = "吾牝"; Text[ polish ] = "Obiekt"; - Text[ japanese ] = "銈儢銈搞偋銈儓"; - Text[ chinese_traditional ] = "鐗╀欢"; + Text[ japanese ] = "銈儢銈搞偋銈儓/Web"; + Text[ chinese_traditional ] = "鐗╀欢/Web"; Text[ arabic ] = "咔其"; Text[ dutch ] = "Object"; - Text[ chinese_simplified ] = "瀵硅薄"; + Text[ chinese_simplified ] = "瀵硅薄/涓囩淮缃"; Text[ greek ] = "另糸赍哽屙"; Text[ korean ] = "臧滌泊/鞗"; Text[ turkish ] = "Nesne"; @@ -655,3 +678,8 @@ ToolBox RID_WEBOLE_TOOLBOX /************************************************************************* *************************************************************************/ + + + + + diff --git a/sw/source/ui/wrtsh/delete.cxx b/sw/source/ui/wrtsh/delete.cxx index b775ed1ee78d..04aeffe78417 100644 --- a/sw/source/ui/wrtsh/delete.cxx +++ b/sw/source/ui/wrtsh/delete.cxx @@ -2,9 +2,9 @@ * * $RCSfile: delete.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: os $ $Date: 2002-12-05 12:42:11 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:45:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -179,15 +179,19 @@ long SwWrtShell::DelLeft() // JP 29.06.95: nie eine davor stehende Tabelle loeschen. BOOL bSwap = FALSE; - if( SwCrsrShell::IsSttPara() && !SwCrsrShell::IsCrsrInTbl() ) + const SwTableNode * pWasInTblNd = SwCrsrShell::IsCrsrInTbl(); + if( SwCrsrShell::IsSttPara()) { + /* If the cursor is at the beginning of a paragraph, try to step + backwards. On failure we are done. */ if( !SwCrsrShell::Left(1,CRSR_SKIP_CHARS) ) return 0; - if( SwCrsrShell::IsCrsrInTbl() ) - { - SwCrsrShell::Right(1,CRSR_SKIP_CHARS); + + /* If the cursor entered or left a table (or both) we are done. No step + back. */ + if( SwCrsrShell::IsCrsrInTbl() != pWasInTblNd ) return 0; - } + OpenMark(); SwCrsrShell::Right(1,CRSR_SKIP_CHARS); SwCrsrShell::SwapPam(); @@ -205,8 +209,6 @@ long SwWrtShell::DelLeft() return nRet; } - - long SwWrtShell::DelRight(BOOL bDelFrm) { // werden verodert, wenn Tabellenselektion vorliegt; @@ -217,6 +219,9 @@ long SwWrtShell::DelRight(BOOL bDelFrm) nSelection = SwWrtShell::SEL_TBL; if(nSelection & SwWrtShell::SEL_TXT) nSelection = SwWrtShell::SEL_TXT; + + const SwTableNode * pWasInTblNd = NULL; + switch( nSelection & ~(SEL_BEZ) ) { case SEL_TXT: @@ -238,6 +243,8 @@ long SwWrtShell::DelRight(BOOL bDelFrm) break; } + pWasInTblNd = IsCrsrInTbl(); + if( SEL_TXT & nSelection && SwCrsrShell::IsSttPara() && SwCrsrShell::IsEndPara() && !IsCrsrInTbl() && SwCrsrShell::Right(1,CRSR_SKIP_CHARS) ) @@ -252,6 +259,14 @@ long SwWrtShell::DelRight(BOOL bDelFrm) break; } } + else if (SwCrsrShell::IsEndPara() && + SwCrsrShell::Right(1, CRSR_SKIP_CHARS)) + { + if (IsCrsrInTbl() || (pWasInTblNd != IsCrsrInTbl())) + break; + + SwCrsrShell::Left(1, CRSR_SKIP_CHARS); + } OpenMark(); SwCrsrShell::Right(1,CRSR_SKIP_CELLS); diff --git a/sw/source/ui/wrtsh/select.cxx b/sw/source/ui/wrtsh/select.cxx index 3f99ce46564f..5194f13bdc9e 100644 --- a/sw/source/ui/wrtsh/select.cxx +++ b/sw/source/ui/wrtsh/select.cxx @@ -2,9 +2,9 @@ * * $RCSfile: select.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: os $ $Date: 2002-10-24 11:05:45 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:45:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -220,6 +220,9 @@ void SwWrtShell::SelLine(const Point *pPt, BOOL ) long SwWrtShell::SelAll() { + const BOOL bLockedView = IsViewLocked(); + LockView( TRUE ); + { MV_KONTEXT(this); BOOL bMoveTable = FALSE; @@ -243,6 +246,9 @@ long SwWrtShell::SelAll() GoEnd(TRUE, &bMoveTable); } EndSelect(); + + LockView( bLockedView ); + return 1; } diff --git a/sw/source/ui/wrtsh/wrtsh.src b/sw/source/ui/wrtsh/wrtsh.src index becad60a48ef..536cdc0f2225 100644 --- a/sw/source/ui/wrtsh/wrtsh.src +++ b/sw/source/ui/wrtsh/wrtsh.src @@ -2,10 +2,9 @@ * * $RCSfile: wrtsh.src,v $ * - * $Revision: 1.33 $ - * - * last change: $Author: hbrinkm $ $Date: 2002-11-21 14:39:17 $ + * $Revision: 1.34 $ * + * last change: $Author: hr $ $Date: 2003-03-27 15:45:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,19 +76,20 @@ String STR_CANT_UNDO TEXT [ dutch ] = "Onmogelijk" ; TEXT [ spanish ] = "imposible" ; TEXT [ english_us ] = "not possible" ; - TEXT[ chinese_simplified ] = "不可能"; + TEXT[ chinese_simplified ] = "涓嶅彲鑳"; TEXT[ russian ] = "礤忸珈铈眍"; TEXT[ polish ] = "niemo縧iwy"; - TEXT[ japanese ] = "晄壜擻\"; - TEXT[ chinese_traditional ] = "ぃ"; + TEXT[ japanese ] = "涓嶅彲鑳"; + TEXT[ chinese_traditional ] = "涓嶅彲鑳"; TEXT[ arabic ] = "垌 沣咪"; TEXT[ dutch ] = "Onmogelijk"; - TEXT[ chinese_simplified ] = "不可能"; + TEXT[ chinese_simplified ] = "涓嶅彲鑳"; TEXT[ greek ] = "徜狒镯"; - TEXT[ korean ] = "阂啊瓷."; + TEXT[ korean ] = "攵堦皜電"; TEXT[ turkish ] = "olanaks齴"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "imposible"; + TEXT[ catalan ] = "impossible"; + TEXT[ thai ] = "喙勦浮喙堗釜喔侧浮喔侧福喔栢箑喔涏箛喔權箘喔涏箘喔斷箟"; }; String STR_DELETE_UNDO { @@ -104,21 +104,22 @@ String STR_DELETE_UNDO TEXT [ french ] = "Supprimer" ; TEXT [ swedish ] = "Radera" ; TEXT [ dutch ] = "Wissen" ; - TEXT [ spanish ] = "Eliminar" ; + TEXT [ spanish ] = "Borrar" ; TEXT [ english_us ] = "Delete" ; - TEXT[ chinese_simplified ] = "删除"; + TEXT[ chinese_simplified ] = "鍒犻櫎"; TEXT[ russian ] = "愉嚯栩"; TEXT[ polish ] = "Usu"; - TEXT[ japanese ] = "嶍彍"; - TEXT[ chinese_traditional ] = "埃"; + TEXT[ japanese ] = "鍓婇櫎"; + TEXT[ chinese_traditional ] = "鍒櫎"; TEXT[ arabic ] = "托"; TEXT[ dutch ] = "Wissen"; - TEXT[ chinese_simplified ] = "删除"; + TEXT[ chinese_simplified ] = "鍒犻櫎"; TEXT[ greek ] = "拈徙襻鲛"; - TEXT[ korean ] = "昏力"; + TEXT[ korean ] = "靷牅"; TEXT[ turkish ] = "Sil"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Eliminar"; + TEXT[ catalan ] = "Suprimeix"; + TEXT[ thai ] = "喔ム笟"; }; String STR_INSERT_UNDO { @@ -135,19 +136,20 @@ String STR_INSERT_UNDO TEXT [ dutch ] = "Invoegen" ; TEXT [ spanish ] = "Insertar" ; TEXT [ english_us ] = "Insert" ; - TEXT[ chinese_simplified ] = "插入"; - TEXT[ russian ] = "埋蜞怅"; + TEXT[ chinese_simplified ] = "鎻掑叆"; + TEXT[ russian ] = "埋蜞忤螯"; TEXT[ polish ] = "Wstaw"; - TEXT[ japanese ] = "憓擖"; - TEXT[ chinese_traditional ] = "础"; + TEXT[ japanese ] = "鎸垮叆"; + TEXT[ chinese_traditional ] = "鎻掑叆"; TEXT[ arabic ] = "畔亚"; TEXT[ dutch ] = "Invoegen"; - TEXT[ chinese_simplified ] = "插入"; + TEXT[ chinese_simplified ] = "鎻掑叆"; TEXT[ greek ] = "砰筢泫戕"; - TEXT[ korean ] = "火涝"; + TEXT[ korean ] = "靷届瀰"; TEXT[ turkish ] = "Ekle"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Insertar"; + TEXT[ catalan ] = "Insereix"; + TEXT[ thai ] = "喙佮笚喔｀竵"; }; String STR_OVR_UNDO { @@ -164,19 +166,20 @@ String STR_OVR_UNDO TEXT [ dutch ] = "Overschrijven" ; TEXT [ spanish ] = "Sobrescribir" ; TEXT [ english_us ] = "Overwrite" ; - TEXT[ chinese_simplified ] = "覆写"; + TEXT[ chinese_simplified ] = "鏀瑰啓"; TEXT[ russian ] = "青戾龛螯"; TEXT[ polish ] = "Skasuj przez zapisanie"; - TEXT[ japanese ] = "忋彂偒"; - TEXT[ chinese_traditional ] = "滦糶"; + TEXT[ japanese ] = "涓婃浉銇"; + TEXT[ chinese_traditional ] = "瑕嗗"; TEXT[ arabic ] = "轻呤侨 萱"; TEXT[ dutch ] = "Overschrijven"; - TEXT[ chinese_simplified ] = "覆写"; + TEXT[ chinese_simplified ] = "鏀瑰啓"; TEXT[ greek ] = "另糸赆糗篝狍"; - TEXT[ korean ] = "丹绢竞快扁"; + TEXT[ korean ] = "瓴轨硱鞊瓣赴"; TEXT[ turkish ] = "躾erine yaz"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Sobrescribir"; + TEXT[ catalan ] = "Sobreescriu"; + TEXT[ thai ] = "喙喔傕傅喔⑧笝喔椸副喔"; }; String STR_SPLITNODE_UNDO { @@ -193,19 +196,20 @@ String STR_SPLITNODE_UNDO TEXT [ dutch ] = "Nieuwe alinea" ; TEXT [ spanish ] = "P醨rafo nuevo" ; TEXT [ english_us ] = "New Paragraph" ; - TEXT[ chinese_simplified ] = "新建段落"; - TEXT[ russian ] = "皖恹 噌玎"; + TEXT[ chinese_simplified ] = "鏂板缓娈佃惤"; + TEXT[ russian ] = "耦玟囗桢 噌玎鲟"; TEXT[ polish ] = "Nowy akapit"; - TEXT[ japanese ] = "怴偟偄抜棊"; - TEXT[ chinese_traditional ] = "穝琿辅"; + TEXT[ japanese ] = "鏂般仐銇勬钀"; + TEXT[ chinese_traditional ] = "鏂板缓娈佃惤"; TEXT[ arabic ] = "蒉焉 滔硐"; TEXT[ dutch ] = "Nieuwe alinea"; - TEXT[ chinese_simplified ] = "新建段落"; + TEXT[ chinese_simplified ] = "鏂板缓娈佃惤"; TEXT[ greek ] = "溺扉秕胥哚 疳襻泷荟秕"; - TEXT[ korean ] = "货 窜遏"; + TEXT[ korean ] = "靸 雼澖"; TEXT[ turkish ] = "Yeni paragraf"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "P醨rafo nuevo"; + TEXT[ catalan ] = "Par鄃raf nou"; + TEXT[ thai ] = "喔⑧箞喔斧喔權箟喔侧箖喔浮喙"; }; String STR_MOVE_UNDO { @@ -222,19 +226,20 @@ String STR_MOVE_UNDO TEXT [ dutch ] = "Verplaatsen" ; TEXT [ spanish ] = "Desplazar" ; TEXT [ english_us ] = "Move" ; - TEXT[ chinese_simplified ] = "移动"; + TEXT[ chinese_simplified ] = "绉诲姩"; TEXT[ russian ] = "襄疱戾耱栩"; TEXT[ polish ] = "Przesu"; - TEXT[ japanese ] = "堏摦"; - TEXT[ chinese_traditional ] = "簿笆"; + TEXT[ japanese ] = "绉诲嫊"; + TEXT[ chinese_traditional ] = "绉诲嫊"; TEXT[ arabic ] = "乓峭"; TEXT[ dutch ] = "Verplaatsen"; - TEXT[ chinese_simplified ] = "移动"; + TEXT[ chinese_simplified ] = "绉诲姩"; TEXT[ greek ] = "体翎赀礴箸"; - TEXT[ korean ] = "捞悼"; + TEXT[ korean ] = "鞚措彊"; TEXT[ turkish ] = "Ta"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Desplazar"; + TEXT[ catalan ] = "Mou"; + TEXT[ thai ] = "喔⑧箟喔侧涪"; }; String STR_INSATTR_UNDO { @@ -251,19 +256,20 @@ String STR_INSATTR_UNDO TEXT [ dutch ] = "Attributen toepassen" ; TEXT [ spanish ] = "Aplicar atributos" ; TEXT [ english_us ] = "Apply attributes" ; - TEXT[ chinese_simplified ] = "使用属性"; + TEXT[ chinese_simplified ] = "浣跨敤灞炴"; TEXT[ russian ] = "橡桁屙栩 囹痂狍螓"; TEXT[ polish ] = "Zastosuj atrybuty"; - TEXT[ japanese ] = "懏惈偺揔梡"; - TEXT[ chinese_traditional ] = "ㄏノ妮┦"; + TEXT[ japanese ] = "灞炴с伄閬╃敤"; + TEXT[ chinese_traditional ] = "浣跨敤灞"; TEXT[ arabic ] = "怯饰锨 轻鱼鞘"; TEXT[ dutch ] = "Attributen toepassen"; - TEXT[ chinese_simplified ] = "使用属性"; + TEXT[ chinese_simplified ] = "浣跨敤灞炴"; TEXT[ greek ] = "碰狁祜戕 殇轱艮豉"; - TEXT[ korean ] = "加己 利侩"; + TEXT[ korean ] = "靻嶌劚 鞝侅毄"; TEXT[ turkish ] = "謟nitelikleri de餴⺶ir"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Aplicar atributos"; + TEXT[ catalan ] = "Aplica els atributs"; + TEXT[ thai ] = "喙冟笂喙夃竸喔膏笓喔ム副喔佮俯喔撪赴"; }; String STR_SETFMTCOLL_UNDO { @@ -280,19 +286,20 @@ String STR_SETFMTCOLL_UNDO TEXT [ dutch ] = "Opmaakprofielen toepassen" ; TEXT [ spanish ] = "Aplicar estilos" ; TEXT [ english_us ] = "Apply Styles" ; - TEXT[ chinese_simplified ] = "使用样式"; + TEXT[ chinese_simplified ] = "浣跨敤鏍峰紡"; TEXT[ russian ] = "橡桁屙栩 耱桦"; TEXT[ polish ] = "Zastosuj style"; - TEXT[ japanese ] = "嚼操偺揔梡"; - TEXT[ chinese_traditional ] = "ㄏノ妓Α"; + TEXT[ japanese ] = "銈广偪銈ゃ儷銇仼鐢"; + TEXT[ chinese_traditional ] = "浣跨敤妯ｅ紡"; TEXT[ arabic ] = "怯饰锨 轻溷切"; TEXT[ dutch ] = "Opmaakprofielen toepassen"; - TEXT[ chinese_simplified ] = "使用样式"; + TEXT[ chinese_simplified ] = "浣跨敤鏍峰紡"; TEXT[ greek ] = "碰狁祜戕 瘃雉"; - TEXT[ korean ] = "蜡屈 利侩"; + TEXT[ korean ] = "鞀ろ儉鞚 鞝侅毄"; TEXT[ turkish ] = "Bi鏸m uygula"; - TEXT[ language_user1 ] = "All \"Vorlage\"/Styles are always written with capital S. 10.5.00EM"; - TEXT[ catalan ] = "Aplicar estilos"; + TEXT[ language_user1 ] = "All ; All \"Vorlage\"/Styles are always written with capital S. 10.5.00EM"; + TEXT[ catalan ] = "Aplica els estils"; + TEXT[ thai ] = "喙冟笂喙夃弗喔编竵喔┼笓喔"; }; String STR_RESET_ATTR_UNDO { @@ -306,22 +313,23 @@ String STR_RESET_ATTR_UNDO TEXT [ danish ] = "Nulstil attributter" ; TEXT [ french ] = "Restaurer les attributs" ; TEXT [ swedish ] = "舤erst鋖l attribut" ; - TEXT [ dutch ] = "Attributen terugzetten" ; + TEXT [ dutch ] = "Attributen herstellen" ; TEXT [ spanish ] = "Restablecer atributos" ; TEXT [ english_us ] = "Reset attributes" ; - TEXT[ chinese_simplified ] = "重设属性"; + TEXT[ chinese_simplified ] = "閲嶈灞炴"; TEXT[ russian ] = "骂耨蜞眍忤螯 囹痂狍螓"; TEXT[ polish ] = "Zresetuj atrybuty"; - TEXT[ japanese ] = "懏惈偺鼐"; - TEXT[ chinese_traditional ] = "砞妮┦"; + TEXT[ japanese ] = "灞炴с伄銉偦銉冦儓"; + TEXT[ chinese_traditional ] = "閲嶈ō灞"; TEXT[ arabic ] = "炮窍 授眄 轻鱼鞘"; - TEXT[ dutch ] = "Attributen terugzetten"; - TEXT[ chinese_simplified ] = "重设属性"; + TEXT[ dutch ] = "Attributen herstellen"; + TEXT[ chinese_simplified ] = "閲嶈灞炴"; TEXT[ greek ] = "硼犴狯锺 殇轱艮豉"; - TEXT[ korean ] = "加己 盔贰措肺"; + TEXT[ korean ] = "靻嶌劚 鞗愲灅雽搿"; TEXT[ turkish ] = "謟nitelikleri ba al"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Restablecer atributos"; + TEXT[ catalan ] = "Reinicia els atributs"; + TEXT[ thai ] = "喔佮赋喔笝喔斷竸喔膏笓喔ム副喔佮俯喔撪赴喙冟斧喔∴箞"; }; String STR_APPLY_ATTR_UNDO { @@ -338,19 +346,20 @@ String STR_APPLY_ATTR_UNDO TEXT [ dutch ] = "Attributen toepassen" ; TEXT [ spanish ] = "Aplicar atributos" ; TEXT [ english_us ] = "Apply attributes" ; - TEXT[ chinese_simplified ] = "使用属性"; + TEXT[ chinese_simplified ] = "浣跨敤灞炴"; TEXT[ russian ] = "橡桁屙栩 囹痂狍螓"; TEXT[ polish ] = "Zastosuj atrybuty"; - TEXT[ japanese ] = "懏惈偺揔梡"; - TEXT[ chinese_traditional ] = "ㄏノ妮┦"; + TEXT[ japanese ] = "灞炴с伄閬╃敤"; + TEXT[ chinese_traditional ] = "浣跨敤灞"; TEXT[ arabic ] = "怯饰锨 轻鱼鞘"; TEXT[ dutch ] = "Attributen toepassen"; - TEXT[ chinese_simplified ] = "使用属性"; + TEXT[ chinese_simplified ] = "浣跨敤灞炴"; TEXT[ greek ] = "碰狁祜戕 殇轱艮豉"; - TEXT[ korean ] = "加己 利侩"; + TEXT[ korean ] = "靻嶌劚 鞝侅毄"; TEXT[ turkish ] = "謟nitelikleri kullan"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Aplicar atributos"; + TEXT[ catalan ] = "Aplica els atributs"; + TEXT[ thai ] = "喙冟笂喙夃竸喔膏笓喔ム副喔佮俯喔撪赴"; }; String STR_INSERT_DOC_UNDO { @@ -367,19 +376,20 @@ String STR_INSERT_DOC_UNDO TEXT [ dutch ] = "Document invoegen" ; TEXT [ spanish ] = "Insertar documento" ; TEXT [ english_us ] = "Insert Document" ; - TEXT[ chinese_simplified ] = "插入文档"; + TEXT[ chinese_simplified ] = "鎻掑叆鏂囨。"; TEXT[ russian ] = "埋蜞忤螯 漕牦戾眚"; TEXT[ polish ] = "Wstaw dokument"; - TEXT[ japanese ] = "霓翻逸膫虘}擖"; - TEXT[ chinese_traditional ] = "础ゅン"; + TEXT[ japanese ] = "銉夈偔銉ャ儭銉炽儓銇尶鍏"; + TEXT[ chinese_traditional ] = "鎻掑叆鏂囦欢"; TEXT[ arabic ] = "畔亚 阌输"; TEXT[ dutch ] = "Document invoegen"; - TEXT[ chinese_simplified ] = "插入文档"; + TEXT[ chinese_simplified ] = "鎻掑叆鏂囨。"; TEXT[ greek ] = "旭矬柁赙 邈泷荟秕"; - TEXT[ korean ] = "巩辑 火涝"; + TEXT[ korean ] = "氍胳劀 靷届瀰"; TEXT[ turkish ] = "Belge ekle"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Insertar documento"; + TEXT[ catalan ] = "Insereix el document"; + TEXT[ thai ] = "喙佮笚喔｀竵喙喔竵喔覆喔"; }; String STR_INSERT_GLOSSARY { @@ -394,21 +404,22 @@ String STR_INSERT_GLOSSARY TEXT [ french ] = "Ins閞er un AutoTexte" ; TEXT [ swedish ] = "Infoga AutoText" ; TEXT [ dutch ] = "AutoTekst invoegen" ; - TEXT [ spanish ] = "Insertar AutoTexto" ; + TEXT [ spanish ] = "Insertar Texto autom醫ico" ; TEXT [ english_us ] = "Insert AutoText" ; - TEXT[ chinese_simplified ] = "插入自动图文集"; + TEXT[ chinese_simplified ] = "鎻掑叆鑷姩鍥炬枃闆"; TEXT[ russian ] = "埋蜞忤螯 噔蝾蝈犟"; TEXT[ polish ] = "Wstaw Autotekst"; - TEXT[ japanese ] = "擖椡巟墖偺憓擖"; - TEXT[ chinese_traditional ] = "础笆瓜ゅ栋"; + TEXT[ japanese ] = "鍏ュ姏鏀彺銇尶鍏"; + TEXT[ chinese_traditional ] = "鎻掑叆鑷嫊鍦栨枃闆"; TEXT[ arabic ] = "畔亚 湔 梳耷祈"; TEXT[ dutch ] = "AutoTekst invoegen"; - TEXT[ chinese_simplified ] = "插入自动图文集"; + TEXT[ chinese_simplified ] = "鎻掑叆鑷姩鍥炬枃闆"; TEXT[ greek ] = "旭矬柁赙 刘麸叔殪蓓秕"; - TEXT[ korean ] = "磊悼咆胶飘 火涝"; + TEXT[ korean ] = "鞛愲彊 韰嶌姢韸 靷届瀰"; TEXT[ turkish ] = "Otomatik metin ekle"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Insertar AutoTexto"; + TEXT[ catalan ] = "Insereix el text autom鄑ic"; + TEXT[ thai ] = "喙佮笚喔｀竵喔傕箟喔竸喔о覆喔∴腑喔编笗喙傕笝喔∴副喔曕复"; }; String STR_DELBOOKMARK { @@ -423,21 +434,22 @@ String STR_DELBOOKMARK TEXT [ french ] = "Supprimer le rep鑢e de texte" ; TEXT [ swedish ] = "Radera bokm鋜ke" ; TEXT [ dutch ] = "Tekstmarkering verwijderen" ; - TEXT [ spanish ] = "Eliminar marca de texto" ; + TEXT [ spanish ] = "Borrar marca de texto" ; TEXT [ english_us ] = "Delete bookmark" ; - TEXT[ chinese_simplified ] = "删除书签"; - TEXT[ russian ] = "愉嚯栩 蝈犟蝾怏 镱戾蜿"; + TEXT[ chinese_simplified ] = "鍒犻櫎涔︾"; + TEXT[ russian ] = "愉嚯栩 玎觌噤牦"; TEXT[ polish ] = "Usu zak砤dk"; - TEXT[ japanese ] = "梅侥习競虓韽"; - TEXT[ chinese_traditional ] = "埃ずゅ夹乓"; + TEXT[ japanese ] = "銉嗐偔銈广儓銉炪兗銈伄鍓婇櫎"; + TEXT[ chinese_traditional ] = "鍒櫎鍏ф枃妯欑堡"; TEXT[ arabic ] = "托 旁茄 阊腾砩"; TEXT[ dutch ] = "Tekstmarkering verwijderen"; - TEXT[ chinese_simplified ] = "删除书签"; + TEXT[ chinese_simplified ] = "鍒犻櫎涔︾"; TEXT[ greek ] = "拈徙襻鲛 箸灬溟稞 赍殪蓓秕"; - TEXT[ korean ] = "氓哎乔 昏力"; + TEXT[ korean ] = "毂呹皥頂 靷牅"; TEXT[ turkish ] = "Metin iretini sil"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Eliminar marca de texto"; + TEXT[ catalan ] = "Suprimeix l'adre鏰 d'inter鑣"; + TEXT[ thai ] = "喔ム笟喔曕副喔о竸喔编箞喔"; }; String STR_INSBOOKMARK { @@ -454,19 +466,20 @@ String STR_INSBOOKMARK TEXT [ dutch ] = "Tekstmarkering invoegen" ; TEXT [ spanish ] = "Insertar marca" ; TEXT [ english_us ] = "Insert bookmark" ; - TEXT[ chinese_simplified ] = "插入书签"; - TEXT[ russian ] = "埋蜞忤螯 蝈犟蝾怏 镱戾蜿"; + TEXT[ chinese_simplified ] = "鎻掑叆涔︾"; + TEXT[ russian ] = "埋蜞忤螯 玎觌噤牦"; TEXT[ polish ] = "Wstaw zak砤dk"; - TEXT[ japanese ] = "梅侥习競虘}擖"; - TEXT[ chinese_traditional ] = "础ずゅ夹乓"; + TEXT[ japanese ] = "銉嗐偔銈广儓銉炪兗銈伄鎸垮叆"; + TEXT[ chinese_traditional ] = "鎻掑叆鍏ф枃妯欑堡"; TEXT[ arabic ] = "畔亚 旁茄 阊腾砩"; TEXT[ dutch ] = "Tekstmarkering invoegen"; - TEXT[ chinese_simplified ] = "插入书签"; + TEXT[ chinese_simplified ] = "鎻掑叆涔︾"; TEXT[ greek ] = "砰筢泫戕 箸灬溟稞 赍殪蓓秕"; - TEXT[ korean ] = "氓哎乔 火涝"; + TEXT[ korean ] = "毂呹皥頂 靷届瀰"; TEXT[ turkish ] = "Metin ireti ekle"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Insertar marca"; + TEXT[ catalan ] = "Insereix una adre鏰 d'inter鑣"; + TEXT[ thai ] = "喙佮笚喔｀竵喔曕副喔о竸喔编箞喔"; }; String STR_SORT_TBL { @@ -483,19 +496,20 @@ String STR_SORT_TBL TEXT [ dutch ] = "Tabel sorteren" ; TEXT [ spanish ] = "Ordenar tabla" ; TEXT [ english_us ] = "Sort table" ; - TEXT[ chinese_simplified ] = "排序表格"; + TEXT[ chinese_simplified ] = "鎺掑簭琛ㄦ牸"; TEXT[ russian ] = "杨痱桊钼赅 蜞犭桷"; TEXT[ polish ] = "Sortuj tabel"; - TEXT[ japanese ] = "昞\偺暲傋懼偊"; - TEXT[ chinese_traditional ] = "逼"; + TEXT[ japanese ] = "琛ㄣ伄涓︺伖鏇裤亪"; + TEXT[ chinese_traditional ] = "鎺掑簭琛ㄦ牸"; TEXT[ arabic ] = "菅 轻滔驷"; TEXT[ dutch ] = "Tabel sorteren"; - TEXT[ chinese_simplified ] = "排序表格"; + TEXT[ chinese_simplified ] = "鎺掑簭琛ㄦ牸"; TEXT[ greek ] = "葬铋睃扃箸 疬磲赆"; - TEXT[ korean ] = "抛捞喉 沥纺"; + TEXT[ korean ] = "響 鞝曤牞"; TEXT[ turkish ] = "Tabloyu s齬ala"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Ordenar tabla"; + TEXT[ catalan ] = "Ordena la taula"; + TEXT[ thai ] = "喙喔｀傅喔⑧竾喔曕覆喔｀覆喔"; }; String STR_SORT_TXT { @@ -512,19 +526,20 @@ String STR_SORT_TXT TEXT [ dutch ] = "Tekst sorteren" ; TEXT [ spanish ] = "Ordenar texto" ; TEXT [ english_us ] = "Sort text" ; - TEXT[ chinese_simplified ] = "排序文字"; + TEXT[ chinese_simplified ] = "鎺掑簭鏂囧瓧"; TEXT[ russian ] = "杨痱桊钼赅 蝈犟蜞"; TEXT[ polish ] = "Sortuj tekst"; - TEXT[ japanese ] = "梅侥偺暲傋懼偊"; - TEXT[ chinese_traditional ] = "逼ゅ"; + TEXT[ japanese ] = "銉嗐偔銈广儓銇甫銇规浛銇"; + TEXT[ chinese_traditional ] = "鎺掑簭鏂囧瓧"; TEXT[ arabic ] = "菅 轻湔"; TEXT[ dutch ] = "Tekst sorteren"; - TEXT[ chinese_simplified ] = "排序文字"; + TEXT[ chinese_simplified ] = "鎺掑簭鏂囧瓧"; TEXT[ greek ] = "葬铋睃扃箸 赍殪蓓秕"; - TEXT[ korean ] = "咆胶飘 沥纺"; + TEXT[ korean ] = "韰嶌姢韸 鞝曤牞"; TEXT[ turkish ] = "Metni s齬ala"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Ordenar texto"; + TEXT[ catalan ] = "Ordena el text"; + TEXT[ thai ] = "喙喔｀傅喔⑧竾喔傕箟喔竸喔о覆喔"; }; String STR_INSTABLE_UNDO { @@ -541,19 +556,20 @@ String STR_INSTABLE_UNDO TEXT [ dutch ] = "Tabel invoegen" ; TEXT [ spanish ] = "Insertar tabla" ; TEXT [ english_us ] = "Insert Table" ; - TEXT[ chinese_simplified ] = "插入表格"; + TEXT[ chinese_simplified ] = "鎻掑叆琛ㄦ牸"; TEXT[ russian ] = "埋蜞忤螯 蜞犭桷"; TEXT[ polish ] = "Wstaw tabel"; - TEXT[ japanese ] = "昞\偺憓擖"; - TEXT[ chinese_traditional ] = "础"; + TEXT[ japanese ] = "琛ㄣ伄鎸垮叆"; + TEXT[ chinese_traditional ] = "鎻掑叆琛ㄦ牸"; TEXT[ arabic ] = "畔亚 滔驷"; TEXT[ dutch ] = "Tabel invoegen"; - TEXT[ chinese_simplified ] = "插入表格"; + TEXT[ chinese_simplified ] = "鎻掑叆琛ㄦ牸"; TEXT[ greek ] = "砰筢泫戕 疬磲赆"; - TEXT[ korean ] = "抛捞喉 火涝"; + TEXT[ korean ] = "響 靷届瀰"; TEXT[ turkish ] = "Tablo ekle"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Insertar tabla"; + TEXT[ catalan ] = "Insereix una taula"; + TEXT[ thai ] = "喙佮笚喔｀竵喔曕覆喔｀覆喔"; }; String STR_TEXTTOTABLE_UNDO { @@ -570,19 +586,20 @@ String STR_TEXTTOTABLE_UNDO TEXT [ dutch ] = "Tekst naar tabel converteren" ; TEXT [ spanish ] = "Convertir texto en tabla" ; TEXT [ english_us ] = "Convert text -> table" ; - TEXT[ chinese_simplified ] = "文字转换成表格"; - TEXT[ russian ] = "橡孱狃噻钼囹 义犟 -> 亦犭桷"; + TEXT[ chinese_simplified ] = "鏂囧瓧杞崲鎴愯〃鏍"; + TEXT[ russian ] = "橡孱狃噻钼囹 蝈犟 蜞犭桷"; TEXT[ polish ] = "Konwertuj tekst na tabel"; - TEXT[ japanese ] = "暥彂傪昞\偵曄姺"; - TEXT[ chinese_traditional ] = "ゅ锣传Θ"; + TEXT[ japanese ] = "鏂囨浉銈掕〃銇鎻"; + TEXT[ chinese_traditional ] = "鏂囧瓧杞夋彌鎴愯〃鏍"; TEXT[ arabic ] = "释骓 湔 -> 滔驷"; TEXT[ dutch ] = "Tekst naar tabel converteren"; - TEXT[ chinese_simplified ] = "文字转换成表格"; + TEXT[ chinese_simplified ] = "鏂囧瓧杞崲鎴愯〃鏍"; TEXT[ greek ] = "体翎赳镳 叔哽屙 -> 羞磲赆"; - TEXT[ korean ] = "函券， 咆胶飘 -> 钎"; + TEXT[ korean ] = "韰嶌姢韸鸽ゼ 響滊 氤頇"; TEXT[ turkish ] = "Metni tabloya d鰊t黵"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Convertir texto en tabla"; + TEXT[ catalan ] = "Converteix text -> taula"; + TEXT[ thai ] = "喙佮笡喔ム竾喔傕箟喔竸喔о覆喔 -> 喔曕覆喔｀覆喔"; }; String STR_TABLETOTEXT_UNDO { @@ -594,24 +611,25 @@ String STR_TABLETOTEXT_UNDO TEXT [ portuguese ] = "Converter tabela -> texto" ; TEXT [ finnish ] = "Muunna taulukko tekstiksi" ; TEXT [ danish ] = "Konverter tabel til tekst" ; - TEXT [ french ] = "Convertir tableau en texte" ; + TEXT [ french ] = "Convertir le tableau en texte" ; TEXT [ swedish ] = "Konvertera tabell till text" ; TEXT [ dutch ] = "Tabel naar tekst converteren" ; TEXT [ spanish ] = "Convertir tabla en texto" ; TEXT [ english_us ] = "Convert table to text" ; - TEXT[ chinese_simplified ] = "表格转换成文字"; - TEXT[ russian ] = "橡孱狃噻钼囹 亦犭桷 -> 义犟"; + TEXT[ chinese_simplified ] = "琛ㄦ牸杞崲鎴愭枃瀛"; + TEXT[ russian ] = "橡孱狃噻钼囹 蜞犭桷 蝈犟"; TEXT[ polish ] = "Konwertuj tabel na tekst"; - TEXT[ japanese ] = "昞\傪暥彂偵曄姺"; - TEXT[ chinese_traditional ] = "锣传Θゅ"; + TEXT[ japanese ] = "琛ㄣ倰鏂囨浉銇鎻"; + TEXT[ chinese_traditional ] = "琛ㄦ牸杞夋彌鎴愭枃瀛"; TEXT[ arabic ] = "释骓 轻滔驷 裴 湔"; TEXT[ dutch ] = "Tabel naar tekst converteren"; - TEXT[ chinese_simplified ] = "表格转换成文字"; + TEXT[ chinese_simplified ] = "琛ㄦ牸杞崲鎴愭枃瀛"; TEXT[ greek ] = "体翎赳镳 羞磲赆 -> 叔哽屙"; - TEXT[ korean ] = "抛捞喉 -> 咆胶飘 函券"; + TEXT[ korean ] = "響滊ゼ 韰嶌姢韸鸽 氤頇"; TEXT[ turkish ] = "Tabloyu metne d鰊t黵"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Convertir tabla en texto"; + TEXT[ catalan ] = "Converteix la taula en text"; + TEXT[ thai ] = "喙佮笡喔ム竾喔曕覆喔｀覆喔囙箑喔涏箛喔權競喙夃腑喔勦抚喔侧浮"; }; String STR_COPY_UNDO { @@ -628,19 +646,20 @@ String STR_COPY_UNDO TEXT [ dutch ] = "Kopi雛en" ; TEXT [ spanish ] = "Copiar" ; TEXT [ english_us ] = "Copy" ; - TEXT[ chinese_simplified ] = "复制"; + TEXT[ chinese_simplified ] = "澶嶅埗"; TEXT[ russian ] = "暑镨痤忄螯"; TEXT[ polish ] = "Kopiuj"; - TEXT[ japanese ] = "核甙"; - TEXT[ chinese_traditional ] = "狡籹"; + TEXT[ japanese ] = "銈炽償銉"; + TEXT[ chinese_traditional ] = "瑜囪＝"; TEXT[ arabic ] = "溆"; TEXT[ dutch ] = "Kopi雛en"; - TEXT[ chinese_simplified ] = "复制"; + TEXT[ chinese_simplified ] = "澶嶅埗"; TEXT[ greek ] = "另糸泷狯"; - TEXT[ korean ] = "汗荤"; + TEXT[ korean ] = "氤奠偓"; TEXT[ turkish ] = "Kopyala"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Copiar"; + TEXT[ catalan ] = "Copia"; + TEXT[ thai ] = "喔勦副喔斷弗喔竵"; }; String STR_REPLACE_UNDO { @@ -657,19 +676,20 @@ String STR_REPLACE_UNDO TEXT [ dutch ] = "Vervangen" ; TEXT [ spanish ] = "Reemplazar" ; TEXT [ english_us ] = "Replace" ; - TEXT[ chinese_simplified ] = "更替"; + TEXT[ chinese_simplified ] = "鏇挎崲"; TEXT[ russian ] = "青戾龛螯"; TEXT[ polish ] = "Zamie"; - TEXT[ japanese ] = "抲姺"; - TEXT[ chinese_traditional ] = "蠢"; + TEXT[ japanese ] = "缃彌"; + TEXT[ chinese_traditional ] = "浠ｆ浛"; TEXT[ arabic ] = "怯嗜锨"; TEXT[ dutch ] = "Vervangen"; - TEXT[ chinese_simplified ] = "更替"; + TEXT[ chinese_simplified ] = "鏇挎崲"; TEXT[ greek ] = "另糸赆糗篝狍"; - TEXT[ korean ] = "官操扁"; + TEXT[ korean ] = "氚旉靖旮"; TEXT[ turkish ] = "De餴⺶ir"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Reemplazar"; + TEXT[ catalan ] = "Reempla鏰"; + TEXT[ thai ] = "喙佮笚喔權笚喔掂箞"; }; String STR_INSERT_PAGE_BREAK_UNDO { @@ -681,24 +701,25 @@ String STR_INSERT_PAGE_BREAK_UNDO TEXT [ portuguese ] = "Quebra de p醙ina fixa" ; TEXT [ finnish ] = "Suora sivunvaihto" ; TEXT [ danish ] = "H錼dt sideskift" ; - TEXT [ french ] = "Saut de page forc" ; + TEXT [ french ] = "Saut de page direct" ; TEXT [ swedish ] = "H錼d sidbrytning" ; TEXT [ dutch ] = "Vast pagina-einde" ; TEXT [ spanish ] = "Salto fijo de p醙ina" ; TEXT [ english_us ] = "Direct page break" ; - TEXT[ chinese_simplified ] = "手工换页"; + TEXT[ chinese_simplified ] = "鎵嬪伐鎹㈤〉"; TEXT[ russian ] = "棋耱觇 疣琊 耱疣龛"; TEXT[ polish ] = "Twarde 砤manie strony"; - TEXT[ japanese ] = "擟堄巜掕偺夵瓦凹"; - TEXT[ chinese_traditional ] = "も笆传"; + TEXT[ japanese ] = "浠绘剰鎸囧畾銇敼銉氥兗銈"; + TEXT[ chinese_traditional ] = "鎵嬪嫊鎻涢爜"; TEXT[ arabic ] = "萸蔗 蛰颓 硐骓"; TEXT[ dutch ] = "Vast pagina-einde"; - TEXT[ chinese_simplified ] = "手工换页"; + TEXT[ chinese_simplified ] = "鎵嬪伐鎹㈤〉"; TEXT[ greek ] = "疙麸礴 犭脶戕 箦脒溽"; - TEXT[ korean ] = "绊沥 率 唱穿扁"; + TEXT[ korean ] = "靾橂彊 韼橃澊歆 雮橂垊旮"; TEXT[ turkish ] = "Sabit sayfa sonu"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Salto fijo de p醙ina"; + TEXT[ catalan ] = "Salt de p鄃ina directe"; + TEXT[ thai ] = "喙佮笟喙堗竾喔笝喙夃覆喙傕笖喔⑧笗喔｀竾"; }; String STR_INSERT_COLUMN_BREAK_UNDO { @@ -708,26 +729,27 @@ String STR_INSERT_COLUMN_BREAK_UNDO TEXT [ italian ] = "Interruzione di colonna fissa" ; TEXT [ portuguese_brazilian ] = "Quebra for?ada de coluna" ; TEXT [ portuguese ] = "Quebra de coluna fixa" ; - TEXT [ finnish ] = "Suora sarakevaihto" ; + TEXT [ finnish ] = "Suora sarakkeenvaihto" ; TEXT [ danish ] = "H錼dt spalteskift" ; - TEXT [ french ] = "Saut de colonne forc" ; + TEXT [ french ] = "Saut de colonne direct" ; TEXT [ swedish ] = "H錼d kolumnbrytning" ; TEXT [ dutch ] = "Vast kolomeinde" ; - TEXT [ spanish ] = "Salto de columna fijo" ; + TEXT [ spanish ] = "Salto de columna directo" ; TEXT [ english_us ] = "Direct column break" ; - TEXT[ chinese_simplified ] = "手工换列"; + TEXT[ chinese_simplified ] = "鎵嬪伐鎹㈠垪"; TEXT[ russian ] = "棋耱觇 疣琊 觐腩眍"; TEXT[ polish ] = "Twardy podzia kolumny"; - TEXT[ japanese ] = "擟堄巜掕偺夵楍"; - TEXT[ chinese_traditional ] = "も笆传逆"; + TEXT[ japanese ] = "浠绘剰鎸囧畾銇敼鍒"; + TEXT[ chinese_traditional ] = "鎵嬪嫊鎻涙瑒"; TEXT[ arabic ] = "萸蔗 泌阆 硐骓"; TEXT[ dutch ] = "Vast kolomeinde"; - TEXT[ chinese_simplified ] = "手工换列"; + TEXT[ chinese_simplified ] = "鎵嬪伐鎹㈠垪"; TEXT[ greek ] = "疙麸礴 犭脶戕 篝揠珧"; - TEXT[ korean ] = "绊沥 凯官操扁"; + TEXT[ korean ] = "靾橂彊 鞐 雮橂垊旮"; TEXT[ turkish ] = "Sabit s黷un sonu"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Salto de columna fijo"; + TEXT[ catalan ] = "Salt de columna directe"; + TEXT[ thai ] = "喙佮笟喙堗竾喔勦腑喔ム副喔∴笝喙屶箓喔斷涪喔曕福喔"; }; String STR_PLAY_MACRO_UNDO { @@ -744,19 +766,20 @@ String STR_PLAY_MACRO_UNDO TEXT [ dutch ] = "Macro starten" ; TEXT [ spanish ] = "Reproducir macro" ; TEXT [ english_us ] = "Run macro" ; - TEXT[ chinese_simplified ] = "执行宏"; - TEXT[ russian ] = "橡钽铐 爨牮铖"; + TEXT[ chinese_simplified ] = "鎵ц瀹"; + TEXT[ russian ] = "蔓镱腠栩 爨牮铖"; TEXT[ polish ] = "Wykonaj makro"; - TEXT[ japanese ] = "细蹅處缻s"; - TEXT[ chinese_traditional ] = "磅︽エ栋"; + TEXT[ japanese ] = "銉炪偗銉伄瀹熻"; + TEXT[ chinese_traditional ] = "鍩疯宸ㄩ泦"; TEXT[ arabic ] = "输蓓 轻闱哐"; TEXT[ dutch ] = "Macro starten"; - TEXT[ chinese_simplified ] = "执行宏"; + TEXT[ chinese_simplified ] = "鎵ц瀹"; TEXT[ greek ] = "抨糨脲箸 灬犟镥眙镫掾"; - TEXT[ korean ] = "概农肺 角青"; + TEXT[ korean ] = "毵ろ伂搿 鞁ろ枆"; TEXT[ turkish ] = "Makroyu 鏰lt齬"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Reproducir macro"; + TEXT[ catalan ] = "Executa la macro"; + TEXT[ thai ] = "喙冟笂喙夃竾喔侧笝喔∴覆喙傕竸喔"; }; String STR_INSERT_ENV_UNDO { @@ -773,19 +796,20 @@ String STR_INSERT_ENV_UNDO Text [ dutch ] = "Envelop invoegen" ; Text [ spanish ] = "Insertar sobre" ; Text [ english_us ] = "Insert Envelope" ; - Text[ chinese_simplified ] = "插入信封"; + Text[ chinese_simplified ] = "鎻掑叆淇″皝"; Text[ russian ] = "埋蜞忤螯 觐礅屦"; Text[ polish ] = "Wstaw kopert"; - Text[ japanese ] = "晻摏偺憓擖"; - Text[ chinese_traditional ] = "础獺"; + Text[ japanese ] = "灏佺瓛銇尶鍏"; + Text[ chinese_traditional ] = "鎻掑叆淇″皝"; Text[ arabic ] = "畔亚 傺"; Text[ dutch ] = "Envelop invoegen"; - Text[ chinese_simplified ] = "插入信封"; + Text[ chinese_simplified ] = "鎻掑叆淇″皝"; Text[ greek ] = "旭矬柁赙 鲠贻腼 屦轶麸朕"; - Text[ korean ] = "祈瘤豪捧 火涝"; + Text[ korean ] = "韼胳氪夗埇 靷届瀰"; Text[ turkish ] = "Zarf ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar sobre"; + Text[ catalan ] = "Insereix el sobre"; + Text[ thai ] = "喙佮笚喔｀竵喔嬥腑喔囙笀喔斷斧喔∴覆喔"; }; String STR_DRAG_AND_COPY { @@ -800,20 +824,21 @@ String STR_DRAG_AND_COPY Text [ danish ] = "Kopier" ; Text [ portuguese ] = "Copiar" ; Text [ portuguese_brazilian ] = "Kopieren" ; - Text[ chinese_simplified ] = "复制"; + Text[ chinese_simplified ] = "澶嶅埗"; Text[ russian ] = "暑镨痤忄螯"; Text[ polish ] = "Kopiuj"; - Text[ japanese ] = "核甙偡傞"; - Text[ chinese_traditional ] = "狡籹"; + Text[ japanese ] = "銈炽償銉笺仚銈"; + Text[ chinese_traditional ] = "瑜囪＝"; Text[ arabic ] = "溆"; Text[ dutch ] = "Kopi雛en"; - Text[ chinese_simplified ] = "复制"; + Text[ chinese_simplified ] = "澶嶅埗"; Text[ greek ] = "另糸泷狯"; - Text[ korean ] = "汗荤"; + Text[ korean ] = "氤奠偓"; Text[ turkish ] = "Kopyala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Copiar"; + Text[ catalan ] = "Copia"; Text[ finnish ] = "Kopioi"; + Text[ thai ] = "喔勦副喔斷弗喔竵"; }; String STR_DRAG_AND_MOVE { @@ -828,20 +853,21 @@ String STR_DRAG_AND_MOVE Text [ danish ] = "Flyt" ; Text [ portuguese ] = "Mover" ; Text [ portuguese_brazilian ] = "Verschieben" ; - Text[ chinese_simplified ] = "移动"; + Text[ chinese_simplified ] = "绉诲姩"; Text[ russian ] = "襄疱戾耱栩"; Text[ polish ] = "Przesu"; - Text[ japanese ] = "堏摦偡傞"; - Text[ chinese_traditional ] = "簿笆"; + Text[ japanese ] = "绉诲嫊銇欍倠"; + Text[ chinese_traditional ] = "绉诲嫊"; Text[ arabic ] = "乓峭"; Text[ dutch ] = "Verplaatsen"; - Text[ chinese_simplified ] = "移动"; + Text[ chinese_simplified ] = "绉诲姩"; Text[ greek ] = "体翎赀礴箸"; - Text[ korean ] = "捞悼"; + Text[ korean ] = "鞚措彊"; Text[ turkish ] = "Ta"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Desplazar"; + Text[ catalan ] = "Mou"; Text[ finnish ] = "Siirr"; + Text[ thai ] = "喔⑧箟喔侧涪"; }; String STR_INSERT_RULER { @@ -855,21 +881,22 @@ String STR_INSERT_RULER Text [ italian ] = "Inserisci ruler" ; Text [ spanish ] = "Insertar regla" ; Text [ french ] = "Ins閞er une r鑗le" ; - Text [ dutch ] = "Ruler invoegen" ; - Text[ chinese_simplified ] = "插入标尺"; + Text [ dutch ] = "Liniaal invoegen" ; + Text[ chinese_simplified ] = "鎻掑叆鏍囧昂"; Text[ russian ] = "埋蜞忤螯 腓礤殛 疣珈弪觇"; Text[ polish ] = "Wstaw linijk"; - Text[ japanese ] = "侔讉虘}擖"; - Text[ chinese_traditional ] = "础夹へ"; + Text[ japanese ] = "銉兗銉┿伄鎸垮叆"; + Text[ chinese_traditional ] = "鎻掑叆妯欏昂"; Text[ arabic ] = "畔亚 阌匮"; - Text[ dutch ] = "Ruler invoegen"; - Text[ chinese_simplified ] = "插入标尺"; + Text[ dutch ] = "Liniaal invoegen"; + Text[ chinese_simplified ] = "鎻掑叆鏍囧昂"; Text[ greek ] = "砰筢泫戕 鬈襻赆"; - Text[ korean ] = "传陛磊 火涝"; + Text[ korean ] = "雸堦笀鞛 靷届瀰"; Text[ turkish ] = "Cetvel ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar regla"; - Text[ finnish ] = "Lis滗 kohdistin"; + Text[ catalan ] = "Insereix el regle"; + Text[ finnish ] = "Lis滗 viivain"; + Text[ thai ] = "喙佮笚喔｀竵喙勦浮喙夃笟喔｀福喔椸副喔"; }; String STR_INSERT_CHART { @@ -881,23 +908,24 @@ String STR_INSERT_CHART Text [ swedish ] = "Infoga %PRODUCTNAME Chart" ; Text [ danish ] = "Inds鎡 %PRODUCTNAME Chart" ; Text [ italian ] = "Inserisci %PRODUCTNAME Chart" ; - Text [ spanish ] = "Insertar %PRODUCTNAME Chart" ; + Text [ spanish ] = "Insertar diagrama de %PRODUCTNAME Chart" ; Text [ french ] = "Ins閞er un diagramme %PRODUCTNAME Chart" ; Text [ dutch ] = "%PRODUCTNAME Chart invoegen" ; - Text[ chinese_simplified ] = "插入 %PRODUCTNAME 图表"; + Text[ chinese_simplified ] = "鎻掑叆 %PRODUCTNAME 鍥捐〃"; Text[ russian ] = "埋蜞忤螯 %PRODUCTNAME Chart"; Text[ polish ] = "Wstaw %PRODUCTNAME Chart"; - Text[ japanese ] = "%PRODUCTNAME Chart 偺憓擖"; - Text[ chinese_traditional ] = "础 %PRODUCTNAME 瓜"; + Text[ japanese ] = "%PRODUCTNAME Chart 銇尶鍏"; + Text[ chinese_traditional ] = "鎻掑叆 %PRODUCTNAME 鍦栬〃"; Text[ arabic ] = "畔亚 %PRODUCTNAME Chart"; Text[ dutch ] = "%PRODUCTNAME Chart invoegen"; - Text[ chinese_simplified ] = "插入 %PRODUCTNAME 图表"; + Text[ chinese_simplified ] = "鎻掑叆 %PRODUCTNAME 鍥捐〃"; Text[ greek ] = "旭矬柁赙 %PRODUCTNAME Chart"; - Text[ korean ] = "%PRODUCTNAMEChart 火涝"; + Text[ korean ] = "%PRODUCTNAME Chart 靷届瀰"; Text[ turkish ] = "%PRODUCTNAME Chart ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar %PRODUCTNAME Chart"; - Text[ finnish ] = "Lis滗 tuotteen %PRODUCTNAME kaavio"; + Text[ catalan ] = "Insereix el %PRODUCTNAME Chart"; + Text[ finnish ] = "Lis滗 %PRODUCTNAME-kaavio"; + Text[ thai ] = "喙佮笚喔｀竵喙佮笢喔權笭喔灌浮喔 %PRODUCTNAME "; }; String STR_INSERTFLY { @@ -914,19 +942,20 @@ String STR_INSERTFLY TEXT [ dutch ] = "Kader invoegen" ; TEXT [ spanish ] = "Insertar marco" ; TEXT [ english_us ] = "Insert frame" ; - TEXT[ chinese_simplified ] = "插入框对象"; + TEXT[ chinese_simplified ] = "鎻掑叆妗嗗璞"; TEXT[ russian ] = "埋蜞忤螯 疣礻"; TEXT[ polish ] = "Wstaw ramk"; - TEXT[ japanese ] = "榞偺憓擖"; - TEXT[ chinese_traditional ] = "础ン"; + TEXT[ japanese ] = "鏋犮伄鎸垮叆"; + TEXT[ chinese_traditional ] = "鎻掑叆妗嗙墿浠"; TEXT[ arabic ] = "畔亚 咔涎"; TEXT[ dutch ] = "Kader invoegen"; - TEXT[ chinese_simplified ] = "插入框对象"; + TEXT[ chinese_simplified ] = "鎻掑叆妗嗗璞"; TEXT[ greek ] = "旭矬柁赙 痣衢筮秕"; - TEXT[ korean ] = "橇饭烙 火涝"; + TEXT[ korean ] = "頂勲爤鞛 靷届瀰"; TEXT[ turkish ] = "莈r鏴ve ekle"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Insertar marco"; + TEXT[ catalan ] = "Insereix un marc"; + TEXT[ thai ] = "喙佮笚喔｀竵喔佮福喔笟"; }; String STR_DELETEFLY { @@ -941,21 +970,22 @@ String STR_DELETEFLY TEXT [ french ] = "Supprimer le cadre" ; TEXT [ swedish ] = "Radera ram" ; TEXT [ dutch ] = "Kader wissen" ; - TEXT [ spanish ] = "Eliminar marco" ; + TEXT [ spanish ] = "Borrar el marco" ; TEXT [ english_us ] = "Delete frame" ; - TEXT[ chinese_simplified ] = "删除框对象"; + TEXT[ chinese_simplified ] = "鍒犻櫎妗嗗璞"; TEXT[ russian ] = "愉嚯栩 疣礻"; TEXT[ polish ] = "Usu ramk"; - TEXT[ japanese ] = "榞偺嶍彍"; - TEXT[ chinese_traditional ] = "埃ン"; + TEXT[ japanese ] = "鏋犮伄鍓婇櫎"; + TEXT[ chinese_traditional ] = "鍒櫎妗嗙墿浠"; TEXT[ arabic ] = "托 咔涎"; TEXT[ dutch ] = "Kader wissen"; - TEXT[ chinese_simplified ] = "删除框对象"; + TEXT[ chinese_simplified ] = "鍒犻櫎妗嗗璞"; TEXT[ greek ] = "拈徙襻鲛 痣衢筮秕"; - TEXT[ korean ] = "橇饭烙 昏力"; + TEXT[ korean ] = "頂勲爤鞛 靷牅"; TEXT[ turkish ] = "莈r鏴veyi d鼁elt"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Eliminar marco"; + TEXT[ catalan ] = "Suprimeix el marc"; + TEXT[ thai ] = "喔ム笟喔佮福喔笟"; }; String STR_AUTOFORMAT { @@ -970,21 +1000,22 @@ String STR_AUTOFORMAT TEXT [ french ] = "AutoFormat" ; TEXT [ swedish ] = "Autoformat" ; TEXT [ dutch ] = "AutoOpmaak" ; - TEXT [ spanish ] = "AutoFormato" ; + TEXT [ spanish ] = "Formateado autom醫ico" ; TEXT [ english_us ] = "AutoFormat" ; - TEXT[ chinese_simplified ] = "自动格式"; + TEXT[ chinese_simplified ] = "鑷姩鏍煎紡"; TEXT[ russian ] = "棱蝾纛痨囹"; TEXT[ polish ] = "Autoformat"; - TEXT[ japanese ] = "蛋奶席"; - TEXT[ chinese_traditional ] = "笆Α"; + TEXT[ japanese ] = "銈兗銉堛儠銈┿兗銉炪儍銉"; + TEXT[ chinese_traditional ] = "鑷嫊鏍煎紡"; TEXT[ arabic ] = "输禹 梳耷祈"; TEXT[ dutch ] = "AutoOpmaak"; - TEXT[ chinese_simplified ] = "自动格式"; + TEXT[ chinese_simplified ] = "鑷姩鏍煎紡"; TEXT[ greek ] = "刘麸田聆"; - TEXT[ korean ] = "磊悼辑侥"; + TEXT[ korean ] = "鞛愲彊 靹滌嫕"; TEXT[ turkish ] = "Otomatik formatlama"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "AutoFormato"; + TEXT[ catalan ] = "Formatatge autom鄑ic"; + TEXT[ thai ] = "喔｀腹喔涏箒喔氞笟喔副喔曕箓喔權浮喔编笗喔"; }; String STR_TABLEHEADLINE { @@ -1001,19 +1032,20 @@ String STR_TABLEHEADLINE TEXT [ dutch ] = "Tabelkop" ; TEXT [ spanish ] = "Encabezado de la tabla" ; TEXT [ english_us ] = "Table heading" ; - TEXT[ chinese_simplified ] = "表格标题"; + TEXT[ chinese_simplified ] = "琛ㄦ牸鏍囬"; TEXT[ russian ] = "青泐腩忸 蜞犭桷"; TEXT[ polish ] = "Nag丑wek tabeli"; - TEXT[ japanese ] = "昞\偺尒弌偟"; - TEXT[ chinese_traditional ] = "夹肈"; + TEXT[ japanese ] = "琛ㄣ伄瑕嬪嚭銇"; + TEXT[ chinese_traditional ] = "琛ㄦ牸妯欓"; TEXT[ arabic ] = "阡媲 轻滔驷"; TEXT[ dutch ] = "Tabelkop"; - TEXT[ chinese_simplified ] = "表格标题"; + TEXT[ chinese_simplified ] = "琛ㄦ牸鏍囬"; TEXT[ greek ] = "硼殛弼犭咪 疬磲赆"; - TEXT[ korean ] = "钎 力格"; + TEXT[ korean ] = "響 鞝滊"; TEXT[ turkish ] = "Tablo ba"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Encabezado de la tabla"; + TEXT[ catalan ] = "Encap鏰lament de la taula"; + TEXT[ thai ] = "喔副喔о競喙夃腑喔曕覆喔｀覆喔"; }; String STR_REPLACE { @@ -1030,19 +1062,20 @@ String STR_REPLACE TEXT [ dutch ] = "Vervangen" ; TEXT [ spanish ] = "Reemplazar" ; TEXT [ english_us ] = "Replace" ; - TEXT[ chinese_simplified ] = "更替"; + TEXT[ chinese_simplified ] = "鏇挎崲"; TEXT[ russian ] = "青戾龛螯"; TEXT[ polish ] = "Zamie"; - TEXT[ japanese ] = "抲姺"; - TEXT[ chinese_traditional ] = "蠢"; + TEXT[ japanese ] = "缃彌"; + TEXT[ chinese_traditional ] = "浠ｆ浛"; TEXT[ arabic ] = "怯嗜锨"; TEXT[ dutch ] = "Vervangen"; - TEXT[ chinese_simplified ] = "更替"; + TEXT[ chinese_simplified ] = "鏇挎崲"; TEXT[ greek ] = "另糸赆糗篝狍"; - TEXT[ korean ] = "官操扁"; + TEXT[ korean ] = "氚旉靖旮"; TEXT[ turkish ] = "De餴⺶ir"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Reemplazar"; + TEXT[ catalan ] = "Reempla鏰"; + TEXT[ thai ] = "喙佮笚喔權笚喔掂箞"; }; String STR_INSERTSECTION { @@ -1052,26 +1085,27 @@ String STR_INSERTSECTION TEXT [ italian ] = "Inserisci area" ; TEXT [ portuguese_brazilian ] = "Inserir se??o" ; TEXT [ portuguese ] = "Inserir sec玢o" ; - TEXT [ finnish ] = "Lis滗 osio" ; + TEXT [ finnish ] = "Lis滗 osa" ; TEXT [ danish ] = "Inds鎡 omr錮e" ; TEXT [ french ] = "Ins閞er une section" ; TEXT [ swedish ] = "Infoga omr錮e" ; TEXT [ dutch ] = "Bereik invoegen" ; - TEXT [ spanish ] = "Insertar 醨ea" ; + TEXT [ spanish ] = "Insertar una secci髇" ; TEXT [ english_us ] = "Insert section" ; - TEXT[ chinese_simplified ] = "插入区域"; - TEXT[ russian ] = "埋蜞忤螯 钺豚耱"; + TEXT[ chinese_simplified ] = "鎻掑叆鍖哄煙"; + TEXT[ russian ] = "埋蜞忤螯 疣玟咫"; TEXT[ polish ] = "Wstaw obszar"; - TEXT[ japanese ] = "斖埻偺憓擖"; - TEXT[ chinese_traditional ] = "础跋办"; + TEXT[ japanese ] = "绡勫洸銇尶鍏"; + TEXT[ chinese_traditional ] = "鎻掑叆鍗鍩"; TEXT[ arabic ] = "畔亚 湄寝"; TEXT[ dutch ] = "Bereik invoegen"; - TEXT[ chinese_simplified ] = "插入区域"; + TEXT[ chinese_simplified ] = "鎻掑叆鍖哄煙"; TEXT[ greek ] = "旭矬柁赙 疱耖秣掾"; - TEXT[ korean ] = "备开 火涝"; + TEXT[ korean ] = "甑棴 靷届瀰"; TEXT[ turkish ] = "B鰈黰 ekle"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Insertar 醨ea"; + TEXT[ catalan ] = "Insereix una secci"; + TEXT[ thai ] = "喙佮笚喔｀竵喔箞喔о笝"; }; String STR_DELETESECTION { @@ -1081,26 +1115,27 @@ String STR_DELETESECTION TEXT [ italian ] = "Elimina area" ; TEXT [ portuguese_brazilian ] = "Apagar se??o" ; TEXT [ portuguese ] = "Eliminar categoria" ; - TEXT [ finnish ] = "Poista osio" ; + TEXT [ finnish ] = "Poista osa" ; TEXT [ danish ] = "Slet omr錮e" ; TEXT [ french ] = "Supprimer la section" ; TEXT [ swedish ] = "Radera kategori" ; TEXT [ dutch ] = "Bereik wissen" ; - TEXT [ spanish ] = "Eliminar 醨ea" ; + TEXT [ spanish ] = "Borrar secci髇" ; TEXT [ english_us ] = "Delete section" ; - TEXT[ chinese_simplified ] = "删除区域"; - TEXT[ russian ] = "愉嚯栩 赅蝈泐痂"; + TEXT[ chinese_simplified ] = "鍒犻櫎鍖哄煙"; + TEXT[ russian ] = "愉嚯栩 疣玟咫"; TEXT[ polish ] = "Usu obszar"; - TEXT[ japanese ] = "斖埻偺嶍彍"; - TEXT[ chinese_traditional ] = "埃跋办"; + TEXT[ japanese ] = "绡勫洸銇墛闄"; + TEXT[ chinese_traditional ] = "鍒櫎鍗鍩"; TEXT[ arabic ] = "托 轻萜"; TEXT[ dutch ] = "Bereik wissen"; - TEXT[ chinese_simplified ] = "删除区域"; + TEXT[ chinese_simplified ] = "鍒犻櫎鍖哄煙"; TEXT[ greek ] = "拈徙襻鲛 赆翮泔襁狎"; - TEXT[ korean ] = "备开 昏力"; + TEXT[ korean ] = "甑棴 靷牅"; TEXT[ turkish ] = "B鰈黰 sil"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Eliminar 醨ea"; + TEXT[ catalan ] = "Suprimeix una secci"; + TEXT[ thai ] = "喔ム笟喔箞喔о笝"; }; String STR_CHANGESECTION { @@ -1110,26 +1145,27 @@ String STR_CHANGESECTION TEXT [ italian ] = "Cambia area" ; TEXT [ portuguese_brazilian ] = "Mudar se??o" ; TEXT [ portuguese ] = "Alterar sec玢o" ; - TEXT [ finnish ] = "Muokkaa osiota" ; + TEXT [ finnish ] = "Muokkaa osaa" ; TEXT [ danish ] = "Modificer omr錮e" ; - TEXT [ french ] = "Modifier section" ; + TEXT [ french ] = "蒬iter la section" ; TEXT [ swedish ] = "膎dra omr錮e" ; TEXT [ dutch ] = "Bereik wijzigen" ; - TEXT [ spanish ] = "Modificar 醨ea" ; + TEXT [ spanish ] = "Modificar la secci髇" ; TEXT [ english_us ] = "Modify section" ; - TEXT[ chinese_simplified ] = "更改区域"; - TEXT[ russian ] = "如戾龛螯 钺豚耱"; + TEXT[ chinese_simplified ] = "鏇存敼鍖哄煙"; + TEXT[ russian ] = "如戾龛螯 疣玟咫"; TEXT[ polish ] = "Zmodyfikuj sekcj"; - TEXT[ japanese ] = "斖埻偺曄峏"; - TEXT[ chinese_traditional ] = "跑跋办"; + TEXT[ japanese ] = "绡勫洸銇鏇"; + TEXT[ chinese_traditional ] = "璁婃洿鍗鍩"; TEXT[ arabic ] = "授享 轻湄寝"; TEXT[ dutch ] = "Bereik wijzigen"; - TEXT[ chinese_simplified ] = "更改区域"; + TEXT[ chinese_simplified ] = "鏇存敼鍖哄煙"; TEXT[ greek ] = "择镳镳镞珞 疱耖秣掾"; - TEXT[ korean ] = "备开 荐沥"; + TEXT[ korean ] = "甑棴 氤瓴"; TEXT[ turkish ] = "B鰈黰 de餴⺶ir"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Modificar 醨ea"; + TEXT[ catalan ] = "Modifica la secci"; + TEXT[ thai ] = "喔斷副喔斷箒喔涏弗喔囙釜喙堗抚喔"; }; String STR_CHANGESECTPASSWD { @@ -1137,27 +1173,28 @@ String STR_CHANGESECTPASSWD TEXT [ English ] = "password protected change" ; Text [ english_us ] = "Change password protection" ; Text [ italian ] = "Cambia protezione password" ; - Text [ spanish ] = "Modificar contrase馻" ; + Text [ spanish ] = "Cambiar contrase馻" ; Text [ french ] = "Modification du mot de passe" ; Text [ dutch ] = "Wachtwoordbeveiliging wijzigen" ; Text [ swedish ] = "膎dra l鰏enordsskydd" ; Text [ danish ] = "Modificer adgangskodebeskyttelse" ; Text [ portuguese ] = "Alterar protec玢o da senha" ; Text [ portuguese_brazilian ] = "Pa?wortschutz ?ndern" ; - Text[ chinese_simplified ] = "更改保护密码"; + Text[ chinese_simplified ] = "鏇存敼淇濇姢瀵嗙爜"; Text[ russian ] = "如戾龛螯 玎蝮 镟痤脲"; Text[ polish ] = "Zmie ochron has砤"; - Text[ japanese ] = "蔬杰澳迺蹖靷虝蠉X"; - Text[ chinese_traditional ] = "跑玂臔盞絏"; + Text[ japanese ] = "銉戙偣銉兗銉変繚璀枫伄澶夋洿"; + Text[ chinese_traditional ] = "璁婃洿淇濊瀵嗙⒓"; Text[ arabic ] = "售眄 豌琼 哚闵 轻友"; Text[ dutch ] = "Wachtwoordbeveiliging wijzigen"; - Text[ chinese_simplified ] = "更改保护密码"; + Text[ chinese_simplified ] = "鏇存敼淇濇姢瀵嗙爜"; Text[ greek ] = "岭脶戕 瘃矬翎筮狎 犍溟觑 瘃忉箸"; - Text[ korean ] = "菩胶况靛 焊龋 函版"; + Text[ korean ] = "鞎旐樃 氤挫晥 氤瓴"; Text[ turkish ] = "辤fre korumas齨 de餴⺶ir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Modificar contrase馻"; + Text[ catalan ] = "Canvia la contrasenya"; Text[ finnish ] = "Muuta salasanasuojausta"; + Text[ thai ] = "喙喔涏弗喔掂箞喔⑧笝喔佮覆喔｀笡喙夃腑喔囙竵喔编笝喔｀斧喔编釜喔溹箞喔侧笝"; }; String STR_CHANGEDEFATTR { @@ -1172,21 +1209,22 @@ String STR_CHANGEDEFATTR TEXT [ french ] = "Changement des valeurs standard" ; TEXT [ swedish ] = "膎dra standardv鋜den" ; TEXT [ dutch ] = "Standaardwaarden wijzigen" ; - TEXT [ spanish ] = "Modificar valores est醤dar" ; + TEXT [ spanish ] = "Modificar valores predeterminados" ; TEXT [ english_us ] = "Modify default values" ; - TEXT[ chinese_simplified ] = "更改标准值"; + TEXT[ chinese_simplified ] = "鏇存敼鏍囧噯鍊"; TEXT[ russian ] = "如戾龛螯 耱囗溧痱睇 珥圜屙"; TEXT[ polish ] = "Zmie warto渃i domy渓ne"; - TEXT[ japanese ] = "昗弨抣偺曄峏"; - TEXT[ chinese_traditional ] = "跑夹非"; + TEXT[ japanese ] = "妯欐簴鍊ゃ伄澶夋洿"; + TEXT[ chinese_traditional ] = "璁婃洿妯欐簴鍊"; TEXT[ arabic ] = "授享 轻揄 轻禽恃侵砩"; TEXT[ dutch ] = "Standaardwaarden wijzigen"; - TEXT[ chinese_simplified ] = "更改标准值"; + TEXT[ chinese_simplified ] = "鏇存敼鏍囧噯鍊"; TEXT[ greek ] = "择镳镳镞珞 瘃镥痖脲沆蓓 糸忐"; - TEXT[ korean ] = "扁夯蔼 荐沥"; + TEXT[ korean ] = "旮半掣臧 氤瓴"; TEXT[ turkish ] = "Standart de餰rleri de餴⺶ir"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Modificar valores est醤dar"; + TEXT[ catalan ] = "Modifica els valors per defecte"; + TEXT[ thai ] = "喔斷副喔斷箒喔涏弗喔囙竸喙堗覆喙喔｀复喙堗浮喔曕箟喔"; }; String STR_OUTLINE_LR { @@ -1196,26 +1234,27 @@ String STR_OUTLINE_LR TEXT [ italian ] = "Graduare struttura" ; TEXT [ portuguese_brazilian ] = "Promover vazado" ; TEXT [ portuguese ] = "Escalonar esquema" ; - TEXT [ finnish ] = "Pienenn j鋝ennyksen sisennyst" ; + TEXT [ finnish ] = "Korota j鋝ennystasoa" ; TEXT [ danish ] = "Inddel disposition" ; TEXT [ french ] = "蒫helonner la structure" ; TEXT [ swedish ] = "Dela in disposition" ; TEXT [ dutch ] = "Overzichtsniveaus bepalen" ; - TEXT [ spanish ] = "Escalonar Esquema" ; + TEXT [ spanish ] = "Escalonar el esquema" ; TEXT [ english_us ] = "Promote Outline" ; - TEXT[ chinese_simplified ] = "分级大纲"; + TEXT[ chinese_simplified ] = "鍒嗙骇澶х翰"; TEXT[ russian ] = "羽钼龛 耱痼牝箴"; TEXT[ polish ] = "Poziomy konspektu"; - TEXT[ japanese ] = "背淖草偺谕拶"; - TEXT[ chinese_traditional ] = "だ乎"; + TEXT[ japanese ] = "銈€偊銉堛儵銈ゃ兂銇儸銉欍儷"; + TEXT[ chinese_traditional ] = "鍒嗙礆澶х侗"; TEXT[ arabic ] = "氏秧 轻兽禹"; TEXT[ dutch ] = "Overzichtsniveaus bepalen"; - TEXT[ chinese_simplified ] = "分级大纲"; + TEXT[ chinese_simplified ] = "鍒嗙骇澶х翰"; TEXT[ greek ] = "拈荞桉 戾 弩秣蒡"; - TEXT[ korean ] = "促窜拌 荐霖"; + TEXT[ korean ] = "臧滌殧 靾橃 鞓Μ旮"; TEXT[ turkish ] = "Anahat de餴⺶ir"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Escalonar Esquema"; + TEXT[ catalan ] = "Promou el contorn"; + TEXT[ thai ] = "喙喔ム阜喙堗腑喔權箑喔勦箟喔侧福喙堗覆喔"; }; String STR_OUTLINE_UD { @@ -1232,19 +1271,20 @@ String STR_OUTLINE_UD TEXT [ dutch ] = "Overzicht verplaatsen" ; TEXT [ spanish ] = "Desplazar esquema" ; TEXT [ english_us ] = "Move outline" ; - TEXT[ chinese_simplified ] = "移动大纲"; + TEXT[ chinese_simplified ] = "绉诲姩澶х翰"; TEXT[ russian ] = "襄疱戾耱栩 耱痼牝箴"; TEXT[ polish ] = "Przesu konspekt"; - TEXT[ japanese ] = "背淖草偺堏摦"; - TEXT[ chinese_traditional ] = "簿笆乎"; + TEXT[ japanese ] = "銈€偊銉堛儵銈ゃ兂銇Щ鍕"; + TEXT[ chinese_traditional ] = "绉诲嫊澶х侗"; TEXT[ arabic ] = "滢 轻兽禹"; TEXT[ dutch ] = "Overzicht verplaatsen"; - TEXT[ chinese_simplified ] = "移动大纲"; + TEXT[ chinese_simplified ] = "绉诲姩澶х翰"; TEXT[ greek ] = "体翎赀礴箸 溟荞桉珧"; - TEXT[ korean ] = "促窜拌 捞悼"; + TEXT[ korean ] = "臧滌殧 鞚措彊"; TEXT[ turkish ] = "Anahat ta"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Desplazar esquema"; + TEXT[ catalan ] = "Mou el contorn"; + TEXT[ thai ] = "喔⑧箟喔侧涪喙喔勦箟喔侧福喙堗覆喔"; }; String STR_INSNUM { @@ -1261,19 +1301,20 @@ String STR_INSNUM TEXT [ dutch ] = "Nummering invoegen" ; TEXT [ spanish ] = "Insertar numeraci髇" ; TEXT [ english_us ] = "Insert numbering" ; - TEXT[ chinese_simplified ] = "插入编号"; + TEXT[ chinese_simplified ] = "鎻掑叆缂栧彿"; TEXT[ russian ] = "埋蜞忤螯 眢戾疣鲨"; TEXT[ polish ] = "Wstaw numeracj"; - TEXT[ japanese ] = "斣崋晅偗偺憓擖"; - TEXT[ chinese_traditional ] = "础絪腹"; + TEXT[ japanese ] = "鐣彿浠樸亼銇尶鍏"; + TEXT[ chinese_traditional ] = "鎻掑叆绶ㄨ櫉"; TEXT[ arabic ] = "畔亚 恃揄"; TEXT[ dutch ] = "Nummering invoegen"; - TEXT[ chinese_simplified ] = "插入编号"; + TEXT[ chinese_simplified ] = "鎻掑叆缂栧彿"; TEXT[ greek ] = "旭矬柁赙 狁哞扃箸"; - TEXT[ korean ] = "锅龋概扁扁 火涝"; + TEXT[ korean ] = "氩堩樃 毵り赴旮 靷届瀰"; TEXT[ turkish ] = "Numaralama ekle"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Insertar numeraci髇"; + TEXT[ catalan ] = "Insereix la numeraci"; + TEXT[ thai ] = "喙佮笚喔｀竵喔ム赋喔斷副喔氞笗喔编抚喙喔ム競"; }; String STR_NUMUPDOWN { @@ -1290,19 +1331,20 @@ String STR_NUMUPDOWN TEXT [ dutch ] = "Nummering indelen" ; TEXT [ spanish ] = "Graduar numeraci髇" ; TEXT [ english_us ] = "Shift numbering" ; - TEXT[ chinese_simplified ] = "分级编号"; + TEXT[ chinese_simplified ] = "鍒嗙骇缂栧彿"; TEXT[ russian ] = "羽钼龛 眢戾疣鲨"; TEXT[ polish ] = "Poziomy numeracji"; - TEXT[ japanese ] = "斣崋晅偗偺抜奒晅偗"; + TEXT[ japanese ] = "鐣彿浠樸亼銇闅庝粯銇"; TEXT[ language_user1 ] = " "; - TEXT[ chinese_traditional ] = "だ絪腹"; + TEXT[ chinese_traditional ] = "鍒嗙礆绶ㄨ櫉"; TEXT[ arabic ] = "氏秧 轻恃揄"; TEXT[ dutch ] = "Nummering indelen"; - TEXT[ chinese_simplified ] = "分级编号"; + TEXT[ chinese_simplified ] = "鍒嗙骇缂栧彿"; TEXT[ greek ] = "榴哞扃箸 戾 弩秣蒡"; - TEXT[ korean ] = "锅龋概扁扁 窜拌"; + TEXT[ korean ] = "氩堩樃 毵り赴旮 雼硠"; TEXT[ turkish ] = "Numaralamay de餴⺶ir"; - TEXT[ catalan ] = "Graduar numeraci髇"; + TEXT[ catalan ] = "Despla鏰 la numeraci"; + TEXT[ thai ] = "喙喔ム阜喙堗腑喔權弗喔赤笖喔编笟喔曕副喔о箑喔ム競"; }; String STR_MOVENUM { @@ -1316,21 +1358,22 @@ String STR_MOVENUM Text [ italian ] = "Sposta paragrafi" ; Text [ spanish ] = "Desplazar p醨rafos" ; Text [ french ] = "D閜lacer paragraphes" ; - Text [ dutch ] = "Alinea磗 verplaatsen" ; - Text[ chinese_simplified ] = "移动段落"; + Text [ dutch ] = "Alinea's verplaatsen" ; + Text[ chinese_simplified ] = "绉诲姩娈佃惤"; Text[ russian ] = "襄疱戾耱栩 噌玎鳆"; Text[ polish ] = "Przesu akapity"; - Text[ japanese ] = "抜棊偺堏摦"; - Text[ chinese_traditional ] = "簿笆琿辅"; + Text[ japanese ] = "娈佃惤銇Щ鍕"; + Text[ chinese_traditional ] = "绉诲嫊娈佃惤"; Text[ arabic ] = "乓峭 轻蒉亚"; - Text[ dutch ] = "Alinea磗 verplaatsen"; - Text[ chinese_simplified ] = "移动段落"; + Text[ dutch ] = "Alinea's verplaatsen"; + Text[ chinese_simplified ] = "绉诲姩娈佃惤"; Text[ greek ] = "体翎鲲褴 疳襻泷荟"; - Text[ korean ] = "窜遏 捞悼"; + Text[ korean ] = "雼澖 鞚措彊"; Text[ turkish ] = "Paragraflar ta"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Desplazar p醨rafos"; + Text[ catalan ] = "Mou els par鄃rafs"; Text[ finnish ] = "Siirr kappaleita"; + Text[ thai ] = "喔⑧箟喔侧涪喔⑧箞喔斧喔權箟喔"; }; String STR_INSERTDRAW { @@ -1345,20 +1388,21 @@ String STR_INSERTDRAW Text [ danish ] = "Inds鎡 tegneobjekt" ; Text [ portuguese ] = "Inserir objecto de desenho" ; Text [ portuguese_brazilian ] = "Zeichenobjekt einf?en" ; - Text[ chinese_simplified ] = "插入绘图对象"; + Text[ chinese_simplified ] = "鎻掑叆缁樺浘瀵硅薄"; Text[ russian ] = "埋蜞忤螯 沭圄梓羼觇 钺牝"; Text[ polish ] = "Wstaw obiekty graficzne"; - Text[ japanese ] = "昤夋堤藜蕺改偺憓擖"; - Text[ chinese_traditional ] = "础酶瓜ン"; + Text[ japanese ] = "鎻忕敾銈儢銈搞偋銈儓銇尶鍏"; + Text[ chinese_traditional ] = "鎻掑叆绻湒鐗╀欢"; Text[ arabic ] = "畔亚 咔其 延驺"; Text[ dutch ] = "Tekenobject invoegen"; - Text[ chinese_simplified ] = "插入绘图对象"; + Text[ chinese_simplified ] = "鎻掑叆缁樺浘瀵硅薄"; Text[ greek ] = "旭矬柁赙 犴糸赍殪蓓秕 篦邃哚箸"; - Text[ korean ] = "弊府扁 俺眉 火涝"; + Text[ korean ] = "攴鸽Μ旮 臧滌泊 靷届瀰"; Text[ turkish ] = "莍zim nesnesi ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar objeto de dibujo"; + Text[ catalan ] = "Insereix l'objecte de dibuix"; Text[ finnish ] = "Lis滗 piirrosobjekti"; + Text[ thai ] = "喙佮笚喔｀竵喔о副喔曕笘喔膏抚喔侧笖喔｀腹喔"; }; String STR_NUMORNONUM { @@ -1373,20 +1417,21 @@ String STR_NUMORNONUM Text [ danish ] = "Aktiver/deaktiver nummer" ; Text [ portuguese ] = "N鷐ero activado/des." ; Text [ portuguese_brazilian ] = "Nummer an/aus" ; - Text[ chinese_simplified ] = "显示/隐入编号"; - Text[ russian ] = "玛./悟觌. 眍戾疣"; + Text[ chinese_simplified ] = "鏄剧ず/闅愬叆缂栧彿"; + Text[ russian ] = "皖戾"; Text[ polish ] = "W彻cz/Wy彻cz numer"; - Text[ japanese ] = "斣崋 递/堤"; - Text[ chinese_traditional ] = "陪ボ/留絪腹"; + Text[ japanese ] = "鐣彿 銈兂/銈儠"; + Text[ chinese_traditional ] = "椤ず/闅卞叆绶ㄨ櫉"; Text[ arabic ] = "刨迩/盼萸 轻艳"; Text[ dutch ] = "Nummer aan/uit"; - Text[ chinese_simplified ] = "显示/隐入编号"; + Text[ chinese_simplified ] = "鏄剧ず/闅愬叆缂栧彿"; Text[ greek ] = "榴殍禳 歪/槛"; - Text[ korean ] = "锅龋 利侩/秦力"; + Text[ korean ] = "氩堩樃 鞝侅毄/頃挫牅"; Text[ turkish ] = "Numara a琮k/kapal"; Text[ language_user1 ] = " "; - Text[ catalan ] = "N鷐ero activado/desactivado"; - Text[ finnish ] = "Numerot On/Off"; + Text[ catalan ] = "N鷐ero activat/desactivat"; + Text[ finnish ] = "Numerot K鋣t鰏s/poissa k鋣t鰏t"; + Text[ thai ] = "喔曕副喔о箑喔ム競 喔∴傅/喙勦浮喙堗浮喔"; }; String STR_INC_LEFTMARGIN { @@ -1401,20 +1446,21 @@ String STR_INC_LEFTMARGIN Text [ french ] = "Augmenter le retrait" ; Text [ portuguese ] = "Aumentar avan鏾" ; Text [ portuguese_brazilian ] = "Einzug vergr?ern" ; - Text[ chinese_simplified ] = "增大缩进"; + Text[ chinese_simplified ] = "澧炲ぇ缂╄繘"; Text[ russian ] = "逾咫梓栩 铗耱箫"; Text[ polish ] = "Zwi阫sz wci阠ie"; - Text[ japanese ] = "草棉菽偺娫妘偺奼戝"; - Text[ chinese_traditional ] = "糤罽逼"; + Text[ japanese ] = "銈ゃ兂銉囥兂銉堛伄闁撻殧銇嫛澶"; + Text[ chinese_traditional ] = "澧炲ぇ绺帓"; Text[ arabic ] = "翼窍 轻乓峭"; Text[ dutch ] = "Inspringing vergroten"; - Text[ chinese_simplified ] = "增大缩进"; + Text[ chinese_simplified ] = "澧炲ぇ缂╄繘"; Text[ greek ] = "笼铉箸 弩秣掾"; - Text[ korean ] = "甸咯静扁 疵烙"; + Text[ korean ] = "霌れ棳鞊瓣赴"; Text[ turkish ] = "Girintiyi b鼀黷"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Aumentar sangr韆"; + Text[ catalan ] = "Augmenta el sagnat"; Text[ finnish ] = "Lis滗 sisennyst"; + Text[ thai ] = "喙喔炧复喙堗浮喔｀赴喔⑧赴喙喔⑧阜喙夃腑喔"; }; String STR_DEC_LEFTMARGIN { @@ -1425,24 +1471,25 @@ String STR_DEC_LEFTMARGIN Text [ swedish ] = "Minska indrag" ; Text [ danish ] = "Formindsk indrykning" ; Text [ italian ] = "Riduci rientro" ; - Text [ spanish ] = "Disminuir sangr韆" ; - Text [ french ] = "Diminuer le retrait" ; + Text [ spanish ] = "Reducir la sangr韆" ; + Text [ french ] = "R閐uire le retrait" ; Text [ portuguese ] = "Reduzir avan鏾 de par醙rafo" ; Text [ portuguese_brazilian ] = "Einzug verringern" ; - Text[ chinese_simplified ] = "减少缩进"; + Text[ chinese_simplified ] = "鍑忓皯缂╄繘"; Text[ russian ] = "屿屙栩 铗耱箫"; Text[ polish ] = "Zmiejsz wci阠ie"; - Text[ japanese ] = "草棉菽娫妘偺弅彫"; - Text[ chinese_traditional ] = "搭ぶ罽逼"; + Text[ japanese ] = "銈ゃ兂銉囥兂銉堥枔闅斻伄绺皬"; + Text[ chinese_traditional ] = "娓涘皯绺帓"; Text[ arabic ] = "配耷 轻乓峭"; Text[ dutch ] = "Inspringing verkleinen"; - Text[ chinese_simplified ] = "减少缩进"; + Text[ chinese_simplified ] = "鍑忓皯缂╄繘"; Text[ greek ] = "体啭箸 弩秣掾"; - Text[ korean ] = "甸咯静扁 临烙"; + Text[ korean ] = "雮挫柎鞊瓣赴"; Text[ turkish ] = "Girintiyi k黮t"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Disminuir sangr韆"; + Text[ catalan ] = "Redueix el sagnat"; Text[ finnish ] = "V鋒enn sisennyst"; + Text[ thai ] = "喔ム笖喔｀赴喔⑧赴喙喔⑧阜喙夃腑喔"; }; String STR_INSERTLABEL { @@ -1457,20 +1504,21 @@ String STR_INSERTLABEL Text [ french ] = "Ins閞er une l間ende" ; Text [ dutch ] = "Bijschrift invoegen" ; Text [ portuguese ] = "Inserir legenda" ; - Text[ chinese_simplified ] = "插入标签"; + Text[ chinese_simplified ] = "鎻掑叆鏍囩"; Text[ russian ] = "埋蜞忤螯 磬玮囗桢"; Text[ polish ] = "Wstaw legend"; - Text[ japanese ] = "恾昞\斣崋偺憓擖"; - Text[ chinese_traditional ] = "础夹乓"; + Text[ japanese ] = "鍥宠〃鐣彿銇尶鍏"; + Text[ chinese_traditional ] = "鎻掑叆妯欑堡"; Text[ arabic ] = "畔亚 视沩 舒猪晚"; Text[ dutch ] = "Bijschrift invoegen"; - Text[ chinese_simplified ] = "插入标签"; + Text[ chinese_simplified ] = "鎻掑叆鏍囩"; Text[ greek ] = "旭矬柁赙 屦殂襻鲛"; - Text[ korean ] = "母记 火涝"; + Text[ korean ] = "旌§厴 靷届瀰"; Text[ turkish ] = "Etiket ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar etiqueta"; - Text[ finnish ] = "Lis滗 kuvaotsikko"; + Text[ catalan ] = "Insereix una llegenda"; + Text[ finnish ] = "Lis滗 otsikko"; + Text[ thai ] = "喙佮笚喔｀竵喔勦赋喔氞福喔｀涪喔侧涪喔犩覆喔"; }; String STR_SETNUMRULESTART { @@ -1485,20 +1533,21 @@ String STR_SETNUMRULESTART Text [ spanish ] = "Reiniciar numeraci髇" ; Text [ french ] = "Reprendre la num閞otation" ; Text [ dutch ] = "Nieuwe nummering" ; - Text[ chinese_simplified ] = "重新开始编号"; - Text[ russian ] = "袜鬣腩 眢戾疣鲨"; + Text[ chinese_simplified ] = "閲嶆柊寮濮嬬紪鍙"; + Text[ russian ] = "袜鬣螯 眢戾疣鲨 玎眍忸"; Text[ polish ] = "W彻cz ponownie numeracj"; - Text[ japanese ] = "斣崋晅偗傪怴偟偔奐巒"; - Text[ chinese_traditional ] = "穝絪腹"; + Text[ japanese ] = "鐣彿浠樸亼銈掓柊銇椼亸闁嬪"; + Text[ chinese_traditional ] = "閲嶆柊绶ㄨ櫉"; Text[ arabic ] = "炮窍 认 轻恃揄"; Text[ dutch ] = "Nieuwe nummering"; - Text[ chinese_simplified ] = "重新开始编号"; + Text[ chinese_simplified ] = "閲嶆柊寮濮嬬紪鍙"; Text[ greek ] = "硼犴尻赀礴箸 狁哞扃箸"; - Text[ korean ] = "锅龋概扁扁 促矫 矫累"; + Text[ korean ] = "氩堩樃 雼れ嫓 毵り赴旮"; Text[ turkish ] = "Numaralamay yeniden baat"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Reiniciar numeraci髇"; + Text[ catalan ] = "Reinicia la numeraci"; Text[ finnish ] = "Aloita numerointi uudestaan"; + Text[ thai ] = "喙喔｀复喙堗浮喔ム赋喔斷副喔氞笗喔编抚喙喔ム競喙冟斧喔∴箞"; }; String STR_CHANGEFTN { @@ -1511,22 +1560,23 @@ String STR_CHANGEFTN Text [ danish ] = "Modificer fodnote" ; Text [ italian ] = "Modifica nota a pi pagina" ; Text [ spanish ] = "Modificar nota al pie" ; - Text [ french ] = "Modifier note de bas de page" ; - Text [ dutch ] = "Voetnoot wijzigingen" ; - Text[ chinese_simplified ] = "更改注脚"; + Text [ french ] = "Modifier la note de bas de page" ; + Text [ dutch ] = "Voetnoot wijzigen" ; + Text[ chinese_simplified ] = "鏇存敼娉ㄨ剼"; Text[ russian ] = "如戾龛螯 耥铖牦"; Text[ polish ] = "Zmodyfikuj przypis dolny"; - Text[ japanese ] = "媟拲偺曄峏"; - Text[ chinese_traditional ] = "跑爹竲"; + Text[ japanese ] = "鑴氭敞銇鏇"; + Text[ chinese_traditional ] = "璁婃洿瑷昏叧"; Text[ arabic ] = "授享 轻颓皂 轻虞犴"; - Text[ dutch ] = "Voetnoot wijzigingen"; - Text[ chinese_simplified ] = "更改注脚"; + Text[ dutch ] = "Voetnoot wijzigen"; + Text[ chinese_simplified ] = "鏇存敼娉ㄨ剼"; Text[ greek ] = "择镳镳镞珞 躔矬珈暹珧"; - Text[ korean ] = "阿林 荐沥"; + Text[ korean ] = "臧侅＜ 氤瓴"; Text[ turkish ] = "Dipnotu de餴⺶ir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Modificar nota al pie"; + Text[ catalan ] = "Modifica la nota al peu"; Text[ finnish ] = "Muokkaa alaviitett"; + Text[ thai ] = "喔斷副喔斷箒喔涏弗喔囙箒喔佮箟喙勦競喙喔娻复喔囙腑喔｀福喔"; }; String STR_REDLINE { @@ -1542,24 +1592,25 @@ String STR_ACCEPT_REDLINE Text [ swedish ] = "Acceptera 鋘dring" ; Text [ danish ] = "Accepter 鎛dring" ; Text [ italian ] = "Accetta le modifiche" ; - Text [ spanish ] = "Aceptar modificaci髇" ; + Text [ spanish ] = "Aceptar modificaciones" ; Text [ french ] = "Accepter la modification" ; Text [ dutch ] = "Wijziging accepteren" ; Text [ portuguese ] = "Aceitar modifica珲es" ; - Text[ chinese_simplified ] = "接受更改"; + Text[ chinese_simplified ] = "鎺ュ彈鏇存敼"; Text[ russian ] = "橡桧螯 桤戾礤龛"; Text[ polish ] = "Zaakceptuj zmiany"; - Text[ japanese ] = "曄峏傪庴偗擖傟傞"; - Text[ chinese_traditional ] = "钡跑"; + Text[ japanese ] = "澶夋洿銈掑彈銇戝叆銈屻倠"; + Text[ chinese_traditional ] = "鎺ュ彈璁婃洿"; Text[ arabic ] = "奕驷 轻售眄亚"; Text[ dutch ] = "Wijziging accepteren"; - Text[ chinese_simplified ] = "接受更改"; + Text[ chinese_simplified ] = "鎺ュ彈鏇存敼"; Text[ greek ] = "琉镤秣 犭脶泾"; - Text[ korean ] = "函版 荐遏"; + Text[ korean ] = "氤瓴 霃欖潣"; Text[ turkish ] = "De餴㱮klikleri kaydet"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Aceptar modificaci髇"; + Text[ catalan ] = "Accepta els canvis"; Text[ finnish ] = "Hyv鋕sy muutokset"; + Text[ thai ] = "喔⑧腑喔∴福喔编笟喔佮覆喔｀箑喔涏弗喔掂箞喔⑧笝喙佮笡喔ム竾"; }; String STR_REJECT_REDLINE { @@ -1574,20 +1625,21 @@ String STR_REJECT_REDLINE Text [ spanish ] = "Rechazar modificaci髇" ; Text [ french ] = "Rejeter la modification" ; Text [ dutch ] = "Wijziging verwerpen" ; - Text[ chinese_simplified ] = "拒绝更改"; + Text[ chinese_simplified ] = "鎷掔粷鏇存敼"; Text[ russian ] = "悟觌铐栩 桤戾礤龛"; Text[ polish ] = "Odrzu zmiany"; - Text[ japanese ] = "曄峏傪庴偗擖傟側偄"; - Text[ chinese_traditional ] = "┶荡跑"; + Text[ japanese ] = "澶夋洿銈掑彈銇戝叆銈屻仾銇"; + Text[ chinese_traditional ] = "鎷掔禃璁婃洿"; Text[ arabic ] = "演 轻售眄"; Text[ dutch ] = "Wijziging verwerpen"; - Text[ chinese_simplified ] = "拒绝更改"; + Text[ chinese_simplified ] = "鎷掔粷鏇存敼"; Text[ greek ] = "琉耖 犭脶泾"; - Text[ korean ] = "函版 芭何"; + Text[ korean ] = "氤瓴 瓯半秬"; Text[ turkish ] = "De餴㱮kli餴 reddet"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Rechazar modificaci髇"; + Text[ catalan ] = "Rebutja el canvi"; Text[ finnish ] = "Hylk滗 muutos"; + Text[ thai ] = "喔涏笍喔脆箑喔笜喔佮覆喔｀箑喔涏弗喔掂箞喔⑧笝喙佮笡喔ム竾"; }; String STR_SPLIT_TABLE { @@ -1601,21 +1653,22 @@ String STR_SPLIT_TABLE Text [ italian ] = "Dividi tabella" ; Text [ spanish ] = "Dividir tabla" ; Text [ french ] = "Scinder le tableau" ; - Text [ dutch ] = "Tabel splitsen" ; - Text[ chinese_simplified ] = "分隔表格"; + Text [ dutch ] = "Tabel opsplitsen" ; + Text[ chinese_simplified ] = "鍒嗛殧琛ㄦ牸"; Text[ russian ] = "朽玑栩 蜞犭桷"; Text[ polish ] = "Rozdziel tabel"; - Text[ japanese ] = "昞\偺暘妱"; - Text[ chinese_traditional ] = "だ秨"; + Text[ japanese ] = "琛ㄣ伄鍒嗗壊"; + Text[ chinese_traditional ] = "鍒嗛枊琛ㄦ牸"; Text[ arabic ] = "菡 轻滔驷"; - Text[ dutch ] = "Tabel splitsen"; - Text[ chinese_simplified ] = "分隔表格"; + Text[ dutch ] = "Tabel opsplitsen"; + Text[ chinese_simplified ] = "鍒嗛殧琛ㄦ牸"; Text[ greek ] = "拈徇皴箸 疬磲赆"; - Text[ korean ] = "钎 唱穿扁"; + Text[ korean ] = "響 雮橂垊旮"; Text[ turkish ] = "Tabloyu b鰈"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Dividir tabla"; + Text[ catalan ] = "Divideix la taula"; Text[ finnish ] = "Jaa taulukko"; + Text[ thai ] = "喙佮涪喔佮笗喔侧福喔侧竾"; }; String STR_DONTEXPAND { @@ -1630,20 +1683,21 @@ String STR_DONTEXPAND Text [ spanish ] = "Detener atributo" ; Text [ french ] = "Arr阾er" ; Text [ dutch ] = "Attribuut stoppen" ; - Text[ chinese_simplified ] = "停止显示属性"; + Text[ chinese_simplified ] = "鍋滄鏄剧ず灞炴"; Text[ russian ] = "务蜞眍忤螯 囹痂狍"; Text[ polish ] = "Zatrzymaj atrybuty"; - Text[ japanese ] = "懏惈偺拞巭"; - Text[ chinese_traditional ] = "氨ゎ陪ボ妮┦"; + Text[ japanese ] = "灞炴с伄涓"; + Text[ chinese_traditional ] = "鍋滄椤ず灞"; Text[ arabic ] = "孓 轻鱼鞘"; Text[ dutch ] = "Attribuut stoppen"; - Text[ chinese_simplified ] = "停止显示属性"; + Text[ chinese_simplified ] = "鍋滄鏄剧ず灞炴"; Text[ greek ] = "拈彡镳 殇辄翮翎"; - Text[ korean ] = "加己 沥瘤"; + Text[ korean ] = "靻嶌劚 欷戩"; Text[ turkish ] = "謟niteli餴 durdur"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Detener atributo"; + Text[ catalan ] = "Atura l'atribut"; Text[ finnish ] = "Pys鋣t ominaisuus"; + Text[ thai ] = "喔涪喔膏笖喔勦父喔撪弗喔编竵喔┼笓喔"; }; String STR_AUTOCORRECT { @@ -1655,23 +1709,24 @@ String STR_AUTOCORRECT Text [ swedish ] = "AutoKorrigering" ; Text [ danish ] = "AutoKorrektur" ; Text [ italian ] = "Correzione automatica" ; - Text [ spanish ] = "AutoCorrecci髇" ; + Text [ spanish ] = "Correcci髇 autom醫ica" ; Text [ french ] = "AutoCorrection" ; Text [ dutch ] = "AutoCorrectie" ; - Text[ chinese_simplified ] = "自动更正"; + Text[ chinese_simplified ] = "鑷姩鏇存"; Text[ russian ] = "棱蝾玎戾磬"; Text[ polish ] = "Autokorekta"; - Text[ japanese ] = "蛋暮诟"; - Text[ chinese_traditional ] = "笆タ"; + Text[ japanese ] = "銈兗銉堛偝銉偗銉"; + Text[ chinese_traditional ] = "鑷嫊鏍℃"; Text[ arabic ] = "收晚 梳耷祈"; Text[ dutch ] = "AutoCorrectie"; - Text[ chinese_simplified ] = "自动更正"; + Text[ chinese_simplified ] = "鑷姩鏇存"; Text[ greek ] = "刘麸拈棂箸"; - Text[ korean ] = "磊悼绊魔"; + Text[ korean ] = "鞛愲彊 靾橃爼/鞛愲彊 靹滌嫕"; Text[ turkish ] = "Otomatik d鼁eltme"; Text[ language_user1 ] = " "; - Text[ catalan ] = "AutoCorrecci髇"; - Text[ finnish ] = "Automaattinen korjaus"; + Text[ catalan ] = "Correcci autom鄑ica"; + Text[ finnish ] = "Autom. korjaus"; + Text[ thai ] = "喙佮竵喙夃箘喔傕箖喔箟喔栢腹喔佮笗喙夃腑喔囙腑喔编笗喙傕笝喔∴副喔曕复"; }; String STR_MERGE_TABLE { @@ -1685,21 +1740,22 @@ String STR_MERGE_TABLE Text[ spanish ] = "unir tablas"; Text[ italian ] = "Collega tabella"; Text[ danish ] = "Flet tabeller"; - Text[ swedish ] = "F鰎bind tabeller"; + Text[ swedish ] = "Sammanfoga tabeller"; Text[ polish ] = "Po彻cz tabele"; Text[ portuguese_brazilian ] = "Merge table"; - Text[ japanese ] = "昞\偺寢崌"; - Text[ chinese_simplified ] = "合并表格"; - Text[ chinese_traditional ] = "ㄖ"; + Text[ japanese ] = "琛ㄣ伄绲愬悎"; + Text[ chinese_simplified ] = "鍚堝苟琛ㄦ牸"; + Text[ chinese_traditional ] = "鍚堜降琛ㄦ牸"; Text[ arabic ] = "嬲 轻滔驷"; Text[ dutch ] = "Tabel verbinden"; - Text[ chinese_simplified ] = "合并表格"; + Text[ chinese_simplified ] = "鍚堝苟琛ㄦ牸"; Text[ greek ] = "育礓弩 痖碥犍"; - Text[ korean ] = "抛捞喉 楷搬"; + Text[ korean ] = "響 頃╈箻旮"; Text[ turkish ] = "Tabloyu birle⺶ir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "unir tablas"; + Text[ catalan ] = "Fusiona la taula"; Text[ finnish ] = "Yhdist taulukko"; + Text[ thai ] = "喔溹釜喔侧笝喔曕覆喔｀覆喔"; }; String STR_TRANSLITERATE @@ -1708,24 +1764,25 @@ String STR_TRANSLITERATE TEXT [ English ] = "Change case" ; TEXT[ english_us ] = "Case/Characters"; TEXT[ portuguese ] = "Caixa/Caracteres"; - TEXT[ russian ] = "青汶噔睇/耱痤黜 狍赈"; + TEXT[ russian ] = "疱汨耱"; TEXT[ greek ] = "叔鲠脶哚/绣孳"; - TEXT[ dutch ] = "Hoofd-/kleine letters"; + TEXT[ dutch ] = "Hoofdletters/kleine letters"; TEXT[ french ] = "Casse/Caract鑢es"; TEXT[ spanish ] = "May鷖culas/min鷖culas"; TEXT[ italian ] = "Maiuscole/minuscole"; - TEXT[ danish ] = "Change case"; - TEXT[ swedish ] = "Versalk鋘slig"; + TEXT[ danish ] = "Store og sm bogstaver"; + TEXT[ swedish ] = "Bokst鋠er/tecken"; TEXT[ polish ] = "Wielkie i ma砮 litery"; TEXT[ portuguese_brazilian ] = "Change case"; - TEXT[ japanese ] = "戝暥帤/彫暥帤"; - TEXT[ korean ] = "措/家巩磊 备盒"; - TEXT[ chinese_simplified ] = "字母大小写"; - TEXT[ chinese_traditional ] = "ダ糶"; + TEXT[ japanese ] = "鏂囧瓧绋伄澶夋彌"; + TEXT[ korean ] = "氍胳瀽 氚旉靖旮"; + TEXT[ chinese_simplified ] = "瀛楁瘝澶у皬鍐"; + TEXT[ chinese_traditional ] = "瀛楁瘝澶у皬瀵"; TEXT[ turkish ] = "Change case"; TEXT[ arabic ] = "轻呤侨 让脱 呷硌 面 折硌"; - TEXT[ catalan ] = "May鷖culas/min鷖culas"; - TEXT[ finnish ] = "Gro-/Kleinschreibung"; + TEXT[ catalan ] = "Maj鷖cules/min鷖cules"; + TEXT[ finnish ] = "Muuta kirjainkoko"; + TEXT[ thai ] = "喔曕副喔о笧喔脆浮喔炧箤/喔曕副喔о腑喔编竵喔傕福喔"; }; String STR_DELNUM @@ -1741,21 +1798,22 @@ String STR_DELNUM TEXT [ french ] = "Supprimer la num閞otation" ; TEXT [ swedish ] = "Radera numrering" ; TEXT [ dutch ] = "Nummering wissen" ; - TEXT [ spanish ] = "Eliminar numeraci髇" ; + TEXT [ spanish ] = "Borrar numeraci髇" ; TEXT [ english_us ] = "Delete numbering" ; - TEXT[ chinese_simplified ] = "删除编号"; + TEXT[ chinese_simplified ] = "鍒犻櫎缂栧彿"; TEXT[ russian ] = "愉嚯栩 眢戾疣鲨"; TEXT[ polish ] = "Usu numeracj"; - TEXT[ japanese ] = "斣崋晅偗偺嶍彍"; - TEXT[ chinese_traditional ] = "埃絪腹"; + TEXT[ japanese ] = "鐣彿浠樸亼銇墛闄"; + TEXT[ chinese_traditional ] = "鍒櫎绶ㄨ櫉"; TEXT[ arabic ] = "托 轻恃揄"; TEXT[ dutch ] = "Nummering wissen"; - TEXT[ chinese_simplified ] = "删除编号"; + TEXT[ chinese_simplified ] = "鍒犻櫎缂栧彿"; TEXT[ greek ] = "拈徙襻鲛 狁哞扃箸"; - TEXT[ korean ] = "锅龋概扁扁 力芭"; + TEXT[ korean ] = "氩堩樃 毵り赴旮 靷牅"; TEXT[ turkish ] = "Numaralamay sil"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "Eliminar numeraci髇"; + TEXT[ catalan ] = "Suprimeix la numeraci"; + TEXT[ thai ] = "喔ム笟喔ム赋喔斷副喔氞笗喔编抚喙喔ム競"; }; String STR_DRAWUNDO { @@ -1770,20 +1828,21 @@ String STR_DRAWUNDO Text [ danish ] = "Tegneobjekter" ; Text [ portuguese ] = "Objectos de desenho" ; Text [ portuguese_brazilian ] = "Zeichenobjekte" ; - Text[ chinese_simplified ] = "绘图对象"; + Text[ chinese_simplified ] = "缁樺浘瀵硅薄"; Text[ russian ] = "灭圄梓羼觇 钺牝"; Text[ polish ] = "Obiekty graficzne"; - Text[ japanese ] = "恾宍昤夋堤藜蕺改"; - Text[ chinese_traditional ] = "酶瓜ン"; + Text[ japanese ] = "鍥冲舰鎻忕敾銈儢銈搞偋銈儓"; + Text[ chinese_traditional ] = "绻湒鐗╀欢"; Text[ arabic ] = "咔其鞘 延驺砩"; Text[ dutch ] = "Tekenobjecten"; - Text[ chinese_simplified ] = "绘图对象"; + Text[ chinese_simplified ] = "缁樺浘瀵硅薄"; Text[ greek ] = "另糸赍哽屙 篦邃哚箸"; - Text[ korean ] = "巩磊 俺眉"; + Text[ korean ] = "攴鸽Μ旮 臧滌泊"; Text[ turkish ] = "莍zim nesneleri"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Objetos de dibujo"; + Text[ catalan ] = "Objectes de dibuix"; Text[ finnish ] = "Piirrosobjektit"; + Text[ thai ] = "喔о覆喔斷抚喔编笗喔栢父"; }; String STR_DRAWGROUP { @@ -1798,20 +1857,21 @@ String STR_DRAWGROUP Text [ danish ] = "Grupper tegneobjekter" ; Text [ portuguese ] = "Agrupar objectos de desenho" ; Text [ portuguese_brazilian ] = "Zeichenobjekte gruppieren" ; - Text[ chinese_simplified ] = "分组绘图对象"; + Text[ chinese_simplified ] = "鍒嗙粍缁樺浘瀵硅薄"; Text[ russian ] = "灭箫镨痤忄螯 沭圄梓羼觇 钺牝"; Text[ polish ] = "Grupuj obiekty graficzne"; - Text[ japanese ] = "恾宍昤夋傪皋侔踢壔偡傞"; - Text[ chinese_traditional ] = "酶瓜ン竤舱"; + Text[ japanese ] = "鍥冲舰鎻忕敾銈掋偘銉兗銉楀寲銇欍倠"; + Text[ chinese_traditional ] = "绻湒鐗╀欢缇ょ祫"; Text[ arabic ] = "侍沩 咔其鞘 延驺砩"; Text[ dutch ] = "Tekenobjecten groeperen"; - Text[ chinese_simplified ] = "分组绘图对象"; + Text[ chinese_simplified ] = "鍒嗙粍缁樺浘瀵硅薄"; Text[ greek ] = "响徜镳镞珞 犴糸赍殪蓓 篦邃哚箸"; - Text[ korean ] = "弊府扁 俺眉 弊缝"; + Text[ korean ] = "攴鸽Μ旮 臧滌泊 攴鸽９"; Text[ turkish ] = "莍zim nesnelerini grupla"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Agrupar objetos de dibujo"; + Text[ catalan ] = "Agrupa els objectes de dibuix"; Text[ finnish ] = "Ryhmittele piirrosobjektit"; + Text[ thai ] = "喔堗副喔斷竵喔ム父喙堗浮喔о副喔曕笘喔膏抚喔侧笖喔｀腹喔"; }; String STR_DRAWUNGROUP { @@ -1822,24 +1882,25 @@ String STR_DRAWUNGROUP Text [ spanish ] = "Resolver objeto de grupo" ; Text [ french ] = "Dissocier les objets" ; Text [ dutch ] = "Groepsobject opheffen" ; - Text [ swedish ] = "Uppl鰏 gruppobjekt" ; + Text [ swedish ] = "L鰏 upp gruppobjekt" ; Text [ danish ] = "Oph鎣 gruppeobjekter" ; Text [ portuguese ] = "Desagrupar objectos" ; Text [ portuguese_brazilian ] = "Gruppenobjekt aufl?en" ; - Text[ chinese_simplified ] = "取消分组对象"; + Text[ chinese_simplified ] = "鍙栨秷鍒嗙粍瀵硅薄"; Text[ russian ] = "朽玢痼镲桊钼囹 沭圄梓羼觇 钺牝"; Text[ polish ] = "Rozgrupuj obiekty rysunkowe"; - Text[ japanese ] = "皋侔踢壔偝傟偨堤藜蕲改偺夝彍"; - Text[ chinese_traditional ] = "竤舱ン"; + Text[ japanese ] = "銈般儷銉笺儣鍖栥仌銈屻仧銈儢銈搞儱銈儓銇В闄"; + Text[ chinese_traditional ] = "鍙栨秷缇ょ祫鐗╀欢"; Text[ arabic ] = "葸 侍沩 轻咔其鞘"; Text[ dutch ] = "Groepsobject opheffen"; - Text[ chinese_simplified ] = "取消分组对象"; + Text[ chinese_simplified ] = "鍙栨秷鍒嗙粍瀵硅薄"; Text[ greek ] = "梳糗胥珞 镬徜镳镞珞珧 犴糸赍殪蓓"; - Text[ korean ] = "弊缝 俺眉 秦眉"; + Text[ korean ] = "攴鸽Μ旮 臧滌泊 攴鸽９ 頃挫牅"; Text[ turkish ] = "Nesne grubunu 琏z"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Resolver objeto de grupo"; + Text[ catalan ] = "Desagrupa els objectes de dibuix"; Text[ finnish ] = "Pura piirrosobjektien ryhmitys"; + Text[ thai ] = "喙勦浮喙堗笀喔编笖喔佮弗喔膏箞喔∴抚喔编笗喔栢父喔о覆喔斷福喔灌笡"; }; String STR_DRAWDELETE { @@ -1848,26 +1909,27 @@ String STR_DRAWDELETE Text [ dutch ] = "Tekenobjecten wissen" ; Text [ english_us ] = "Delete drawing objects" ; Text [ italian ] = "Elimina oggetti di disegno" ; - Text [ spanish ] = "Eliminar objetos de dibujo" ; + Text [ spanish ] = "Borrar objetos de dibujo" ; Text [ french ] = "Supprimer des objets de dessin" ; Text [ swedish ] = "Radera ritobjekt" ; Text [ danish ] = "Slet tegneobjekter" ; Text [ portuguese ] = "Eliminar objectos de desenho" ; Text [ portuguese_brazilian ] = "Zeichenobjekte l?chen" ; - Text[ chinese_simplified ] = "删除绘图对象"; + Text[ chinese_simplified ] = "鍒犻櫎缁樺浘瀵硅薄"; Text[ russian ] = "愉嚯栩 沭圄梓羼觇 钺牝"; Text[ polish ] = "Usu obiekty graficzne"; - Text[ japanese ] = "恾宍昤夋堤藜蕺改傪夝彍"; - Text[ chinese_traditional ] = "埃酶瓜ン"; + Text[ japanese ] = "鍥冲舰鎻忕敾銈儢銈搞偋銈儓銈掕В闄"; + Text[ chinese_traditional ] = "鍒櫎绻湒鐗╀欢"; Text[ arabic ] = "托 咔其鞘 延驺砩"; Text[ dutch ] = "Tekenobjecten wissen"; - Text[ chinese_simplified ] = "删除绘图对象"; + Text[ chinese_simplified ] = "鍒犻櫎缁樺浘瀵硅薄"; Text[ greek ] = "拈徙襻鲛 犴糸赍殪蓓 篦邃哚箸"; - Text[ korean ] = "弊府扁 俺眉 昏力"; + Text[ korean ] = "攴鸽Μ旮 臧滌泊 靷牅"; Text[ turkish ] = "莍zim nesnelerini sil"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Eliminar objetos de dibujo"; + Text[ catalan ] = "Suprimeix els objectes de dibuix"; Text[ finnish ] = "Poista piirrosobjektit"; + Text[ thai ] = "喔ム笟喔о副喔曕笘喔膏抚喔侧笖喔｀腹喔"; }; String STR_REREAD { @@ -1882,20 +1944,21 @@ String STR_REREAD Text [ danish ] = "Erstat grafik" ; Text [ portuguese ] = "Substituir imagem" ; Text [ portuguese_brazilian ] = "Grafik ersetzen" ; - Text[ chinese_simplified ] = "更替图形"; + Text[ chinese_simplified ] = "鏇挎崲鍥惧舰"; Text[ russian ] = "青戾龛螯 沭圄桕"; Text[ polish ] = "Zamie grafik"; - Text[ japanese ] = "恾偺抲姺"; - Text[ chinese_traditional ] = "蠢瓜"; + Text[ japanese ] = "鍥炽伄缃彌"; + Text[ chinese_traditional ] = "浠ｆ浛鍦栧舰"; Text[ arabic ] = "怯嗜锨 轻延驺鞘"; Text[ dutch ] = "Afbeelding vervangen"; - Text[ chinese_simplified ] = "更替图形"; + Text[ chinese_simplified ] = "鏇挎崲鍥惧舰"; Text[ greek ] = "另糸赆糗篝狍 泷狯殛"; - Text[ korean ] = "弊贰侨 官操扁"; + Text[ korean ] = "攴鸽 氚旉靖旮"; Text[ turkish ] = "Grafi餴 de餴⺶irmek"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Reemplazar imagen"; + Text[ catalan ] = "Reempla鏰 la imatge"; Text[ finnish ] = "Korvaa grafiikka"; + Text[ thai ] = "喙佮笚喔權笚喔掂箞喔佮福喔侧笩喔脆竸"; }; String STR_DELGRF { @@ -1904,26 +1967,27 @@ String STR_DELGRF Text [ dutch ] = "Afbeelding wissen" ; Text [ english_us ] = "Delete graphics" ; Text [ italian ] = "Elimina immagine" ; - Text [ spanish ] = "Eliminar imagen" ; + Text [ spanish ] = "Borrar imagen" ; Text [ french ] = "Supprimer l'image" ; Text [ swedish ] = "Radera grafik" ; Text [ danish ] = "Slet grafik" ; Text [ portuguese ] = "Eliminar imagem" ; Text [ portuguese_brazilian ] = "Grafik l?chen" ; - Text[ chinese_simplified ] = "删除图形"; - Text[ russian ] = "愉嚯栩"; + Text[ chinese_simplified ] = "鍒犻櫎鍥惧舰"; + Text[ russian ] = "愉嚯栩 沭圄桕"; Text[ polish ] = "Usu grafik"; - Text[ japanese ] = "恾偺嶍彍"; - Text[ chinese_traditional ] = "埃瓜"; + Text[ japanese ] = "鍥炽伄鍓婇櫎"; + Text[ chinese_traditional ] = "鍒櫎鍦栧舰"; Text[ arabic ] = "托 真焉"; Text[ dutch ] = "Afbeelding wissen"; - Text[ chinese_simplified ] = "删除图形"; + Text[ chinese_simplified ] = "鍒犻櫎鍥惧舰"; Text[ greek ] = "拈徙襻鲛 泷狯殛稞"; - Text[ korean ] = "弊贰侨 昏力"; + Text[ korean ] = "攴鸽 靷牅"; Text[ turkish ] = "Grafi餴 sil"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Eliminar imagen"; - Text[ finnish ] = "Poista kuvat"; + Text[ catalan ] = "Suprimeix la imatge"; + Text[ finnish ] = "Poista grafiikka"; + Text[ thai ] = "喔ム笟喔佮福喔侧笩喔脆竸"; }; String STR_DELOLE { @@ -1931,27 +1995,28 @@ String STR_DELOLE TEXT [ English ] = "Delete Object" ; Text [ english_us ] = "Delete object" ; Text [ italian ] = "Elimina oggetto" ; - Text [ spanish ] = "Eliminar objeto" ; + Text [ spanish ] = "Borrar objeto" ; Text [ french ] = "Supprimer l'objet" ; Text [ dutch ] = "Object wissen" ; Text [ swedish ] = "Radera objekt" ; Text [ danish ] = "Slet objekt" ; Text [ portuguese ] = "Eliminar objecto" ; Text [ portuguese_brazilian ] = "Objekt l?chen" ; - Text[ chinese_simplified ] = "删除对象"; + Text[ chinese_simplified ] = "鍒犻櫎瀵硅薄"; Text[ russian ] = "愉嚯栩 钺牝"; Text[ polish ] = "Usu obiekt"; - Text[ japanese ] = "堤藜蕺改偺嶍彍"; - Text[ chinese_traditional ] = "埃ン"; + Text[ japanese ] = "銈儢銈搞偋銈儓銇墛闄"; + Text[ chinese_traditional ] = "鍒櫎鐗╀欢"; Text[ arabic ] = "托 咔其"; Text[ dutch ] = "Object wissen"; - Text[ chinese_simplified ] = "删除对象"; + Text[ chinese_simplified ] = "鍒犻櫎瀵硅薄"; Text[ greek ] = "拈徙襻鲛 犴糸赍殪蓓秕"; - Text[ korean ] = "俺眉 昏力"; + Text[ korean ] = "臧滌泊 靷牅"; Text[ turkish ] = "Nesneyi sil"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Eliminar objeto"; + Text[ catalan ] = "Suprimeix l'objecte"; Text[ finnish ] = "Poista objekti"; + Text[ thai ] = "喔ム笟喔о副喔曕笘喔"; }; String STR_TABLE_ATTR { @@ -1966,20 +2031,21 @@ String STR_TABLE_ATTR Text [ danish ] = "Anvend tabelattributter" ; Text [ portuguese ] = "Aplicar atributos da tabela" ; Text [ portuguese_brazilian ] = "Tabellenattribute anwenden" ; - Text[ chinese_simplified ] = "使用表格属性"; + Text[ chinese_simplified ] = "浣跨敤琛ㄦ牸灞炴"; Text[ russian ] = "橡桁屙栩 囹痂狍螓 蜞犭桷"; Text[ polish ] = "Zastosuj atrybuty tabeli"; - Text[ japanese ] = "昞\偺懏惈偺揔梡"; - Text[ chinese_traditional ] = "ㄏノ妮┦"; + Text[ japanese ] = "琛ㄣ伄灞炴с伄閬╃敤"; + Text[ chinese_traditional ] = "浣跨敤琛ㄦ牸灞"; Text[ arabic ] = "怯饰锨 鱼鞘 轻滔驷"; Text[ dutch ] = "Tabelattributen toepassen"; - Text[ chinese_simplified ] = "使用表格属性"; + Text[ chinese_simplified ] = "浣跨敤琛ㄦ牸灞炴"; Text[ greek ] = "碰狁祜戕 殇轱艮豉 疬磲赆"; - Text[ korean ] = "钎 加己 利侩"; + Text[ korean ] = "響滌潣 靻嶌劚 鞝侅毄"; Text[ turkish ] = "Tablo 鰖niteliklerini kullan"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Aplicar atributos de la tabla"; + Text[ catalan ] = "Aplica els atributs de la taula"; Text[ finnish ] = "K鋣t taulukkom滗ritteit"; + Text[ thai ] = "喙冟笂喙夃竸喔膏笓喔ム副喔佮俯喔撪赴喔曕覆喔｀覆喔"; }; String STR_TABLE_AUTOFMT { @@ -1987,27 +2053,28 @@ String STR_TABLE_AUTOFMT TEXT [ English ] = "Autoformat Table" ; Text [ english_us ] = "AutoFormat Table" ; Text [ italian ] = "Formattazione automatica tabella" ; - Text [ spanish ] = "AutoFormato tabla" ; + Text [ spanish ] = "Formateado autom醫ico tabla" ; Text [ french ] = "AutoFormat de tableau" ; Text [ dutch ] = "AutoOpmaak tabel" ; Text [ swedish ] = "Autoformat Tabell" ; Text [ danish ] = "AutoFormat tabel" ; Text [ portuguese ] = "AutoFormato tabela" ; Text [ portuguese_brazilian ] = "Autoformat Tabelle" ; - Text[ chinese_simplified ] = "自动格式 表格"; + Text[ chinese_simplified ] = "鑷姩鏍煎紡 琛ㄦ牸"; Text[ russian ] = "棱蝾纛痨囹 蜞犭桷"; Text[ polish ] = "Autoformat tabeli"; - Text[ japanese ] = "蛋奶席 昞\"; - Text[ chinese_traditional ] = "笆Α "; + Text[ japanese ] = "銈兗銉堛儠銈┿兗銉炪儍銉 琛"; + Text[ chinese_traditional ] = "鑷嫊鏍煎紡 琛ㄦ牸"; Text[ arabic ] = "输禹 梳耷祈 後滔驷"; Text[ dutch ] = "AutoOpmaak tabel"; - Text[ chinese_simplified ] = "自动格式 表格"; + Text[ chinese_simplified ] = "鑷姩鏍煎紡 琛ㄦ牸"; Text[ greek ] = "刘麸田聆 羞磲赆"; - Text[ korean ] = "磊悼辑侥 抛捞喉"; + Text[ korean ] = "響 鞛愲彊 靹滌嫕"; Text[ turkish ] = "Otomatik formatlama Tablo"; Text[ language_user1 ] = " "; - Text[ catalan ] = "AutoFormato tabla"; + Text[ catalan ] = "Taula de formatatge autom鄑ic"; Text[ finnish ] = "Automaattinen taulukon muotoilu"; + Text[ thai ] = "喔曕覆喔｀覆喔囙福喔灌笡喙佮笟喔氞腑喔编笗喙傕笝喔∴副喔曕复"; }; String STR_TABLE_INSCOL { @@ -2024,19 +2091,20 @@ String STR_TABLE_INSCOL Text [ dutch ] = "Kolom invoegen" ; Text [ spanish ] = "Insertar columna" ; Text [ english_us ] = "Insert Column" ; - Text[ chinese_simplified ] = "插入列"; - Text[ russian ] = "埋蜞忤螯 觐腩黻"; + Text[ chinese_simplified ] = "鎻掑叆鍒"; + Text[ russian ] = "埋蜞忤螯 耱铍徨"; Text[ polish ] = "Wstaw kolumn"; - Text[ japanese ] = "楍偺憓擖"; - Text[ chinese_traditional ] = "础逆"; + Text[ japanese ] = "鍒椼伄鎸垮叆"; + Text[ chinese_traditional ] = "鎻掑叆娆"; Text[ arabic ] = "畔亚 阢嫦"; Text[ dutch ] = "Kolom invoegen"; - Text[ chinese_simplified ] = "插入列"; + Text[ chinese_simplified ] = "鎻掑叆鍒"; Text[ greek ] = "砰筢泫戕 篝揠珧"; - Text[ korean ] = "凯 火涝"; + Text[ korean ] = "鞐 靷届瀰"; Text[ turkish ] = "S黷unu ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar columna"; + Text[ catalan ] = "Insereix una columna"; + Text[ thai ] = "喙佮笚喔｀竵喔勦腑喔ム副喔∴笝喙"; }; String STR_TABLE_INSROW { @@ -2053,19 +2121,20 @@ String STR_TABLE_INSROW Text [ dutch ] = "Rij invoegen" ; Text [ spanish ] = "Insertar fila" ; Text [ english_us ] = "Insert Row" ; - Text[ chinese_simplified ] = "插入行"; + Text[ chinese_simplified ] = "鎻掑叆琛"; Text[ russian ] = "埋蜞忤螯 耱痤牦"; Text[ polish ] = "Wstaw wiersz"; - Text[ japanese ] = "峴偺憓擖"; - Text[ chinese_traditional ] = "础︽"; + Text[ japanese ] = "琛屻伄鎸垮叆"; + Text[ chinese_traditional ] = "鎻掑叆琛"; Text[ arabic ] = "畔亚 蛰"; Text[ dutch ] = "Rij invoegen"; - Text[ chinese_simplified ] = "插入行"; + Text[ chinese_simplified ] = "鎻掑叆琛"; Text[ greek ] = "砰筢泫戕 泷犰燹"; - Text[ korean ] = "青 火涝"; + Text[ korean ] = "頄 靷届瀰"; Text[ turkish ] = "Sat齬 ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar fila"; + Text[ catalan ] = "Insereix una fila"; + Text[ thai ] = "喙佮笚喔｀竵喙佮笘喔"; }; String STR_TABLE_DELBOX { @@ -2080,21 +2149,22 @@ String STR_TABLE_DELBOX Text [ french ] = "Supprimer la ligne/colonne" ; Text [ swedish ] = "Radera rad/kolumn" ; Text [ dutch ] = "Rij/Kolom wissen" ; - Text [ spanish ] = "Eliminar fila/columna" ; + Text [ spanish ] = "Borrar fila/columna" ; Text [ english_us ] = "Delete row/column" ; - Text[ chinese_simplified ] = "删除行/列"; + Text[ chinese_simplified ] = "鍒犻櫎琛/鍒"; Text[ russian ] = "愉嚯栩 耱痤牦/耱铍徨"; Text[ polish ] = "Usu wiersz/kolumn"; - Text[ japanese ] = "峴/楍偺嶍彍"; - Text[ chinese_traditional ] = "埃/逆"; + Text[ japanese ] = "琛/鍒椼伄鍓婇櫎"; + Text[ chinese_traditional ] = "鍒櫎鍒/娆"; Text[ arabic ] = "托 蛰/阢嫦"; Text[ dutch ] = "Rij/Kolom wissen"; - Text[ chinese_simplified ] = "删除行/列"; + Text[ chinese_simplified ] = "鍒犻櫎琛/鍒"; Text[ greek ] = "拈徙襻鲛 泷犰燹/篝揠珧"; - Text[ korean ] = "青/凯 昏力"; + Text[ korean ] = "頄/鞐 靷牅"; Text[ turkish ] = "Sat齬/s黷unu sil"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Eliminar fila/columna"; + Text[ catalan ] = "Suprimeix la fila/columna"; + Text[ thai ] = "喔ム笟喙佮笘喔/喔勦腑喔ム副喔∴笝喙"; }; String STR_TABLE_SPLIT { @@ -2111,19 +2181,20 @@ String STR_TABLE_SPLIT Text [ dutch ] = "Cellen splitsen" ; Text [ spanish ] = "Dividir celdas" ; Text [ english_us ] = "Split Cells" ; - Text[ chinese_simplified ] = "分隔单元格"; + Text[ chinese_simplified ] = "鍒嗛殧鍗曞厓鏍"; Text[ russian ] = "朽玑栩 麇殛"; Text[ polish ] = "Podziel kom髍ki"; - Text[ japanese ] = "举偺暘妱"; - Text[ chinese_traditional ] = "だ秨纗"; + Text[ japanese ] = "銈汇儷銇垎鍓"; + Text[ chinese_traditional ] = "鍒嗛枊鍎插瓨鏍"; Text[ arabic ] = "兽禹 轻吾琼"; Text[ dutch ] = "Cellen splitsen"; - Text[ chinese_simplified ] = "分隔单元格"; + Text[ chinese_simplified ] = "鍒嗛殧鍗曞厓鏍"; Text[ greek ] = "拈徇皴箸 赍腴"; - Text[ korean ] = "伎 唱穿扁"; + Text[ korean ] = "靺 雮橂垊旮"; Text[ turkish ] = "H點reyi ay齬"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Dividir celdas"; + Text[ catalan ] = "Divideix les cel.les"; + Text[ thai ] = "喙佮涪喔佮箑喔嬥弗喔ム箤"; }; String STR_TABLE_MERGE { @@ -2134,24 +2205,25 @@ String STR_TABLE_MERGE Text [ spanish ] = "Unir celdas" ; Text [ french ] = "Fusionner la cellule" ; Text [ dutch ] = "Cel koppelen" ; - Text [ swedish ] = "F鰎bind cell" ; + Text [ swedish ] = "Sammanfoga celler" ; Text [ danish ] = "Flet celler" ; Text [ portuguese ] = "Unir c閘ulas" ; Text [ portuguese_brazilian ] = "Zelle verbinden" ; - Text[ chinese_simplified ] = "合并单元格"; + Text[ chinese_simplified ] = "鍚堝苟鍗曞厓鏍"; Text[ russian ] = "吾滂龛螯 麇殛"; Text[ polish ] = "Scal kom髍ki"; - Text[ japanese ] = "举偺寢崌"; - Text[ chinese_traditional ] = "ㄖ纗"; + Text[ japanese ] = "銈汇儷銇祼鍚"; + Text[ chinese_traditional ] = "鍚堜降鍎插瓨鏍"; Text[ arabic ] = "嬲 轻吾砩"; Text[ dutch ] = "Cel koppelen"; - Text[ chinese_simplified ] = "合并单元格"; + Text[ chinese_simplified ] = "鍚堝苟鍗曞厓鏍"; Text[ greek ] = "疙 赍腴"; - Text[ korean ] = "伎 捍钦"; + Text[ korean ] = "靺 頃╈箻旮"; Text[ turkish ] = "H點reyi birle⺶ir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Unir celdas"; + Text[ catalan ] = "Fusiona les cel.les"; Text[ finnish ] = "Yhdist solut"; + Text[ thai ] = "喔溹釜喔侧笝喙喔嬥弗喔ム箤"; }; String STR_TABLE_NUMFORMAT { @@ -2166,20 +2238,21 @@ String STR_TABLE_NUMFORMAT Text [ spanish ] = "Formatear celda" ; Text [ french ] = "Formater la cellule" ; Text [ dutch ] = "Cel opmaken" ; - Text[ chinese_simplified ] = "格式化单元格"; + Text[ chinese_simplified ] = "鏍煎紡鍖栧崟鍏冩牸"; Text[ russian ] = "灶痨囹 麇尻"; Text[ polish ] = "Formatuj kom髍k"; - Text[ japanese ] = "举偺彂幃愝掕"; - Text[ chinese_traditional ] = "Αて纗"; + Text[ japanese ] = "銈汇儷銇浉寮忚ō瀹"; + Text[ chinese_traditional ] = "鏍煎紡鍖栧劜瀛樻牸"; Text[ arabic ] = "输禹 轻吾砩"; Text[ dutch ] = "Cel opmaken"; - Text[ chinese_simplified ] = "格式化单元格"; + Text[ chinese_simplified ] = "鏍煎紡鍖栧崟鍏冩牸"; Text[ greek ] = "田聆镳镞珞 赍腴稞"; - Text[ korean ] = "伎 器杆泼"; + Text[ korean ] = "靺 靹滌嫕 靹れ爼"; Text[ turkish ] = "H點reyi formatla"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Formatear celda"; + Text[ catalan ] = "Formata la cel.la"; Text[ finnish ] = "Muotoile solu"; + Text[ thai ] = "喔堗副喔斷福喔灌笡喙佮笟喔氞箑喔嬥弗喔ム箤"; }; String STR_INSERT_TOX { @@ -2194,20 +2267,21 @@ String STR_INSERT_TOX Text [ spanish ] = "Insertar 韓dice" ; Text [ french ] = "Ins閞er un index" ; Text [ dutch ] = "Index invoegen" ; - Text[ chinese_simplified ] = "插入索引"; - Text[ russian ] = "埋蜞忤螯 箨噻囹咫"; + Text[ chinese_simplified ] = "鎻掑叆鐩綍"; + Text[ russian ] = "埋蜞怅 箨噻囹咫"; Text[ polish ] = "Wstaw indeks"; - Text[ japanese ] = "栚師偲嶕堷偺憓擖"; - Text[ chinese_traditional ] = "础ヘ魁"; + Text[ japanese ] = "鐩銇ㄧ储寮曘伄鎸垮叆"; + Text[ chinese_traditional ] = "鎻掑叆鐩寗"; Text[ arabic ] = "畔亚 蒎延"; Text[ dutch ] = "Index invoegen"; - Text[ chinese_simplified ] = "插入索引"; + Text[ chinese_simplified ] = "鎻掑叆鐩綍"; Text[ greek ] = "砰筢泫戕 艴皴翮襁秕"; - Text[ korean ] = "祸牢 火涝"; + Text[ korean ] = "靸夓澑 氚 氇╈皑 靷届瀰"; Text[ turkish ] = "Dizin ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar 韓dice"; + Text[ catalan ] = "Insereix l'韓dex"; Text[ finnish ] = "Lis滗 hakemisto"; + Text[ thai ] = "喙佮笚喔｀竵喔斷副喔娻笝喔"; }; String STR_CLEAR_TOX_RANGE { @@ -2219,23 +2293,24 @@ String STR_CLEAR_TOX_RANGE Text [ swedish ] = "Upph鋠 f鰎teckning" ; Text [ danish ] = "Oph鎣 indeks" ; Text [ italian ] = "Rimuovi indice" ; - Text [ spanish ] = "Eliminar directorio" ; + Text [ spanish ] = "Borrar el directorio" ; Text [ french ] = "Supprimer l'index" ; Text [ dutch ] = "Index verwijderen" ; - Text[ chinese_simplified ] = "取消索引"; - Text[ russian ] = "俞疣螯 箨噻囹咫"; + Text[ chinese_simplified ] = "鍙栨秷鐩綍"; + Text[ russian ] = "愉嚯栩 箨噻囹咫"; Text[ polish ] = "Usu indeks"; - Text[ japanese ] = "栚師偲嶕堷偺夝彍"; - Text[ chinese_traditional ] = "ヘ魁"; + Text[ japanese ] = "鐩銇ㄧ储寮曘伄瑙ｉ櫎"; + Text[ chinese_traditional ] = "鍙栨秷鐩寗"; Text[ arabic ] = "乓轻 轻蒎延"; Text[ dutch ] = "Index verwijderen"; - Text[ chinese_simplified ] = "取消索引"; + Text[ chinese_simplified ] = "鍙栨秷鐩綍"; Text[ greek ] = "梳糗胥珞 艴皴翮襁秕"; - Text[ korean ] = "祸牢 力芭"; + Text[ korean ] = "靸夓澑 氚 氇╈皑 鞝滉卑"; Text[ turkish ] = "Dizini kald齬"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Eliminar directorio"; + Text[ catalan ] = "Elimina l'韓dex"; Text[ finnish ] = "Poista hakemisto"; + Text[ thai ] = "喙喔覆喔斷副喔娻笝喔掂腑喔竵"; }; String STR_TABLE_TBLCPYTBL { @@ -2250,20 +2325,21 @@ String STR_TABLE_TBLCPYTBL Text [ spanish ] = "Copiar tabla" ; Text [ french ] = "Copier le tableau" ; Text [ dutch ] = "Tabel kopi雛en" ; - Text[ chinese_simplified ] = "复制表格"; + Text[ chinese_simplified ] = "澶嶅埗琛ㄦ牸"; Text[ russian ] = "暑镨痤忄螯 蜞犭桷"; Text[ polish ] = "Kopiuj tabel"; - Text[ japanese ] = "昞\偺核甙"; - Text[ chinese_traditional ] = "狡籹"; + Text[ japanese ] = "琛ㄣ伄銈炽償銉"; + Text[ chinese_traditional ] = "瑜囪＝琛ㄦ牸"; Text[ arabic ] = "溆 轻滔驷"; Text[ dutch ] = "Tabel kopi雛en"; - Text[ chinese_simplified ] = "复制表格"; + Text[ chinese_simplified ] = "澶嶅埗琛ㄦ牸"; Text[ greek ] = "另糸泷狯 疬磲赆"; - Text[ korean ] = "抛捞喉 汗荤"; + Text[ korean ] = "響 氤奠偓"; Text[ turkish ] = "Tabloyu kopyala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Copiar tabla"; + Text[ catalan ] = "Copia la taula"; Text[ finnish ] = "Kopioi taulukko"; + Text[ thai ] = "喔勦副喔斷弗喔竵喔曕覆喔｀覆喔"; }; String STR_TABLE_CPYTBL { @@ -2278,20 +2354,21 @@ String STR_TABLE_CPYTBL Text [ spanish ] = "Copiar tabla" ; Text [ french ] = "Copier le tableau" ; Text [ dutch ] = "Tabel kopi雛en" ; - Text[ chinese_simplified ] = "复制表格"; + Text[ chinese_simplified ] = "澶嶅埗琛ㄦ牸"; Text[ russian ] = "暑镨痤忄螯 蜞犭桷"; Text[ polish ] = "Kopiuj tabel"; - Text[ japanese ] = "昞\偺核甙"; - Text[ chinese_traditional ] = "狡籹"; + Text[ japanese ] = "琛ㄣ伄銈炽償銉"; + Text[ chinese_traditional ] = "瑜囪＝琛ㄦ牸"; Text[ arabic ] = "溆 轻滔驷"; Text[ dutch ] = "Tabel kopi雛en"; - Text[ chinese_simplified ] = "复制表格"; + Text[ chinese_simplified ] = "澶嶅埗琛ㄦ牸"; Text[ greek ] = "另糸泷狯 疬磲赆"; - Text[ korean ] = "钎 汗荤"; + Text[ korean ] = "響 氤奠偓"; Text[ turkish ] = "Tabloyu kopyala"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Copiar tabla"; + Text[ catalan ] = "Copia la taula"; Text[ finnish ] = "Kopioi taulukko"; + Text[ thai ] = "喔勦副喔斷弗喔竵喔曕覆喔｀覆喔"; }; String STR_INS_FROM_SHADOWCRSR { @@ -2304,22 +2381,23 @@ String STR_INS_FROM_SHADOWCRSR Text [ danish ] = "Konfigurer mark鴕" ; Text [ italian ] = "Imposta cursore" ; Text [ spanish ] = "Poner cursor" ; - Text [ french ] = "Mettre le curseur" ; + Text [ french ] = "D閒inir le curseur" ; Text [ dutch ] = "Cursor configureren" ; - Text[ chinese_simplified ] = "定位光标"; + Text[ chinese_simplified ] = "瀹氫綅鍏夋爣"; Text[ russian ] = "玉蜞眍忤螯 牦瘃铕"; Text[ polish ] = "Ustaw kursor"; - Text[ japanese ] = "栋抠偺愝掕"; - Text[ chinese_traditional ] = "﹚夹"; + Text[ japanese ] = "銈兗銈姐儷銇ō瀹"; + Text[ chinese_traditional ] = "瀹氫綅娓告"; Text[ arabic ] = "授眄 轻隳匝"; Text[ dutch ] = "Cursor configureren"; - Text[ chinese_simplified ] = "定位光标"; + Text[ chinese_simplified ] = "瀹氫綅鍏夋爣"; Text[ greek ] = "像轶禳 溴哧翮"; - Text[ korean ] = "目辑 汲沥"; + Text[ korean ] = "旎れ劀 靹れ爼"; Text[ turkish ] = "輒leci ayarla"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Poner cursor"; - Text[ finnish ] = "M滗rit osoitin"; + Text[ catalan ] = "Defineix el cursor"; + Text[ finnish ] = "M滗rit kohdistin"; + Text[ thai ] = "喔佮赋喔笝喔斷箑喔勦腑喔｀箤喙喔嬥腑喔｀箤"; }; String STR_UNDO_CHAIN { @@ -2334,20 +2412,21 @@ String STR_UNDO_CHAIN Text [ spanish ] = "Conectar marcos de texto" ; Text [ french ] = "Encha頽er les cadres texte" ; Text [ dutch ] = "Tekstkader verbinden" ; - Text[ chinese_simplified ] = "链接文本框"; + Text[ chinese_simplified ] = "閾炬帴鏂囨湰妗"; Text[ russian ] = "吾滂龛螯 蝈犟蝾恹 疣礻"; Text[ polish ] = "Po彻cz ramk tekstow"; - Text[ japanese ] = "梅侥榞偺楢寢"; - Text[ chinese_traditional ] = "硈挡ゅよ遏"; + Text[ japanese ] = "銉嗐偔銈广儓鏋犮伄閫ｇ祼"; + Text[ chinese_traditional ] = "閫ｇ祼鏂囧瓧鏂瑰"; Text[ arabic ] = "恃侨 哝窍 轻湔"; Text[ dutch ] = "Tekstkader verbinden"; - Text[ chinese_simplified ] = "链接文本框"; + Text[ chinese_simplified ] = "閾炬帴鏂囨湰妗"; Text[ greek ] = "育礓弩 痣衢筮秕 赍殪蓓秕"; - Text[ korean ] = "咆胶飘 橇饭烙 楷搬"; + Text[ korean ] = "韰嶌姢韸 頂勲爤鞛 鞐瓣舶"; Text[ turkish ] = "Metin kutular齨 ba餷a"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Conectar marcos de texto"; + Text[ catalan ] = "Enlla鏰 els marcs de text"; Text[ finnish ] = "Linkit tekstikehykset"; + Text[ thai ] = "喙喔娻阜喙堗腑喔∴箓喔⑧竾喔佮福喔笟喔傕箟喔竸喔о覆喔"; }; String STR_UNDO_UNCHAIN { @@ -2362,20 +2441,21 @@ String STR_UNDO_UNCHAIN Text [ spanish ] = "Deshacer el v韓culo de los marcos de texto." ; Text [ french ] = "D閠acher les cadres texte" ; Text [ dutch ] = "Tekstkaderverbinding verwijderen" ; - Text[ chinese_simplified ] = "取消文本框的链接"; + Text[ chinese_simplified ] = "鍙栨秷鏂囨湰妗嗙殑閾炬帴"; Text[ russian ] = "朽琥邃桧栩 蝈犟蝾怏 疣礻"; Text[ polish ] = "Roz彻cz ramki tekstu"; - Text[ japanese ] = "梅侥榞偺楢寢夝彍"; - Text[ chinese_traditional ] = "ゅよ遏硈挡"; + Text[ japanese ] = "銉嗐偔銈广儓鏋犮伄閫ｇ祼瑙ｉ櫎"; + Text[ chinese_traditional ] = "鍙栨秷鏂囧瓧鏂瑰鐨勯ｇ祼"; Text[ arabic ] = "葸 恃侨 哝窍 轻湔"; Text[ dutch ] = "Tekstkaderverbinding verwijderen"; - Text[ chinese_simplified ] = "取消文本框的链接"; + Text[ chinese_simplified ] = "鍙栨秷鏂囨湰妗嗙殑閾炬帴"; Text[ greek ] = "琉矬溴箸 痣徇箝 赍殪蓓秕"; - Text[ korean ] = "咆胶飘 橇饭烙 楷搬 力芭"; + Text[ korean ] = "韰嶌姢韸 頂勲爤鞛 鞐瓣舶 靷牅"; Text[ turkish ] = "Metin kutusu ba餷ant齦ar齨 琏z"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Deshacer el v韓culo de los marcos de texto."; + Text[ catalan ] = "Desenlla鏰 els marcs de text."; Text[ finnish ] = "Poista tekstikehysten linkki"; + Text[ thai ] = "喙勦浮喙堗箑喔娻阜喙堗腑喔∴箓喔⑧竾喔佮福喔笟喔傕箟喔竸喔о覆喔"; }; String STR_UNDO_FTNINFO { @@ -2390,20 +2470,21 @@ String STR_UNDO_FTNINFO Text [ spanish ] = "Modificar opciones de nota al pie" ; Text [ french ] = "Modifier les param鑤res des notes de bas de page" ; Text [ dutch ] = "Voetnoteninstellingen wijzigen" ; - Text[ chinese_simplified ] = "更改注脚设定"; + Text[ chinese_simplified ] = "鏇存敼娉ㄨ剼璁惧畾"; Text[ russian ] = "如戾龛螯 磬耱痤殛 耥铖铌"; Text[ polish ] = "Zmodyfikuj ustawienia przypis體 dolnych"; - Text[ japanese ] = "媟拲偺愝掕曄峏"; - Text[ chinese_traditional ] = "跑爹竲砞﹚"; + Text[ japanese ] = "鑴氭敞銇ō瀹氬鏇"; + Text[ chinese_traditional ] = "璁婃洿瑷昏叧瑷畾"; Text[ arabic ] = "授享 雾茄鞘 轻颓皂 轻虞犴"; Text[ dutch ] = "Voetnoteninstellingen wijzigen"; - Text[ chinese_simplified ] = "更改注脚设定"; + Text[ chinese_simplified ] = "鏇存敼娉ㄨ剼璁惧畾"; Text[ greek ] = "择镳镳镞珞 屦殡镢 躔矬珈彘妁"; - Text[ korean ] = "阿林 汲沥 荐沥"; + Text[ korean ] = "臧侅＜ 靹れ爼 氤瓴"; Text[ turkish ] = "Dipnot ayarlar齨 de餴⺶ir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Modificar opciones de nota al pie"; + Text[ catalan ] = "Modifica les opcions de notes al peu"; Text[ finnish ] = "Muokkaa alaviiteasetuksia"; + Text[ thai ] = "喔斷副喔斷箒喔涏弗喔囙箒喔佮箟喙勦競喔曕副喔о箑喔ム阜喔竵喙喔娻复喔囙腑喔｀福喔"; }; String STR_UNDO_ENDNOTEINFO { @@ -2415,23 +2496,24 @@ String STR_UNDO_ENDNOTEINFO Text [ swedish ] = "膎dra slutnotsinst鋖lningar" ; Text [ danish ] = "Modificer slutnoteindstillinger" ; Text [ italian ] = "Modifica impostazione note di chiusura" ; - Text [ spanish ] = "Modificar configuraci髇 de notas finales" ; + Text [ spanish ] = "Modificar la configuraci髇 de las notas finales" ; Text [ french ] = "Modifier les param鑤res des notes de fin" ; Text [ dutch ] = "Eindnootinstellingen wijzigen" ; - Text[ chinese_simplified ] = "更改尾注设定"; + Text[ chinese_simplified ] = "鏇存敼灏炬敞璁惧畾"; Text[ russian ] = "如戾龛螯 篑蜞眍怅 觐眦邂 耥铖铌"; Text[ polish ] = "Zmodyfikuj ustawienia przypis體 dolnych"; - Text[ japanese ] = "暥枛媟拲偺愝掕曄峏"; - Text[ chinese_traditional ] = "跑Ю爹砞﹚"; + Text[ japanese ] = "鏂囨湯鑴氭敞銇ō瀹氬鏇"; + Text[ chinese_traditional ] = "璁婃洿灏捐ɑ瑷畾"; Text[ arabic ] = "授享 炮锨锨 轻授犴耷 轻问倾砩"; Text[ dutch ] = "Eindnootinstellingen wijzigen"; - Text[ chinese_simplified ] = "更改尾注设定"; + Text[ chinese_simplified ] = "鏇存敼灏炬敞璁惧畾"; Text[ greek ] = "择镳镳镞珞 屦殡镢 箸戾辋箦 糨腼躜"; - Text[ korean ] = "固林 汲沥 荐沥"; + Text[ korean ] = "氙胳＜ 靹れ爼 氤瓴"; Text[ turkish ] = "Sonnot ayarlar齨 de餴⺶ir"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Modificar configuraci髇 de notas finales"; - Text[ finnish ] = "Muokkaa loppuhuomautuksen asetuksia"; + Text[ catalan ] = "Modifica la configuraci de notes finals"; + Text[ finnish ] = "Muokkaa loppuviiteasetuksia"; + Text[ thai ] = "喔斷副喔斷箒喔涏弗喔囙箒喔佮箟喙勦競喔佮覆喔｀竵喔赤斧喔權笖喔佮覆喔｀腑喙夃覆喔囙腑喔脆竾喔椸箟喔侧涪喙喔｀阜喙堗腑喔"; }; String STR_UNDO_COMPAREDOC { @@ -2445,21 +2527,22 @@ String STR_UNDO_COMPAREDOC Text [ italian ] = "Confronto documento" ; Text [ spanish ] = "Comparar documento" ; Text [ french ] = "Comparaison de documents" ; - Text [ dutch ] = "Vergelijking van documenten" ; - Text[ chinese_simplified ] = "比较文档"; + Text [ dutch ] = "Documentvergelijking" ; + Text[ chinese_simplified ] = "姣旇緝鏂囨。"; Text[ russian ] = "佯噔龛螯 忮瘃梃 漕牦戾眚"; Text[ polish ] = "Por體naj dokument"; - Text[ japanese ] = "霓翻逸膫虜鋳r"; - Text[ chinese_traditional ] = "ゑ耕ゅン"; + Text[ japanese ] = "銉夈偔銉ャ儭銉炽儓銇瘮杓"; + Text[ chinese_traditional ] = "姣旇純鏂囦欢"; Text[ arabic ] = "戕茄渖 轻阌输"; - Text[ dutch ] = "Vergelijking van documenten"; - Text[ chinese_simplified ] = "比较文档"; + Text[ dutch ] = "Documentvergelijking"; + Text[ chinese_simplified ] = "姣旇緝鏂囨。"; Text[ greek ] = "育汴耖箸 邈泷荟秕"; - Text[ korean ] = "巩辑厚背"; + Text[ korean ] = "氍胳劀 牍勱祼"; Text[ turkish ] = "Belgeyi karla⺶齬"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Comparar documento"; + Text[ catalan ] = "Compara el document"; Text[ finnish ] = "Vertaa asiakirjaa"; + Text[ thai ] = "喙喔涏福喔掂涪喔氞箑喔椸傅喔⑧笟喙喔竵喔覆喔"; }; String STR_UNDO_SETFLYFRMFMT { @@ -2474,20 +2557,21 @@ String STR_UNDO_SETFLYFRMFMT Text [ spanish ] = "Aplicar estilo de marco" ; Text [ french ] = "Utiliser un style de cadre" ; Text [ dutch ] = "Kaderopmaakprofiel toepassen" ; - Text[ chinese_simplified ] = "使用框样式"; + Text[ chinese_simplified ] = "浣跨敤妗嗘牱寮"; Text[ russian ] = "橡桁屙栩 耱桦 疣祛"; Text[ polish ] = "Zastosuj styl ramki"; - Text[ japanese ] = "榞嚼操偺揔梡"; - Text[ chinese_traditional ] = "ㄏノよ遏妓Α"; + Text[ japanese ] = "鏋犮偣銈裤偆銉伄閬╃敤"; + Text[ chinese_traditional ] = "浣跨敤鏂瑰妯ｅ紡"; Text[ arabic ] = "怯饰锨 溷 咔涎"; Text[ dutch ] = "Kaderopmaakprofiel toepassen"; - Text[ chinese_simplified ] = "使用框样式"; + Text[ chinese_simplified ] = "浣跨敤妗嗘牱寮"; Text[ greek ] = "碰狁祜戕 篝蹼 痣衢筮秕"; - Text[ korean ] = "橇饭烙 胶鸥老 利侩"; + Text[ korean ] = "頂勲爤鞛 鞀ろ儉鞚 鞝侅毄"; Text[ turkish ] = "莈r鏴ve bi鏸mi uygula"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Aplicar estilo de marco"; + Text[ catalan ] = "Aplica l'estil del marc"; Text[ finnish ] = "K鋣t kehystyyli"; + Text[ thai ] = "喙冟笂喙夃弗喔编竵喔┼笓喔班竵喔｀腑喔"; }; String STR_UNDO_SETRUBYATTR { @@ -2495,24 +2579,25 @@ String STR_UNDO_SETRUBYATTR Text [ ENGLISH ] = "Set phonetic Symbols" ; Text[ english_us ] = "Ruby Setting"; Text[ portuguese ] = "Atributo Ruby"; - Text[ russian ] = "项戾耱栩 滂嚓痂蜩麇耜桢 珥嚓"; + Text[ russian ] = "袜耱痤殛 蝠囗耜痂秭梃"; Text[ greek ] = "像轶禳 鳄礴糸掰 篚焘"; Text[ dutch ] = "Fonetische symbolen invoegen"; Text[ french ] = "Attribut Ruby"; Text[ spanish ] = "Aplicar s韒bolos fon閠icos"; Text[ italian ] = "Applica testo Ruby"; - Text[ danish ] = "Set phonetic Symbols"; + Text[ danish ] = "S鎡 fonetiske symboler"; Text[ swedish ] = "S鋞t fonetiska symboler"; Text[ polish ] = "Osad znaki diakrytyczne"; Text[ portuguese_brazilian ] = "Set phonetic Symbols"; - Text[ japanese ] = "偎迱輶"; - Text[ korean ] = "磊澜 扁龋 瘤沥"; - Text[ chinese_simplified ] = "加上拼音或注音符号"; - Text[ chinese_traditional ] = "爹才腹"; + Text[ japanese ] = "銉儞瑷畾"; + Text[ korean ] = "雿щ 雱ｊ赴 靹れ爼"; + Text[ chinese_simplified ] = "鍔犱笂鎷奸煶鎴栨敞闊崇鍙"; + Text[ chinese_traditional ] = "鍔犱笂娉ㄩ煶妯欑ず"; Text[ turkish ] = "Set phonetic Symbols"; Text[ arabic ] = "授眄 雁嬉 真薯"; - Text[ catalan ] = "Aplicar s韒bolos fon閠icos"; - Text[ finnish ] = "Phonetische Symbole setzen"; + Text[ catalan ] = "Aplica els s韒bols fon鑤ics"; + Text[ finnish ] = "Ruby-tekstin asetukset"; + Text[ thai ] = "喔佮赋喔笝喔斷笗喔编抚喔炧复喔∴笧喙屶競喔權覆喔斷箑喔ム箛喔"; }; #102505# String STR_UNDO_TMPAUTOCORR @@ -2521,11 +2606,11 @@ String STR_UNDO_TMPAUTOCORR Text [ English ] = "AutoCorrect" ; Text [ portuguese ] = "AutoCorrec玢o" ; Text [ english_us ] = "AutoCorrect" ; - Text [ portuguese_brazilian ] = "AutoKorrektur" ; + Text [ portuguese_brazilian ] = "AutoCorre玢o" ; Text [ swedish ] = "AutoKorrigering" ; Text [ danish ] = "AutoKorrektur" ; Text [ italian ] = "Correzione automatica" ; - Text [ spanish ] = "AutoCorrecci髇" ; + Text [ spanish ] = "Correcci髇 autom醫ica" ; Text [ french ] = "AutoCorrection" ; Text [ dutch ] = "AutoCorrectie" ; Text[ chinese_simplified ] = "鑷姩鏇存"; @@ -2537,7 +2622,7 @@ String STR_UNDO_TMPAUTOCORR Text[ dutch ] = "AutoCorrectie"; Text[ chinese_simplified ] = "鑷姩鏇存"; Text[ greek ] = "刘麸拈棂箸"; - Text[ korean ] = "鞛愲彊瓿犾龚"; + Text[ korean ] = "鞛愲彊 靾橃爼"; Text[ turkish ] = "Otomatik d鼁eltme"; Text[ language_user1 ] = " "; Text[ catalan ] = "Correcci autom鄑ica"; @@ -2557,20 +2642,21 @@ String STR_INSERT_FOOTNOTE Text [ french ] = "Ins閞er une note de bas de page" ; Text [ dutch ] = "Voetnoot invoegen" ; Text [ portuguese ] = "Inserir nota de rodap" ; - Text[ chinese_simplified ] = "插入注脚"; + Text[ chinese_simplified ] = "鎻掑叆娉ㄨ剼"; Text[ russian ] = "埋蜞忤螯 耥铖牦"; Text[ polish ] = "Wstaw przypis dolny"; - Text[ japanese ] = "媟拲偺憓擖"; - Text[ chinese_traditional ] = "础爹竲"; + Text[ japanese ] = "鑴氭敞銇尶鍏"; + Text[ chinese_traditional ] = "鎻掑叆瑷昏叧"; Text[ arabic ] = "畔亚 颓皂 虞犴"; Text[ dutch ] = "Voetnoot invoegen"; - Text[ chinese_simplified ] = "插入注脚"; + Text[ chinese_simplified ] = "鎻掑叆娉ㄨ剼"; Text[ greek ] = "旭矬柁赙 躔矬珈暹珧"; - Text[ korean ] = "阿林 火涝"; + Text[ korean ] = "臧侅＜ 靷届瀰"; Text[ turkish ] = "Dipnot ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar nota al pie"; + Text[ catalan ] = "Insereix una nota al peu"; Text[ finnish ] = "Lis滗 alaviite"; + Text[ thai ] = "喙佮笚喔｀竵喙喔娻复喔囙腑喔｀福喔"; }; String STR_INSERT_URLBTN { @@ -2579,7 +2665,7 @@ String STR_INSERT_URLBTN Text[ english_us ] = "insert URL button"; Text[ portuguese ] = "Inserir bot鉶 URL"; Text[ russian ] = "埋蜞忤螯 觏铒牦 URL"; - Text[ dutch ] = "URL button invoegen"; + Text[ dutch ] = "URL-knop invoegen"; Text[ french ] = "Ins閞er un bouton d'URL"; Text[ spanish ] = "Insertar bot髇 URL"; Text[ italian ] = "Inserisci pulsante URL"; @@ -2587,18 +2673,19 @@ String STR_INSERT_URLBTN Text[ swedish ] = "Infoga URL-knapp"; Text[ polish ] = "Wstaw przycisk URL"; Text[ portuguese_brazilian ] = "insert URL button"; - Text[ japanese ] = "URL无垒偺憓擖"; - Text[ chinese_simplified ] = "插入 URL 按钮"; - Text[ chinese_traditional ] = "础 URL 秙"; + Text[ japanese ] = "URL銉溿偪銉炽伄鎸垮叆"; + Text[ chinese_simplified ] = "鎻掑叆 URL 鎸夐挳"; + Text[ chinese_traditional ] = "鎻掑叆 URL 鎸夐垥"; Text[ arabic ] = "畔亚 爿是 URL"; - Text[ dutch ] = "URL button invoegen"; - Text[ chinese_simplified ] = "插入 URL 按钮"; + Text[ dutch ] = "URL-knop invoegen"; + Text[ chinese_simplified ] = "鎻掑叆 URL 鎸夐挳"; Text[ greek ] = "旭矬柁赙 疱溥秕 屦殡镢掾 URL"; - Text[ korean ] = "URL 滚瓢 火涝"; + Text[ korean ] = "URL 氩勴娂 靷届瀰"; Text[ turkish ] = "URL dmesi ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar bot髇 URL"; + Text[ catalan ] = "Insereix un bot URL"; Text[ finnish ] = "Lis滗 URL-painike"; + Text[ thai ] = "喙佮笚喔｀竵喔涏父喙堗浮 URL "; }; String STR_INSERT_URLTXT { @@ -2615,18 +2702,19 @@ String STR_INSERT_URLTXT Text[ swedish ] = "Infoga hyperl鋘k"; Text[ polish ] = "Wstaw hiper彻cze"; Text[ portuguese_brazilian ] = "insert Hyperlink"; - Text[ japanese ] = "什蔬柏莞偺憓擖"; - Text[ chinese_simplified ] = "插入超链接"; - Text[ chinese_traditional ] = "础禬硈挡"; + Text[ japanese ] = "銉忋偆銉戙兗銉兂銈伄鎸垮叆"; + Text[ chinese_simplified ] = "鎻掑叆瓒呴摼鎺"; + Text[ chinese_traditional ] = "鎻掑叆瓒呴ｇ祼"; Text[ arabic ] = "畔亚 茄嗜秦 试谌"; Text[ dutch ] = "Hyperlink invoegen"; - Text[ chinese_simplified ] = "插入超链接"; + Text[ chinese_simplified ] = "鎻掑叆瓒呴摼鎺"; Text[ greek ] = "旭矬柁赙 躔羼-簖礓弩珧"; - Text[ korean ] = "窍捞欺傅农 火涝"; + Text[ korean ] = "頃橃澊韻茧韥 靷届瀰"; Text[ turkish ] = "Hyperlink ekle"; Text[ language_user1 ] = " "; - Text[ catalan ] = "Insertar hiperenlace"; + Text[ catalan ] = "Insereix un hiperenlla"; Text[ finnish ] = "Lis滗 hyperlinkki"; + Text[ thai ] = "喙佮笚喔｀竵喔佮覆喔｀箑喔娻阜喙堗腑喔∴箓喔⑧竾喔弗喔侧涪喔∴复喔曕复"; }; String STR_DELETE_INVISIBLECNTNT { @@ -2635,24 +2723,25 @@ String STR_DELETE_INVISIBLECNTNT Text[ english_us ] = "remove invisible content"; Text[ portuguese ] = "eliminar conte鷇o invis韛el"; Text[ greek ] = "赆糗胥珞 扃 锺狒 疱耖鬻镬蓓"; - Text[ dutch ] = "詎zichtbare inhoud verwijderen"; + Text[ dutch ] = "Onzichtbare inhoud verwijderen"; Text[ french ] = "supprimer le contenu invisible"; - Text[ spanish ] = "eliminar contenido invisible"; + Text[ spanish ] = "borrar el contenido invisible"; Text[ swedish ] = "ta bort osynligt inneh錶l"; Text[ russian ] = "箐嚯栩 礤忤滂祛 耦溴疰桁铄"; Text[ italian ] = "Rimuovi contenuto nascosto"; Text[ danish ] = "fjern usynlige indhold"; Text[ polish ] = "usu niewidoczn zawarto滄"; Text[ portuguese_brazilian ] = "remove invisible content"; - Text[ japanese ] = "昞\帵偱偒側偄撪梕傪嶍彍偡傞"; - Text[ korean ] = "焊捞瘤 臼绰 郴侩 力芭"; - Text[ chinese_simplified ] = "删除隐入的内容"; - Text[ chinese_traditional ] = "睲埃留ず甧"; + Text[ japanese ] = "琛ㄧず銇с亶銇亜鍐呭銈掑墛闄ゃ仚銈"; + Text[ korean ] = "靾复 雮挫毄 鞝滉卑"; + Text[ chinese_simplified ] = "鍒犻櫎闅愬叆鐨勫唴瀹"; + Text[ chinese_traditional ] = "娓呴櫎闅卞叆鐨勫収瀹"; Text[ arabic ] = "乓轻 轻阃舒砬 轻垌 阊祈"; Text[ turkish ] = "G鰎黱mez i鏴ri餴 kald齬"; Text[ language_user1 ] = " "; - Text[ catalan ] = "eliminar contenido invisible"; + Text[ catalan ] = "elimina el contingut invisible"; Text[ finnish ] = "poista n鋕ym鋞鰊 sis鋖t"; + Text[ thai ] = "喙喔覆喙喔權阜喙夃腑喔覆喔椸傅喙堗浮喔竾喙勦浮喙堗箑喔箛喔權腑喔竵"; }; String STR_DDEERROR_APP1 @@ -2667,19 +2756,20 @@ String STR_DDEERROR_APP1 TEXT [ danish ] = "Applikationen [" ; TEXT [ french ] = "L'application [" ; TEXT [ swedish ] = "Programmet [" ; - TEXT [ dutch ] = "Applicatie [" ; + TEXT [ dutch ] = "Toepassing [" ; TEXT [ spanish ] = "La aplicaci髇 [" ; TEXT [ english_us ] = "Application [" ; - TEXT[ chinese_simplified ] = "应用程序 ["; - TEXT[ russian ] = " 镳桦铈屙棹 ["; + TEXT[ chinese_simplified ] = "搴旂敤绋嬪簭 ["; + TEXT[ russian ] = "橡桦铈屙棹 ["; TEXT[ polish ] = "Aplikacja ["; - TEXT[ japanese ] = "碧哓拱籍 ["; + TEXT[ japanese ] = "銈€儣銉偙銉笺偡銉с兂 ["; TEXT[ greek ] = " 弼狁祜戕 ["; - TEXT[ korean ] = "览侩橇肺弊伐 ["; - TEXT[ chinese_traditional ] = "祘Α ["; + TEXT[ korean ] = "鞚戩毄 頂勲攴鸽灗 ["; + TEXT[ chinese_traditional ] = "绋嬪紡 ["; TEXT[ arabic ] = "轻守软 ]"; TEXT[ turkish ] = "Uygulama ["; - TEXT[ catalan ] = "La aplicaci髇 ["; + TEXT[ catalan ] = "L'aplicaci ["; + TEXT[ thai ] = "喙傕笡喔｀箒喔佮福喔∴笡喔｀赴喔⑧父喔佮笗喙 ["; }; String STR_DDEERROR_APP2 { @@ -2696,19 +2786,20 @@ String STR_DDEERROR_APP2 TEXT [ dutch ] = "] reageert niet" ; TEXT [ spanish ] = "] no responde" ; TEXT [ english_us ] = "] is not responding." ; - TEXT[ chinese_simplified ] = "] 没有回应。"; - TEXT[ russian ] = "] 钺疣蜩螯 礤忸珈铈眍"; + TEXT[ chinese_simplified ] = "] 娌℃湁鍥炲簲銆"; + TEXT[ russian ] = "] 礤 铗忮鬣弪"; TEXT[ polish ] = "] nie reaguje"; - TEXT[ japanese ] = "] 偐傜偺墳摎偑偁傝傑偣傫"; - TEXT[ chinese_traditional ] = "] ⊿Τ莱"; + TEXT[ japanese ] = "] 銇嬨倝銇繙绛斻亴銇傘倞銇俱仜銈"; + TEXT[ chinese_traditional ] = "] 娌掓湁鍥炴噳銆"; TEXT[ arabic ] = "[ 崆 碛侍砣"; TEXT[ dutch ] = "] reageert niet"; - TEXT[ chinese_simplified ] = "] 没有回应。"; + TEXT[ chinese_simplified ] = "] 娌℃湁鍥炲簲銆"; TEXT[ greek ] = "] 溴 犴翎痫犟唔弭衢."; - TEXT[ korean ] = "] 览翠窍瘤 臼澜."; + TEXT[ korean ] = "] 鞙茧攵韯 鞚戨嫷鞚 鞐嗢姷雼堧嫟."; TEXT[ turkish ] = "] cevap vermiyor"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "] no responde"; + TEXT[ catalan ] = "] no respon"; + TEXT[ thai ] = "] 喙勦浮喙堗笗喔笟喔笝喔竾"; }; String STR_DDEERROR_DATA1 { @@ -2718,23 +2809,24 @@ String STR_DDEERROR_DATA1 TEXT [ italian ] = "Dati per [" ; TEXT [ portuguese_brazilian ] = "Dados para [" ; TEXT [ portuguese ] = "Os dados para [" ; - TEXT [ finnish ] = "Tiedot [" ; + TEXT [ finnish ] = "Tietoja [" ; TEXT [ danish ] = "Dataene til [" ; TEXT [ french ] = "Les donn閑s pour [" ; TEXT [ swedish ] = "Data till [" ; TEXT [ dutch ] = "Gegevens voor [" ; TEXT [ spanish ] = "Los datos para [" ; TEXT [ english_us ] = "Data for [" ; - TEXT[ chinese_simplified ] = "用于 ["; + TEXT[ chinese_simplified ] = "鐢ㄤ簬 ["; TEXT[ russian ] = "泥眄 潆 ["; TEXT[ polish ] = "Danych dla ["; TEXT[ japanese ] = "["; TEXT[ greek ] = "葬 溴滹燧磲 汩 ["; - TEXT[ korean ] = "单捞磐 ["; - TEXT[ chinese_traditional ] = "ノ["; + TEXT[ korean ] = "["; + TEXT[ chinese_traditional ] = "鐢ㄦ柤["; TEXT[ arabic ] = "软卿鞘 ] "; TEXT[ turkish ] = "["; - TEXT[ catalan ] = "Los datos para ["; + TEXT[ catalan ] = "Les dades per a ["; + TEXT[ thai ] = "喔傕箟喔浮喔灌弗喔赋喔福喔编笟 ["; }; String STR_DDEERROR_DATA2 { @@ -2744,26 +2836,27 @@ String STR_DDEERROR_DATA2 TEXT [ italian ] = "]" ; TEXT [ portuguese_brazilian ] = "] n?o podem ser obtidos" ; TEXT [ portuguese ] = "] n鉶 podem ser determinados." ; - TEXT [ finnish ] = "] ei ole saatavilla" ; + TEXT [ finnish ] = "] eiv鋞 ole saatavilla" ; TEXT [ danish ] = "] kan ikke bestemmes" ; TEXT [ french ] = "] ne peuvent pas 阾re obtenues" ; TEXT [ swedish ] = "] kan inte best鋗mas" ; TEXT [ dutch ] = "] onmogelijk" ; TEXT [ spanish ] = "] no pueden ser determinados" ; TEXT [ english_us ] = "] cannot be obtained" ; - TEXT[ chinese_simplified ] = "] 的数据无法被读取。"; - TEXT[ russian ] = "] 铒疱溴腓螯 礤忸珈铈眍"; + TEXT[ chinese_simplified ] = "] 鐨勬暟鎹棤娉曡璇诲彇銆"; + TEXT[ russian ] = "] 镱塍麒螯 礤忸珈铈眍"; TEXT[ polish ] = "] nie mo縩a uzyska"; - TEXT[ japanese ] = "] 偺棉袄偼妋擣偱偒傑偣傫"; - TEXT[ chinese_traditional ] = "] 戈礚猭砆弄"; + TEXT[ japanese ] = "] 銇儑銉笺偪銇⒑瑾嶃仹銇嶃伨銇涖倱"; + TEXT[ chinese_traditional ] = "] 鐨勮硣鏂欑劇娉曡璁鍙栥"; TEXT[ arabic ] = "[ 垌 闶孑焉"; TEXT[ dutch ] = "] onmogelijk"; - TEXT[ chinese_simplified ] = "] 的数据无法被读取。"; + TEXT[ chinese_simplified ] = "] 鐨勬暟鎹棤娉曡璇诲彇銆"; TEXT[ greek ] = "] 溴 暹磲 漉磲酎 磲 孱彡耖怡栾."; - TEXT[ korean ] = "] 炼荤且 荐 绝澜"; + TEXT[ korean ] = "] 鞚 雿办澊韯半ゼ 頇曥澑頃 靾 鞐嗢姷雼堧嫟"; TEXT[ turkish ] = "] ile ilgili veriler al齨am齳or"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "] no pueden ser determinados"; + TEXT[ catalan ] = "] no es poden obtenir"; + TEXT[ thai ] = "] 喙勦浮喙堗釜喔侧浮喔侧福喔栢箘喔斷箟喔｀副喔"; }; String STR_DDEERROR_LINK1 { @@ -2780,16 +2873,17 @@ String STR_DDEERROR_LINK1 TEXT [ dutch ] = "Koppeling naar [" ; TEXT [ spanish ] = "El v韓culo con [" ; TEXT [ english_us ] = "Link to [" ; - TEXT[ chinese_simplified ] = "无法建立与 ["; + TEXT[ chinese_simplified ] = "鏃犳硶寤虹珛涓 ["; TEXT[ russian ] = "疡牦 磬 ["; TEXT[ polish ] = "９cza do ["; TEXT[ japanese ] = "["; TEXT[ greek ] = " 簖礓弩 戾 ["; - TEXT[ korean ] = "楷搬 措惑 ["; - TEXT[ chinese_traditional ] = "硈挡 ["; + TEXT[ korean ] = "["; + TEXT[ chinese_traditional ] = "閫ｇ祼 ["; TEXT[ arabic ] = "轻茄嗜秦 裴 ]"; TEXT[ turkish ] = "["; - TEXT[ catalan ] = "El v韓culo con ["; + TEXT[ catalan ] = "L'enlla amb ["; + TEXT[ thai ] = "喙喔娻阜喙堗腑喔∴箓喔⑧竾喙勦笡喔⑧副喔 ["; }; String STR_DDEERROR_LINK2 { @@ -2806,21 +2900,40 @@ String STR_DDEERROR_LINK2 TEXT [ dutch ] = "] onmogelijk" ; TEXT [ spanish ] = "] no se puede establecer" ; TEXT [ english_us ] = "] cannot be established" ; - TEXT[ chinese_simplified ] = "]的链接"; - TEXT[ russian ] = "] 耦玟囹 礤忸珈铈眍"; + TEXT[ chinese_simplified ] = "]鐨勯摼鎺"; + TEXT[ russian ] = "] 篑蜞眍忤螯 礤忸珈铈眍"; TEXT[ polish ] = "] nie mo縩a ustanowi"; - TEXT[ japanese ] = "] 傊偺剌競蛡聜瓊陚軅箓"; - TEXT[ chinese_traditional ] = "] 礚猭ミ"; + TEXT[ japanese ] = "] 銇搞伄銉兂銈伅銇ゃ亸銈屻伨銇涖倱"; + TEXT[ chinese_traditional ] = "] 鐒℃硶寤虹珛銆"; TEXT[ arabic ] = "[ 垌 耷柔 後炮锨"; TEXT[ dutch ] = "] onmogelijk"; - TEXT[ chinese_simplified ] = "]的链接"; + TEXT[ chinese_simplified ] = "]鐨勯摼鎺"; TEXT[ greek ] = "] 溴 暹磲 漉磲酎 磲 瘃徙灬麸痫殓桢."; - TEXT[ korean ] = "] 汲摹且 荐 绝澜."; + TEXT[ korean ] = "] 搿滌潣 毵來伂電 毵岆摛 靾 鞐嗢姷雼堧嫟"; TEXT[ turkish ] = "] ile ilgili ba餷ant olu⺶urulam齳or"; TEXT[ language_user1 ] = " "; - TEXT[ catalan ] = "] no se puede establecer"; + TEXT[ catalan ] = "] no es pot establir"; + TEXT[ thai ] = "] 喙勦浮喙堗釜喔侧浮喔侧福喔栢笘喔灌竵喔福喙夃覆喔囙箘喔斷箟"; }; + + + + + + + + + + + + + + + + + + diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx index c2b2d6000b09..f95c9b16eba4 100644 --- a/sw/source/ui/wrtsh/wrtsh1.cxx +++ b/sw/source/ui/wrtsh/wrtsh1.cxx @@ -2,9 +2,9 @@ * * $RCSfile: wrtsh1.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: os $ $Date: 2002-09-09 12:21:54 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:45:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,6 +65,8 @@ #pragma hdrstop +#include <so3/outplace.hxx> + #if STLPORT_VERSION>=321 #include <math.h> // prevent conflict between exception and std::exception #endif @@ -509,9 +511,19 @@ void SwWrtShell::Insert( SvInPlaceObjectRef *pRef, SvGlobalName *pName, BOOL bAc BOOL bDoVerb = TRUE; if ( pName ) { - SvStorageRef aStor = new SvStorage( aEmptyStr ); - xIPObj = &((SvFactory*)SvInPlaceObject::ClassFactory())->CreateAndInit( - *pName,aStor ); + const SotFactory* pFact = SvFactory::Find( *pName ); + if ( pFact ) + { + SvStorageRef aStor = new SvStorage( aEmptyStr ); + xIPObj = &((SvFactory*)SvInPlaceObject::ClassFactory())->CreateAndInit( *pName,aStor ); + } + else + { + SvStorageRef aStor = new SvStorage( FALSE, aEmptyStr ); + String aFileName; + BOOL bOk; + xIPObj = SvOutPlaceObject::InsertObject( NULL, &aStor, bOk, *pName, aFileName ); + } } else { @@ -530,6 +542,7 @@ void SwWrtShell::Insert( SvInPlaceObjectRef *pRef, SvGlobalName *pName, BOOL bAc aServerList.Remove( *SwDocShell::ClassFactory() ); xIPObj = aDlg.Execute( GetWin(), aStor, &aServerList); + bDoVerb = aDlg.IsCreateNew(); } break; diff --git a/sw/source/ui/wrtsh/wrtsh3.cxx b/sw/source/ui/wrtsh/wrtsh3.cxx index 5bcbaf2efb32..dceb626ef9f5 100644 --- a/sw/source/ui/wrtsh/wrtsh3.cxx +++ b/sw/source/ui/wrtsh/wrtsh3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: wrtsh3.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: os $ $Date: 2002-12-05 12:42:10 $ + * last change: $Author: hr $ $Date: 2003-03-27 15:45:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -203,7 +203,11 @@ FASTBOOL SwWrtShell::GoPrevBookmark() void SwWrtShell::ExecMacro( const SvxMacro& rMacro, String* pRet, SbxArray* pArgs ) { - GetDoc()->ExecMacro( rMacro, pRet, pArgs ); + // OD 11.02.2003 #100556# - execute macro, if it is allowed. + if ( IsMacroExecAllowed() ) + { + GetDoc()->ExecMacro( rMacro, pRet, pArgs ); + } } diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk index 47f8e696b454..6a6cdab4d334 100644 --- a/sw/util/makefile.mk +++ b/sw/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.20 $ +# $Revision: 1.21 $ # -# last change: $Author: fme $ $Date: 2002-06-10 09:00:58 $ +# last change: $Author: hr $ $Date: 2003-03-27 15:45:23 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -65,6 +65,7 @@ PRJ=.. PRJNAME=sw TARGET=sw GEN_HID=TRUE +GEN_HID_OTHER=TRUE .IF "$(CPU)"=="i386" USE_LDUMP2=TRUE .ENDIF @@ -251,7 +252,6 @@ do_build+= \ .IF "$(depend)"=="" ALL:\ $(do_build) \ - $(SRS)$/hidother.hid\ $(INC)$/sw.lst \ ALLTAR .ENDIF @@ -293,22 +293,6 @@ $(MISC)$/$(SHL2TARGET).def: makefile.mk .ENDIF -$(MISC)$/$(PRJNAME).hid : $(SRS)$/hidother.hid - -$(SRS)$/hidother.hid: hidother.src -.IF "$(GUI)" =="WNT" -.IF "$(BUILD_SOSL)"=="" - @+echo - @+echo NO HIDS! - @+echo - +copy ..\inc\helpid.h . - @+-mhids hidother.src $(SRS) $(PRJNAME) dummy $(INCLUDE) - +del helpid.h -.ENDIF -.ELSE - @echo wnt only -.ENDIF - $(INC)$/sw.lst: .IF "$(GUI)" =="WNT" +-@echo clook missed!!!! diff --git a/sw/xml/writer.xml b/sw/xml/writer.xml index 96507dae008a..1e8df0530637 100644 --- a/sw/xml/writer.xml +++ b/sw/xml/writer.xml @@ -4,6 +4,17 @@ <module-name>sw</module-name> <component-description> <author>TL</author> + <name>com.sun.star.comp.office.SwXMailMerge</name> + <description> + This component provides an API for mail merging. + </description> + <loader-name>com.sun.star.loader.SharedLibrary</loader-name> + <language>c++</language> + <status value="beta"/> + <supported-service>com.sun.star.text.MailMerge</supported-service> + </component-description> + <component-description> + <author>TL</author> <name>com.sun.star.comp.office.SwXTextDefaults</name> <description> This component provides default settings for paragraph and @@ -324,6 +335,28 @@ </component-description> <component-description> <author>automatically generated by objects2xml</author> + <name>com.sun.star.comp.office.SwXPropertySet</name> + <description> + This component provides ... +</description> + <loader-name>com.sun.star.loader.SharedLibrary</loader-name> + <language>c++</language> + <status value="final"/> + <supported-service>com::sun::star::beans::XPropertySet</supported-service> + </component-description> + <component-description> + <author>automatically generated by objects2xml</author> + <name>com.sun.star.comp.office.SwXPropertySetInfo</name> + <description> + This component provides ... +</description> + <loader-name>com.sun.star.loader.SharedLibrary</loader-name> + <language>c++</language> + <status value="final"/> + <supported-service>com::sun::star::beans::XPropertySetInfo</supported-service> + </component-description> + <component-description> + <author>automatically generated by objects2xml</author> <name>com.sun.star.comp.office.SwXReferenceMark</name> <description> This component provides ... @@ -390,6 +423,17 @@ </component-description> <component-description> <author>automatically generated by objects2xml</author> + <name>com.sun.star.comp.office.SwXTableCellText</name> + <description> + This component provides ... +</description> + <loader-name>com.sun.star.loader.SharedLibrary</loader-name> + <language>c++</language> + <status value="final"/> + <supported-service>com.sun.star.text.Text</supported-service> + </component-description> + <component-description> + <author>automatically generated by objects2xml</author> <name>com.sun.star.comp.office.SwXTableColumns</name> <description> This component provides ... @@ -397,7 +441,7 @@ <loader-name>com.sun.star.loader.SharedLibrary</loader-name> <language>c++</language> <status value="final"/> - <supported-service>com.sun.star.table.TableColumns</supported-service> + <supported-service>com.sun.star.text.TableColumns</supported-service> </component-description> <component-description> <author>automatically generated by objects2xml</author> @@ -408,7 +452,7 @@ <loader-name>com.sun.star.loader.SharedLibrary</loader-name> <language>c++</language> <status value="final"/> - <supported-service>com.sun.star.table.TableRows</supported-service> + <supported-service>com.sun.star.text.TableRows</supported-service> </component-description> <component-description> <author>automatically generated by objects2xml</author> @@ -511,6 +555,17 @@ </component-description> <component-description> <author>automatically generated by objects2xml</author> + <name>com.sun.star.comp.office.SwXTextFrameText</name> + <description> + This component provides ... +</description> + <loader-name>com.sun.star.loader.SharedLibrary</loader-name> + <language>c++</language> + <status value="final"/> + <supported-service>com.sun.star.text.Text</supported-service> + </component-description> + <component-description> + <author>automatically generated by objects2xml</author> <name>com.sun.star.comp.office.SwXTextGraphicObject</name> <description> This component provides ... @@ -880,4 +935,201 @@ </component-description> + <!-- UNO Accessibility API (UAA) --> + + <component-description> + <author>Michael Brauer</author> + <name>com.sun.star.comp.Writer.SwAccessibleDocumentView</name> + <description> + Accessible document view. + </description> + <loader-name>com.sun.star.loader.SharedLibrary</loader-name> + <language>c++</language> + <status value="final"/> + <supported-service>drafts.com.sun.star.accessibility.Accessible</supported-service> + <supported-service>drafts.com.sun.star.text.AccessibleTextDocumentView</supported-service> + <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html" + xlink:title="OpenOffice.org Accessibility project" /> + </component-description> + + <component-description> + <author>Michael Brauer</author> + <name>com.sun.star.comp.Writer.SwAccessibleDocumentPageView</name> + <description> + Accessible document page preview. + </description> + <loader-name>com.sun.star.loader.SharedLibrary</loader-name> + <language>c++</language> + <status value="final"/> + <supported-service>drafts.com.sun.star.accessibility.Accessible</supported-service> + <supported-service>drafts.com.sun.star.text.AccessibleTextDocumentPageView</supported-service> + <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html" + xlink:title="OpenOffice.org Accessibility project" /> + </component-description> + + <component-description> + <author>Michael Brauer</author> + <name>com.sun.star.comp.Writer.SwAccessiblePageView</name> + <description> + An accessible page of the document page preview. + </description> + <loader-name>com.sun.star.loader.SharedLibrary</loader-name> + <language>c++</language> + <status value="final"/> + <supported-service>drafts.com.sun.star.accessibility.Accessible</supported-service> + <supported-service>drafts.com.sun.star.text.AccessiblePageView</supported-service> + <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html" + xlink:title="OpenOffice.org Accessibility project" /> + </component-description> + + <component-description> + <author>Michael Brauer</author> + <name>com.sun.star.comp.Writer.SwAccessibleHeaderView</name> + <description> + An accessible header of a text document. + </description> + <loader-name>com.sun.star.loader.SharedLibrary</loader-name> + <language>c++</language> + <status value="final"/> + <supported-service>drafts.com.sun.star.accessibility.Accessible</supported-service> + <supported-service>drafts.com.sun.star.text.AccessibleHeaderFooterView</supported-service> + <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html" + xlink:title="OpenOffice.org Accessibility project" /> + </component-description> + + <component-description> + <author>Michael Brauer</author> + <name>com.sun.star.comp.Writer.SwAccessibleFooterView</name> + <description> + An accessible footer of a text document. + </description> + <loader-name>com.sun.star.loader.SharedLibrary</loader-name> + <language>c++</language> + <status value="final"/> + <supported-service>drafts.com.sun.star.accessibility.Accessible</supported-service> + <supported-service>drafts.com.sun.star.text.AccessibleHeaderFooterView</supported-service> + <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html" + xlink:title="OpenOffice.org Accessibility project" /> + </component-description> + + <component-description> + <author>Michael Brauer</author> + <name>com.sun.star.comp.Writer.SwAccessibleFootnoteView</name> + <description> + An accessible footnote of a text document. + </description> + <loader-name>com.sun.star.loader.SharedLibrary</loader-name> + <language>c++</language> + <status value="final"/> + <supported-service>drafts.com.sun.star.accessibility.Accessible</supported-service> + <supported-service>drafts.com.sun.star.text.AccessibleFootnoteView</supported-service> + <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html" + xlink:title="OpenOffice.org Accessibility project" /> + </component-description> + + <component-description> + <author>Michael Brauer</author> + <name>com.sun.star.comp.Writer.SwAccessibleEndnoteView</name> + <description> + An accessible endnote of a text document. + </description> + <loader-name>com.sun.star.loader.SharedLibrary</loader-name> + <language>c++</language> + <status value="final"/> + <supported-service>drafts.com.sun.star.accessibility.Accessible</supported-service> + <supported-service>drafts.com.sun.star.text.AccessibleEndnoteView</supported-service> + <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html" + xlink:title="OpenOffice.org Accessibility project" /> + </component-description> + + <component-description> + <author>Michael Brauer</author> + <name>com.sun.star.comp.Writer.SwAccessibleParagraphView</name> + <description> + An accessible paragraph in a text document. + </description> + <loader-name>com.sun.star.loader.SharedLibrary</loader-name> + <language>c++</language> + <status value="final"/> + <supported-service>drafts.com.sun.star.accessibility.Accessible</supported-service> + <supported-service>drafts.com.sun.star.text.AccessibleParagraphView</supported-service> + <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html" + xlink:title="OpenOffice.org Accessibility project" /> + </component-description> + + <component-description> + <author>Michael Brauer</author> + <name>com.sun.star.comp.Writer.SwAccessibleTableView</name> + <description> + An accessible table in a text document. + </description> + <loader-name>com.sun.star.loader.SharedLibrary</loader-name> + <language>c++</language> + <status value="final"/> + <supported-service>drafts.com.sun.star.accessibility.Accessible</supported-service> + <supported-service>drafts.com.sun.star.table.AccessibleTableView</supported-service> + <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html" + xlink:title="OpenOffice.org Accessibility project" /> + </component-description> + + <component-description> + <author>Michael Brauer</author> + <name>com.sun.star.comp.Writer.SwAccessibleTableCellView</name> + <description> + An accessible table cell in a text document. + </description> + <loader-name>com.sun.star.loader.SharedLibrary</loader-name> + <language>c++</language> + <status value="final"/> + <supported-service>drafts.com.sun.star.accessibility.Accessible</supported-service> + <supported-service>drafts.com.sun.star.table.AccessibleCellView</supported-service> + <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html" + xlink:title="OpenOffice.org Accessibility project" /> + </component-description> + + <component-description> + <author>Michael Brauer</author> + <name>com.sun.star.comp.Writer.SwAccessibleTextFrameView</name> + <description> + An accessible text frame in a text document. + </description> + <loader-name>com.sun.star.loader.SharedLibrary</loader-name> + <language>c++</language> + <status value="final"/> + <supported-service>drafts.com.sun.star.accessibility.Accessible</supported-service> + <supported-service>drafts.com.sun.star.text.AccessibleTextFrameView</supported-service> + <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html" + xlink:title="OpenOffice.org Accessibility project" /> + </component-description> + + <component-description> + <author>Michael Brauer</author> + <name>com.sun.star.comp.Writer.SwAccessibleTextGraphicObject</name> + <description> + An accessible graphic in a text document. + </description> + <loader-name>com.sun.star.loader.SharedLibrary</loader-name> + <language>c++</language> + <status value="final"/> + <supported-service>drafts.com.sun.star.accessibility.Accessible</supported-service> + <supported-service>drafts.com.sun.star.text.AccessibleTextGraphicObject</supported-service> + <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html" + xlink:title="OpenOffice.org Accessibility project" /> + </component-description> + + <component-description> + <author>Michael Brauer</author> + <name>com.sun.star.comp.Writer.SwAccessibleTextEmbeddedObject</name> + <description> + An accessible text frame in a text document. + </description> + <loader-name>com.sun.star.loader.SharedLibrary</loader-name> + <language>c++</language> + <status value="final"/> + <supported-service>drafts.com.sun.star.accessibility.Accessible</supported-service> + <supported-service>drafts.com.sun.star.text.AccessibleTextEmbeddedObject</supported-service> + <reference-docu xlink:href="http://ui.openoffice.org/accessibility/index.html" + xlink:title="OpenOffice.org Accessibility project" /> + </component-description> + </module-description> |