[Libreoffice-commits] core.git: sfx2/source smoketest/data soltools/cpp

[Johnny_M]

 sfx2/source/appl/appserv.cxx             |    2 +-
 sfx2/source/dialog/tabdlg.cxx            |    2 +-
 sfx2/source/doc/objembed.cxx             |    2 +-
 smoketest/data/Basic/Standard/Global.xml |    2 +-
 soltools/cpp/_nlist.c                    |    9 ++++-----
 5 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 47b8034efc33a1c022d4a1f8385e3739aca86442
Author: Johnny_M <klasse at partyheld.de>
Date:   Wed Jul 5 20:09:03 2017 +0200

    Translate German comments/debug strings (leftovers in dirs sdext to soltools)
    
    Translates leftovers found using a custom regex and manually checking
    the rest of the affected file.
    
    Additionally:
    - Translation of someone's attempts at Spanish in the .java file
    
    Change-Id: Ie3a761bc1a8e302247d5dd6e93a6bc4cb3e85a9f
    Reviewed-on: https://gerrit.libreoffice.org/39609
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index d9910d314a70..363ab7f60ef8 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -361,7 +361,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
                 return;
             }
 
-            // aus verschachtelten Requests nach 100ms nochmal probieren
+            // try from nested requests again after 100ms
             if( Application::GetDispatchLevel() > 1 )
             {
                 /* Don't save the request for closing the application and try it later
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 592f59509829..ae36f224a6a6 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -1045,7 +1045,7 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void )
 
     DBG_ASSERT( m_pImpl->aData.size(), "no Pages registered" );
 
-    // Tab Page schon da?
+    // Tab Page already there?
     VclPtr<SfxTabPage> pTabPage = dynamic_cast<SfxTabPage*> (pTabCtrl->GetTabPage( nId ));
     Data_Impl* pDataObject = Find( m_pImpl->aData, nId );
 
diff --git a/sfx2/source/doc/objembed.cxx b/sfx2/source/doc/objembed.cxx
index 7428a5e39ed7..422e3ea62842 100644
--- a/sfx2/source/doc/objembed.cxx
+++ b/sfx2/source/doc/objembed.cxx
@@ -189,7 +189,7 @@ void SfxObjectShell::DoDraw_Impl( OutputDevice* pDev,
                                sal_uInt16 nAspect )
 {
     tools::Rectangle aVisArea  = GetVisArea( nAspect );
-    // MapUnit des Ziels
+    // MapUnit of the target
     MapMode aMapMode( GetMapUnit() );
     aMapMode.SetScaleX( rScaleX );
     aMapMode.SetScaleY( rScaleY );
diff --git a/smoketest/data/Basic/Standard/Global.xml b/smoketest/data/Basic/Standard/Global.xml
index 220fb83b7f98..fa28297fe695 100644
--- a/smoketest/data/Basic/Standard/Global.xml
+++ b/smoketest/data/Basic/Standard/Global.xml
@@ -528,7 +528,7 @@ Sub ShowOptionsDlg
     REM show the dialog
     gOptionsDialog.execute()
 
-       ' jetzt läuft der Dialog, bis ein Button gedrückt wird
+       ' now the dialog will run until a button is pressed
 
        Select Case (gDlgState)
            case cDlgOk
diff --git a/soltools/cpp/_nlist.c b/soltools/cpp/_nlist.c
index 3dbb54c7d1a7..20118f363b83 100644
--- a/soltools/cpp/_nlist.c
+++ b/soltools/cpp/_nlist.c
@@ -27,11 +27,10 @@ Nlist *kwdefined;
 char wd[128];
 
 /*
-    ER: Tabelle extra gross gemacht, da es anscheinend ein Problem mit der
-    der Verkettung gibt, irgendwann irgendwo wird mal ein nlist->next
-    ueberschrieben, was in eineme SIGSEGV resultiert.
-    Den GDB mit watchpoint hab ich aber nach 2 Tagen abgebrochen..
-    so loeppt's jedenfalls erstmal..
+    ER: Table was made extra large, because there seems to be a problem with the
+    chaining. An nlist->next is sometimes overwritten somewhere, which
+    results in a SIGSEGV. I canceled the GDB with watchpoint after 2 days, though..
+    It works this way for now..
  */
 #define NLSIZE 15000