[PATCH] Comment translation GER-ENG in sw/source/ui/utlui/ PART2

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3129

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/29/3129/1

Comment translation GER-ENG in sw/source/ui/utlui/ PART2

Change-Id: If636f0de7d883412e36c76fe0de997204021d45b
---
M sw/source/ui/utlui/glbltree.cxx
M sw/source/ui/utlui/gloslst.cxx
M sw/source/ui/utlui/initui.cxx
M sw/source/ui/utlui/initui.hrc
M sw/source/ui/utlui/navicfg.cxx
M sw/source/ui/utlui/navipi.hrc
6 files changed, 54 insertions(+), 70 deletions(-)



diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx
index ec4e5c6..5ecc1fa 100644
--- a/sw/source/ui/utlui/glbltree.cxx
+++ b/sw/source/ui/utlui/glbltree.cxx
@@ -59,7 +59,7 @@
 using namespace ::com::sun::star::uno;
 using ::rtl::OUString;
 
-// Kontextmenue fuer GlobalTree
+// Context menu for GlobalTree
 #define CTX_INSERT_ANY_INDEX 10
 #define CTX_INSERT_FILE     11
 #define CTX_INSERT_NEW_FILE 12
@@ -78,7 +78,7 @@
 
 #define GLOBAL_UPDATE_TIMEOUT 2000
 
-// Flags fuer PopupMenu-enable/disable
+// Flags for PopupMenu-enable/disable
 #define ENABLE_INSERT_IDX   0x0001
 #define ENABLE_INSERT_FILE  0x0002
 #define ENABLE_INSERT_TEXT  0x0004
@@ -88,7 +88,7 @@
 #define ENABLE_UPDATE_SEL   0x0040
 #define ENABLE_EDIT_LINK    0x0080
 
-// TabPos nach links schieben
+// TabPos: push to left
 #define  GLBL_TABPOS_SUB 5
 
 const SfxObjectShell* SwGlobalTree::pShowShell = 0;
@@ -220,21 +220,20 @@
                                     - 1;
             sal_uInt16 nEntryCount = (sal_uInt16)GetEntryCount();
 
-            // Daten holen
+            // Get data
             FileList aFileList;
             aData.GetFileList( FORMAT_FILE_LIST, aFileList );
             for ( sal_uInt16 n = (sal_uInt16)aFileList.Count(); n--; )
             {
                 sFileName = aFileList.GetFile(n);
                 InsertRegion(pCnt, &sFileName);
-                // nach dem Einfuegen muss die Liste der Contents neu
-                // geholt werden, um nicht auf einem alten Content zu
-                // arbeiten
+                // The list of contents must be newly fetched after inserting,
+                // to not work on an old content.
                 if(n)
                 {
                     pActiveShell->GetGlobalDocContent(*pTempContents);
-                    // wenn das file erfolgreich eingefuegt wurde,
-                    // dann muss auch der naechste Content geholt werden
+                    // If the file was successfully inserted,
+                    // then the next content must also be fetched.
                     if(nEntryCount < pTempContents->size())
                     {
                         nEntryCount++;
@@ -250,7 +249,7 @@
         {
             INetURLObject aTemp(sFileName);
             GraphicDescriptor aDesc(aTemp);
-            if( !aDesc.Detect() )   // keine Grafiken annehmen
+            if( !aDesc.Detect() )   // accept no graphics
             {
                 nRet = rEvt.mnAction;
                 InsertRegion(pCnt, &sFileName);
@@ -364,7 +363,7 @@
         pPop->InsertItem(CTX_DELETE, aContextStrings[ST_DELETE - ST_GLOBAL_CONTEXT_FIRST]);
         pPop->SetHelpId(CTX_DELETE, aHelpForMenu[CTX_DELETE]);
 
-        //evtl. disablen
+        //disabling if applicable
         pSubPop1->EnableItem(CTX_INSERT_ANY_INDEX,  0 != (nEnableFlags & ENABLE_INSERT_IDX ));
         pSubPop1->EnableItem(CTX_INSERT_TEXT,       0 != (nEnableFlags & ENABLE_INSERT_TEXT));
         pSubPop1->EnableItem(CTX_INSERT_FILE,       0 != (nEnableFlags & ENABLE_INSERT_FILE));
@@ -578,10 +577,9 @@
     bIsInternalDrag = false;
 }
 
-/***************************************************************************
-    Beschreibung:   Wird ein Ctrl+DoubleClick in einen freien Bereich ausgefuehrt,
- *                  dann soll die Basisfunktion des Controls gerufen werden
-***************************************************************************/
+// If a Ctrl+DoubleClick is executed in an empty area,
+// the the base function of the control should be called.
+
 void  SwGlobalTree::MouseButtonDown( const MouseEvent& rMEvt )
 {
     Point aPos( rMEvt.GetPosPixel());
@@ -607,7 +605,7 @@
         switch(aCode.GetModifier())
         {
             case KEY_MOD2:
-                // Boxen umschalten
+                // Switch boxes
                 GetParentWindow()->ToggleTree();
             break;
         }
@@ -644,7 +642,7 @@
     {
         SetUpdateMode( sal_False );
         SvTreeListEntry* pOldSelEntry = FirstSelected();
-        String sEntryName;  // Name des Eintrags
+        String sEntryName;  // Name of the entry
         sal_uInt16 nSelPos = USHRT_MAX;
         if(pOldSelEntry)
         {
@@ -773,9 +771,9 @@
 {
     SvTreeListEntry* pEntry = FirstSelected();
     SwGlblDocContent* pCont = pEntry ? (SwGlblDocContent*)pEntry->GetUserData() : 0;
-    // wird waehrend des Dialogs ein RequestHelp gerufen,
-    // dann geht der Content verloren. Deshalb wird hier eine
-    // Kopie angelegt, in der nur die DocPos richtig gesetzt ist.
+    // If a RequestHelp is called during the dialogue,
+    // then the content gets lost. Because of that a copy
+    // is created in which only the DocPos is set correctly.
     SwGlblDocContent* pContCopy = 0;
     if(pCont)
         pContCopy = new SwGlblDocContent(pCont->GetDocPos());
@@ -786,8 +784,7 @@
     {
         case CTX_UPDATE_SEL:
         {
-            // zwei Durchlaeufe: zuerst die Bereiche, dann die Verzeichnisse
-            // aktualisieren
+            // Two passes: first update the areas, then the directories.
             SvTreeListEntry* pSelEntry = FirstSelected();
             while( pSelEntry )
             {
@@ -841,9 +838,9 @@
         break;
         case CTX_DELETE:
         {
-            // sind mehrere Eintraege selektiert, dann muss nach jedem delete
-            // das Array neu gefuellt werden. Damit man sich nichts merken muss,
-            // beginnt das Loeschen am Ende
+            // If several entries selected, then after each delete the array
+            // must be refilled. So you do not have to remember anything,
+            // deleting begins at the end.
             SvTreeListEntry* pSelEntry = LastSelected();
             SwGlblDocContents* pTempContents  = 0;
             pActiveShell->StartAction();
@@ -914,7 +911,7 @@
             SwGlobalFrameListener_Impl aFrmListener(*pGlobFrm);
 
             sal_uLong nEntryPos = pEntry ? GetModel()->GetAbsPos(pEntry) : (sal_uLong)-1;
-            // neues Dok anlegen
+            // Creating a new doc
             SfxStringItem aFactory(SID_NEWDOCDIRECT,
                             SwDocShell::Factory().GetFilterContainer()->GetName());
 
@@ -922,7 +919,7 @@
                             rDispatch.Execute(SID_NEWDOCDIRECT,
                                 SFX_CALLMODE_SYNCHRON, &aFactory, 0L);
 
-            // sichern unter
+            // save at
             SfxFrame* pFrm = pItem ? pItem->GetFrame() : 0;
             SfxViewFrame* pFrame = pFrm ? pFrm->GetCurrentViewFrame() : 0;
             if( pFrame )
@@ -933,13 +930,12 @@
                 SfxObjectShell& rObj = *pFrame->GetObjectShell();
                 const SfxMedium* pMedium = rObj.GetMedium();
                 String sNewFile(pMedium->GetURLObject().GetMainURL(INetURLObject::DECODE_TO_IURI));
-                // Bereich mit dem Dok-Namen einfuegen
-                // eigenes Dok in den Vordergrund
-
+                // Insert the area with the Doc-Name
+                // Bring the own Doc in the foreground
                 if(aFrmListener.IsValid() && sNewFile.Len())
                 {
                     pGlobFrm->ToTop();
-                    // durch das Update sind die Eintraege invalid
+                    // Due to the update the entries are invalid
                     if(nEntryPos != (sal_uLong)-1)
                     {
                         Update( sal_False );
@@ -976,7 +972,7 @@
                 pActiveShell->InsertGlobalDocContent(*pCont);
             else
             {
-                pActiveShell->SplitNode(); // leeres Dokument
+                pActiveShell->SplitNode(); // Empty document
                 pActiveShell->Up( sal_False, 1 );
             }
             pActiveShell->GetView().GetEditWin().GrabFocus();
@@ -986,7 +982,7 @@
             pCont = 0;
         break;
         default:;
-        // hier passiert nichts
+        // here nothing happens
     }
     if(pCont)
         GotoContent(pCont);
@@ -1044,7 +1040,7 @@
 void    SwGlobalTree::ExecCommand(sal_uInt16 nCmd)
 {
     SvTreeListEntry* pEntry = FirstSelected();
-    OSL_ENSURE(pEntry, "gleich knallt's");
+    OSL_ENSURE(pEntry, "It explodes in the next moment");
     if(FN_GLOBAL_EDIT == nCmd)
     {
         const SwGlblDocContent* pCont = (const SwGlblDocContent*)
@@ -1155,7 +1151,7 @@
         if(pSwGlblDocContents)
             pSwGlblDocContents->DeleteAndDestroyAll();
     }
-    // hier muss noch eine Veraenderungspruefung rein!
+    // Here must be implemented a test for changes!
     return bRet;
 }
 
@@ -1218,7 +1214,7 @@
         const OUString& rStr ,const Image& rImg1,const Image& rImg2,
         SvLBoxButtonKind eButtonKind)
 {
-    sal_uInt16 nColToHilite = 1; //0==Bitmap;1=="Spalte1";2=="Spalte2"
+    sal_uInt16 nColToHilite = 1; //0==Bitmap;1=="Column1";2=="Column2"
     SvTreeListBox::InitEntry( pEntry, rStr, rImg1, rImg2, eButtonKind );
     SvLBoxString* pCol = (SvLBoxString*)pEntry->GetItem( nColToHilite );
     SwLBoxString* pStr = new SwLBoxString( pEntry, 0, pCol->GetText() );
@@ -1309,7 +1305,7 @@
             String sTempSectionName(sSectionName);
             sal_uInt16 nAddNumber = 0;
             sal_uInt16 nCount = 0;
-            // evtl : und Index anhaengen, wenn der Bereichsname schon vergeben ist
+            // if applicable: add index if the range name is already in use.
             while ( nCount < nSectCount )
             {
                 const SwSectionFmt& rFmt = rSh.GetSectionFmt(nCount);
diff --git a/sw/source/ui/utlui/gloslst.cxx b/sw/source/ui/utlui/gloslst.cxx
index 831e4ba..72bd51b 100644
--- a/sw/source/ui/utlui/gloslst.cxx
+++ b/sw/source/ui/utlui/gloslst.cxx
@@ -41,7 +41,7 @@
 
 
 #define STRING_DELIM (char)0x0A
-#define GLOS_TIMEOUT 30000   // alle 30 s updaten
+#define GLOS_TIMEOUT 30000   // update every 30 seconds
 #define FIND_MAX_GLOS 20
 
 
@@ -106,11 +106,9 @@
     ClearGroups();
 }
 
-/********************************************************************
- * Wenn der GroupName bereits bekannt ist, dann wird nur
- * rShortName gefuellt, sonst wird rGroupName ebenfals gesetzt und
- * bei Bedarf nach der richtigen Gruppe gefragt
-********************************************************************/
+// If the GroupName is already known, then only rShortName
+// will be filled. Otherwise also rGroupName will be set and
+// on demand asked for the right group.
 
 sal_Bool SwGlossaryList::GetShortName(const String& rLongName,
                                 String& rShortName, String& rGroupName )
@@ -313,12 +311,12 @@
             sal_uInt16 nArrCount = aGroupArr.size();
             for( sal_uInt16 i = nArrCount; i; --i)
             {
-                // evtl. geloeschte Gruppen entfernen
+                // maybe remove deleted groups
                 AutoTextGroup* pGroup = aGroupArr[i - 1];
                 sal_uInt16 nGroupPath = (sal_uInt16)pGroup->sName.GetToken( 1,
                                                         GLOS_DELIM).ToInt32();
-                // nur die Gruppen werden geprueft, die fuer den
-                // aktuellen Teilpfad registriert sind
+                // Only the groups will be checked which are registered
+                // for the current subpath.
                 if( nGroupPath == static_cast<sal_uInt16>(nPath) )
                 {
                     bool bFound = false;
@@ -339,7 +337,7 @@
 
 void SwGlossaryList::Timeout()
 {
-    // nur, wenn eine SwView den Fokus hat, wird automatisch upgedated
+    // Only update automatically if a SwView has the focus.
     if(::GetActiveView())
         Update();
 }
@@ -373,10 +371,8 @@
     pGlossaries->PutGroupDoc(pBlock);
 }
 
-/********************************************************************
-    Alle (nicht mehr als FIND_MAX_GLOS) gefunden Bausteine mit
-    passendem Anfang zurueckgeben
-********************************************************************/
+// Give back all (not exceeding FIND_MAX_GLOS) found modules
+// with matching beginning.
 
 bool SwGlossaryList::HasLongName(const String& rBegin, std::vector<String> *pLongNames)
 {
diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx
index 42bb787..0d8cee3 100644
--- a/sw/source/ui/utlui/initui.cxx
+++ b/sw/source/ui/utlui/initui.cxx
@@ -35,13 +35,11 @@
 
 #include <unomid.h>
 
-/*--------------------------------------------------------------------
-    Beschreibung:   globale Pointer
- --------------------------------------------------------------------*/
+// Global Pointer
 
 SwGlossaries*       pGlossaries = 0;
 
-// Liefert alle benoetigten Pfade. Wird durch UI initialisiert
+// Provides all needed paths. Is initialized by UI.
 SwGlossaryList*     pGlossaryList = 0;
 
 String* pOldGrfCat = 0;
@@ -80,9 +78,7 @@
 std::vector<String>*  pAuthFieldNameList = 0;
 std::vector<String>*  pAuthFieldTypeList = 0;
 
-/*--------------------------------------------------------------------
-    Beschreibung:   UI beenden
- --------------------------------------------------------------------*/
+// End UI
 
 void _FinitUI()
 {
@@ -106,21 +102,17 @@
     delete pAuthFieldNameList;
     delete pAuthFieldTypeList;
 
-
 }
-/*--------------------------------------------------------------------
-    Beschreibung:   Initialisierung
- --------------------------------------------------------------------*/
 
+// Initialise
 
 void _InitUI()
 {
-    // ShellResource gibt der CORE die Moeglichkeit mit Resourcen zu arbeiten
+    // ShellResource gives the CORE the possibility to work with resources.
     ViewShell::SetShellRes( new ShellResource );
     pDBNameList = new std::vector<String>;
     SwEditWin::_InitStaticData();
 }
-
 
 ShellResource::ShellResource()
     : Resource( SW_RES(RID_SW_SHELLRES) ),
@@ -244,13 +236,14 @@
         if(STR_AUTOFMTREDL_TYPO == n)
         {
 #ifdef WNT
-            //fuer Windows Sonderbehandlung, da MS hier ein paar Zeichen im Dialogfont vergessen 
hat
+            // For Windows, a special treatment is necessary because MS has
+            // forgotten some characters in the dialog font here.
             p.SearchAndReplace(rtl::OUString("%1"), rtl::OUString(",,"));
             p.SearchAndReplace(rtl::OUString("%2"), rtl::OUString("''"));
 #else
             const SvtSysLocale aSysLocale;
             const LocaleDataWrapper& rLclD = aSysLocale.GetLocaleData();
-            //unter richtigen Betriebssystemen funktioniert es auch so
+            // With real operating systems it also works without special handling.
             p.SearchAndReplace(rtl::OUString("%1"), rLclD.getDoubleQuotationMarkStart());
             p.SearchAndReplace(rtl::OUString("%2"), rLclD.getDoubleQuotationMarkEnd());
 #endif
diff --git a/sw/source/ui/utlui/initui.hrc b/sw/source/ui/utlui/initui.hrc
index 276339a..902ca3b 100644
--- a/sw/source/ui/utlui/initui.hrc
+++ b/sw/source/ui/utlui/initui.hrc
@@ -20,7 +20,7 @@
 #ifndef _INITUI_HRC
 #define _INITUI_HRC
 
-// lokale Resourcen fuer die Shells:
+// Local Resources for the shells:
 #define STR_POSTIT_PAGE              1
 #define STR_POSTIT_AUTHOR            2
 #define STR_CALC_SYNTAX              3
diff --git a/sw/source/ui/utlui/navicfg.cxx b/sw/source/ui/utlui/navicfg.cxx
index 843a04e..7cfc2c4 100644
--- a/sw/source/ui/utlui/navicfg.cxx
+++ b/sw/source/ui/utlui/navicfg.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <swtypes.hxx>  // fuer Pathfinder
+#include <swtypes.hxx>  // for pathfinder
 #include <navicfg.hxx>
 #include <swcont.hxx>
 #include <osl/diagnose.h>
diff --git a/sw/source/ui/utlui/navipi.hrc b/sw/source/ui/utlui/navipi.hrc
index e662679..651cd0d 100644
--- a/sw/source/ui/utlui/navipi.hrc
+++ b/sw/source/ui/utlui/navipi.hrc
@@ -25,8 +25,7 @@
 #define TL_GLOBAL           55
 #define TB_GLOBAL           56
 
-//-------------------------------------------------------------------
-// Strings fuer Kontextmenue des ContentTree
+// Strings for the context menu of the content tree
 #define ST_CONTEXT_FIRST        60
 #define ST_OUTLINE_LEVEL        ST_CONTEXT_FIRST
 #define ST_DRAGMODE                     (ST_CONTEXT_FIRST + 1)

-- 
To view, visit https://gerrit.libreoffice.org/3129
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If636f0de7d883412e36c76fe0de997204021d45b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matthias Freund <matti_lx@yahoo.de>