diff options
author | Johnny_M <klasse@partyheld.de> | 2017-09-10 21:40:52 +0200 |
---|---|---|
committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-12-05 08:19:25 -0500 |
commit | 981bee0c5656c0e3339c1df7007c57fde9ac270d (patch) | |
tree | f455bf9e3c85ef654f946bc14186ac731aae6e83 | |
parent | 116fca4a4cb01cfb646f2271daccaac76b90d423 (diff) |
Translate German comments/debug strings (leftovers in dirs vbahelper and vcl)
Translates leftovers found using a custom regex.
Additionally:
- Translated the "SGV Fonts for StarView" INI file parameter group
in vcl/source/filter/sgf.ini and .../sgvtext.cxx
Reviewed-on: https://gerrit.libreoffice.org/42145
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 59010ca14ba07f0a1d6f662bb1f8fbad33f3c654)
Change-Id: I1360aac1a2f3fa825f86d77ac1b05e2de9ffb007
Reviewed-on: https://gerrit.libreoffice.org/45453
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
(cherry picked from commit 7bd77b9306f0fc6908b715683b2e3b90cc4b75d6)
-rw-r--r-- | vcl/headless/svpprn.cxx | 2 | ||||
-rw-r--r-- | vcl/inc/win/salgdi.h | 4 | ||||
-rw-r--r-- | vcl/inc/win/wincomp.hxx | 2 | ||||
-rw-r--r-- | vcl/source/app/help.cxx | 2 | ||||
-rw-r--r-- | vcl/source/control/button.cxx | 4 | ||||
-rw-r--r-- | vcl/source/edit/textdoc.cxx | 18 | ||||
-rw-r--r-- | vcl/source/filter/sgf.ini | 2 | ||||
-rw-r--r-- | vcl/source/filter/sgvmain.hxx | 4 | ||||
-rw-r--r-- | vcl/source/filter/sgvtext.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/bitmap.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/menufloatingwindow.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/tabdlg.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/winproc.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/generic/print/genprnpsp.cxx | 2 | ||||
-rw-r--r-- | vcl/win/window/salobj.cxx | 4 |
15 files changed, 29 insertions, 29 deletions
diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx index ac6cfdd26cab..f707254efa92 100644 --- a/vcl/headless/svpprn.cxx +++ b/vcl/headless/svpprn.cxx @@ -216,7 +216,7 @@ void SvpSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList ) for( ::std::list< OUString >::iterator it = aPrinters.begin(); it != aPrinters.end(); ++it ) { const PrinterInfo& rInfo( rManager.getPrinterInfo( *it ) ); - // Neuen Eintrag anlegen + // create new entry SalPrinterQueueInfo* pInfo = new SalPrinterQueueInfo; pInfo->maPrinterName = *it; pInfo->maDriver = rInfo.m_aDriverName; diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index 14310f90411e..4204a0954d53 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -232,7 +232,7 @@ private: bool mbFontKernInit; // FALSE: FontKerns must be queried KERNINGPAIR* mpFontKernPairs; // Kerning Pairs of the current Font sal_uIntPtr mnFontKernPairCount;// Number of Kerning Pairs of the current Font - int mnPenWidth; // Linienbreite + int mnPenWidth; // line width LogicalFontInstance* GetWinFontEntry(int nFallbackLevel); @@ -412,7 +412,7 @@ public: // pFont: describes from which font to create a subset // pGlyphIDs: the glyph ids to be extracted // pEncoding: the character code corresponding to each glyph - // pWidths: the advance widths of the correspoding glyphs (in PS font units) + // pWidths: the advance widths of the corresponding glyphs (in PS font units) // nGlyphs: the number of glyphs // rInfo: additional outgoing information // implementation note: encoding 0 with glyph id 0 should be added implicitly diff --git a/vcl/inc/win/wincomp.hxx b/vcl/inc/win/wincomp.hxx index 87aae83e9cfc..b404aa532365 100644 --- a/vcl/inc/win/wincomp.hxx +++ b/vcl/inc/win/wincomp.hxx @@ -196,7 +196,7 @@ inline HINSTANCE GetWindowInstance( HWND hWnd ) #endif -// - 5.0-Erweiterungen - +// - 5.0 extensions - #ifndef COLOR_GRADIENTACTIVECAPTION #define COLOR_GRADIENTACTIVECAPTION 27 diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index 153abc29e371..a531c11bfde0 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -631,7 +631,7 @@ void ImplSetHelpWindowPos( vcl::Window* pHelpWin, sal_uInt16 nHelpWinStyle, Quic pHelpWin->GetParent()->ImplGetFrameWindow()->OutputToAbsoluteScreenPixel( rHelpArea.TopLeft() ), pHelpWin->GetParent()->ImplGetFrameWindow()->OutputToAbsoluteScreenPixel( rHelpArea.BottomRight() ) ); - // Welche Position vom Rechteck? + // which position of the rectangle? aPos = devHelpArea.Center(); if ( nStyle & QuickHelpFlags::Left ) diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 7691a4c4feed..f0dea4402d79 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -2631,7 +2631,7 @@ bool RadioButton::SetModeRadioImage( const Image& rImage ) void RadioButton::SetState( bool bCheck ) { - // TabStop-Flag richtig mitfuehren + // carry the TabStop flag along correctly if ( bCheck ) mpWindowImpl->mnStyle |= WB_TABSTOP; else @@ -3711,7 +3711,7 @@ Size CheckBox::CalcMinimumSize( long nMaxWidth ) const { // is this still correct ? since the checkbox now // shows a focus rect it should be 2 pixels wider and longer -/* da ansonsten im Writer die Control zu weit oben haengen +/* since otherwise the controls in the Writer hang too far up aSize.Width() += 2; aSize.Height() += 2; */ diff --git a/vcl/source/edit/textdoc.cxx b/vcl/source/edit/textdoc.cxx index aacd1d21cc75..ead5bc57b965 100644 --- a/vcl/source/edit/textdoc.cxx +++ b/vcl/source/edit/textdoc.cxx @@ -219,9 +219,9 @@ void TextNode::ExpandAttribs( sal_Int32 nIndex, sal_Int32 nNew ) } } - SAL_WARN_IF( rAttrib.GetStart() > rAttrib.GetEnd(), "vcl", "Expand: Attribut verdreht!" ); - SAL_WARN_IF( ( rAttrib.GetEnd() > maText.getLength() ), "vcl", "Expand: Attrib groesser als Absatz!" ); - SAL_WARN_IF( rAttrib.IsEmpty(), "vcl", "Leeres Attribut nach ExpandAttribs?" ); + SAL_WARN_IF( rAttrib.GetStart() > rAttrib.GetEnd(), "vcl", "Expand: attribute twisted!" ); + SAL_WARN_IF( ( rAttrib.GetEnd() > maText.getLength() ), "vcl", "Expand: attribute greater than paragraph!" ); + SAL_WARN_IF( rAttrib.IsEmpty(), "vcl", "Empty attribute after ExpandAttribs?" ); } if ( bResort ) @@ -274,8 +274,8 @@ void TextNode::CollapseAttribs( sal_Int32 nIndex, sal_Int32 nDeleted ) } } - SAL_WARN_IF( rAttrib.GetStart() > rAttrib.GetEnd(), "vcl", "Collaps: Attribut verdreht!" ); - SAL_WARN_IF( ( rAttrib.GetEnd() > maText.getLength()) && !bDelAttr, "vcl", "Collaps: Attrib groesser als Absatz!" ); + SAL_WARN_IF( rAttrib.GetStart() > rAttrib.GetEnd(), "vcl", "Collaps: attribute twisted!" ); + SAL_WARN_IF( ( rAttrib.GetEnd() > maText.getLength()) && !bDelAttr, "vcl", "Collaps: attribute greater than paragraph!" ); if ( bDelAttr /* || rAttrib.IsEmpty() */ ) { bResort = true; @@ -491,8 +491,8 @@ sal_Int32 TextDoc::GetTextLen( const sal_Unicode* pSep, const TextSelection* pSe TextPaM TextDoc::InsertText( const TextPaM& rPaM, sal_Unicode c ) { - SAL_WARN_IF( c == 0x0A, "vcl", "TextDoc::InsertText: Zeilentrenner in Absatz nicht erlaubt!" ); - SAL_WARN_IF( c == 0x0D, "vcl", "TextDoc::InsertText: Zeilentrenner in Absatz nicht erlaubt!" ); + SAL_WARN_IF( c == 0x0A, "vcl", "TextDoc::InsertText: Line separator in paragraph not allowed!" ); + SAL_WARN_IF( c == 0x0D, "vcl", "TextDoc::InsertText: Line separator in paragraph not allowed!" ); TextNode* pNode = maTextNodes[ rPaM.GetPara() ]; pNode->InsertText( rPaM.GetIndex(), c ); @@ -503,8 +503,8 @@ TextPaM TextDoc::InsertText( const TextPaM& rPaM, sal_Unicode c ) TextPaM TextDoc::InsertText( const TextPaM& rPaM, const OUString& rStr ) { - SAL_WARN_IF( rStr.indexOf( 0x0A ) != -1, "vcl", "TextDoc::InsertText: Zeilentrenner in Absatz nicht erlaubt!" ); - SAL_WARN_IF( rStr.indexOf( 0x0D ) != -1, "vcl", "TextDoc::InsertText: Zeilentrenner in Absatz nicht erlaubt!" ); + SAL_WARN_IF( rStr.indexOf( 0x0A ) != -1, "vcl", "TextDoc::InsertText: Line separator in paragraph not allowed!" ); + SAL_WARN_IF( rStr.indexOf( 0x0D ) != -1, "vcl", "TextDoc::InsertText: Line separator in paragraph not allowed!" ); TextNode* pNode = maTextNodes[ rPaM.GetPara() ]; pNode->InsertText( rPaM.GetIndex(), rStr ); diff --git a/vcl/source/filter/sgf.ini b/vcl/source/filter/sgf.ini index 17c01255b6f1..2068c5f46e5a 100644 --- a/vcl/source/filter/sgf.ini +++ b/vcl/source/filter/sgf.ini @@ -20,7 +20,7 @@ #CharSet : (Ansi,IBMPC,Mac,Symbol,System); Default is System #Attribute: (Bold,Ital,Sans,Serf,Fixd); -[SGV Fonts fuer StarView] +[SGV Fonts for StarView] #IF-ID Fontname Attribute SV-Fam ChSet Width FontName 3848=(ITC Zapf Dingbats) Decora () 5720=(Symbol) Serf Decora Symbol () diff --git a/vcl/source/filter/sgvmain.hxx b/vcl/source/filter/sgvmain.hxx index 08450f1be117..df5229bc259b 100644 --- a/vcl/source/filter/sgvmain.hxx +++ b/vcl/source/filter/sgvmain.hxx @@ -123,8 +123,8 @@ public: sal_uInt8 Kapit; // 1..255% sal_uInt16 Schnitt; // 8 flags sal_uInt16 LnFeed; // 1..32767% of max font size of the line - sal_uInt16 Slant; // slant angle 0.00..89.99deg default 15.00deg viewed double width) - sal_uInt8 ZAbst; // character spacing 0..255% (0=on the line; 100=normal; 200=Zeichen wird als + sal_uInt16 Slant; // slant angle 0.00..89.99deg default 15.00deg + sal_uInt8 ZAbst; // character spacing 0..255% (0=on the line; 100=normal; 200=character is viewed as double width) signed char ChrVPos; // vertical position of char. Default 0=on baseline, 10=5Pt below (-64..63") ObjLineType ShdL; // shadow outline (new 2.0) ObjAreaType ShdF; // shadow inside (new 2.0) diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx index 404dd4206c9b..9fcf62dba545 100644 --- a/vcl/source/filter/sgvtext.cxx +++ b/vcl/source/filter/sgvtext.cxx @@ -1101,7 +1101,7 @@ void SgfFontLst::ReadList() LastLn=nullptr; SgfFontOne* P,P1; Config aCfg(FNam); - aCfg.SetGroup("SGV Fonts fuer StarView"); + aCfg.SetGroup("SGV Fonts for StarView"); sal_uInt16 Anz=aCfg.GetKeyCount(); sal_uInt16 i; OString FID; diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx index 7b8eb97e03a7..0d2f5f1aa644 100644 --- a/vcl/source/gdi/bitmap.cxx +++ b/vcl/source/gdi/bitmap.cxx @@ -576,7 +576,7 @@ bool Bitmap::Mirror( BmpMirrorFlags nMirrorFlags ) } } - // ggf. noch mittlere Zeile horizontal spiegeln + // if necessary, also mirror the middle line horizontally if( nHeight & 1 ) { for( long nX = 0, nOtherX = nWidth1, nWidth_2 = nWidth >> 1; nX < nWidth_2; nX++, nOtherX-- ) diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx index cfa8b7521c38..9b09e649a706 100644 --- a/vcl/source/window/menufloatingwindow.cxx +++ b/vcl/source/window/menufloatingwindow.cxx @@ -710,7 +710,7 @@ void MenuFloatingWindow::ImplScroll( const Point& rMousePos ) } void MenuFloatingWindow::ChangeHighlightItem( sal_uInt16 n, bool bStartPopupTimer ) { - // #57934# ggf. immediately close the active, as TH's backgroundstorage works. + // #57934# if necessary, immediately close the active, as TH's backgroundstorage works. // #65750# we prefer to refrain from the background storage of small lines. // otherwise the menus are difficult to operate. // MenuItemData* pNextData = pMenu->pItemList->GetDataFromPos( n ); diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx index 6c97b1f29c1e..6a2b8cbaeb64 100644 --- a/vcl/source/window/tabdlg.cxx +++ b/vcl/source/window/tabdlg.cxx @@ -89,7 +89,7 @@ void TabDialog::ImplPosControls() aTabSize.Height() + IMPL_DIALOG_OFFSET*2 + nOffY ); long nBtnEx = 0; - // consider Preview-Fenster and adapt the sizes/offsets + // consider preview window and adapt the sizes/offsets if ( mpViewWindow && mpViewWindow->IsVisible() ) { long nViewOffX = 0; diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 82d81a6ecbd3..47bcab8697c9 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -1785,7 +1785,7 @@ IMPL_LINK_NOARG(vcl::Window, ImplAsyncFocusHdl, void*, void) if ( pSVData->maWinData.mpFocusWin == pFocusWin ) { - // FocusWindow umsetzen + // transfer the FocusWindow vcl::Window* pOverlapWindow = pFocusWin->ImplGetFirstOverlapWindow(); pOverlapWindow->ImplGetWindowImpl()->mpLastFocusWindow = pFocusWin; pSVData->maWinData.mpFocusWin = nullptr; @@ -1793,7 +1793,7 @@ IMPL_LINK_NOARG(vcl::Window, ImplAsyncFocusHdl, void*, void) if ( pFocusWin->ImplGetWindowImpl()->mpCursor ) pFocusWin->ImplGetWindowImpl()->mpCursor->ImplHide(); - // Deaktivate rufen + // call the Deactivate vcl::Window* pOldFocusWindow = pFocusWin; if ( pOldFocusWindow ) { @@ -2483,7 +2483,7 @@ bool ImplWindowFrameProc( vcl::Window* _pWindow, SalEvent nEvent, const void* pE bInQueryExit = true; if ( GetpApp()->QueryExit() ) { - // Message-Schleife beenden + // end the message loop Application::Quit(); return false; } diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx index d0cedec3ed20..3d7ad0ae5eb1 100644 --- a/vcl/unx/generic/print/genprnpsp.cxx +++ b/vcl/unx/generic/print/genprnpsp.cxx @@ -442,7 +442,7 @@ void SalGenericInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList ) for( ::std::list< OUString >::iterator it = aPrinters.begin(); it != aPrinters.end(); ++it ) { const PrinterInfo& rInfo( rManager.getPrinterInfo( *it ) ); - // Neuen Eintrag anlegen + // create new entry SalPrinterQueueInfo* pInfo = new SalPrinterQueueInfo; pInfo->maPrinterName = *it; pInfo->maDriver = rInfo.m_aDriverName; diff --git a/vcl/win/window/salobj.cxx b/vcl/win/window/salobj.cxx index f21dfb7ade9d..ace9847dc87c 100644 --- a/vcl/win/window/salobj.cxx +++ b/vcl/win/window/salobj.cxx @@ -70,7 +70,7 @@ WinSalFrame* ImplFindSalObjectFrame( HWND hWnd ) WinSalObject* pObject = ImplFindSalObject( hWnd ); if ( pObject ) { - // Dazugehoerenden Frame suchen + // find matching frame HWND hWnd2 = ::GetParent( pObject->mhWnd ); pFrame = GetSalData()->mpFirstFrame; while ( pFrame ) @@ -585,7 +585,7 @@ WinSalObject::~WinSalObject() pTempObject->mpNextObject = mpNextObject; } - // Cache-Daten zerstoeren + // destroy cache data delete [] reinterpret_cast<BYTE*>(mpStdClipRgnData); HWND hWndParent = ::GetParent( mhWnd ); |