svx/source/dialog/docrecovery.cxx | 6 +++---
svx/source/form/fmtools.cxx | 2 +-
svx/source/inc/filtnav.hxx | 2 +-
svx/source/items/numfmtsh.cxx | 31 +++++++++++++++----------------
svx/source/items/numinf.cxx | 2 +-
svx/source/items/pageitem.cxx | 11 +++++------
svx/source/items/rotmodit.cxx | 4 ++--
7 files changed, 28 insertions(+), 30 deletions(-)
New commits:
commit 3a70ae03fee12e6b8ed87afba1095bc78f9a9812
Author: Daniel Sikeler <d.sikele...@gmail.com>
Date: Mon Feb 9 09:32:35 2015 +0100
fdo#39468 translated german comments
also tranlated some error messages
Change-Id: Ia5035c7c2f5379a0b419fc5514a288368e687c83
Reviewed-on: https://gerrit.libreoffice.org/14382
Tested-by: Michael Stahl <mst...@redhat.com>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/svx/source/dialog/docrecovery.cxx
b/svx/source/dialog/docrecovery.cxx
index 9a0a025..d96a352 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -711,9 +711,9 @@ void SaveProgressDialog::stepNext(TURLInfo* )
{
/* TODO
- wenn die m_pCore noch ein Member m_nCurrentItem haette
- koennte man dort erkennen, wer gerade drann war, wer demnaechst
- dran ist ... Diese Info kann man dann in unserem Progress FixText
anzeigen ...
+ if m_pCore would have a member m_mCurrentItem, you could see,
+ who is current, who is next ... You can show this information
+ in progress report FixText
*/
}
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index f4cde2a..4b7bfadd 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -179,7 +179,7 @@ sal_Int32 getElementPos(const Reference<
::com::sun::star::container::XIndexAcce
DBG_ASSERT( xNormalized.is(), "getElementPos: invalid element!" );
if ( xNormalized.is() )
{
- // Feststellen an welcher Position sich das Kind befindet
+ // find child position
nIndex = xCont->getCount();
while (nIndex--)
{
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index 3bde69e..6e050a0 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -248,7 +248,7 @@ class FmFilterNavigator : public SvTreeListBox, public
SfxListener
AutoTimer m_aDropActionTimer;
unsigned short m_aTimerCounter;
- Point m_aTimerTriggered; // die Position, an der der
DropTimer angeschaltet wurde
+ Point m_aTimerTriggered; // position, where DropTimer
was started
DROP_ACTION m_aDropActionType;
public:
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index a3fabc6..dda14b3 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -145,8 +145,7 @@ SvxNumberFormatShell::~SvxNumberFormatShell()
if ( bUndoAddList )
{
- // Hinzugefuegte Formate sind nicht gueltig:
- // => wieder entfernen:
+ // Added formats are invalid => remove them
for ( std::vector<sal_uInt32>::const_iterator it(aAddList.begin()); it
!= aAddList.end(); ++it )
pFormatter->DeleteEntry( *it );
@@ -166,7 +165,7 @@ void SvxNumberFormatShell::GetUpdateData( sal_uInt32*
pDelArray, const sal_uInt3
{
const size_t nListSize = aDelList.size();
- DBG_ASSERT( pDelArray && ( nSize == nListSize ), "Array nicht
initialisiert!" );
+ DBG_ASSERT( pDelArray && ( nSize == nListSize ), "Array not initialised!"
);
if ( pDelArray && ( nSize == nListSize ) )
for (std::vector<sal_uInt32>::const_iterator it(aDelList.begin()); it
!= aDelList.end(); ++it )
@@ -236,7 +235,7 @@ bool SvxNumberFormatShell::AddFormat( OUString& rFormat,
sal_Int32& rErrPos,
bool bInserted = false;
sal_uInt32 nAddKey = pFormatter->GetEntryKey( rFormat, eCurLanguage );
- if ( nAddKey != NUMBERFORMAT_ENTRY_NOT_FOUND ) // bereits vorhanden?
+ if ( nAddKey != NUMBERFORMAT_ENTRY_NOT_FOUND ) // exists already?
{
::std::vector<sal_uInt32>::iterator nAt = GetRemoved_Impl( nAddKey );
if ( nAt != aDelList.end() )
@@ -246,10 +245,10 @@ bool SvxNumberFormatShell::AddFormat( OUString& rFormat,
sal_Int32& rErrPos,
}
else
{
- OSL_FAIL( "Doppeltes Format!" );
+ OSL_FAIL( "duplicate format!" );
}
}
- else // neues Format
+ else // new format
{
sal_Int32 nPos;
bInserted = pFormatter->PutEntry( rFormat, nPos,
@@ -273,27 +272,27 @@ bool SvxNumberFormatShell::AddFormat( OUString& rFormat,
sal_Int32& rErrPos,
}
}
- if ( bInserted ) // eingefuegt
+ if ( bInserted )
{
nCurFormatKey = nAddKey;
- DBG_ASSERT( !IsAdded_Impl( nCurFormatKey ), "Doppeltes Format!" );
+ DBG_ASSERT( !IsAdded_Impl( nCurFormatKey ), "duplicate format!" );
aAddList.push_back( nCurFormatKey );
- // aktuelle Tabelle holen
+ // get current table
pCurFmtTable = &(pFormatter->GetEntryTable( nCurCategory,
nCurFormatKey,
eCurLanguage ));
- nCurCategory=pFormatter->GetType(nAddKey); //@@ ???
+ nCurCategory=pFormatter->GetType(nAddKey);
CategoryToPos_Impl( nCurCategory, rCatLbSelPos );
rFmtSelPos = FillEntryList_Impl( rFmtEntries );
}
- else if ( rErrPos != 0 ) // Syntaxfehler
+ else if ( rErrPos != 0 ) // syntax error
{
;
}
- else // Doppelt einfuegen nicht moeglich
+ else // insert twice not possible
{
- OSL_FAIL( "Doppeltes Format!" ); // oder doch?
+ OSL_FAIL( "duplicate format!" );
}
return bInserted;
@@ -308,8 +307,8 @@ bool SvxNumberFormatShell::RemoveFormat( const OUString&
rFormat,
{
sal_uInt32 nDelKey = pFormatter->GetEntryKey( rFormat, eCurLanguage );
- DBG_ASSERT( nDelKey != NUMBERFORMAT_ENTRY_NOT_FOUND, "Eintrag nicht
gefunden!" );
- DBG_ASSERT( !IsRemoved_Impl( nDelKey ), "Eintrag bereits geloescht!" );
+ DBG_ASSERT( nDelKey != NUMBERFORMAT_ENTRY_NOT_FOUND, "entry not found!" );
+ DBG_ASSERT( !IsRemoved_Impl( nDelKey ), "entry already removed!" );
if ( (nDelKey != NUMBERFORMAT_ENTRY_NOT_FOUND) && !IsRemoved_Impl( nDelKey
) )
{
@@ -512,7 +511,7 @@ void SvxNumberFormatShell::GetInitSettings( sal_uInt16&
nCatLbPos,
Color*& rpPrevColor )
{
- // Vorbedingung: Zahlenformatierer gefunden
+ // precondition: number formater found
DBG_ASSERT( pFormatter != NULL, "Zahlenformatierer nicht gefunden!" );
short nSelPos = SELPOS_NONE;
diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx
index 4cc527b..5a855d5 100644
--- a/svx/source/items/numinf.cxx
+++ b/svx/source/items/numinf.cxx
@@ -168,7 +168,7 @@ SfxPoolItem* SvxNumberInfoItem::Clone( SfxItemPool * ) const
return new SvxNumberInfoItem( *this );
}
-// Laden/Speichern wird nicht gebraucht!
+// Load/Save is unused!
SfxPoolItem* SvxNumberInfoItem::Create( SvStream& /*rStream*/, sal_uInt16 )
const
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index 80447b9..1ebbdea 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -33,7 +33,6 @@ using namespace ::com::sun::star;
TYPEINIT1_FACTORY( SvxPageItem, SfxPoolItem , new SvxPageItem(0));
-// Konstruktor
SvxPageItem::SvxPageItem( const sal_uInt16 nId ) : SfxPoolItem( nId ),
eNumType ( SVX_ARABIC ),
@@ -42,7 +41,7 @@ SvxPageItem::SvxPageItem( const sal_uInt16 nId ) :
SfxPoolItem( nId ),
{
}
-// Copy-Konstruktor
+// Copy-Ctor
SvxPageItem::SvxPageItem( const SvxPageItem& rItem )
: SfxPoolItem( rItem )
{
@@ -51,13 +50,13 @@ SvxPageItem::SvxPageItem( const SvxPageItem& rItem )
eUse = rItem.eUse;
}
-// Clonen
+// Clone
SfxPoolItem* SvxPageItem::Clone( SfxItemPool * ) const
{
return new SvxPageItem( *this );
}
-// Abfrage auf Gleichheit
+// Test for equality
bool SvxPageItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
@@ -147,7 +146,7 @@ bool SvxPageItem::QueryValue( uno::Any& rVal, sal_uInt8
nMemberId ) const
{
case MID_PAGE_NUMTYPE:
{
- //! die Konstanten sind nicht mehr in den IDLs ?!?
+ //! constants aren't in IDLs any more ?!?
rVal <<= (sal_Int16)( eNumType );
}
break;
@@ -165,7 +164,7 @@ bool SvxPageItem::QueryValue( uno::Any& rVal, sal_uInt8
nMemberId ) const
case SVX_PAGE_ALL : eRet = style::PageStyleLayout_ALL;
break;
case SVX_PAGE_MIRROR: eRet = style::PageStyleLayout_MIRRORED;
break;
default:
- OSL_FAIL("was fuer ein Layout ist das?");
+ OSL_FAIL("what layout is this?");
return false;
}
rVal <<= eRet;
diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx
index 5750fc8..f356010 100644
--- a/svx/source/items/rotmodit.cxx
+++ b/svx/source/items/rotmodit.cxx
@@ -40,7 +40,7 @@ TYPEINIT1_FACTORY(SvxRotateModeItem, SfxEnumItem, new
SvxRotateModeItem(SVX_ROTA
-// SvxRotateModeItem - Ausrichtung bei gedrehtem Text
+// SvxRotateModeItem - orientation with turned text
SvxRotateModeItem::SvxRotateModeItem( SvxRotateMode eMode, sal_uInt16 _nWhich )
@@ -75,7 +75,7 @@ bool SvxRotateModeItem::GetPresentation(
{
case SFX_ITEM_PRESENTATION_COMPLETE:
rText += "...: ";
-// break; // DURCHFALLEN!!!
+// break; // FALL THROUGH!!!
case SFX_ITEM_PRESENTATION_NAMELESS:
rText += OUString( GetValue() );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
