Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2157
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/57/2157/1
Comment translation - german-english - 3 files
I'm struggeling over line 407 in sw/source/core/edit/acorrect.cxx, is this the right translation.
Is this a question or is it a description what happens in the moment???
Change-Id: Ie665a8dffc41ee057c0277788282eea96cbbe6a3
---
M sw/source/core/docnode/ndtbl.cxx
M sw/source/core/edit/acorrect.cxx
M sw/source/ui/utlui/numfmtlb.cxx
3 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 775359a..9e296eb 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -333,8 +333,8 @@
sal_Bool bCalledFromShell,
sal_Bool bNewModel )
{
- OSL_ENSURE( nRows, "Tabelle ohne Zeile?" );
- OSL_ENSURE( nCols, "Tabelle ohne Spalten?" );
+ OSL_ENSURE( nRows, "Table without line?" );
+ OSL_ENSURE( nCols, "Table without rows?" );
{
// Do not copy into Footnotes!
@@ -1398,7 +1398,7 @@
aCellNodeIdx = SwNodeIndex( *aCellNodeIdx.GetNode().EndOfSectionNode() );
}
- // Section der Box zuweisen
+ // assign Section to the Box
pBox = new SwTableBox( pBoxFmt, *pSttNd, pLine );
pLine->GetTabBoxes().insert( pLine->GetTabBoxes().begin() + nBoxes++, pBox );
}
@@ -3086,7 +3086,7 @@
}
}
- // bedingte Vorlage beachten
+ // note conditional template
pBox->GetSttNd()->CheckSectionCondColl();
}
}
diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx
index b1df33b..0242a54 100644
--- a/sw/source/core/edit/acorrect.cxx
+++ b/sw/source/core/edit/acorrect.cxx
@@ -64,7 +64,7 @@
}
_PaMIntoCrsrShellRing::~_PaMIntoCrsrShellRing()
{
- // und den Pam wieder herausnehmen:
+ // and take out the Pam again:
RemoveFromRing( rDelPam, pPrevDelPam );
RemoveFromRing( rCrsr, pPrevCrsr );
}
@@ -102,8 +102,8 @@
SwDoc* pDoc = rEditSh.GetDoc();
if( pDoc->IsAutoFmtRedline() )
{
- // damit der DelPam auch verschoben wird, in den Shell-Cursr-Ring
- // mit aufnehmen !!
+ // so that also the DelPam be moved, include it in the
+ // Shell-Cursr-Ring !!
_PaMIntoCrsrShellRing aTmp( rEditSh, rCrsr, rDelPam );
pDoc->DeleteAndJoin( rDelPam );
}
@@ -181,7 +181,7 @@
if( pDoc->IsAutoFmtRedline() )
{
- if( nPos == pNd->GetTxt().Len() ) // am Ende erfolgt ein Insert
+ if( nPos == pNd->GetTxt().Len() ) // at the End an Insert takes place
{
pDoc->InsertString( *pPam, rTxt );
}
@@ -271,13 +271,13 @@
return sal_True;
}
- // returne den Text eines vorherigen Absatzes.
- // Dieser darf nicht leer sein!
- // Gibt es diesen nicht oder gibt es davor nur Leere, dann returne 0
- // Das Flag gibt an:
- // sal_True: den, vor der normalen Einfuegeposition (sal_True)
- // sal_False: den, in den das korrigierte Wort eingfuegt wurde.
- // (Muss nicht der gleiche Absatz sein!!!!)
+ // Return the text of a previous paragraph
+ // This must not be empty!
+ // Does this not exists or there are only blankness, then return 0
+ // The Flag specifies:
+ // sal_True: that, before the normal insert position
+ //sal_False: that, in which the corrected word was inserted.
+ // (Doesn't need to be the same paragraph!!!!)
const String* SwAutoCorrDoc::GetPrevPara( sal_Bool bAtNormalPos )
{
const String* pStr = 0;
@@ -309,10 +309,10 @@
if( bUndoIdInitialized )
bUndoIdInitialized = true;
- // Absatz-Anfang oder ein Blank gefunden, suche nach dem Wort
- // Kuerzel im Auto
+ // Found a beginning of a paragraph or a Blank, suche nach dem Wort
+ // search for the word Kuerzel (Shortcut) in the Auto
SwTxtNode* pTxtNd = rCrsr.GetNode()->GetTxtNode();
- OSL_ENSURE( pTxtNd, "wo ist denn der TextNode?" );
+ OSL_ENSURE( pTxtNd, "where is the TextNode?" );
sal_Bool bRet = sal_False;
if( nEndPos == rSttPos )
@@ -322,7 +322,7 @@
if(LANGUAGE_SYSTEM == eLang)
eLang = GetAppLanguage();
- //JP 22.04.99: Bug 63883 - Sonderbehandlung fuer Punkte.
+ //JP 22.04.99: Bug 63883 - Special treatment for dots.
bool bLastCharIsPoint = nEndPos < pTxtNd->GetTxt().Len() &&
'.' == pTxtNd->GetTxt().GetChar( nEndPos );
@@ -336,7 +336,7 @@
if( pFnd->IsTextOnly() )
{
- //JP 22.04.99: Bug 63883 - Sonderbehandlung fuer Punkte.
+ //JP 22.04.99: Bug 63883 - Special treatment for dots.
if( !bLastCharIsPoint || !pFnd->GetLong().Len() ||
'.' != pFnd->GetLong().GetChar( pFnd->GetLong().Len() - 1 ) )
{
@@ -356,7 +356,7 @@
if( ppPara )
{
- OSL_ENSURE( !pIdx, "wer hat seinen Index nicht geloescht?" );
+ OSL_ENSURE( !pIdx, "who has not deleted his Index?" );
pIdx = new SwNodeIndex( rCrsr.GetPoint()->nNode, -1 );
}
@@ -374,7 +374,7 @@
}
aCpyPam.SetMark();
- // dann bis zum Ende vom Nodes Array
+ // then until the end of the Nodes Array
aCpyPam.GetPoint()->nNode.Assign( pAutoDoc->GetNodes().GetEndOfContent(), -1 );
pCntntNd = aCpyPam.GetCntntNode();
aCpyPam.GetPoint()->nContent.Assign( pCntntNd, pCntntNd->Len() );
@@ -404,11 +404,11 @@
}
- // wird nach dem austauschen der Zeichen von den Funktionen
+ // is being called after the exchange of the character from the functions
// - FnCptlSttWrd
// - FnCptlSttSntnc
- // gerufen. Dann koennen die Worte ggfs. in die Ausnahmelisten
- // aufgenommen werden.
+ // Then, the words if necessary be added to the exception
+ // list.
void SwAutoCorrDoc::SaveCpltSttWord( sal_uLong nFlag, xub_StrLen nPos,
const String& rExceptWord,
sal_Unicode cChar )
@@ -436,15 +436,15 @@
void SwAutoCorrExceptWord::CheckChar( const SwPosition& rPos, sal_Unicode cChr )
{
- // nur testen ob es eine Verbesserung ist. Wenn ja, dann das Wort
- // in die Ausnahmeliste aufnehmen.
+ // test only if this is a improvement.
+ // If yes, then add the word to the list.
if( cChar == cChr && rPos.nNode.GetIndex() == nNode &&
rPos.nContent.GetIndex() == nCntnt )
{
- // die akt. Autokorrektur besorgen:
+ // get the current autocorrection:
SvxAutoCorrect* pACorr = SvxAutoCorrCfg::Get().GetAutoCorrect();
- // dann in die Liste aufnehmen:
+ // then add to the list:
if( CptlSttWrd & nFlags )
pACorr->AddWrtSttException( sWord, eLanguage );
else if( CptlSttSntnc & nFlags )
@@ -501,7 +501,7 @@
{
SwTxtAttr* pHt = pTxtNd->GetpSwpHints()->GetTextHint( n );
nAttrStart = *pHt->GetStart();
- if( nAttrStart > nStart ) // ueber den Bereich hinaus
+ if( nAttrStart > nStart ) // beyond the area
break;
if( 0 != ( pAttrEnd = pHt->GetEnd() ) &&
@@ -516,9 +516,9 @@
GetItemState( pHt->Which(), sal_False, &pItem ) ||
*pItem != pHt->GetAttr() )
{
- // das Attribut war vorher nicht in dieser Form im Absatz
- // gesetzt, also kann es nur durchs einfuegen/kopieren erzeugt
- // worden sein. Damit ist es ein Kandiadat fuers DontExpand
+ // The attribute was not previously set in this form in the
+ // paragraph, so it can only be created through insert/copy
+ // Because of that it is a candidate for DontExpand
pHt->SetDontExpand( sal_True );
}
}
diff --git a/sw/source/ui/utlui/numfmtlb.cxx b/sw/source/ui/utlui/numfmtlb.cxx
index 7dbfe5c..687236e 100644
--- a/sw/source/ui/utlui/numfmtlb.cxx
+++ b/sw/source/ui/utlui/numfmtlb.cxx
@@ -49,10 +49,10 @@
// STATIC DATA -----------------------------------------------------------
/*--------------------------------------------------------------------
- Beschreibung:
- nFormatType: Formate dieses Typs anzeigen
- nDefFmt: Dieses Format selektieren und ggf vorher
- einfuegen
+ Description:
+ nFormatType: Display the formats of this Type
+ nDefFmt: Select this format and possibly
+ insert it
--------------------------------------------------------------------*/
NumFormatListBox::NumFormatListBox( Window* pWin, const ResId& rResId,
@@ -122,7 +122,7 @@
void NumFormatListBox::SetFormatType(const short nFormatType)
{
if (nCurrFormatType == -1 ||
- (nCurrFormatType & nFormatType) == 0) // Es gibt Mischformate, wie z.B. DateTime
+ (nCurrFormatType & nFormatType) == 0) // there are mixed formats, like for example
DateTime
{
SvNumberFormatter* pFormatter;
@@ -138,7 +138,7 @@
pFormatter = rSh.GetNumberFormatter();
}
- Clear(); // Alle Eintraege in der Listbox entfernen
+ Clear(); // Remove all entries from the Listbox
NfIndexTableOffset eOffsetStart = NF_NUMBER_START;
NfIndexTableOffset eOffsetEnd = NF_NUMBER_START;
@@ -302,7 +302,7 @@
}
}
- // Kein Eintrag gefunden:
+ // No entry found:
double fValue = GetDefValue(nType);
String sValue;
Color* pCol = 0;
@@ -348,7 +348,7 @@
sValue += String(SW_RES(RID_STR_SYSTEM));
}
- nPos = InsertEntry(sValue, nPos); // Als ersten numerischen Eintrag einfuegen
+ nPos = InsertEntry(sValue, nPos); // Insert as first numeric entry
SetEntryData(nPos, (void*)nDefFmt);
SelectEntryPos(nPos);
nDefFormat = GetFormat();
--
To view, visit https://gerrit.libreoffice.org/2157
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie665a8dffc41ee057c0277788282eea96cbbe6a3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matthias Freund <matti_lx@yahoo.de>
Context
- [PATCH] Comment translation - german-english - 3 files · Matthias Freund (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.