[Libreoffice-commits] core.git: idl/source include/comphelper include/connectivity include/drawinglayer include/editeng include/filter include/formula include/rsc include/sfx2 include/sot include/svl include/svtools include/svx include/vcl
Johnny_M
klasse at partyheld.de
Tue Jun 6 11:52:16 UTC 2017
idl/source/objects/object.cxx | 2 +-
include/comphelper/classids.hxx | 16 ++++++++--------
include/connectivity/dbtools.hxx | 2 +-
include/drawinglayer/primitive2d/cropprimitive2d.hxx | 2 +-
include/editeng/editrids.hrc | 2 +-
include/editeng/lrspitem.hxx | 2 +-
include/filter/msfilter/escherex.hxx | 4 ++--
include/formula/formdata.hxx | 2 +-
include/rsc/rsc-vcl-shared-types.hxx | 4 ++--
include/sfx2/basedlgs.hxx | 2 +-
include/sot/filelist.hxx | 6 +++---
include/svl/filerec.hxx | 2 +-
include/svtools/brwbox.hxx | 2 +-
include/svtools/ctrltool.hxx | 2 +-
include/svtools/imappoly.hxx | 4 ++--
include/svtools/inetimg.hxx | 2 +-
include/svtools/parrtf.hxx | 4 ++--
include/svx/gridctrl.hxx | 2 +-
include/svx/svdtypes.hxx | 2 +-
include/svx/svdview.hxx | 2 +-
include/svx/svxitems.hrc | 6 +++---
include/vcl/keycodes.hxx | 4 ++--
include/vcl/seleng.hxx | 2 +-
include/vcl/textview.hxx | 4 ++--
include/vcl/window.hxx | 2 +-
25 files changed, 42 insertions(+), 42 deletions(-)
New commits:
commit c6f4fd1942ddecab8485f19fa53faf1eda3a5667
Author: Johnny_M <klasse at partyheld.de>
Date: Sun Jun 4 16:44:43 2017 +0200
tdf#39468 Translate German comments and dbg strings (leftovers in h.. to i..)
Translates all (leftovers) found using a custom regex, in directories not shown by
/bin/find-german-comments and beginning with "h" to "i".
Additionally:
- Fixed a few spellings
Change-Id: I54ea06f8e0cf1bd4bd6c84b171bec1bd342a8df8
Reviewed-on: https://gerrit.libreoffice.org/38390
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index 8beb1071b84b..1efd70bb35a5 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -102,7 +102,7 @@ bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
{
if ( !rAttr.GetRef() && dynamic_cast<const SvMetaSlot *>(&rAttr) )
{
- SAL_WARN( "idl", "Neuer Slot : " << rAttr.GetSlotId().getString() );
+ SAL_WARN( "idl", "new slot : " << rAttr.GetSlotId().getString() );
}
for( sal_uLong n = 0; n < aAttrList.size(); n++ )
diff --git a/include/comphelper/classids.hxx b/include/comphelper/classids.hxx
index 4634cf72667a..4c345b84bf93 100644
--- a/include/comphelper/classids.hxx
+++ b/include/comphelper/classids.hxx
@@ -59,7 +59,7 @@
0xf616b81f, 0x7bb8, 0x4f22, 0xb8, 0xa5, 0x47, \
0x42, 0x8d, 0x59, 0xf8, 0xad
-/* aktuell */
+/* current */
#define SO3_SW_CLASSID SO3_SW_CLASSID_60
@@ -73,7 +73,7 @@
0xA8BBA60C, 0x7C60, 0x4550, 0x91, 0xCE, 0x39, \
0xC3, 0x90, 0x3F, 0xAC, 0x5E
-/* aktuell */
+/* current */
#define SO3_SWWEB_CLASSID SO3_SWWEB_CLASSID_60
@@ -87,7 +87,7 @@
0xB21A0A7C, 0xE403, 0x41FE, 0x95, 0x62, 0xBD, \
0x13, 0xEA, 0x6F, 0x15, 0xA0
-/* aktuell */
+/* current */
#define SO3_SWGLOB_CLASSID SO3_SWGLOB_CLASSID_60
@@ -132,7 +132,7 @@
0x7fa8ae11, 0xb3e3, 0x4d88, 0xaa, 0xbf, 0x25, \
0x55, 0x26, 0xcd, 0x1c, 0xe8
-/* aktuell */
+/* current */
#define SO3_SC_CLASSID SO3_SC_CLASSID_60
@@ -176,7 +176,7 @@
0xee5d1ea4, 0xd445, 0x4289, 0xb2, 0xfc, 0x55, \
0xfc, 0x93, 0x69, 0x39, 0x17
-/* aktuell */
+/* current */
#define SO3_SIMPRESS_CLASSID SO3_SIMPRESS_CLASSID_60
@@ -207,7 +207,7 @@
0x448bb771, 0xcfe2, 0x47c4, 0xbc, 0xdf, 0x1f, \
0xbf, 0x37, 0x8e, 0x20, 0x2c
-/* aktuell */
+/* current */
#define SO3_SDRAW_CLASSID SO3_SDRAW_CLASSID_60
@@ -251,7 +251,7 @@
0xdd0a57f, 0xcf3b, 0x4fd2, 0xbd, 0xa4, 0x94, \
0x42, 0x71, 0x9b, 0x2a, 0x73
-/* aktuell */
+/* current */
#define SO3_SCH_CLASSID SO3_SCH_CLASSID_60
@@ -301,7 +301,7 @@
0xd2d59cd1, 0xa6a, 0x4d36, 0xae, 0x20, 0x47, \
0x81, 0x70, 0x77, 0xd5, 0x7c
-/* aktuell */
+/* current */
#define SO3_SM_CLASSID SO3_SM_CLASSID_60
diff --git a/include/connectivity/dbtools.hxx b/include/connectivity/dbtools.hxx
index 93fad78229a6..7f4719bd41c8 100644
--- a/include/connectivity/dbtools.hxx
+++ b/include/connectivity/dbtools.hxx
@@ -113,7 +113,7 @@ namespace dbtools
The function tries to obtain a connection for the row set with the following
steps (in this order):
<nl>
- <li>If the rowset already has an ActiveConnection (means a non-<NULL/> value vor this property),
+ <li>If the rowset already has an ActiveConnection (means a non-<NULL/> value for this property),
this one is used.</li>
<li>If row set is part of a database form document (see ->isEmbeddedInDatabase),
a connection for the respective database is used.</li>
diff --git a/include/drawinglayer/primitive2d/cropprimitive2d.hxx b/include/drawinglayer/primitive2d/cropprimitive2d.hxx
index 9a71e9c4176d..cf1dcaca04a9 100644
--- a/include/drawinglayer/primitive2d/cropprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/cropprimitive2d.hxx
@@ -42,7 +42,7 @@ namespace drawinglayer
Thus a transformation has to be calculated which will be applied
to the already exsisting content to get it to the uncropped state
- ans then this is masked with the current state (mask polygon
+ and then this is masked with the current state (mask polygon
created from unit polygon and maTransformation).
At least in this primitive the units of the crop values are
diff --git a/include/editeng/editrids.hrc b/include/editeng/editrids.hrc
index a281d1814207..f88f0d0c00a3 100644
--- a/include/editeng/editrids.hrc
+++ b/include/editeng/editrids.hrc
@@ -372,7 +372,7 @@
#define RID_DASH_DOT_DOT (RID_EDIT_START + 331)
#if 331 > (RID_EDIT_END-RID_EDIT_START)
-#error Resource-Ueberlauf in #line, #file
+#error Resource overflow in #line, #file
#endif
#endif
diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx
index eea64a7d0ec3..82b2e3c57a40 100644
--- a/include/editeng/lrspitem.hxx
+++ b/include/editeng/lrspitem.hxx
@@ -90,7 +90,7 @@ public:
virtual void ScaleMetrics( long nMult, long nDiv ) override;
virtual bool HasMetrics() const override;
- // Die "Layout-Schnittstelle":
+ // The "layout interface":
inline void SetLeft ( const long nL, const sal_uInt16 nProp = 100 );
inline void SetRight( const long nR, const sal_uInt16 nProp = 100 );
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx
index 4486ceb34e58..47845d2391e5 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -515,7 +515,7 @@ class EscherBlibEntry
protected:
sal_uInt32 mnIdentifier[ 4 ];
- sal_uInt32 mnPictureOffset; // offset to the graphic im PictureStreams
+ sal_uInt32 mnPictureOffset; // offset to the graphic in PictureStreams
sal_uInt32 mnSize; // size of real graphic
sal_uInt32 mnRefCount; // !! reference count
@@ -1094,7 +1094,7 @@ public:
void ReplacePersistOffset( sal_uInt32 nKey, sal_uInt32 nOffset );
sal_uInt32 GetPersistOffset( sal_uInt32 nKey );
bool SeekToPersistOffset( sal_uInt32 nKey );
- void InsertAtPersistOffset( sal_uInt32 nKey, sal_uInt32 nValue ); // nValue is being inserted into the Stream where it's appropriate (overwrite modus), without that the
+ void InsertAtPersistOffset( sal_uInt32 nKey, sal_uInt32 nValue ); // nValue is being inserted into the Stream where it's appropriate (overwrite mode), without that the
// current StreamPosition changes
void SetEditAs( const OUString& rEditAs );
const OUString& GetEditAs() { return mEditAs; }
diff --git a/include/formula/formdata.hxx b/include/formula/formdata.hxx
index 9fce5d6e54d2..8bd274c8827b 100644
--- a/include/formula/formdata.hxx
+++ b/include/formula/formdata.hxx
@@ -59,7 +59,7 @@ protected:
FormEditData( const FormEditData& );
FormEditData& operator=( const FormEditData& r );
- FormEditData* pParent; // fuer Verschachtelung
+ FormEditData* pParent; // for nesting
private:
sal_uInt16 nMode; // enum ScFormulaDlgMode
sal_Int32 nFStart;
diff --git a/include/rsc/rsc-vcl-shared-types.hxx b/include/rsc/rsc-vcl-shared-types.hxx
index 1091e6432c39..bc943b078fb9 100644
--- a/include/rsc/rsc-vcl-shared-types.hxx
+++ b/include/rsc/rsc-vcl-shared-types.hxx
@@ -109,7 +109,7 @@ enum class SymbolType : sal_uInt16
};
-// Border-Styles fuer SetBorder()
+// Border styles for SetBorder()
enum class WindowBorderStyle : sal_Int16
{
NONE = 0x0000,
@@ -127,7 +127,7 @@ namespace o3tl
#define KEY_CODE_MASK ((sal_uInt16)0x0FFF)
-// Modifier-Tasten
+// Modifier keys
#define KEY_SHIFT ((sal_uInt16)0x1000)
#define KEY_MOD1 ((sal_uInt16)0x2000)
#define KEY_MOD2 ((sal_uInt16)0x4000)
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index a83ae7909c9b..c92fedf434e8 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -160,7 +160,7 @@ struct SingleTabDlgImpl
SingleTabDlgImpl();
};
-typedef const sal_uInt16* (*GetTabPageRanges)(); // liefert internationale Which-Werte
+typedef const sal_uInt16* (*GetTabPageRanges)(); // provides international Which values
class SFX2_DLLPUBLIC SfxSingleTabDialog : public SfxModalDialog
{
diff --git a/include/sot/filelist.hxx b/include/sot/filelist.hxx
index e12fb363f63d..d8895644e4ae 100644
--- a/include/sot/filelist.hxx
+++ b/include/sot/filelist.hxx
@@ -31,15 +31,15 @@ class SOT_DLLPUBLIC FileList
private:
- // Liste loeschen;
+ // delete list
void clear() { aStrList.clear(); }
public:
- // Im-/Export
+ // import/export
SOT_DLLPUBLIC friend SvStream& ReadFileList( SvStream& rIStm, FileList& rFileList );
- // Liste fuellen/abfragen
+ // fill in / interrogate list
void AppendFile( const OUString& rStr );
OUString GetFile( size_t i ) const;
size_t Count() const;
diff --git a/include/svl/filerec.hxx b/include/svl/filerec.hxx
index a26dc6a68aeb..904b2d2e3e04 100644
--- a/include/svl/filerec.hxx
+++ b/include/svl/filerec.hxx
@@ -213,7 +213,7 @@ private:
* @par Extensions
* Plans are to extend the file format in such a way that the high nibble
* of the record type has special duties. For instance it is planned
- * to mark Record-Contents als 'consisting only of Records'. That way
+ * to mark Record-Contents as 'consisting only of Records'. That way
* a file viewer could automatically parse these structures without
* risking encountering data that looks like records, but actually is
* flat data. Those further extensions are prepared to the extent
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 0617373ba52e..053d7dcc24c9 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -407,7 +407,7 @@ public:
virtual sal_Int8 AcceptDrop( const BrowserAcceptDropEvent& rEvt );
virtual sal_Int8 ExecuteDrop( const BrowserExecuteDropEvent& rEvt );
- // neue Handler
+ // new handlers
virtual void MouseButtonDown( const BrowserMouseEvent& rEvt );
virtual void MouseButtonUp( const BrowserMouseEvent& rEvt );
void StartScroll();
diff --git a/include/svtools/ctrltool.hxx b/include/svtools/ctrltool.hxx
index 8527e456023d..3b11eac75e36 100644
--- a/include/svtools/ctrltool.hxx
+++ b/include/svtools/ctrltool.hxx
@@ -68,7 +68,7 @@ the printer. Because if two different device fonts (one for the printer and
one for the screen) exist, the ones from the "pDevice" are preferred.
The third parameter governs whether only scalable or all fonts shall be queried.
-With sal_True Bitmap-Schriften will also be queried.
+With sal_True bitmap fonts will also be queried.
With sal_False vectorized and scalable fonts will be queried.
--------------------------------------------------------------------------
diff --git a/include/svtools/imappoly.hxx b/include/svtools/imappoly.hxx
index fd2c52221b3f..088cf9760deb 100644
--- a/include/svtools/imappoly.hxx
+++ b/include/svtools/imappoly.hxx
@@ -36,7 +36,7 @@ class SVT_DLLPUBLIC IMapPolygonObject : public IMapObject
protected:
- // Binaer-Im-/Export
+ // binary import/export
virtual void WriteIMapObject( SvStream& rOStm ) const override;
virtual void ReadIMapObject( SvStream& rIStm ) override;
@@ -65,7 +65,7 @@ public:
using IMapObject::IsEqual;
bool IsEqual( const IMapPolygonObject& rEqObj );
- // Im-/Export
+ // import/export
void WriteCERN( SvStream& rOStm ) const;
void WriteNCSA( SvStream& rOStm ) const;
};
diff --git a/include/svtools/inetimg.hxx b/include/svtools/inetimg.hxx
index 1acee86b5d95..f173f7bc72e7 100644
--- a/include/svtools/inetimg.hxx
+++ b/include/svtools/inetimg.hxx
@@ -49,7 +49,7 @@ public:
const OUString& GetTargetURL() const { return aTargetURL; }
const OUString& GetTargetFrame() const { return aTargetFrame; }
- // Im-/Export
+ // import/export
void Write( SvStream& rOStm, SotClipboardFormatId nFormat ) const;
bool Read( SvStream& rIStm, SotClipboardFormatId nFormat );
};
diff --git a/include/svtools/parrtf.hxx b/include/svtools/parrtf.hxx
index 0e870f685c89..cd846e6f2294 100644
--- a/include/svtools/parrtf.hxx
+++ b/include/svtools/parrtf.hxx
@@ -63,9 +63,9 @@ protected:
public:
SvRTFParser( SvStream& rIn, sal_uInt8 nStackSize = 3 );
- virtual SvParserState CallParser() override; // Aufruf des Parsers
+ virtual SvParserState CallParser() override; // calling the parser
- // fuers asynchrone lesen aus dem SvStream
+ // for asynchronous read from the SvStream
virtual void Continue( int nToken ) override;
};
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index 5a49a5835255..0af05ee18ce9 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -185,7 +185,7 @@ public:
friend class NavigationBar::AbsolutePos;
- // zusaetzliche Controls
+ // additional controls
VclPtr<FixedText> m_aRecordText;
VclPtr<AbsolutePos> m_aAbsolute; // absolute positioning
VclPtr<FixedText> m_aRecordOf;
diff --git a/include/svx/svdtypes.hxx b/include/svx/svdtypes.hxx
index bf8e00005bb3..e3edbcc41511 100644
--- a/include/svx/svdtypes.hxx
+++ b/include/svx/svdtypes.hxx
@@ -68,7 +68,7 @@ constexpr SdrLayerID SDRLAYER_NOTFOUND(0xff);
*/
enum class SdrObjListKind {
Unknown = 0x00,
- // reine Objektlisten:
+ // pure object lists:
GroupObj = 0x01,
// Here is space for 12 more types of lists
// Pages:
diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx
index 10f527735334..8351f7228187 100644
--- a/include/svx/svdview.hxx
+++ b/include/svx/svdview.hxx
@@ -176,7 +176,7 @@ public:
// to implement it yourself. Example for MouseButtonDown:
// SdrViewEvent aVEvt;
// SdrHitKind eHit=pSdrView->PickAnything(rMEvt,SdrMouseEventKind::BUTTONDOWN,aVEvt);
- // ... hier Applikationsspezifischer Eingriff ...
+ // ... here application-specific intervention ...
// pSdrView->DoMouseEvent(aVEvt);
// SetPointer(GetPreferredPointer(...))
// CaptureMouse(...)
diff --git a/include/svx/svxitems.hrc b/include/svx/svxitems.hrc
index 0ee3a67e476e..1870806f5c90 100644
--- a/include/svx/svxitems.hrc
+++ b/include/svx/svxitems.hrc
@@ -28,7 +28,7 @@
#define RID_SVXITEMS_ORI_BOTTOMTOP (RID_SVXITEMS_START + 412)
#define RID_SVXITEMS_ORI_STACKED (RID_SVXITEMS_START + 413)
-// Complete-Texte -----------------------------------------------------------
+// Complete-texts -----------------------------------------------------------
#define RID_SVXITEMS_MARGIN_LEFT (RID_SVXITEMS_START + 480)
#define RID_SVXITEMS_MARGIN_TOP (RID_SVXITEMS_START + 481)
@@ -55,12 +55,12 @@
#define RID_SVXITEMS_BRUSH_CHAR (RID_SVXITEMS_START + 527)
#define RID_ATTR_NAMES (RID_SVXITEMS_START + 528)
-// Ueberlaufpruefung --------------------------------------------------------
+// Overflow check --------------------------------------------------------
// Resource-Id's
#define ACT_RID_SVXITEMS_END RID_ATTR_NAMES
#if ACT_RID_SVXITEMS_END > RID_SVXITEMS_END
-#error Resource-Ueberlauf in #line, #file
+#error Resource overflow in #line, #file
#endif
#endif
diff --git a/include/vcl/keycodes.hxx b/include/vcl/keycodes.hxx
index 5356c203a187..06b7c124972f 100644
--- a/include/vcl/keycodes.hxx
+++ b/include/vcl/keycodes.hxx
@@ -26,7 +26,7 @@
#include <com/sun/star/awt/KeyGroup.hpp>
#include <o3tl/typed_flags_set.hxx>
-// Key-Gruppen
+// Key groups
#define KEYGROUP_NUM ((sal_uInt16)css::awt::KeyGroup::NUM)
#define KEYGROUP_ALPHA ((sal_uInt16)css::awt::KeyGroup::ALPHA)
#define KEYGROUP_FKEYS ((sal_uInt16)css::awt::KeyGroup::FKEYS)
@@ -34,7 +34,7 @@
#define KEYGROUP_MISC ((sal_uInt16)css::awt::KeyGroup::MISC)
#define KEYGROUP_TYPE ((sal_uInt16)css::awt::KeyGroup::TYPE)
-// Key-Codes
+// Key codes
#define KEY_0 ((sal_uInt16)css::awt::Key::NUM0)
#define KEY_1 ((sal_uInt16)css::awt::Key::NUM1)
#define KEY_2 ((sal_uInt16)css::awt::Key::NUM2)
diff --git a/include/vcl/seleng.hxx b/include/vcl/seleng.hxx
index 9b1c269e2582..69b58e94a142 100644
--- a/include/vcl/seleng.hxx
+++ b/include/vcl/seleng.hxx
@@ -152,7 +152,7 @@ public:
void SetUpdateInterval( sal_uLong nInterval );
- // wird im Ctor eingeschaltet
+ // is switched on in the Ctor
void ExpandSelectionOnMouseMove( bool bExpand = true )
{
if( bExpand )
diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx
index ba96f89dba56..1d066d225886 100644
--- a/include/vcl/textview.hxx
+++ b/include/vcl/textview.hxx
@@ -169,8 +169,8 @@ public:
void SetPaintSelection( bool bPaint);
- // aus dem protected Teil hierher verschoben
- // For 'SvtXECTextCursor' (TL). Must ggf nochmal anders gel?st werden.
+ // Moved in here from the protected part.
+ // For 'SvtXECTextCursor' (TL). Possibly needs to be solved again differently.
TextPaM PageUp( const TextPaM& rPaM );
TextPaM PageDown( const TextPaM& rPaM );
TextPaM CursorUp( const TextPaM& rPaM );
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 7e67182d5095..a7633f29c109 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -123,7 +123,7 @@ namespace o3tl
}
-// Type fuer GetWindow()
+// Type for GetWindow()
enum class GetWindowType
{
Parent = 0,
More information about the Libreoffice-commits
mailing list