[Libreoffice-commits] core.git: vcl/headless vcl/inc vcl/source vcl/unx vcl/win

Johnny_M klasse at partyheld.de
Mon Sep 11 11:28:30 UTC 2017


 vcl/headless/svpprn.cxx                  |    2 +-
 vcl/inc/win/salgdi.h                     |    2 +-
 vcl/inc/win/wincomp.hxx                  |    2 +-
 vcl/source/app/help.cxx                  |    2 +-
 vcl/source/control/button.cxx            |    4 ++--
 vcl/source/edit/textdoc.cxx              |   18 +++++++++---------
 vcl/source/filter/sgf.ini                |    2 +-
 vcl/source/filter/sgvmain.hxx            |    4 ++--
 vcl/source/filter/sgvtext.cxx            |    2 +-
 vcl/source/gdi/bitmap.cxx                |    2 +-
 vcl/source/window/menufloatingwindow.cxx |    2 +-
 vcl/source/window/tabdlg.cxx             |    2 +-
 vcl/source/window/winproc.cxx            |    6 +++---
 vcl/unx/generic/print/genprnpsp.cxx      |    2 +-
 vcl/win/window/salobj.cxx                |    4 ++--
 15 files changed, 28 insertions(+), 28 deletions(-)

New commits:
commit 59010ca14ba07f0a1d6f662bb1f8fbad33f3c654
Author: Johnny_M <klasse at partyheld.de>
Date:   Sun Sep 10 21:40:52 2017 +0200

    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
    
    Change-Id: I1360aac1a2f3fa825f86d77ac1b05e2de9ffb007
    Reviewed-on: https://gerrit.libreoffice.org/42145
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx
index 92a11e99d03a..488f17bb4084 100644
--- a/vcl/headless/svpprn.cxx
+++ b/vcl/headless/svpprn.cxx
@@ -217,7 +217,7 @@ void SvpSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList )
     for( ::std::vector< 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 acc64e0ac17c..38edc94d0d37 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -174,7 +174,7 @@ private:
     COLORREF                mnTextColor;        // TextColor
     RGNDATA*                mpClipRgnData;      // ClipRegion-Data
     RGNDATA*                mpStdClipRgnData;   // Cache Standard-ClipRegion-Data
-    int                     mnPenWidth;         // Linienbreite
+    int                     mnPenWidth;         // line width
 
     LogicalFontInstance* GetWinFontEntry(int nFallbackLevel);
 
diff --git a/vcl/inc/win/wincomp.hxx b/vcl/inc/win/wincomp.hxx
index c2182c4ff255..8fd774fc6eb1 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 1d8faa415222..e2410e596b62 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -630,7 +630,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 705d8d5f0154..4d6d26b318f5 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -2599,7 +2599,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
@@ -3691,7 +3691,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 70976cb35530..3daf97e2761b 100644
--- a/vcl/source/edit/textdoc.cxx
+++ b/vcl/source/edit/textdoc.cxx
@@ -193,9 +193,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 )
@@ -248,8 +248,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;
@@ -465,8 +465,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 );
@@ -477,8 +477,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 061aa4205a72..398674f7f814 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 558c563bae24..f3ec82655120 100644
--- a/vcl/source/filter/sgvtext.cxx
+++ b/vcl/source/filter/sgvtext.cxx
@@ -1098,7 +1098,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 db70c3969904..94646dc286a1 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -568,7 +568,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 d6dd08d4e17e..0ec130ffe654 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -703,7 +703,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 f25324a34d73..fa820124d1d2 100644
--- a/vcl/source/window/tabdlg.cxx
+++ b/vcl/source/window/tabdlg.cxx
@@ -88,7 +88,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 6f00faba1cd2..071f71d0d508 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1751,7 +1751,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;
@@ -1759,7 +1759,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 )
                 {
@@ -2448,7 +2448,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 b7fb41665bcb..20b6d1484c01 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -432,7 +432,7 @@ void SalGenericInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList )
     for( ::std::vector< 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 85d4ead765c9..dfbcf8c54648 100644
--- a/vcl/win/window/salobj.cxx
+++ b/vcl/win/window/salobj.cxx
@@ -69,7 +69,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 )
@@ -584,7 +584,7 @@ WinSalObject::~WinSalObject()
         pTempObject->mpNextObject = mpNextObject;
     }
 
-    // Cache-Daten zerstoeren
+    // destroy cache data
     delete [] reinterpret_cast<BYTE*>(mpStdClipRgnData);
 
     HWND hWndParent = ::GetParent( mhWnd );


More information about the Libreoffice-commits mailing list