soltools/cpp/_macro.c | 3 ++-
sw/source/filter/html/htmlatr.cxx | 2 +-
sw/source/filter/ww8/wrtw8sty.cxx | 4 ++--
sw/source/filter/ww8/ww8scan.cxx | 2 +-
sw/source/ui/dbui/dbinsdlg.cxx | 2 +-
toolkit/source/helper/unopropertyarrayhelper.cxx | 6 +++---
tools/source/stream/stream.cxx | 2 +-
7 files changed, 11 insertions(+), 10 deletions(-)
New commits:
commit 88b0711aa5cda440805fa49f16f7c83ea0b2e292
Author: Christian Barth <christian.ba...@zoho.com>
Date: Thu Aug 10 20:25:35 2017 +0200
tdf#39468: Translate some german comments
Change-Id: Ie9062738de26b44394d4c91b31fab99a7777813f
Signed-off-by: Christian Barth <christian.ba...@zoho.com>
Reviewed-on: https://gerrit.libreoffice.org/40994
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
diff --git a/soltools/cpp/_macro.c b/soltools/cpp/_macro.c
index a5e5b931d431..e8b87d002f4c 100644
--- a/soltools/cpp/_macro.c
+++ b/soltools/cpp/_macro.c
@@ -587,8 +587,9 @@ void
ntp->len + ntp->wslen);
len += ntp->len + ntp->wslen;
}
- else // Leerzeichen um ## herum entfernen:
+ else
{
+ // remove spaces around ##
strncpy((char *) tt + len, (char *) ntp->t, ntp->len);
len += ntp->len;
}
diff --git a/sw/source/filter/html/htmlatr.cxx
b/sw/source/filter/html/htmlatr.cxx
index 2d99f4dabcd3..a7390832ad27 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -2820,7 +2820,7 @@ static Writer& OutHTML_SwUnderline( Writer& rWrt, const
SfxPoolItem& rHt )
}
else if( rHTMLWrt.m_bCfgOutStyles && rHTMLWrt.m_bTextAttr )
{
- // vielleicht als CSS1-Attribut ?
+ // maybe as CSS1 attribute?
OutCSS1_HintSpanTag( rWrt, rHt );
}
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx
b/sw/source/filter/ww8/wrtw8sty.cxx
index a6abde487871..cae1fb75bc5f 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1001,7 +1001,7 @@ MSWordSections::MSWordSections( MSWordExportBase& rExport
)
pFormat = pSectNd->GetSection().GetFormat();
}
- // Hole evtl. Pagedesc des 1. Nodes
+ // Try to get page descriptor of the first node
if ( pSet &&
SfxItemState::SET == pSet->GetItemState( RES_PAGEDESC, true, &pI ) &&
static_cast<const SwFormatPageDesc*>(pI)->GetPageDesc() )
@@ -1901,7 +1901,7 @@ void MSWordExportBase::WriteHeaderFooterText( const
SwFormat& rFormat, bool bHea
{
// there is no Header/Footer, but a CR is still necessary
OSL_ENSURE( pSttIdx, "Header/Footer text is not really present" );
- AttrOutput().EmptyParagraph(); // CR ans Ende ( sonst mault WW )
+ AttrOutput().EmptyParagraph();
}
}
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index cacbf5b54cd5..5d82f5d61706 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -6721,7 +6721,7 @@ struct WW8_FFN_Ver6
sal_Char szFfn[maxStrSize]; // 0x6 bzw. 0x40 ab Ver8 zero terminated
string that
// records name of font.
// Maximal size of szFfn is 65 characters.
- // Vorsicht: Dieses Array kann auch kleiner sein!!!
+ // Attention: This array can also be smaller!!!
// Possibly followed by a second sz which records the
// name of an alternate font to use if the first named
// font does not exist on this system.
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 272d2d6fb3b0..d1ebf8a4360f 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -1001,7 +1001,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const
Sequence<Any>& rSelection,
}
do{ // middle checked loop!!
- if( bAsTable ) // Daten als Tabelle einfuegen
+ if( bAsTable ) // fill in data as table
{
rSh.DoUndo( false );
diff --git a/toolkit/source/helper/unopropertyarrayhelper.cxx
b/toolkit/source/helper/unopropertyarrayhelper.cxx
index d78544c9fb4a..fcae24bc831e 100644
--- a/toolkit/source/helper/unopropertyarrayhelper.cxx
+++ b/toolkit/source/helper/unopropertyarrayhelper.cxx
@@ -66,7 +66,7 @@ sal_Bool UnoPropertyArrayHelper::fillPropertyMembersByHandle(
OUString * pPropNa
css::uno::Sequence< css::beans::Property >
UnoPropertyArrayHelper::getProperties()
{
- // Sortiert nach Namen...
+ // Sort by names ...
std::map<sal_Int32, sal_uInt16> aSortedPropsIds;
for( std::set<sal_Int32>::const_iterator it = maIDs.begin(); it !=
maIDs.end(); ++it)
@@ -76,13 +76,13 @@ css::uno::Sequence< css::beans::Property >
UnoPropertyArrayHelper::getProperties
if ( nId == BASEPROPERTY_FONTDESCRIPTOR )
{
- // Einzelproperties...
+ // single properties ...
for ( sal_uInt16 i = BASEPROPERTY_FONTDESCRIPTORPART_START; i <=
BASEPROPERTY_FONTDESCRIPTORPART_END; i++ )
aSortedPropsIds[ 1+GetPropertyOrderNr( i ) ] = i;
}
}
- sal_uInt32 nProps = aSortedPropsIds.size(); // koennen jetzt mehr sein
+ sal_uInt32 nProps = aSortedPropsIds.size(); // could be more now
css::uno::Sequence< css::beans::Property> aProps( nProps );
css::beans::Property* pProps = aProps.getArray();
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 7658ca86d2da..5dac2b27d163 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -2050,7 +2050,7 @@ namespace
// If set already, skip expensive test
if ( !bConvert )
{
- // Muessen wir Konvertieren
+ // Do we need to convert?
if ( ((eLineEnd != LINEEND_LF) && (rIn[i] == '\n')) ||
((eLineEnd == LINEEND_CRLF) && (i+1) < nStrLen &&
(rIn[i+1] != '\n')) ||
((eLineEnd == LINEEND_LF) &&
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
