sw/source/filter/html/css1atr.cxx | 14 +++++++-------
sw/source/filter/html/htmlfld.cxx | 23 +++++++++++------------
sw/source/filter/writer/writer.cxx | 2 +-
3 files changed, 19 insertions(+), 20 deletions(-)
New commits:
commit ed831436cdc4513add55324a9cd2c125e8bb7f2e
Author: Jens Carl <j.car...@gmx.de>
Date: Sat Apr 29 05:03:59 2017 +0000
tdf#39468: Translate German comments in sw
Translate German comments and terms in:
sw/source/filter/html/css1atr.cxx
sw/source/filter/html/htmlfld.cxx
sw/source/filter/writer/writer.cxx
Change-Id: I05228ea5369e0d1e7f06158dc5369ba89284c2c9
Reviewed-on: https://gerrit.libreoffice.org/37093
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
diff --git a/sw/source/filter/html/css1atr.cxx
b/sw/source/filter/html/css1atr.cxx
index 8f5aa484af96..c67fcb8ec292 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -69,7 +69,7 @@
#include <viewsh.hxx>
#include <viewopt.hxx>
#include <swtable.hxx>
-// OTES
+// NOTES
#include <ftninfo.hxx>
#include <ftnidx.hxx>
#include <txtftn.hxx>
@@ -1654,7 +1654,7 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const
SwPageDesc& rPageDesc,
&aSelector );
// Size: If the only difference is the Landscape-Flag,
- // only export Portrait oder Landscape. Otherwise export size.
+ // only export Portrait or Landscape. Otherwise export size.
bool bRefLandscape = pRefPageDesc && pRefPageDesc->GetLandscape();
Size aRefSz;
const Size& rSz = rPageDesc.GetMaster().GetFrameSize().GetSize();
@@ -2876,7 +2876,7 @@ static Writer& OutCSS1_SwFormatFrameSize( Writer& rWrt,
const SfxPoolItem& rHt,
bOutHeight = bool(nMode & Css1FrameSize::VarHeight);
break;
default:
- OSL_ENSURE( bOutHeight, "Hoehe wird nicht exportiert" );
+ OSL_ENSURE( bOutHeight, "Height will not be exported" );
break;
}
@@ -3504,9 +3504,9 @@ static SwAttrFnTab const aCSS1AttrFnTab = {
/* RES_CHRATR_WORDLINEMODE */ nullptr,
/* RES_CHRATR_AUTOKERN */ nullptr,
/* RES_CHRATR_BLINK */ OutCSS1_SvxBlink,
-/* RES_CHRATR_NOHYPHEN */ nullptr, // Neu: nicht trennen
-/* RES_CHRATR_NOLINEBREAK */ nullptr, // Neu: nicht umbrechen
-/* RES_CHRATR_BACKGROUND */ OutCSS1_SvxBrush, // Neu:
Zeichenhintergrund
+/* RES_CHRATR_NOHYPHEN */ nullptr, // new: don't separate
+/* RES_CHRATR_NOLINEBREAK */ nullptr, // new: don't wrap
+/* RES_CHRATR_BACKGROUND */ OutCSS1_SvxBrush, // new: character
background
/* RES_CHRATR_CJK_FONT */ OutCSS1_SvxFont,
/* RES_CHRATR_CJK_FONTSIZE */ OutCSS1_SvxFontHeight,
/* RES_CHRATR_CJK_LANGUAGE */ OutCSS1_SvxLanguage,
@@ -3559,7 +3559,7 @@ static SwAttrFnTab const aCSS1AttrFnTab = {
/* RES_PARATR_TABSTOP */ nullptr,
/* RES_PARATR_HYPHENZONE*/ nullptr,
/* RES_PARATR_DROP */ OutCSS1_SwFormatDrop,
-/* RES_PARATR_REGISTER */ nullptr, // neu: Registerhaltigkeit
+/* RES_PARATR_REGISTER */ nullptr, // new: register-true
/* RES_PARATR_NUMRULE */ nullptr,
/* RES_PARATR_SCRIPTSPACE */ nullptr,
/* RES_PARATR_HANGINGPUNCTUATION */ nullptr,
diff --git a/sw/source/filter/html/htmlfld.cxx
b/sw/source/filter/html/htmlfld.cxx
index b5ef5f9be9fe..f1286dce22b2 100644
--- a/sw/source/filter/html/htmlfld.cxx
+++ b/sw/source/filter/html/htmlfld.cxx
@@ -251,10 +251,9 @@ void SwHTMLParser::NewField()
if( !bKnownType )
return;
- // Autor und Absender werden nur als als variables Feld eingefuegt,
- // wenn man das Dok selbst als letztes geaendert hat oder es noch
- // niemend geandert hat und man das Dok erstellt hat. Sonst
- // wird ein Fixed-Feld daraus gemacht.
+ // Author and sender are only inserted as a variable field if the document
+ // was last changed by ourself or nobody changed it and it was created
+ // by ourself. Otherwise it will be a fixed field.
if( !bFixed &&
(SwFieldIds::ExtUser == nType ||
SwFieldIds::Author == nType) )
@@ -536,25 +535,25 @@ void SwHTMLParser::EndField()
{
case SwFieldIds::DocInfo:
OSL_ENSURE( static_cast<SwDocInfoField*>(m_pField)->IsFixed(),
- "DokInfo-Feld haette nicht gemerkt werden muessen" );
+ "Field DocInfo should not have been saved" );
static_cast<SwDocInfoField*>(m_pField)->SetExpansion( m_aContents
);
break;
case SwFieldIds::ExtUser:
OSL_ENSURE( static_cast<SwExtUserField*>(m_pField)->IsFixed(),
- "ExtUser-Feld haette nicht gemerkt werden muessen" );
+ "Field ExtUser should not have been saved" );
static_cast<SwExtUserField*>(m_pField)->SetExpansion( m_aContents
);
break;
case SwFieldIds::Author:
OSL_ENSURE( static_cast<SwAuthorField*>(m_pField)->IsFixed(),
- "Author-Feld haette nicht gemerkt werden muessen" );
+ "Field Author should not have been saved" );
static_cast<SwAuthorField*>(m_pField)->SetExpansion( m_aContents );
break;
case SwFieldIds::Filename:
OSL_ENSURE( static_cast<SwFileNameField*>(m_pField)->IsFixed(),
- "FileName-Feld haette nicht gemerkt werden muessen" );
+ "Field FileName should not have been saved" );
static_cast<SwFileNameField*>(m_pField)->SetExpansion( m_aContents
);
break;
default: break;
@@ -573,7 +572,7 @@ void SwHTMLParser::InsertFieldText()
{
if( m_pField )
{
- // das aktuelle Textstueck an den Text anhaengen
+ // append the current text part to the text
m_aContents += aToken;
}
}
@@ -602,9 +601,9 @@ void SwHTMLParser::InsertComment( const OUString& rComment,
const sal_Char *pTag
aComment += ">";
}
- // MIB 24.06.97: Wenn ein PostIt nach einen Space eingefuegt
- // werden soll, fuegen wir es vor dem Space ein. Dann gibt es
- // weniger Probleme beim Formatieren (bug #40483#)
+ // MIB 24.06.97: If a PostIt should be insert after a space, we
+ // will insert before the space. Then there are less problems
+ // during formatting. (bug #40483#)
const sal_Int32 nPos = m_pPam->GetPoint()->nContent.GetIndex();
SwTextNode *pTextNd = m_pPam->GetNode().GetTextNode();
bool bMoveFwd = false;
diff --git a/sw/source/filter/writer/writer.cxx
b/sw/source/filter/writer/writer.cxx
index 0872179801cb..21935dabe1f6 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -445,7 +445,7 @@ void Writer::CreateBookmarkTable()
}
}
-// search alle Bookmarks in the range and return it in the Array
+// search all Bookmarks in the range and return it in the Array
bool Writer::GetBookmarks(const SwContentNode& rNd, sal_Int32 nStt,
sal_Int32 nEnd, std::vector< const ::sw::mark::IMark* >& rArr)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
