[Libreoffice-commits] .: sw/source
Christina Rossmanith
crossmanith at kemper.freedesktop.org
Fri Feb 25 11:29:42 PST 2011
sw/source/ui/dialog/abstract.src | 8 +--
sw/source/ui/dialog/ascfldlg.cxx | 2
sw/source/ui/dialog/dialog.src | 4 -
sw/source/ui/dialog/docstdlg.cxx | 8 +--
sw/source/ui/dialog/macassgn.cxx | 16 +++----
sw/source/ui/dialog/regionsw.cxx | 6 +-
sw/source/ui/dialog/regionsw.src | 4 -
sw/source/ui/dialog/uiregionsw.cxx | 76 ++++++++++++++++++-------------------
8 files changed, 61 insertions(+), 63 deletions(-)
New commits:
commit e3db364db814ac44dc42cf184070c3891c233150
Author: Martin Kepplinger <martinkepplinger at eml.cc>
Date: Fri Feb 25 20:29:15 2011 +0100
Comment translation of writer/sw/source/ui/dialog
diff --git a/sw/source/ui/dialog/abstract.src b/sw/source/ui/dialog/abstract.src
index ab5a863..ebb9082 100644
--- a/sw/source/ui/dialog/abstract.src
+++ b/sw/source/ui/dialog/abstract.src
@@ -34,9 +34,7 @@ ModalDialog DLG_INSERT_ABSTRACT
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 239 , 68 ) ;
- /* ### ACHTUNG: Neuer Text in Resource? AutoAbstract erzeugen : AutoAbstrakt erzeugen */
- /* ### ACHTUNG: Neuer Text in Resource? AutoAbstract erzeugen : AutoAbstrakt erzeugen */
- /* ### ACHTUNG: Neuer Text in Resource? AutoAbstract erzeugen : AutoAbstrakt erzeugen */
+ /* ### ATTENTION: New text in resource? create AutoAbstract : create AutoAbstract */
Moveable = TRUE ;
FixedLine FL_1
{
@@ -70,7 +68,7 @@ ModalDialog DLG_INSERT_ABSTRACT
{
Pos = MAP_APPFONT ( 12 , 27 ) ;
Size = MAP_APPFONT ( 120 , 8 ) ;
- /* ### ACHTUNG: Neuer Text in Resource? Absätze je Kapitel : Absõtze je Kapitel */
+ /* ### ATTENTION: New text in resource? paragraphs per chapter : paragraphs per chapter */
Text [ en-US ] = "Subpoints per level" ;
};
NumericField NF_PARA
@@ -92,7 +90,7 @@ ModalDialog DLG_INSERT_ABSTRACT
{
Pos = MAP_APPFONT ( 12 , 43 ) ;
Size = MAP_APPFONT ( 165 , 16 ) ;
- /* ### ACHTUNG: Neuer Text in Resource? Im Abstrakt erscheint die ausgewählte Anzahl von Absätzen aus den einbezogenen Kapitelebenen. : Im Abstrakt erscheint die ausgewõhlte Anzahl von Absõtzen aus den einbezogenen Kapitelebenen. */
+ /* ### ATTENTION: New text in resource? The selected number of paragraphs from the included outline levels appears in the abstract. : The selected number of paragraphs from the included outline levels appears in the abstract. */
WordBreak = TRUE ;
Text [ en-US ] = "The abstract contains the selected number of paragraphs from the included outline levels." ;
};
diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx
index 893263d..745524c 100644
--- a/sw/source/ui/dialog/ascfldlg.cxx
+++ b/sw/source/ui/dialog/ascfldlg.cxx
@@ -266,7 +266,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh,
SetSizePixel( aSize );
}
- // initialisiere Zeichensatz
+ // initialise character set
aCharSetLB.FillFromTextEncodingTable( pStream != NULL );
aCharSetLB.SelectTextEncoding( aOpt.GetCharSet() );
diff --git a/sw/source/ui/dialog/dialog.src b/sw/source/ui/dialog/dialog.src
index f3df744..55860f6 100644
--- a/sw/source/ui/dialog/dialog.src
+++ b/sw/source/ui/dialog/dialog.src
@@ -28,7 +28,7 @@
CheckBox CB_USE_PASSWD
{
- /* ### ACHTUNG: Neuer Text in Resource? ~Paßwort : ~Pa˜wort */
+ /* ### ATTENTION: New text in resource? ~password : ~password */
Text [ en-US ] = "~Password" ;
};
CheckBox CB_READ_ONLY
@@ -37,7 +37,7 @@ CheckBox CB_READ_ONLY
};
String STR_LINKEDIT_TEXT
{
- /* ### ACHTUNG: Neuer Text in Resource? Verknüpfungen bearbeiten : Verkn³pfungen bearbeiten */
+ /* ### ATTENTION: New text in resource? edit links : edit links */
Text [ en-US ] = "Edit links" ;
};
String STR_PATH_NOT_FOUND
diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx
index bd2711b..5b88900 100644
--- a/sw/source/ui/dialog/docstdlg.cxx
+++ b/sw/source/ui/dialog/docstdlg.cxx
@@ -102,7 +102,7 @@ SwDocStatPage::SwDocStatPage(Window *pParent, const SfxItemSet &rSet) :
}
/*--------------------------------------------------------------------
- Beschreibung: ItemSet fuellen bei Aenderung
+ Description: fill ItemSet when changed
--------------------------------------------------------------------*/
@@ -115,7 +115,7 @@ void SwDocStatPage::Reset(const SfxItemSet &/*rSet*/)
{
}
/*------------------------------------------------------------------------
- Beschreibung: Aktualisieren / Setzen der Daten
+ Description: update / set data
------------------------------------------------------------------------*/
@@ -131,7 +131,7 @@ void SwDocStatPage::SetData(const SwDocStat &rStat)
}
/*------------------------------------------------------------------------
- Beschreibung: Aktualisieren der Statistik
+ Description: update statistics
------------------------------------------------------------------------*/
@@ -156,7 +156,7 @@ void SwDocStatPage::Update()
}
/*-----------------19.06.97 16.37-------------------
- Zeilennummer aktualisieren
+ upate line number
--------------------------------------------------*/
IMPL_LINK( SwDocStatPage, UpdateHdl, PushButton*, EMPTYARG)
{
diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx
index 0253de7..85dbb53 100644
--- a/sw/source/ui/dialog/macassgn.cxx
+++ b/sw/source/ui/dialog/macassgn.cxx
@@ -70,15 +70,15 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType )
switch( eType )
{
- case MACASSGN_TEXTBAUST: // Textbausteine
+ case MACASSGN_TEXTBAUST: // text building blocks
aItem.AddEvent( String( SW_RES(STR_EVENT_START_INS_GLOSSARY) ), String(),
SW_EVENT_START_INS_GLOSSARY );
aItem.AddEvent( String( SW_RES(STR_EVENT_END_INS_GLOSSARY) ), String(),
SW_EVENT_END_INS_GLOSSARY);
- // damit der neue Handler aktiv wird!
+ // in order for the new handler to become active!
break;
case MACASSGN_ALLFRM:
- case MACASSGN_GRAPHIC: // Grafiken
+ case MACASSGN_GRAPHIC: // graphics
{
aItem.AddEvent( String( SW_RES(STR_EVENT_IMAGE_ERROR) ), String(),
SVX_EVENT_IMAGE_ERROR);
@@ -87,8 +87,8 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType )
aItem.AddEvent( String( SW_RES(STR_EVENT_IMAGE_LOAD) ), String(),
SVX_EVENT_IMAGE_LOAD);
}
- // kein break;
- case MACASSGN_FRMURL: // Frm - URL-Attribute
+ // no break;
+ case MACASSGN_FRMURL: // Frm - URL-Attributes
{
if( !bHtmlMode &&
(MACASSGN_FRMURL == eType || MACASSGN_ALLFRM == eType))
@@ -103,15 +103,15 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType )
SW_EVENT_FRM_MOVE );
}
}
- // kein break;
+ // no break;
case MACASSGN_OLE: // OLE
{
if( !bHtmlMode )
aItem.AddEvent( String( SW_RES(STR_EVENT_OBJECT_SELECT) ), String(),
SW_EVENT_OBJECT_SELECT );
}
- // kein break;
- case MACASSGN_INETFMT: // INetFmt-Attribute
+ // no break;
+ case MACASSGN_INETFMT: // INetFmt-Attributes
{
aItem.AddEvent( String( SW_RES(STR_EVENT_MOUSEOVER_OBJECT) ), String(),
SFX_EVENT_MOUSEOVER_OBJECT );
diff --git a/sw/source/ui/dialog/regionsw.cxx b/sw/source/ui/dialog/regionsw.cxx
index bb7c46b..9c2121f 100644
--- a/sw/source/ui/dialog/regionsw.cxx
+++ b/sw/source/ui/dialog/regionsw.cxx
@@ -53,7 +53,7 @@
#include <view.hxx>
#include <swmodule.hxx>
#include <wrtsh.hxx>
-#include <swundo.hxx> // fuer Undo-Ids
+#include <swundo.hxx> // for Undo-Ids
#include <column.hxx>
#include <fmtfsize.hxx>
#include <swunodef.hxx>
@@ -91,7 +91,7 @@ void SwBaseShell::InsertRegionDialog(SfxRequest& rReq)
long nWidth = aRect.Width();
aSet.Put(SwFmtFrmSize(ATT_VAR_SIZE, nWidth));
- // Hoehe=Breite fuer konsistentere Vorschau (analog zu Bereich bearbeiten)
+ // height=width for more consistent preview (edit analog to region)
aSet.Put(SvxSizeItem(SID_ATTR_PAGE_SIZE, Size(nWidth, nWidth)));
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialogdiet fail!");
@@ -202,7 +202,7 @@ IMPL_STATIC_LINK( SwWrtShell, InsertRegionDialog, SwSectionData*, pSect )
pThis->CalcBoundRect(aRect, FLY_AS_CHAR);
long nWidth = aRect.Width();
aSet.Put(SwFmtFrmSize(ATT_VAR_SIZE, nWidth));
- // Hoehe=Breite fuer konsistentere Vorschau (analog zu Bereich bearbeiten)
+ // height=width for more consistent preview (edit analog to region)
aSet.Put(SvxSizeItem(SID_ATTR_PAGE_SIZE, Size(nWidth, nWidth)));
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialogdiet fail!");
diff --git a/sw/source/ui/dialog/regionsw.src b/sw/source/ui/dialog/regionsw.src
index 980f267..428cf45 100644
--- a/sw/source/ui/dialog/regionsw.src
+++ b/sw/source/ui/dialog/regionsw.src
@@ -31,7 +31,7 @@
#include "helpid.h"
/*************************************************************************
- Dialog "Bereich einfuegen"
+ Dialog "paste region"
*************************************************************************/
#define FT_SUBREG_TEXT \
@@ -82,7 +82,7 @@
/*************************************************************************
- Dialog "Bereiche bearbeiten"
+ Dialog "edit region"
*************************************************************************/
ModalDialog MD_EDIT_REGION
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index f705b24..79b6eb8 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -55,13 +55,13 @@
#include <IMark.hxx>
#include <section.hxx>
#include <docary.hxx>
-#include <doc.hxx> // fuers SwSectionFmt-Array
+#include <doc.hxx> // for the SwSectionFmt-Array
#include <basesh.hxx>
#include <wdocsh.hxx>
#include <view.hxx>
#include <swmodule.hxx>
#include <wrtsh.hxx>
-#include <swundo.hxx> // fuer Undo-Ids
+#include <swundo.hxx> // for Undo-Ids
#include <column.hxx>
#include <fmtfsize.hxx>
#include <swunodef.hxx>
@@ -160,7 +160,7 @@ public:
};
/*----------------------------------------------------------------------------
- Beschreibung: User Data Klasse fuer Bereichsinformationen
+ Description: user data class for region information
----------------------------------------------------------------------------*/
class SectRepr
@@ -175,9 +175,9 @@ private:
SvxFrameDirectionItem m_FrmDirItem;
SvxLRSpaceItem m_LRSpaceItem;
USHORT m_nArrPos;
- // zeigt an, ob evtl. Textinhalt im Bereich ist
+ // shows, if maybe textcontent is in the region
bool m_bContent : 1;
- // fuer Multiselektion erst markieren, dann mit der TreeListBox arbeiten!
+ // for multiselection, mark at first, then work with TreeListBox!
bool m_bSelected : 1;
uno::Sequence<sal_Int8> m_TempPasswd;
@@ -253,7 +253,7 @@ void SectRepr::SetFile( const String& rFile )
if( rFile.Len() || sSub.Len() )
{
sNewFile += sfx2::cTokenSeperator;
- if( rFile.Len() ) // Filter nur mit FileName
+ if( rFile.Len() ) // Filter only with FileName
sNewFile += sOldFileName.GetToken( 1, sfx2::cTokenSeperator );
sNewFile += sfx2::cTokenSeperator;
@@ -348,7 +348,7 @@ String SectRepr::GetSubRegion() const
}
/*----------------------------------------------------------------------------
- Beschreibung: Dialog Bearbeiten Bereiche
+ Descriptino: dialog edit regions
----------------------------------------------------------------------------*/
SwEditRegionDlg::SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh )
: SfxModalDialog( pParent, SW_RES(MD_EDIT_REGION) ),
@@ -494,7 +494,7 @@ BOOL SwEditRegionDlg::CheckPasswd(CheckBox* pBox)
}
/*---------------------------------------------------------------------
- Beschreibung: Durchsuchen nach Child-Sections, rekursiv
+ Description: rekursively look for child-sections
---------------------------------------------------------------------*/
void SwEditRegionDlg::RecurseList( const SwSectionFmt* pFmt, SvLBoxEntry* pEntry )
{
@@ -607,9 +607,9 @@ void SwEditRegionDlg::SelectSection(const String& rSectionName)
}
/*---------------------------------------------------------------------
- Beschreibung: Selektierte Eintrag in der TreeListBox wird im
- Edit-Fenster angezeigt
- Bei Multiselektion werden einige Controls disabled
+ Description: selected entry in TreeListBox is showed in
+ Edit window
+ in case of multiselection some controls are disabled
---------------------------------------------------------------------*/
IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox )
{
@@ -808,18 +808,18 @@ IMPL_LINK( SwEditRegionDlg, DeselectHdl, SvTreeListBox *, pBox )
}
/*---------------------------------------------------------------------
- Beschreibung: Im OkHdl werden die veraenderten Einstellungen
- uebernommen und aufgehobene Bereiche geloescht
+ Description: in OkHdl the modified settings are being applied
+ and reversed regions are deleted
---------------------------------------------------------------------*/
IMPL_LINK( SwEditRegionDlg, OkHdl, CheckBox *, EMPTYARG )
{
// JP 13.03.96:
- // temp. Array weil sich waehrend des aendern eines Bereiches die
- // Position innerhalb des "Core-Arrays" verschieben kann:
- // - bei gelinkten Bereichen, wenn sie weitere SubBereiche haben oder
- // neu erhalten.
- // JP 30.05.97: StartUndo darf natuerlich auch erst nach dem Kopieren
- // der Formate erfolgen (ClearRedo!)
+ // temp. Array because during changing of a region the position
+ // inside of the "Core-Arrays" can be shifted:
+ // - at linked regions, when they have more SubRegions or get
+ // new ones.
+ // JP 30.05.97: StartUndo must certainly also happen not before
+ // the formats are copied (ClearRedo!)
const SwSectionFmts& rDocFmts = rSh.GetDoc()->GetSections();
SwSectionFmts aOrigArray( 0, 5 );
@@ -880,8 +880,8 @@ IMPL_LINK( SwEditRegionDlg, OkHdl, CheckBox *, EMPTYARG )
aOrigArray.Remove( 0, aOrigArray.Count() );
- //JP 21.05.97: EndDialog muss vor Ende der EndAction gerufen werden,
- // sonst kann es ScrollFehler geben.
+ //JP 21.05.97: EndDialog must be called ahead of EndAction's end,
+ // otherwise ScrollError can occur.
EndDialog(RET_OK);
rSh.EndUndo();
@@ -891,7 +891,7 @@ IMPL_LINK( SwEditRegionDlg, OkHdl, CheckBox *, EMPTYARG )
}
/*---------------------------------------------------------------------
- Beschreibung: Toggle protect
+ Description: Toggle protect
---------------------------------------------------------------------*/
IMPL_LINK( SwEditRegionDlg, ChangeProtectHdl, TriStateBox *, pBox )
{
@@ -917,7 +917,7 @@ IMPL_LINK( SwEditRegionDlg, ChangeProtectHdl, TriStateBox *, pBox )
}
/*---------------------------------------------------------------------
- Beschreibung: Toggle hide
+ Description: Toggle hide
---------------------------------------------------------------------*/
IMPL_LINK( SwEditRegionDlg, ChangeHideHdl, TriStateBox *, pBox )
{
@@ -946,7 +946,7 @@ IMPL_LINK( SwEditRegionDlg, ChangeHideHdl, TriStateBox *, pBox )
}
/*---------------------------------------------------------------------
- Beschreibung: Toggle edit in readonly
+ Description: Toggle edit in readonly
---------------------------------------------------------------------*/
IMPL_LINK( SwEditRegionDlg, ChangeEditInReadonlyHdl, TriStateBox *, pBox )
{
@@ -967,7 +967,7 @@ IMPL_LINK( SwEditRegionDlg, ChangeEditInReadonlyHdl, TriStateBox *, pBox )
}
/*---------------------------------------------------------------------
- Beschreibung: selektierten Bereich aufheben
+ Description: clear selected region
---------------------------------------------------------------------*/
IMPL_LINK( SwEditRegionDlg, ChangeDismissHdl, CheckBox *, EMPTYARG )
{
@@ -976,7 +976,7 @@ IMPL_LINK( SwEditRegionDlg, ChangeDismissHdl, CheckBox *, EMPTYARG )
SvLBoxEntry* pEntry = aTree.FirstSelected();
SvLBoxEntry* pChild;
SvLBoxEntry* pParent;
- //zuerst alle selektierten markieren
+ // at first mark all selected
while(pEntry)
{
const SectReprPtr pSectRepr = (SectRepr*)pEntry->GetUserData();
@@ -984,7 +984,7 @@ IMPL_LINK( SwEditRegionDlg, ChangeDismissHdl, CheckBox *, EMPTYARG )
pEntry = aTree.NextSelected(pEntry);
}
pEntry = aTree.FirstSelected();
- // dann loeschen
+ // then delete
while(pEntry)
{
const SectReprPtr pSectRepr = (SectRepr*)pEntry->GetUserData();
@@ -995,7 +995,7 @@ IMPL_LINK( SwEditRegionDlg, ChangeDismissHdl, CheckBox *, EMPTYARG )
aSectReprArr.Insert( pSectRepr );
while( (pChild = aTree.FirstChild(pEntry) )!= 0 )
{
- //durch das Umhaengen muss wieder am Anfang aufgesetzt werden
+ // because of the repositioning we have to start at the beginning again
bRestart = TRUE;
pParent=aTree.GetParent(pEntry);
aTree.GetModel()->Move(pChild, pParent, aTree.GetModel()->GetRelPos(pEntry));
@@ -1034,7 +1034,7 @@ IMPL_LINK( SwEditRegionDlg, ChangeDismissHdl, CheckBox *, EMPTYARG )
}
/*---------------------------------------------------------------------
- Beschreibung: CheckBox mit Datei verknuepfen?
+ Description: link CheckBox to file?
---------------------------------------------------------------------*/
IMPL_LINK( SwEditRegionDlg, UseFileHdl, CheckBox *, pBox )
{
@@ -1103,7 +1103,7 @@ IMPL_LINK( SwEditRegionDlg, UseFileHdl, CheckBox *, pBox )
}
/*---------------------------------------------------------------------
- Beschreibung: Dialog Datei einfuegen rufen
+ Description: call dialog paste file
---------------------------------------------------------------------*/
IMPL_LINK( SwEditRegionDlg, FileSearchHdl, PushButton *, EMPTYARG )
{
@@ -1221,8 +1221,8 @@ IMPL_LINK( SwEditRegionDlg, OptionsHdl, PushButton *, EMPTYARG )
}
/*---------------------------------------------------------------------
- Beschreibung: Uebernahme des Dateinamen oder
- des verknuepften Bereichs
+ Description: Applying of the filename or the
+ linked region
---------------------------------------------------------------------*/
IMPL_LINK( SwEditRegionDlg, FileNameHdl, Edit *, pEdit )
{
@@ -1376,9 +1376,9 @@ IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox )
}
/*---------------------------------------------------------------------
- Beschreibung: Aktueller Bereichsname wird sofort beim editieren
- in die TreeListBox eingetragen, mit leerem String
- kein Ok()
+ Description: the current region name is being added to the
+ TreeListBox immediately during editing, with empty
+ string no Ok()
---------------------------------------------------------------------*/
IMPL_LINK( SwEditRegionDlg, NameEditHdl, Edit *, EMPTYARG )
{
@@ -1483,7 +1483,7 @@ Image SwEditRegionDlg::BuildBitmap(BOOL bProtect,BOOL bHidden)
}
/*--------------------------------------------------------------------
- Beschreibung: Hilfsfunktion - Bereichsnamen aus dem Medium lesen
+ Description: helper function - read region names from medium
--------------------------------------------------------------------*/
static void lcl_ReadSections( SfxMedium& rMedium, ComboBox& rBox )
{
@@ -1919,8 +1919,8 @@ IMPL_LINK( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *, _pFil
// --------------------------------------------------------------
-// Numerierungsformat Umsetzung:
-// ListBox - Format - Enum-Wert
+// numbering format conversion:
+// ListBox - format - enum-value
// 0 - A, B, C, ... - 0
// 1 - a, b, c, ... - 1
// 2 - I, II, III, ... - 2
More information about the Libreoffice-commits
mailing list