[Libreoffice-commits] .: 12 commits - sw/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Thu Feb 24 10:55:36 PST 2011
sw/source/ui/config/caption.cxx | 4 +--
sw/source/ui/config/cfgitems.cxx | 10 ++++----
sw/source/ui/config/config.hrc | 4 +--
sw/source/ui/config/dbconfig.cxx | 2 -
sw/source/ui/config/mailconfigpage.cxx | 2 -
sw/source/ui/config/optdlg.hrc | 8 +++---
sw/source/ui/config/optdlg.src | 2 -
sw/source/ui/config/optload.cxx | 10 ++++----
sw/source/ui/config/optpage.cxx | 39 ++++++++++++++++-----------------
sw/source/ui/config/prtopt.cxx | 2 -
sw/source/ui/config/uinums.cxx | 34 ++++++++++++++--------------
sw/source/ui/config/viewopt.cxx | 12 +++++-----
12 files changed, 64 insertions(+), 65 deletions(-)
New commits:
commit 3333c207bfd0af92cdab7d33da6a117e956b7d9a
Author: Martin Kepplinger <martinkepplinger at eml.cc>
Date: Thu Feb 24 19:33:20 2011 +0100
Translate german comments in viewopt.cxx
This translates the german code comments in viewopt.cxx to english.
This is contributed under the terms of the MPL 1.1 / GPLv3+ / LGPLv3+ triple
license.
diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx
index 24f478e..18a1a23 100644
--- a/sw/source/ui/config/viewopt.cxx
+++ b/sw/source/ui/config/viewopt.cxx
@@ -74,7 +74,7 @@ Color SwViewOption::aPageBreakColor(COL_BLUE);
Color SwViewOption::aScriptIndicatorColor(COL_GREEN);
sal_Int32 SwViewOption::nAppearanceFlags = VIEWOPT_DOC_BOUNDARIES|VIEWOPT_OBJECT_BOUNDARIES;
-USHORT SwViewOption::nPixelTwips = 0; //ein Pixel auf dem Bildschirm
+USHORT SwViewOption::nPixelTwips = 0; // one pixel on the screen
#define LINEBREAK_SIZE 12, 8
@@ -103,7 +103,7 @@ BOOL SwViewOption::IsEqualFlags( const SwViewOption &rOpt ) const
&& bShowPlaceHolderFields == rOpt.bShowPlaceHolderFields
&& bIdle == rOpt.bIdle
#if OSL_DEBUG_LEVEL > 1
- // korrespondieren zu den Angaben in ui/config/cfgvw.src
+ // correspond to the statements in ui/config/cfgvw.src
&& bTest1 == rOpt.IsTest1()
&& bTest2 == rOpt.IsTest2()
&& bTest3 == rOpt.IsTest3()
@@ -156,7 +156,7 @@ void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, sal_Bo
{
Color aOldLineColor( pOut->GetLineColor() );
pOut->SetLineColor( Color(COL_GRAY ) );
- // Wir ziehen ueberall zwei Pixel ab, damit es schick aussieht
+ // to make it look nice, we subtract two pixels everywhere
USHORT nPix = GetPixelTwips() * 2;
if( rRect.Width() <= 2 * nPix || rRect.Height() <= 2 * nPix )
nPix = 0;
@@ -188,8 +188,8 @@ SwViewOption::SwViewOption() :
eZoom( SVX_ZOOM_PERCENT ),
nTblDest(TBL_DEST_CELL)
{
- // Initialisierung ist jetzt etwas einfacher
- // alle Bits auf 0
+ // Initialisation is a little simpler now
+ // all Bits to 0
nCoreOptions = VIEWOPT_1_HARDBLANK | VIEWOPT_1_SOFTHYPH |
VIEWOPT_1_REF |
VIEWOPT_1_GRAPHIC |
@@ -210,7 +210,7 @@ SwViewOption::SwViewOption() :
bIdle = true;
#if OSL_DEBUG_LEVEL > 1
- // korrespondieren zu den Angaben in ui/config/cfgvw.src
+ // correspond to the statements in ui/config/cfgvw.src
bTest1 = bTest2 = bTest3 = bTest4 =
bTest5 = bTest6 = bTest7 = bTest8 = bTest10 = FALSE;
#endif
commit ff26cd71e02a03e59814369699fcef077f1a1611
Author: Martin Kepplinger <martinkepplinger at eml.cc>
Date: Thu Feb 24 19:33:19 2011 +0100
Translate german comments in uinums.cxx
This translates the german code comments in uinums.cxx to english.
This is contributed under the terms of the MPL 1.1 / GPLv3+ / LGPLv3+ triple
license.
diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx
index 7025df8..f17d483 100644
--- a/sw/source/ui/config/uinums.cxx
+++ b/sw/source/ui/config/uinums.cxx
@@ -39,7 +39,7 @@
#include <tools/resid.hxx>
#include <fmtornt.hxx>
-#include <swtypes.hxx> // Leerstring
+#include <swtypes.hxx> // empty string
#include <wrtsh.hxx>
#include <uinums.hxx>
#include <poolfmt.hxx>
@@ -67,10 +67,10 @@ SV_IMPL_PTRARR( _SwNumFmtsAttrs, SfxPoolItem* )
// SwNumRulesWithName ----------------------------------------------------
// PUBLIC METHODES -------------------------------------------------------
/*------------------------------------------------------------------------
- Beschreibung: Speichern einer Regel
- Parameter: rCopy -- die zu speichernde Regel
- nIdx -- Position, an der die Regel zu speichern ist.
- Eine alte Regel an dieser Position wird ueberschrieben.
+ Description: Saving a rule
+ Parameter: rCopy -- the rule to save
+ nIdx -- position, where the rule is to be saved.
+ An old rule at that position will be overwritten.
------------------------------------------------------------------------*/
SwBaseNumRules::SwBaseNumRules( const String& rFileName )
@@ -128,8 +128,8 @@ void SwBaseNumRules::ApplyNumRules(const SwNumRulesWithName &rCopy, USHORT nIdx)
BOOL SwBaseNumRules::Store(SvStream &rStream)
{
rStream << ACT_NUM_VERSION;
- // Schreiben, welche Positionen durch eine Regel belegt sind
- // Anschliessend Schreiben der einzelnen Rules
+ // Write, what positions are occupied by a rule
+ // Then write each of the rules
for(USHORT i = 0; i < nMaxRules; ++i)
{
if(pNumRules[i])
@@ -149,8 +149,8 @@ int SwBaseNumRules::Load(SvStream &rStream)
rStream >> nVersion;
- // wegen eines kleinen aber schweren Fehlers schreibt die PreFinal die
- // gleiche VERSION_40A wie das SP2 #55402#
+ // due to a small but serious mistake, PreFinal writes the same VERION_40A as SP2
+ // #55402#
if(VERSION_40A == nVersion)
{
OSL_ENSURE(false, "Version 364 is not clear #55402#");
@@ -244,8 +244,8 @@ SwNumRulesWithName::SwNumRulesWithName( SvStream &rStream, USHORT nVersion )
{
if( VERSION_30B == nVersion )
c = 1;
- // wegen eines kleinen aber schweren Fehlers schreibt die PreFinal die
- // gleiche VERSION_40A wie das SP2 #55402#
+ // due to a small but serious mistake, PreFinal writes the same VERION_40A as SP2
+ // #55402#
else if(nVersion < VERSION_40A && n > 5)
c = 0;
else
@@ -294,7 +294,7 @@ void SwNumRulesWithName::Store( SvStream &rStream )
SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( const SwNumFmt& rFmt )
: aFmt( rFmt ), nCharPoolId( USHRT_MAX )
{
- // relative Abstaende ?????
+ // relative gaps?????
SwCharFmt* pFmt = rFmt.GetCharFmt();
if( pFmt )
@@ -364,7 +364,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream,
rStream >> nL; aFmt.SetLSpace( lNumIndent );
rStream >> nL; aFmt.SetFirstLineOffset( (short)nL );
}
- else // alter StartWert war ein Byte
+ else // old start-value was a Byte
{
short nShort;
rStream >> nUS; aFmt.SetStart( nUS );
@@ -515,7 +515,7 @@ void SwNumRulesWithName::_SwNumFmtGlobal::Store( SvStream& rStream )
pItem->Store( rStream, nIVers );
}
- // Erweiterungen fuer Version 40A
+ // Extensions for 40A
if( SVX_NUM_BITMAP == aFmt.GetNumberingType() )
{
@@ -546,13 +546,13 @@ void SwNumRulesWithName::_SwNumFmtGlobal::ChgNumFmt( SwWrtShell& rSh,
SwCharFmt* pFmt = 0;
if( sCharFmtName.Len() )
{
- // suche erstmal ueber den Namen
+ // at first, look for the name
USHORT nArrLen = rSh.GetCharFmtCount();
for( USHORT i = 1; i < nArrLen; ++i )
{
pFmt = &rSh.GetCharFmt( i );
if( COMPARE_EQUAL == pFmt->GetName().CompareTo( sCharFmtName ))
- // ist vorhanden, also belasse die Attribute wie sie sind!
+ // exists, so leave attributes as they are!
break;
pFmt = 0;
}
@@ -567,7 +567,7 @@ void SwNumRulesWithName::_SwNumFmtGlobal::ChgNumFmt( SwWrtShell& rSh,
else
pFmt = rSh.GetCharFmtFromPool( nCharPoolId );
- if( !pFmt->GetDepends() ) // Attribute setzen
+ if( !pFmt->GetDepends() ) // set attributes
for( USHORT n = aItems.Count(); n; )
pFmt->SetFmtAttr( *aItems[ --n ] );
}
commit e07912233e2350fd51372c0494279a5890d15666
Author: Martin Kepplinger <martinkepplinger at eml.cc>
Date: Thu Feb 24 19:33:18 2011 +0100
Translate german comment in prtopt.cxx
This translates the german code comment in prtopt.cxx to english.
This is contributed under the terms of the MPL 1.1 / GPLv3+ / LGPLv3+ triple
license.
diff --git a/sw/source/ui/config/prtopt.cxx b/sw/source/ui/config/prtopt.cxx
index 55a2f05..a29ea83 100644
--- a/sw/source/ui/config/prtopt.cxx
+++ b/sw/source/ui/config/prtopt.cxx
@@ -44,7 +44,7 @@ using rtl::OUString;
using namespace com::sun::star::uno;
/*--------------------------------------------------------------------
- Beschreibung: Ctor
+ Description: Ctor
--------------------------------------------------------------------*/
Sequence<OUString> SwPrintOptions::GetPropertyNames()
commit ae8b0260588aab041490f0db22b89fa11ded73d4
Author: Martin Kepplinger <martinkepplinger at eml.cc>
Date: Thu Feb 24 19:33:17 2011 +0100
Translate german comments in optpage.cxx
This translates the german code comments in optpage.cxx to english.
This is contributed under the terms of the MPL 1.1 / GPLv3+ / LGPLv3+ triple
license.
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index b3e56b9..2568a64 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -60,7 +60,7 @@
#include <swmodule.hxx>
#include <wrtsh.hxx>
#include <uitool.hxx>
-#include <cfgitems.hxx> //Items fuer Sw-Seiten
+#include <cfgitems.hxx> //Items for Sw-pages
#include <poolfmt.hxx>
#include <uiitems.hxx>
#include <initui.hxx>
@@ -151,7 +151,7 @@ SwContentOptPage::SwContentOptPage( Window* pParent,
case FUNIT_CHAR: // add two units , 'character' and 'line' , their ticks are not fixed
case FUNIT_LINE:
{
- // nur diese Metriken benutzen
+ // only use these metrics
// a horizontal ruler has not the 'line' unit
// there isn't 'line' unit in HTML format
if ( eFUnit != FUNIT_LINE )
@@ -264,7 +264,7 @@ BOOL SwContentOptPage::FillItemSet(SfxItemSet& rSet)
USHORT nGlobalMetricPos = nMPos;
if ( nMPos != aMetricLB.GetSavedValue() )
{
- // Doppel-Cast fuer VA3.0
+ // Double-Cast for VA3.0
USHORT nFieldUnit = (USHORT)(long)aMetricLB.GetEntryData( nMPos );
rSet.Put( SfxUInt16Item( SID_ATTR_METRIC, (UINT16)nFieldUnit ) );
bRet = TRUE;
@@ -273,7 +273,7 @@ BOOL SwContentOptPage::FillItemSet(SfxItemSet& rSet)
nMPos = aHMetric.GetSelectEntryPos();
if ( nMPos != aHMetric.GetSavedValue() || nMPos != nGlobalMetricPos )
{
- // Doppel-Cast fuer VA3.0
+ // Double-Cast for VA3.0
USHORT nFieldUnit = (USHORT)(long)aHMetric.GetEntryData( nMPos );
rSet.Put( SfxUInt16Item( FN_HSCROLL_METRIC, (UINT16)nFieldUnit ) );
bRet = TRUE;
@@ -281,7 +281,7 @@ BOOL SwContentOptPage::FillItemSet(SfxItemSet& rSet)
nMPos = aVMetric.GetSelectEntryPos();
if ( nMPos != aVMetric.GetSavedValue() || nMPos != nGlobalMetricPos )
{
- // Doppel-Cast fuer VA3.0
+ // Double-Cast for VA3.0
USHORT nFieldUnit = (USHORT)(long)aVMetric.GetEntryData( nMPos );
rSet.Put( SfxUInt16Item( FN_VSCROLL_METRIC, (UINT16)nFieldUnit ) );
bRet = TRUE;
@@ -306,7 +306,7 @@ IMPL_LINK( SwContentOptPage, AnyRulerHdl, CheckBox*, pBox)
return 0;
}
/*------------------------------------------------------
- TabPage Drucker Zusatzeinstellungen
+ TabPage Printer additional settings
-------------------------------------------------------*/
SwAddPrinterTabPage::SwAddPrinterTabPage( Window* pParent,
const SfxItemSet& rCoreSet) :
@@ -1213,8 +1213,8 @@ BOOL SwTableOptionsTabPage::FillItemSet( SfxItemSet& )
if(eMode != pModOpt->GetTblMode())
{
pModOpt->SetTblMode(eMode);
- // der Tabellen-Tastatur-Modus hat sich geaendert, das soll
- // jetzt auch die aktuelle Tabelle erfahren
+ // the table-keyboard-mode has changed, now the current
+ // table should know about that too.
if(pWrtShell && nsSelectionType::SEL_TBL & pWrtShell->GetSelectionType())
{
pWrtShell->SetTblChgMode(eMode);
@@ -1519,7 +1519,7 @@ void SwShdwCrsrOptionsTabPage::Reset( const SfxItemSet& rSet )
}
/*--------------------------------------------------
- TabPage fuer Redlining
+ TabPage for Redlining
--------------------------------------------------*/
struct CharAttr
{
@@ -1527,7 +1527,7 @@ struct CharAttr
USHORT nAttr;
};
-// Editieren entspricht Einfuegen-Attributen
+// Edit corresponds to Paste-attributes
static CharAttr aRedlineAttr[] =
{
{ SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_NOT_MAPPED },
@@ -1555,7 +1555,7 @@ static USHORT aDeletedAttrMap[] = { 0, 1, 2, 5, 6, 7, 8, 9, 10 };
static USHORT aChangedAttrMap[] = { 0, 1, 2, 3, 4, 6, 7, 8, 9, 10 };
/*-----------------------------------------------------------------------
- Beschreibung: Markierungsvorschau
+ Description: Preview of selection
-----------------------------------------------------------------------*/
SwMarkPreview::SwMarkPreview( Window *pParent, const ResId& rResID ) :
@@ -1619,15 +1619,15 @@ void SwMarkPreview::DataChanged( const DataChangedEvent& rDCEvt )
void SwMarkPreview::Paint(const Rectangle &/*rRect*/)
{
- // Schatten zeichnen
+ // draw shadow
Rectangle aShadow(aPage);
aShadow += Point(3, 3);
DrawRect( aShadow, m_aShadowCol, m_aTransCol );
- // Seite zeichnen
+ // draw page
DrawRect( aPage, m_aBgCol, m_aLineCol );
- // Separator zeichnen
+ // draw separator
Rectangle aPageSeparator(aPage);
aPageSeparator.SetSize(Size(2, aPageSeparator.GetHeight()));
aPageSeparator.Move(aPage.GetWidth() / 2 - 1, 0);
@@ -1667,10 +1667,10 @@ void SwMarkPreview::Paint(const Rectangle &/*rRect*/)
void SwMarkPreview::PaintPage(const Rectangle &rRect)
{
- // PrintArea zeichnen
+ // draw PrintArea
DrawRect(rRect, m_aTransCol, m_aPrintAreaCol );
- // Testabsatz zeichnen
+ // draw Testparagraph
ULONG nLTxtBorder = 4;
ULONG nRTxtBorder = 4;
ULONG nTTxtBorder = 4;
@@ -1687,8 +1687,7 @@ void SwMarkPreview::PaintPage(const Rectangle &rRect)
nStep = aTextLine.GetHeight() + 2;
nLines = (USHORT)(rRect.GetHeight() / (aTextLine.GetHeight() + 2)) - 1;
- // Text simulieren
- //
+ // simulate text
for (USHORT i = 0; i < nLines; ++i)
{
if (i == (nLines - 1))
@@ -1918,7 +1917,7 @@ BOOL SwRedlineOptionsTabPage::FillItemSet( SfxItemSet& )
nOldMarkColor != pOpt->GetMarkAlignColor().GetColor() ||
nOldMarkMode != pOpt->GetMarkAlignMode())
{
- // Alle Dokumente aktualisieren
+ // update all documents
TypeId aType(TYPE(SwDocShell));
SwDocShell* pDocShell = (SwDocShell*)SfxObjectShell::GetFirst(&aType);
@@ -1945,7 +1944,7 @@ void SwRedlineOptionsTabPage::Reset( const SfxItemSet& )
InitFontStyle(aDeletedPreviewWN);
InitFontStyle(aChangedPreviewWN);
- // initialisieren colour list box
+ // initialise colour list box
String sColor;
aInsertColorLB.SetUpdateMode(FALSE);
aDeletedColorLB.SetUpdateMode(FALSE);
commit 2798fca9046b5ed65d9768b60ba1c0d7898902bc
Author: Martin Kepplinger <martinkepplinger at eml.cc>
Date: Thu Feb 24 19:33:16 2011 +0100
Translate german comments in optload.cxx
This translates the german code comments in optload.cxx to english.
This is contributed under the terms of the MPL 1.1 / GPLv3+ / LGPLv3+ triple
license.
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 3057a69..b0f903c 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -193,7 +193,7 @@ BOOL SwLoadOptPage::FillItemSet( SfxItemSet& rSet )
const USHORT nMPos = aMetricLB.GetSelectEntryPos();
if ( nMPos != aMetricLB.GetSavedValue() )
{
- // Doppel-Cast fuer VA3.0
+ // Double-Cast for VA3.0
USHORT nFieldUnit = (USHORT)(long)aMetricLB.GetEntryData( nMPos );
rSet.Put( SfxUInt16Item( SID_ATTR_METRIC, (UINT16)nFieldUnit ) );
bRet = TRUE;
@@ -313,14 +313,14 @@ void SwLoadOptPage::Reset( const SfxItemSet& rSet)
}
/*-----------------13.01.97 14.44-------------------
- Metric des Deftabstops umschalten
+ Switch Deftabstops' metric
--------------------------------------------------*/
IMPL_LINK(SwLoadOptPage, MetricHdl, ListBox*, EMPTYARG)
{
const USHORT nMPos = aMetricLB.GetSelectEntryPos();
if(nMPos != USHRT_MAX)
{
- // Doppel-Cast fuer VA3.0
+ // Double-Cast for VA3.0
FieldUnit eFieldUnit = (FieldUnit)(long)aMetricLB.GetEntryData( nMPos );
BOOL bModified = aTabMF.IsModified();
long nVal = bModified ?
@@ -524,7 +524,7 @@ BOOL SwCaptionOptPage::FillItemSet( SfxItemSet& )
BOOL bRet = FALSE;
SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig();
- SaveEntry(aCheckLB.FirstSelected()); // Aktuellen Eintrag uebernehmen
+ SaveEntry(aCheckLB.FirstSelected()); // apply current entry
SvLBoxEntry* pEntry = aCheckLB.First();
@@ -847,7 +847,7 @@ void SwCaptionOptPage::DrawSample()
{
//#i61007# order of captions
bool bOrderNumberingFirst = aLbCaptionOrder.GetSelectEntryPos() == 1;
- // Nummer
+ // number
USHORT nNumFmt = (USHORT)(ULONG)aFormatBox.GetEntryData(
aFormatBox.GetSelectEntryPos() );
if( SVX_NUM_NUMBER_NONE != nNumFmt )
commit 08c717a240e1ba3f0c87e0a36bdc14c432510d68
Author: Martin Kepplinger <martinkepplinger at eml.cc>
Date: Thu Feb 24 19:33:15 2011 +0100
Translate german comments
This translates the german code comments in optdlg.src to english.
This is contributed under the terms of the MPL 1.1 / GPLv3+ / LGPLv3+ triple
license.
diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src
index a2573ed..60c1387 100644
--- a/sw/source/ui/config/optdlg.src
+++ b/sw/source/ui/config/optdlg.src
@@ -38,7 +38,7 @@
/**************************************************************************/
/* */
-/* TabPage Ansicht/Inhalt */
+/* TabPage View/Content */
/* */
/**************************************************************************/
TabPage TP_CONTENT_OPT
commit 20ea8297aec902ea26a913ac8a95aa110070bca8
Author: Martin Kepplinger <martinkepplinger at eml.cc>
Date: Thu Feb 24 19:33:14 2011 +0100
Translate german comments
This translates the german code-comments in optdlg.hrc to english.
This is contributed under the terms of the MPL 1.1 / GPLv3+ / LGPLv3+ triple
license.
diff --git a/sw/source/ui/config/optdlg.hrc b/sw/source/ui/config/optdlg.hrc
index 31f2e70..8b0f101 100644
--- a/sw/source/ui/config/optdlg.hrc
+++ b/sw/source/ui/config/optdlg.hrc
@@ -25,7 +25,7 @@
*
************************************************************************/
-/* TabPage Ansicht*/
+/* TabPage View */
#define FL_DISP 1
#define FL_NOPRINT 2
#define FL_WINDOW 3
@@ -69,7 +69,7 @@
#define CB_TEST10 34
#define FL_TEST 35
-#define CB_FLD_HIDDEN_PARA 36 //Mittendrin, damit die HelpIds zum FPII kompatibel bleiben
+#define CB_FLD_HIDDEN_PARA 36 // right in the middle of it, so that HelpIds stay compatible to FPII
#define CB_SMOOTH_SCROLL 37
#define BT_OK 38
@@ -125,7 +125,7 @@
#define CB_TEXT_PLACEHOLDER 94
-// Tabpage Grundschriften
+// Tabpage Basic Fonts
#define FT_STANDARD 90
#define LB_STANDARD 91
#define FT_TITLE 92
@@ -150,7 +150,7 @@
#define LB_LABEL_SIZE 111
#define LB_INDEX_SIZE 112
-//Tabpage Tabelle
+//Tabpage Table
#define CB_HEADER 101
#define CB_REPEAT_HEADER 102
#define CB_DONT_SPLIT 103
commit f614aa83ad296291338c3a61dd74565fc433f332
Author: Martin Kepplinger <martinkepplinger at eml.cc>
Date: Thu Feb 24 19:33:13 2011 +0100
Translate german comment
This translates the german code comment in mailconfigpage.cxx to english.
This is contributed under the terms of the MPL 1.1 / GPLv3+ / LGPLv3+ triple
license.
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index 19de971..825cb25 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -444,7 +444,7 @@ void SwTestAccountSettingsDialog::Test()
SwMailConfigDlg::SwMailConfigDlg(Window* pParent, SfxItemSet& rSet ) :
SfxSingleTabDialog(pParent, rSet, 0)
{
- // TabPage erzeugen
+ // create TabPage
SetTabPage(SwMailConfigPage::Create( this, rSet ));
}
commit adddc40e653845a69b39146e756ce66be4b67a61
Author: Martin Kepplinger <martinkepplinger at eml.cc>
Date: Thu Feb 24 19:33:12 2011 +0100
Translate german comment
This translates the german code comment in dbconfig.cxx to english.
This is contributed under the terms of the MPL 1.1 / GPLv3+ / LGPLv3+ triple
license.
diff --git a/sw/source/ui/config/dbconfig.cxx b/sw/source/ui/config/dbconfig.cxx
index c49f457..cdcfbbc 100644
--- a/sw/source/ui/config/dbconfig.cxx
+++ b/sw/source/ui/config/dbconfig.cxx
@@ -43,7 +43,7 @@ using rtl::OUString;
using namespace com::sun::star::uno;
/*--------------------------------------------------------------------
- Beschreibung: Ctor
+ Description: Ctor
--------------------------------------------------------------------*/
const Sequence<OUString>& SwDBConfig::GetPropertyNames()
commit b5e2e928dd0721bfc404a912fa421d177979458b
Author: Martin Kepplinger <martinkepplinger at eml.cc>
Date: Thu Feb 24 19:33:11 2011 +0100
Translate german comments in config.hrc
This translates the german code comments in config.hrc to english.
This is contributed under the terms of the MPL 1.1 / GPLv3+ / LGPLv3+ triple
license.
diff --git a/sw/source/ui/config/config.hrc b/sw/source/ui/config/config.hrc
index e5a6ef2..7251499 100644
--- a/sw/source/ui/config/config.hrc
+++ b/sw/source/ui/config/config.hrc
@@ -29,9 +29,9 @@
#include "rcid.hrc"
-// Dialoge fuer die Konfiguration
+// dialogs for configuration
-// Strings fuer die Konfiguration
+// strings for configuration
#define STR_CFG_SIGNATUR (RC_CONFIG_BEGIN + 0)
#define DLG_CONFIG_VIEW (RC_CONFIG_BEGIN + 1)
#define DLG_CONFIG_MISC (RC_CONFIG_BEGIN + 2)
commit ba08d26e95af51cdb75ec15d186191456828a62b
Author: Martin Kepplinger <martinkepplinger at eml.cc>
Date: Thu Feb 24 19:33:10 2011 +0100
Translate german comments in cfgitems.cxx
This translates the german code-comments in cfgitems.cxx to english.
This is contributed under the terms of the MPL 1.1 / GPLv3+ / LGPLv3+ triple
license.
diff --git a/sw/source/ui/config/cfgitems.cxx b/sw/source/ui/config/cfgitems.cxx
index 17e5786..43cec7c 100644
--- a/sw/source/ui/config/cfgitems.cxx
+++ b/sw/source/ui/config/cfgitems.cxx
@@ -65,7 +65,7 @@ SwDocDisplayItem::SwDocDisplayItem( USHORT _nWhich ) :
};
/*-------------------------------------------------------------------
- Item fuer Einstellungsdialog, Seite Dokumentansicht
+ Item for the Settings dialog, page document view
--------------------------------------------------------------------*/
SwDocDisplayItem::SwDocDisplayItem( const SwDocDisplayItem& rDocDisplayItem ):
SfxPoolItem(rDocDisplayItem)
@@ -250,7 +250,7 @@ void SwElemItem::FillViewOptions( SwViewOption& rVOpt) const
}
/*--------------------------------------------------------------------
- Beschreibung: CopyCTOR
+ Description: CopyCTOR
--------------------------------------------------------------------*/
SwAddPrinterItem::SwAddPrinterItem( const SwAddPrinterItem& rAddPrinterItem ):
SfxPoolItem(rAddPrinterItem),
@@ -259,7 +259,7 @@ SwAddPrinterItem::SwAddPrinterItem( const SwAddPrinterItem& rAddPrinterItem ):
}
/*--------------------------------------------------------------------
- Beschreibung: CTOR fuer leeres Item
+ Description: CTOR for empty Item
--------------------------------------------------------------------*/
SwAddPrinterItem::SwAddPrinterItem( USHORT _nWhich):
SfxPoolItem(_nWhich)
@@ -267,7 +267,7 @@ SwAddPrinterItem::SwAddPrinterItem( USHORT _nWhich):
}
/*--------------------------------------------------------------------
- Beschreibung: CTOR aus SwPrintOptions
+ Description: CTOR from SwPrintOptions
--------------------------------------------------------------------*/
SwAddPrinterItem::SwAddPrinterItem( USHORT _nWhich, const SwPrintData& rPrtData ) :
SfxPoolItem(_nWhich)
@@ -290,7 +290,7 @@ int SwAddPrinterItem::operator==( const SfxPoolItem& rAttr ) const
}
/*--------------------------------------------------
- Item fuer Einstellungsdialog, ShadowCursorSeite
+ Item for Settings dialog, ShadowCursorPage
--------------------------------------------------*/
SwShadowCursorItem::SwShadowCursorItem( USHORT _nWhich )
: SfxPoolItem( _nWhich ),
commit 8cf91efefecfdeab1eccbce05fddb640bc1b6c69
Author: Martin Kepplinger <martinkepplinger at eml.cc>
Date: Thu Feb 24 19:33:09 2011 +0100
Translate german comment in caption.cxx
This translates the german code-comment in caption.cxx to english.
This is contributed under the terms of the MPL 1.1 / GPLv3+ / LGPLv3+ triple
license.
diff --git a/sw/source/ui/config/caption.cxx b/sw/source/ui/config/caption.cxx
index ed53530..3205a19 100644
--- a/sw/source/ui/config/caption.cxx
+++ b/sw/source/ui/config/caption.cxx
@@ -84,8 +84,8 @@ InsCaptionOpt& InsCaptionOpt::operator=( const InsCaptionOpt& rOpt )
BOOL InsCaptionOpt::operator==( const InsCaptionOpt& rOpt ) const
{
return (eObjType == rOpt.eObjType &&
- aOleId == rOpt.aOleId); // Damit gleiche Ole-IDs nicht mehrfach eingefuegt
- // werden koennen, auf nichts weiteres vergleichen
+ aOleId == rOpt.aOleId); // So that identical Ole-IDs can't be added multiple
+ // times, don't compare against anything else.
}
More information about the Libreoffice-commits
mailing list