Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,
  
All my contributions, past and future, to LibreOffice are licensed under
the terms of the MPL/LGPv3+ Greetings,

Gábor Nyers
From 7af24e3c3613cb0701be3b857dbf465c84cc85c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Nyers?= <gnyers@opensuse.org>
Date: Sat, 2 Mar 2013 15:36:29 +0100
Subject: [PATCH] FDO#39468 Translated German comments to English

---
 comphelper/inc/comphelper/syntaxhighlight.hxx      |   37 +++++++++-----------
 comphelper/source/misc/syntaxhighlight.cxx         |    7 ++--
 dbaccess/source/ui/inc/TableWindow.hxx             |    6 ++--
 dbaccess/source/ui/inc/WCopyTable.hxx              |    2 +-
 .../ui/querydesign/QueryDesignFieldUndoAct.hxx     |   18 ++++++----
 5 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/comphelper/inc/comphelper/syntaxhighlight.hxx 
b/comphelper/inc/comphelper/syntaxhighlight.hxx
index 11a57db..5241713 100644
--- a/comphelper/inc/comphelper/syntaxhighlight.hxx
+++ b/comphelper/inc/comphelper/syntaxhighlight.hxx
@@ -63,10 +63,10 @@ struct HighlightPortion { sal_uInt16 nBegin; sal_uInt16 nEnd; TokenTypes tokenTy
 typedef std::vector<HighlightPortion> HighlightPortions;
 
 /////////////////////////////////////////////////////////////////////////
-// Hilfsklasse zur Untersuchung von JavaScript-Modulen, zunaechst zum
-// Heraussuchen der Funktionen, spaeter auch zum Syntax-Highlighting verwenden
+// Auxiliary class to support JavaScript modules, next to find functions which
+// will later will be used for syntax highlighting
 
-//  Flags fuer Zeichen-Eigenschaften
+// Flags for character properties
 #define CHAR_START_IDENTIFIER   0x0001
 #define CHAR_IN_IDENTIFIER      0x0002
 #define CHAR_START_NUMBER       0x0004
@@ -81,8 +81,8 @@ typedef std::vector<HighlightPortion> HighlightPortions;
 #define CHAR_EOF                0x00
 
 
-// Sprachmodus des HighLighters (spaeter eventuell feiner
-// differenzieren mit Keyword-Liste, C-Kommentar-Flag)
+// Language mode of the Highlighter (possibly to be refined later with keyword
+// lists, C comment flags) 
 enum HighlighterLanguage
 {
     HIGHLIGHT_BASIC,
@@ -92,23 +92,23 @@ enum HighlighterLanguage
 class SimpleTokenizer_Impl
 {
     HighlighterLanguage aLanguage;
-    // Zeichen-Info-Tabelle
+    // Character information tables
     sal_uInt16 aCharTypeTab[256];
 
     const sal_Unicode* mpStringBegin;
     const sal_Unicode* mpActualPos;
 
-    // Zeile und Spalte
+    // Lines and columns
     sal_uInt32 nLine;
     sal_uInt32 nCol;
 
     sal_Unicode peekChar( void )    { return *mpActualPos; }
     sal_Unicode getChar( void )     { nCol++; return *mpActualPos++; }
 
-    // Hilfsfunktion: Zeichen-Flag Testen
+    // Auxiliary function: testing of the character flags
     sal_Bool testCharFlags( sal_Unicode c, sal_uInt16 nTestFlags );
 
-    // Neues Token holen, Leerstring == nix mehr da
+    // Get new token, EmptyString == nothing more over there
     sal_Bool getNextToken( /*out*/TokenTypes& reType,
         /*out*/const sal_Unicode*& rpStartPos, /*out*/const sal_Unicode*& rpEndPos );
 
@@ -126,13 +126,11 @@ public:
 };
 
 
-//*** SyntaxHighlighter-Klasse ***
-// Konzept: Der Highlighter wird ueber alle Aenderungen im Source
-// informiert (notifyChange) und liefert dem Aufrufer jeweils die
-// Information zurueck, welcher Zeilen-Bereich des Source-Codes
-// aufgrund dieser Aenderung neu gehighlighted werden muss.
-// Dazu merkt sich Highlighter intern fuer jede Zeile, ob dort
-// C-Kommentare beginnen oder enden.
+//*** SyntaxHighlighter Class ***
+// Concept: the Highlighter will be notified of all changes in the source
+// (notifyChange) and returns the caller the range of lines, which based on the
+// changes, need to be highlighted again. For this the Highlighter marks all
+// lines internally whether or not C comments begin or end.
 class COMPHELPER_DLLPUBLIC SyntaxHighlighter
 {
     HighlighterLanguage eLanguage;
@@ -146,10 +144,9 @@ public:
     SyntaxHighlighter( void );
     ~SyntaxHighlighter( void );
 
-    // HighLighter (neu) initialisieren, die Zeilen-Tabelle wird
-    // dabei komplett geloescht, d.h. im Abschluss wird von einem
-    // leeren Source ausgegangen. In notifyChange() kann dann
-    // nur Zeile 0 angegeben werden.
+    // (Re-)initialize Highlighter. The line-table will be completely erased,
+    // meaning that on completion an empty Source is assumed.
+    // notifyChange() can only be given line 0
     void initialize( HighlighterLanguage eLanguage_ );
 
     void notifyChange( sal_uInt32 nLine, sal_Int32 nLineCountDifference,
diff --git a/comphelper/source/misc/syntaxhighlight.cxx b/comphelper/source/misc/syntaxhighlight.cxx
index 2064c0c..84790eb 100644
--- a/comphelper/source/misc/syntaxhighlight.cxx
+++ b/comphelper/source/misc/syntaxhighlight.cxx
@@ -411,9 +411,8 @@ sal_Bool SimpleTokenizer_Impl::getNextToken( /*out*/TokenTypes& reType,
                 reType = TT_COMMENT;
             }
 
-            // Echter Operator, kann hier einfach behandelt werden,
-            // da nicht der wirkliche Operator, wie z.B. += interessiert,
-            // sondern nur die Tatsache, dass es sich um einen handelt.
+            // The real operator; can be easily used since not the actual
+            // operator (e.g. +=) is concerned, but the fact that it is one
             if( reType != TT_COMMENT )
             {
                 reType = TT_OPERATOR;
@@ -422,7 +421,7 @@ sal_Bool SimpleTokenizer_Impl::getNextToken( /*out*/TokenTypes& reType,
         }
     }
 
-    // Objekt-Trenner? Muss vor Number abgehandelt werden
+    // Object separator? Must be handled before Number
     else if( c == '.' && ( peekChar() < '0' || peekChar() > '9' ) )
     {
         reType = TT_OPERATOR;
diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx
index a72149c..dfb40711 100644
--- a/dbaccess/source/ui/inc/TableWindow.hxx
+++ b/dbaccess/source/ui/inc/TableWindow.hxx
@@ -35,7 +35,7 @@ class SvTreeListEntry;
 namespace dbaui
 {
     //////////////////////////////////////////////////////////////////////////
-    // Flags fuer die Groessenanpassung der SbaJoinTabWins
+    // Flags for the modification of the size of the SbaJoinTabWins
     const sal_uInt16 SIZING_NONE    = 0x0000;
     const sal_uInt16 SIZING_TOP     = 0x0001;
     const sal_uInt16 SIZING_BOTTOM  = 0x0002;
@@ -67,8 +67,8 @@ namespace dbaui
                                 m_pContainerListener;
         sal_Int32               m_nMoveCount;           // how often the arrow keys was pressed
         sal_Int32               m_nMoveIncrement;       // how many pixel we should move
-        sal_uInt16                  m_nSizingFlags;
-        sal_Bool                    m_bActive;
+        sal_uInt16              m_nSizingFlags;
+        sal_Bool                m_bActive;
 
         void Draw3DBorder( const Rectangle& rRect );
         // OContainerListener
diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx
index 87098f6..c833ea0 100644
--- a/dbaccess/source/ui/inc/WCopyTable.hxx
+++ b/dbaccess/source/ui/inc/WCopyTable.hxx
@@ -335,7 +335,7 @@ namespace dbaui
         OKButton&           GetOKButton() { return m_pbFinish; }
         Wizard_Button_Style GetPressedButton() const { return m_ePressed; }
         void                EnableButton(Wizard_Button_Style eStyle,sal_Bool bEnable);
-        void                AddWizardPage(OWizardPage* pPage); // Page wird von OCopyTableWizard 
gelöscht
+        void                AddWizardPage(OWizardPage* pPage); // Page is erased by 
OCopyTableWizard
         void                RemoveWizardPage(OWizardPage* pPage); // Page goes again to user
         void                CheckButtons(); // checks which button can be disabled, enabled
 
diff --git a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx 
b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
index 5482bb8..2ec0f0d 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
@@ -27,7 +27,8 @@
 namespace dbaui
 {
     // 
================================================================================================
-    // OQueryDesignFieldUndoAct - Basisklasse fuer Undos in der Feldauflistung im Abfrageentwurf
+    // OQueryDesignFieldUndoAct - Prototype class for undos in the field
+    // listing of a query draft
 
 
     class OQueryDesignFieldUndoAct : public OCommentUndoAction
@@ -52,7 +53,8 @@ namespace dbaui
     };
 
     // 
================================================================================================
-    // OTabFieldCellModifiedUndoAct - Undo-Klasse fuer Aendern einer Zelle einer 
Spaltenbeschreibung
+    // OTabFieldCellModifiedUndoAct - Undo class to change the column
+    // description of a line
 
     class OTabFieldCellModifiedUndoAct : public OQueryDesignFieldUndoAct
     {
@@ -73,7 +75,7 @@ namespace dbaui
     };
 
     // 
================================================================================================
-    // OTabFieldSizedUndoAct - Undo-Klasse fuer Aendern einer Spaltenbreite
+    // OTabFieldSizedUndoAct - Undo class to change a line range
 
     class OTabFieldSizedUndoAct : public OQueryDesignFieldUndoAct
     {
@@ -90,7 +92,9 @@ namespace dbaui
     };
 
     // 
================================================================================================
-    // OTabFieldUndoAct - Basisklasse fuer Undos in der Feldauflistung im Abfrageentwurf, die mit 
Veraendern einer kompletten Feldbeschreibung zu tun haben
+    // OTabFieldUndoAct - Prototype class for undos in the field listing of a
+    // query draft, which have to do with the change of a complete field
+    // description
 
     class OTabFieldUndoAct : public OQueryDesignFieldUndoAct
     {
@@ -104,7 +108,7 @@ namespace dbaui
     };
 
     // 
================================================================================================
-    // OTabFieldDelUndoAct - Undo-Klasse fuer Loeschen eines Feldes
+    // OTabFieldDelUndoAct - Undo class to earase a field
 
     class OTabFieldDelUndoAct : public OTabFieldUndoAct
     {
@@ -117,7 +121,7 @@ namespace dbaui
     };
 
     // 
================================================================================================
-    // OTabFieldDelUndoAct - Undo-Klasse fuer Anlegen eines Feldes
+    // OTabFieldDelUndoAct - Undo class for the creation of a field
 
     class OTabFieldCreateUndoAct : public OTabFieldUndoAct
     {
@@ -130,7 +134,7 @@ namespace dbaui
     };
 
     // 
================================================================================================
-    // OTabFieldMovedUndoAct - Undo-class when a field was moved inside the selection
+    // OTabFieldMovedUndoAct - Undo class when a field was moved inside the selection
 
     class OTabFieldMovedUndoAct : public OTabFieldUndoAct
     {
-- 
1.7.10.4


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.