[Libreoffice-commits] core.git: package/source sal/textenc sc/source sw/sdi sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Oct 31 13:27:18 UTC 2018
package/source/zipapi/ZipOutputEntry.cxx | 2 +-
sal/textenc/tcvtarb1.tab | 12 ++++++------
sal/textenc/tcvteas1.tab | 4 ++--
sal/textenc/textenc.cxx | 6 +++---
sc/source/core/tool/autoform.cxx | 4 ++--
sc/source/filter/excel/impop.cxx | 2 +-
sc/source/ui/view/gridwin.cxx | 2 +-
sw/sdi/_annotsh.sdi | 2 +-
sw/sdi/_tabsh.sdi | 2 +-
sw/sdi/_textsh.sdi | 4 ++--
sw/source/filter/ww8/wrtww8.cxx | 2 +-
sw/source/filter/ww8/ww8scan.cxx | 4 ++--
sw/source/filter/ww8/ww8struc.hxx | 2 +-
13 files changed, 24 insertions(+), 24 deletions(-)
New commits:
commit 2a06d78483db77aab28eaa522791bb4d96a4094e
Author: Johnny_M <klasse at partyheld.de>
AuthorDate: Tue Oct 30 21:03:57 2018 +0100
Commit: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Wed Oct 31 14:26:51 2018 +0100
Translate German comments
Change-Id: I94cdb753d01dfd0d5b8f78ede1819b281b840ab2
Reviewed-on: https://gerrit.libreoffice.org/62669
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
diff --git a/package/source/zipapi/ZipOutputEntry.cxx b/package/source/zipapi/ZipOutputEntry.cxx
index 5aa16a0738a5..79f2bdbbd974 100644
--- a/package/source/zipapi/ZipOutputEntry.cxx
+++ b/package/source/zipapi/ZipOutputEntry.cxx
@@ -233,7 +233,7 @@ void ZipOutputEntry::doDeflate()
{
m_xOutStream->writeBytes( aEncryptionBuffer );
- // the sizes as well as checksum for encrypted streams is calculated hier
+ // the sizes as well as checksum for encrypted streams are calculated here
m_pCurrentEntry->nCompressedSize += aEncryptionBuffer.getLength();
m_pCurrentEntry->nSize = m_pCurrentEntry->nCompressedSize;
m_aCRC.update( aEncryptionBuffer );
diff --git a/sal/textenc/tcvtarb1.tab b/sal/textenc/tcvtarb1.tab
index 86af2ae83ce6..f7b0ce945965 100644
--- a/sal/textenc/tcvtarb1.tab
+++ b/sal/textenc/tcvtarb1.tab
@@ -30,7 +30,7 @@
/* IBM-862 */
/* Dos Standard CharSet for Hebrew */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
+/* 1-Byte, 0x00-0x7F ASCII without exception */
/* Convert-Tables: mappings/vendors/micsft/pc/cp862.txt from 04/24/96 Version 2.00 */
/* Last-Changes from us: */
@@ -225,7 +225,7 @@ static ImplTextEncodingData const aImplIBM862TextEncodingData
/* IBM-864 */
/* Dos Standard CharSet for Arabic */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
+/* 1-Byte, 0x00-0x7F ASCII without exception */
/* Convert-Tables: mappings/vendors/micsft/pc/cp864.txt from 04/24/96 Version 2.00 */
/* Last-Changes from us: */
@@ -383,7 +383,7 @@ static ImplTextEncodingData const aImplIBM864TextEncodingData
/* MS-1255 */
/* Windows Standard CharSet for Hebrew */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
+/* 1-Byte, 0x00-0x7F ASCII without exception */
/* Convert-Tables: mappings/vendors/micsft/windows/cp1255.txt from 04/15/98 Version 2.01 */
/* Last-Changes from us: */
@@ -536,7 +536,7 @@ static ImplTextEncodingData const aImplMS1255TextEncodingData
/* MS-1256 */
/* Windows Standard CharSet for Arabic */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
+/* 1-Byte, 0x00-0x7F ASCII without exception */
/* Convert-Tables: mappings/vendors/micsft/windows/cp1256.txt from 01/5/99 Version 2.01 */
/* ----------------------------------------------------------------------- */
@@ -714,7 +714,7 @@ static ImplTextEncodingData const aImplMS1256TextEncodingData
/* ISO-8859-6 */
/* Unix Standard for Arabic */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme, 0x80-0x9F Control-Caracter wie in Unicode */
+/* 1-Byte, 0x00-0x7F ASCII without exception, 0x80-0x9F control character like in Unicode */
/* Convert-Tables: mappings/iso8859/8859-6.txt from 07/27/99 Version 1.0 (based on Unicode 3.0) */
/* Last-Changes from us: */
/* !!! 0x30-0x39 are Arabic numbers and should normally be mapped to 0x0660-0x0669 !!! */
@@ -815,7 +815,7 @@ static ImplTextEncodingData const aImplISO88596TextEncodingData
/* ISO-8859-8 */
/* Unix Standard for Hebrew */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme, 0x80-0x9F Control-Caracter wie in Unicode */
+/* 1-Byte, 0x00-0x7F ASCII without exception, 0x80-0x9F control character like in Unicode */
/* Convert-Tables: mappings/iso8859/8859-8.txt from 2000-Jan-03 Version 1.1 (based on Unicode 3.0) */
#define ISO88598UNI_START 0xA0
diff --git a/sal/textenc/tcvteas1.tab b/sal/textenc/tcvteas1.tab
index fd4ca1b2ada4..c65188a69009 100644
--- a/sal/textenc/tcvteas1.tab
+++ b/sal/textenc/tcvteas1.tab
@@ -30,7 +30,7 @@
/* MS-874 */
/* Windows/Dos Standard CharSet for Thai */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
+/* 1-Byte, 0x00-0x7F ASCII without exception */
/* Convert-Tables: mappings/vendors/micsft/pc/cp874.txt from 04/15/98 Version 2.00 */
/* Last-Changes from us: */
@@ -191,7 +191,7 @@ static ImplTextEncodingData const aImplTis620TextEncodingData
/* MS-1258 */
/* Windows Standard CharSet for Vietnamease */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
+/* 1-Byte, 0x00-0x7F ASCII without exception */
/* Convert-Tables: mappings/vendors/micsft/windows/cp1258.txt from 04/15/98 Version 2.01 */
/* Last-Changes from us: */
diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx
index ded8815a4e97..4f5923d44fde 100644
--- a/sal/textenc/textenc.cxx
+++ b/sal/textenc/textenc.cxx
@@ -89,7 +89,7 @@ static unsigned char const aImplA0FFSameToCharTab[SAMEA0FFCHAR_END
/* MS-1252 */
/* Windows Standard CharSet (ANSI) for Western Script */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
+/* 1-Byte, 0x00-0x7F ASCII without exception */
/* Convert-Tables: mappings/vendors/micsft/windows/cp1252.txt from 04/15/98 Version 2.01 */
/* Last-Changes from us: */
@@ -194,7 +194,7 @@ static ImplTextEncodingData const aImplMS1252TextEncodingData
/* ISO-8859-1 */
/* Unix Standard CharSet (Latin1) for Western Script */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme, 0x80-0x9F Control-Caracter wie in Unicode */
+/* 1-Byte, 0x00-0x7F ASCII without exception, 0x80-0x9F control character like in Unicode */
/* Convert-Tables: mappings/iso8859/8859-1.txt from 07/27/99 Version 1.0 (based on Unicode 3.0) */
/* Last-Changes from us: */
@@ -259,7 +259,7 @@ static ImplTextEncodingData const aImplISO88591TextEncodingData
/* US-ASCII */
/* 7-Bit ASCII */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
+/* 1-Byte, 0x00-0x7F ASCII without exception */
/* For the import we use ISO-8859-1 with MS extension (MS-1252), because */
/* when the 8-Bit is set, the chance, that this is a ISO-8859-1 character */
/* is the greatest. For the export all chars greater than 127 are not */
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index 0a5e7f48c70c..008e570bb61f 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -422,7 +422,7 @@ bool ScAutoFormatDataField::Save( SvStream& rStream, sal_uInt16 fileVersion )
aOrientation.Store ( rStream, aOrientation.GetVersion( fileVersion ) );
aMargin.Store ( rStream, aMargin.GetVersion( fileVersion ) );
aLinebreak.Store ( rStream, aLinebreak.GetVersion( fileVersion ) );
- // Rotation ab SO5
+ // rotation from SO5 on
aRotateAngle.Store ( rStream, aRotateAngle.GetVersion( fileVersion ) );
aRotateMode.Store ( rStream, aRotateMode.GetVersion( fileVersion ) );
@@ -1058,7 +1058,7 @@ void ScAutoFormat::Load()
if( nVal == AUTOFORMAT_ID_358 || nVal == AUTOFORMAT_ID_X ||
(AUTOFORMAT_ID_504 <= nVal && nVal <= AUTOFORMAT_ID) )
{
- m_aVersions.Load( rStream, nVal ); // Item-Versionen
+ m_aVersions.Load( rStream, nVal ); // item versions
ScAutoFormatData* pData;
sal_uInt16 nCnt = 0;
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index 9394585e6920..c1def39c146d 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -135,7 +135,7 @@ ImportExcel::ImportExcel( XclImpRootData& rImpData, SvStream& rStrm ):
pOutlineListBuffer.reset(new XclImpOutlineListBuffer);
- // ab Biff8
+ // from Biff8 on
pFormConv.reset(new ExcelToSc( GetRoot() ));
pExcRoot->pFmlaConverter = pFormConv.get();
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 00a83cd77b00..20e5be4093a0 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5539,7 +5539,7 @@ bool ScGridWindow::ContinueOnlineSpelling()
pEngine->SetControlWord(
pEngine->GetControlWord() | (EEControlBits::ONLINESPELLING | EEControlBits::ALLOWBIGOBJS));
pEngine->SetStatusEventHdl(LINK(&aStatus, SpellCheckStatus, EventHdl));
- // Delimiters hier wie in inputhdl.cxx !!!
+ // Delimiters here like in inputhdl.cxx !!!
pEngine->SetWordDelimiters(
ScEditUtil::ModifyDelimiters(pEngine->GetWordDelimiters()));
diff --git a/sw/sdi/_annotsh.sdi b/sw/sdi/_annotsh.sdi
index e271625bcdd8..323d5d06b8b1 100644
--- a/sw/sdi/_annotsh.sdi
+++ b/sw/sdi/_annotsh.sdi
@@ -468,7 +468,7 @@ interface _Annotation
ExecMethod = ExecSearch ;
DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
]
- // ab hier Export = FALSE;
+ // from here on Export = FALSE;
FID_SEARCH_ON // status()
[
ExecMethod = ExecSearch ;
diff --git a/sw/sdi/_tabsh.sdi b/sw/sdi/_tabsh.sdi
index 6b89dea2438b..9cb65cd4d276 100644
--- a/sw/sdi/_tabsh.sdi
+++ b/sw/sdi/_tabsh.sdi
@@ -410,7 +410,7 @@ interface BaseTextTable
StateMethod = NoState ;
DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
]
-// Slots ohne Export
+// Slots without export
FN_INSERT_TABLE
[
diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index fbd946ca8494..463738966dea 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -987,8 +987,8 @@ interface BaseText
ExecMethod = ExecField ;
StateMethod = StateField;
]
- // Slots mit Export = FALSE
- //Slots ohne Export
+ // slots with Export = FALSE
+ //Slots without export
FN_CHAR_LEFT_SEL
[
ExecMethod = ExecBasicMove ;
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index b415dfb6cc55..f1fd65a86873 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3271,7 +3271,7 @@ bool SwWW8Writer::InitStd97CodecUpdateMedium( ::msfilter::MSCodec_Std97& rCodec
mpMedium->GetItemSet()->ClearItem( SID_PASSWORD );
}
- // nonempty encryption data means hier that the codec was successfully initialized
+ // nonempty encryption data means here that the codec was successfully initialized
return ( aEncryptionData.getLength() != 0 );
}
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 569912912c0d..ca4903521f03 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -7027,7 +7027,7 @@ struct WW8_FFN_Ver6
{
WW8_FFN_BASE base;
// from Ver6
- sal_Char szFfn[maxStrSize]; // 0x6 bzw. 0x40 ab Ver8 zero terminated string that
+ sal_Char szFfn[maxStrSize]; // 0x6 or 0x40 from Ver8 on zero terminated string that
// records name of font.
// Maximal size of szFfn is 65 characters.
// Attention: This array can also be smaller!!!
@@ -7043,7 +7043,7 @@ struct WW8_FFN_Ver8 : public WW8_FFN_BASE
sal_Char fs[ 24 ]; // 0x10 FONTSIGNATURE
// from Ver8 as unicode
- sal_uInt16 szFfn[65]; // 0x6 bzw. 0x40 ab Ver8 zero terminated string that
+ sal_uInt16 szFfn[65]; // 0x6 from 0x40 on Ver8 zero terminated string that
// records name of font.
// Maximal size of szFfn is 65 characters.
// Attention: This array can be smaller!!!
diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx
index 2d9fdb164810..f14ee98e868e 100644
--- a/sw/source/filter/ww8/ww8struc.hxx
+++ b/sw/source/filter/ww8/ww8struc.hxx
@@ -197,7 +197,7 @@ static_assert(sizeof (WW8_STD) == 10, "this has to match the msword size");
/** base for reading AND working on (will have different subclasses */
struct WW8_FFN_BASE // Font Descriptor
{
- // ab Ver6
+ // from Ver6 on
sal_uInt8 cbFfnM1; // 0x0 total length of FFN - 1.
sal_uInt8 prg: 2; // 0x1:03 pitch request
More information about the Libreoffice-commits
mailing list