[Libreoffice-commits] .: 2 commits - sw/source

Martin Kepplinger mkepplinger at kemper.freedesktop.org
Sun Mar 6 19:08:55 PST 2011


 sw/source/ui/envelp/envfmt.cxx   |   34 +++++++++++++++++-----------------
 sw/source/ui/envelp/envfmt.hrc   |    6 +++---
 sw/source/ui/envelp/envlop.hrc   |    6 +++---
 sw/source/ui/envelp/envlop1.cxx  |    4 ++--
 sw/source/ui/envelp/envprt.hrc   |    6 +++---
 sw/source/ui/envelp/label.hrc    |    6 +++---
 sw/source/ui/envelp/label1.cxx   |    4 ++--
 sw/source/ui/envelp/labfmt.cxx   |   36 ++++++++++++++++++------------------
 sw/source/ui/envelp/labfmt.hrc   |    6 +++---
 sw/source/ui/envelp/labprt.cxx   |    2 +-
 sw/source/ui/envelp/labprt.hrc   |    4 ++--
 sw/source/ui/envelp/labprt.hxx   |    2 +-
 sw/source/ui/envelp/mailmrge.hrc |    2 +-
 13 files changed, 59 insertions(+), 59 deletions(-)

New commits:
commit cc8a6dd8fe38d1f9ad1a628ac2c066f11bb9b9a1
Author: Martin Kepplinger <martinkepplinger at eml.cc>
Date:   Mon Mar 7 04:06:24 2011 +0100

    Translate german comments
    
    This translates the remaining german code comments in writer/sw/source/ui/envelp
    to english.
    
    This is contributed under the terms of the MPL 1.1 / GPLv3+ / LGPLv3+ triple
    license.

diff --git a/sw/source/ui/envelp/envprt.hrc b/sw/source/ui/envelp/envprt.hrc
index 044b0cb..3ee2c10 100644
--- a/sw/source/ui/envelp/envprt.hrc
+++ b/sw/source/ui/envelp/envprt.hrc
@@ -30,7 +30,7 @@
 
 #include "envelp.hrc"
 
-// Lokale Resourcen *********************************************************
+// local resources *********************************************************
 
 #define BOX_ALIGN      1
 #define BTN_TOP        7
@@ -44,7 +44,7 @@
 #define BTN_PRTSETUP  15
 #define FL_PRINTER    16
 
-// Globale Resourcen ********************************************************
+// global resources ********************************************************
 
 #define BMP_HOR_LEFT_LOWER  (RC_ENVPRT_BEGIN     )
 #define BMP_HOR_LEFT_UPPER  (RC_ENVPRT_BEGIN +  1)
@@ -67,7 +67,7 @@
 #define ITM_VER_CNTR        (RC_ENVPRT_BEGIN + 16)
 #define ITM_VER_RGHT        (RC_ENVPRT_BEGIN + 17)
 
-// Ueberlaufpruefung ********************************************************
+// overflow check ********************************************************
 
 #define ENVPRT_ACT_END  ITM_VER_RGHT
 
diff --git a/sw/source/ui/envelp/label.hrc b/sw/source/ui/envelp/label.hrc
index c74d9fb..02b25f3 100644
--- a/sw/source/ui/envelp/label.hrc
+++ b/sw/source/ui/envelp/label.hrc
@@ -30,7 +30,7 @@
 
 #include "envelp.hrc"
 
-// Lokale Resourcen *********************************************************
+// local resources *********************************************************
 
 #define TXT_WRITING   1
 #define BOX_ADDR      2
@@ -110,11 +110,11 @@
 //#define FT_MOBILE		        72
 #define FT_FAX			        73
 
-// Globale Resourcen ********************************************************
+// global resources ********************************************************
 #define STR_DOC_TITLE  			(RC_LABEL_BEGIN)
 #define STR_CUSTOM     			(RC_LABEL_BEGIN + 1)
 
-// Ueberlaufpruefung ********************************************************
+// overflow check ********************************************************
 
 #define LABEL_ACT_END  STR_CUSTOM
 
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index bdc0ca1..c035303 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -126,7 +126,7 @@ SwLabDlg::SwLabDlg(Window* pParent, const SfxItemSet& rSet,
 
     GetOKButton().SetText(String(SW_RES(STR_BTN_NEW_DOC)));
     GetOKButton().SetHelpId(HID_LABEL_INSERT);
-    GetOKButton().SetHelpText(aEmptyStr);	// Damit generierter Hilfetext verwendet wird
+    GetOKButton().SetHelpText(aEmptyStr);	// in order for generated help text to get used
 
     AddTabPage(TP_LAB_LAB, m_bLabel ? sFormat : sMedium ,SwLabPage   ::Create, 0, sal_False, 0);
     AddTabPage(TP_VISITING_CARDS, SwVisitingCardPage::Create, 0);
@@ -197,7 +197,7 @@ void SwLabDlg::GetLabItem(SwLabItem &rItem)
 
     if (rActItem != rOldItem)
     {
-        // Wurde schon mal mit (hoffentlich) korrektem Inhalt "geputtet"
+        // Was already "put" with (hopefully) correct content
         rItem = rActItem;
     }
     else
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index acabdaf..fb3ae4d 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -128,7 +128,7 @@ void SwLabPreview::Paint(const Rectangle &)
     aPaintFont.SetTransparent(FALSE);
     SetFont(aPaintFont);
 
-    // Groesse des darzustellenden Bereichs
+    // size of region to be displayed
     long lDispW = ROUND(aItem.lLeft  + aItem.lHDist);
     long lDispH = ROUND(aItem.lUpper + aItem.lVDist);
     if (aItem.nCols == 1)
@@ -140,12 +140,12 @@ void SwLabPreview::Paint(const Rectangle &)
     else
         lDispH += ROUND(aItem.lVDist / 10);
 
-    // Scale factor Skalierungsfaktor
+    // Scale factor 
     float fx = (float) lOutWPix23 / Max(1L, lDispW),
           fy = (float) lOutHPix23 / Max(1L, lDispH),
           f  = fx < fy ? fx : fy;
 
-    // Nullpunkt
+    // zero point 
     long lOutlineW = ROUND(f * lDispW);
     long lOutlineH = ROUND(f * lDispH);
 
@@ -158,17 +158,17 @@ void SwLabPreview::Paint(const Rectangle &)
     long lX3 = ROUND(lX0 + f * (aItem.lLeft  + aItem.lHDist ));
     long lY3 = ROUND(lY0 + f * (aItem.lUpper + aItem.lVDist ));
 
-    // Umriss zeichnen (Flaeche)
+    // draw outline (area)
     DrawRect(Rectangle(Point(lX0, lY0), Size(lOutlineW, lOutlineH)));
 
-    // Umriss zeichnen (Umrandung)
+    // draw outline (border)
     SetLineColor(rFieldTextColor);
-    DrawLine(Point(lX0, lY0), Point(lX0 + lOutlineW - 1, lY0)); // Oben
-    DrawLine(Point(lX0, lY0), Point(lX0, lY0 + lOutlineH - 1)); // Links
+    DrawLine(Point(lX0, lY0), Point(lX0 + lOutlineW - 1, lY0)); // Up
+    DrawLine(Point(lX0, lY0), Point(lX0, lY0 + lOutlineH - 1)); // Left
     if (aItem.nCols == 1)
-        DrawLine(Point(lX0 + lOutlineW - 1, lY0), Point(lX0 + lOutlineW - 1, lY0 + lOutlineH - 1)); // Rechts
+        DrawLine(Point(lX0 + lOutlineW - 1, lY0), Point(lX0 + lOutlineW - 1, lY0 + lOutlineH - 1)); // Right
     if (aItem.nRows == 1)
-        DrawLine(Point(lX0, lY0 + lOutlineH - 1), Point(lX0 + lOutlineW - 1, lY0 + lOutlineH - 1)); // Unten
+        DrawLine(Point(lX0, lY0 + lOutlineH - 1), Point(lX0 + lOutlineW - 1, lY0 + lOutlineH - 1)); // Down
 
     // Labels
     SetClipRegion (Rectangle(Point(lX0, lY0), Size(lOutlineW, lOutlineH)));
@@ -182,7 +182,7 @@ void SwLabPreview::Paint(const Rectangle &)
                     ROUND(f * aItem.lHeight))));
     SetClipRegion();
 
-    // Beschritung: Rand links
+    // annotation: left border
     if (aItem.lLeft)
     {
         long lX = (lX0 + lX1) / 2;
@@ -191,14 +191,14 @@ void SwLabPreview::Paint(const Rectangle &)
         DrawText(Point(lX1 - lLeftWidth, lY0 - 10 - lXHeight), aLeftStr);
     }
 
-    // Beschriftung: Rand oben
+    // annotation: upper border
     if (aItem.lUpper)
     {
         DrawArrow(Point(lX0 - 5, lY0), Point(lX0 - 5, lY1), FALSE);
         DrawText(Point(lX0 - 10 - lUpperWidth, ROUND(lY0 + f * aItem.lUpper / 2 - lXHeight / 2)), aUpperStr);
     }
 
-    // Beschriftung: Breite und Hoehe
+    // annotation: width and height
     {
         long lX = lX2 - lXWidth / 2 - lHeightWidth / 2;
         long lY = lY1 + lXHeight;
@@ -210,7 +210,7 @@ void SwLabPreview::Paint(const Rectangle &)
         DrawText(Point(lX - lHeightWidth / 2, lY2 - lXHeight - lXHeight / 2), aHeightStr);
     }
 
-    // Beschriftung: Horz. Abstand
+    // annotation: horizontal gap
     if (aItem.nCols > 1)
     {
         long lX = (lX1 + lX3) / 2;
@@ -219,21 +219,21 @@ void SwLabPreview::Paint(const Rectangle &)
         DrawText(Point(lX - lHDistWidth / 2, lY0 - 10 - lXHeight), aHDistStr);
     }
 
-    // Beschriftung: Vertikaler Abstand
+    // annotation: vertical gap
     if (aItem.nRows > 1)
     {
         DrawArrow(Point(lX0 - 5, lY1), Point(lX0 - 5, lY3), FALSE);
         DrawText(Point(lX0 - 10 - lVDistWidth, ROUND(lY1 + f * aItem.lVDist / 2 - lXHeight / 2)), aVDistStr);
     }
 
-    // Beschriftung: Spalten
+    // annotation: columns
     {
         long lY = lY0 + lOutlineH + 4;
         DrawArrow(Point(lX0, lY), Point(lX0 + lOutlineW - 1, lY), TRUE);
         DrawText(Point((lX0 + lX0 + lOutlineW - 1) / 2 - lColsWidth / 2, lY + 5), aColsStr);
     }
 
-    // Beschriftung: Zeilen
+    // annotation: lines
     {
         long lX = lX0 + lOutlineW + 4;
         DrawArrow(Point(lX, lY0), Point(lX, lY0 + lOutlineH - 1), TRUE);
@@ -404,7 +404,7 @@ void SwLabFmtPage::ChangeMinMax()
 {
     long lMax = 31748; // 56 cm
 
-    // Min und Max
+    // Min and Max
 
     long lLeft  = static_cast< long >(GETFLDVAL(aLeftField )),
          lUpper = static_cast< long >(GETFLDVAL(aUpperField)),
@@ -431,7 +431,7 @@ void SwLabFmtPage::ChangeMinMax()
     aColsField	.SetMax((lMax - lLeft ) / Max(1L, lHDist));
     aRowsField	.SetMax((lMax - lUpper) / Max(1L, lVDist));
 
-    // First und Last
+    // First and Last
 
     aHDistField .SetFirst(aHDistField .GetMin());
     aVDistField .SetFirst(aVDistField .GetMin());
diff --git a/sw/source/ui/envelp/labfmt.hrc b/sw/source/ui/envelp/labfmt.hrc
index 399b906..96aafaa 100644
--- a/sw/source/ui/envelp/labfmt.hrc
+++ b/sw/source/ui/envelp/labfmt.hrc
@@ -30,7 +30,7 @@
 
 #include "envelp.hrc"
 
-// Lokale Resourcen *********************************************************
+// local resources *********************************************************
 
 #define WIN_PREVIEW   1
 #define TXT_HDIST     2
@@ -64,7 +64,7 @@
 #define PB_HELP         8
 #define MB_QUERY		9
 
-// Globale Resourcen ********************************************************
+// global resources ********************************************************
 
 #define STR_HDIST   (RC_LABFMT_BEGIN + 1)
 #define STR_VDIST   (RC_LABFMT_BEGIN + 2)
@@ -75,7 +75,7 @@
 #define STR_COLS    (RC_LABFMT_BEGIN + 7)
 #define STR_ROWS    (RC_LABFMT_BEGIN + 8)
 
-// Ueberlaufpruefung ********************************************************
+// overflow check ********************************************************
 
 #define LABFMT_ACT_END  STR_ROWS
 
diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx
index 3e7b756..55b0725 100644
--- a/sw/source/ui/envelp/labprt.cxx
+++ b/sw/source/ui/envelp/labprt.cxx
@@ -180,7 +180,7 @@ void SwLabPrtPage::Reset(const SfxItemSet& )
 
     if (pPrinter)
     {
-        // Drucker anzeigen
+        // show printer
         aPrinterInfo.SetText(pPrinter->GetName());
     }
     else
diff --git a/sw/source/ui/envelp/labprt.hrc b/sw/source/ui/envelp/labprt.hrc
index 6e3a191..3f7d879 100644
--- a/sw/source/ui/envelp/labprt.hrc
+++ b/sw/source/ui/envelp/labprt.hrc
@@ -30,7 +30,7 @@
 
 #include "envelp.hrc"
 
-// Lokale Resourcen *********************************************************
+// local resources *********************************************************
 
 #define BTN_PAGE      1
 #define BTN_SINGLE    2
@@ -44,7 +44,7 @@
 #define FL_DONTKNOW  10
 #define CB_SYNCHRON	 11
 
-// Ueberlaufpruefung ********************************************************
+// overflow check ********************************************************
 
 #define LABPRT_ACT_END  0
 
diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx
index 1dd96b7..7e8b246 100644
--- a/sw/source/ui/envelp/labprt.hxx
+++ b/sw/source/ui/envelp/labprt.hxx
@@ -42,7 +42,7 @@ class SwLabItem;
 
 class SwLabPrtPage : public SfxTabPage
 {
-    Printer* 	  pPrinter;				//Fuer die Schachteinstellug - leider.
+    Printer* 	  pPrinter;				// for the shaft setting - unfortunately
 
     RadioButton   aPageButton;
     RadioButton   aSingleButton;
diff --git a/sw/source/ui/envelp/mailmrge.hrc b/sw/source/ui/envelp/mailmrge.hrc
index 5f3ef37..c9a1c2d 100644
--- a/sw/source/ui/envelp/mailmrge.hrc
+++ b/sw/source/ui/envelp/mailmrge.hrc
@@ -30,7 +30,7 @@
 
 #include "envelp.hrc"
 
-// Elemente -----------------------------------------------------------------
+// elements -----------------------------------------------------------------
 
 #define FL_RECORD               1
 #define RB_ALL 			2
commit e66cf09f4a14c3649b5a1ccbd0c9f20660b6bf39
Author: Martin Kepplinger <martinkepplinger at eml.cc>
Date:   Mon Mar 7 02:52:54 2011 +0100

    Translate german comments
    
    This translates german code comments in writer/sw/source/ui/envelp to english.
    
    This is contributed under the terms of the MPL 1.1 / GPLv3+ / LGPLv3+ triple
    license.

diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index e01b532..d0d608a 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -120,7 +120,7 @@ SwEnvFmtPage::SwEnvFmtPage(Window* pParent, const SfxItemSet& rSet) :
     SetMetric(aSizeWidthField,  aMetric);
     SetMetric(aSizeHeightField, aMetric);
 
-    // Menues einhaengen
+    // Hook in Menues
     ::pMenu = new PopupMenu(SW_RES(MNU_EDIT));
     aAddrEditButton.SetPopupMenu(::pMenu);
     aSendEditButton.SetPopupMenu(::pMenu);
@@ -206,7 +206,7 @@ IMPL_LINK_INLINE_START( SwEnvFmtPage, ModifyHdl, Edit *, pEdit )
             if (aIDs[i] == (USHORT)ePaper)
                 aSizeFormatBox.SelectEntryPos(i);
 
-        // Benutzergroesse merken
+        // remember user size
         if (aIDs[aSizeFormatBox.GetSelectEntryPos()] == (USHORT)PAPER_USER)
         {
             lUserW = lWidth ;
@@ -230,7 +230,7 @@ IMPL_LINK( SwEnvFmtPage, EditHdl, MenuButton *, pButton )
     SwWrtShell* pSh = GetParent()->pSh;
     OSL_ENSURE(pSh, "Shell missing");
 
-    // Collection-Ptr ermitteln
+    // determine collection-ptr
     BOOL bSender = pButton != &aAddrEditButton;
 
     SwTxtFmtColl* pColl = pSh->GetTxtCollFromPool( static_cast< USHORT >(
@@ -243,11 +243,11 @@ IMPL_LINK( SwEnvFmtPage, EditHdl, MenuButton *, pButton )
         {
             SfxItemSet *pCollSet = GetCollItemSet(pColl, bSender);
 
-            // Damit die Hintergrundfarbe nicht uebergebuegelt wird:
+            // In order for the background color not to get ironed over:
             SfxAllItemSet aTmpSet(*pCollSet);
 
-            // Das CHRATR_BACKGROUND-Attribut wird fuer den Dialog in
-            // ein RES_BACKGROUND verwandelt und wieder zurueck ...
+            // The CHRATR_BACKGROUND attribute gets transformed into a
+            // RES_BACKGROUND for the dialog and back again ... 
             const SfxPoolItem *pTmpBrush;
 
             if( SFX_ITEM_SET == aTmpSet.GetItemState( RES_CHRATR_BACKGROUND,
@@ -287,10 +287,10 @@ IMPL_LINK( SwEnvFmtPage, EditHdl, MenuButton *, pButton )
         {
             SfxItemSet *pCollSet = GetCollItemSet(pColl, bSender);
 
-            // Damit die Tabulatoren nicht uebergebuegelt werden:
+            // In order for the tabulators not to get ironed over:
             SfxAllItemSet aTmpSet(*pCollSet);
 
-            // Insert tabs, default tabs ito ItemSet
+            // Insert tabs, default tabs into ItemSet
             const SvxTabStopItem& rDefTabs = (const SvxTabStopItem&)
                 pSh->GetView().GetCurShell()->GetPool().GetDefaultItem(RES_PARATR_TABSTOP);
 
@@ -302,20 +302,20 @@ IMPL_LINK( SwEnvFmtPage, EditHdl, MenuButton *, pButton )
             SfxUInt16Item aTabPos( SID_ATTR_TABSTOP_POS, 0 );
             aTmpSet.Put( aTabPos );
 
-            // linker Rand als Offset
+            // left border as offset
             const long nOff = ((SvxLRSpaceItem&)aTmpSet.Get( RES_LR_SPACE )).
                                                                 GetTxtLeft();
             SfxInt32Item aOff( SID_ATTR_TABSTOP_OFFSET, nOff );
             aTmpSet.Put( aOff );
 
-            // BoxInfo setzen
+            // set BoxInfo 
             ::PrepareBoxInfo( aTmpSet, *pSh );
 
             SwParaDlg *pDlg = new SwParaDlg(GetParent(), pSh->GetView(), aTmpSet, DLG_ENVELOP, &pColl->GetName());
 
             if ( pDlg->Execute() == RET_OK )
             {
-                // Defaults evtl umsetzen
+                // maybe relocate defaults 
                 const SfxPoolItem* pItem = 0;
                 SfxItemSet* pOutputSet = (SfxItemSet*)pDlg->GetOutputItemSet();
                 USHORT nNewDist;
@@ -342,7 +342,7 @@ IMPL_LINK( SwEnvFmtPage, EditHdl, MenuButton *, pButton )
 }
 
 /*------------------------------------------------------------------------
-  Beschreibung: Ein temporaeres Itemset, das bei Abbruch verworfen wird
+  Description: A temporary Itemset that gets discarded at abort
 ------------------------------------------------------------------------*/
 
 SfxItemSet *SwEnvFmtPage::GetCollItemSet(SwTxtFmtColl* pColl, BOOL bSender)
@@ -351,7 +351,7 @@ SfxItemSet *SwEnvFmtPage::GetCollItemSet(SwTxtFmtColl* pColl, BOOL bSender)
 
     if (!pAddrSet)
     {
-        // Range ermitteln (Ranges beider Itemsets mergen)
+        // determine range (merge both Itemsets' ranges)
         const USHORT *pRanges = pColl->GetAttrSet().GetRanges();
 
         static USHORT const aRanges[] =
@@ -367,7 +367,7 @@ SfxItemSet *SwEnvFmtPage::GetCollItemSet(SwTxtFmtColl* pColl, BOOL bSender)
             0, 0
         };
 
-        // BruteForce-Merge, weil MergeRange in SvTools buggy ist:
+        // BruteForce merge because MergeRange in SvTools is buggy:
         USHORT i = 0;
         SvLongsSort aMergedRanges( 0, 10 );
 
@@ -387,7 +387,7 @@ SfxItemSet *SwEnvFmtPage::GetCollItemSet(SwTxtFmtColl* pColl, BOOL bSender)
             i += 2;
         }
 
-        // Ranges kompaktieren
+        // compact ranges
         std::vector<USHORT> aCompactedRanges;
 
         aCompactedRanges.push_back(aMergedRanges[0]);
@@ -407,7 +407,7 @@ SfxItemSet *SwEnvFmtPage::GetCollItemSet(SwTxtFmtColl* pColl, BOOL bSender)
             }
         }
 
-        // Neue Ranges erzeugen
+        // create new ranges
         USHORT *pNewRanges = new USHORT[aCompactedRanges.size() + 1];
         for (i = 0; i < aCompactedRanges.size(); ++i)
             pNewRanges[i] = aCompactedRanges[i];
@@ -474,7 +474,7 @@ void SwEnvFmtPage::SetMinMax()
     long lWidth  = Max(lWVal, lHVal),
          lHeight = Min(lWVal, lHVal);
 
-    // Min und Max
+    // Min and Max
     aAddrLeftField.SetMin((long) 100 * (GetFldVal(aSendLeftField) + 566), FUNIT_TWIP);
     aAddrLeftField.SetMax((long) 100 * (lWidth  - 2 * 566), FUNIT_TWIP);
     aAddrTopField .SetMin((long) 100 * (GetFldVal(aSendTopField ) + 2 * 566), FUNIT_TWIP);
diff --git a/sw/source/ui/envelp/envfmt.hrc b/sw/source/ui/envelp/envfmt.hrc
index d2d7011..17cd764 100644
--- a/sw/source/ui/envelp/envfmt.hrc
+++ b/sw/source/ui/envelp/envfmt.hrc
@@ -30,7 +30,7 @@
 
 #include "envelp.hrc"
 
-// Lokale Resourcen *********************************************************
+// local resources *********************************************************
 
 #define FL_ADDRESSEE           11
 #define TXT_ADDR_POS		12
@@ -64,11 +64,11 @@
 #define MID_CHAR        1
 #define MID_PARA        2
 
-// Globale Resourcen ********************************************************
+// global resources ********************************************************
 
 #define MNU_EDIT  (RC_ENVFMT_BEGIN     )
 
-// Ueberlaufpruefung ********************************************************
+// overflow check ********************************************************
 
 #define ENVFMT_ACT_END  MNU_EDIT
 
diff --git a/sw/source/ui/envelp/envlop.hrc b/sw/source/ui/envelp/envlop.hrc
index 1974387..5c03de1 100644
--- a/sw/source/ui/envelp/envlop.hrc
+++ b/sw/source/ui/envelp/envlop.hrc
@@ -30,7 +30,7 @@
 
 #include "envelp.hrc"
 
-// Lokale Resourcen *********************************************************
+// local resources *********************************************************
 
 #define TXT_ADDR      1
 #define EDT_ADDR      2
@@ -46,11 +46,11 @@
 #define WIN_PREVIEW  12
 #define ST_INSERT	13
 #define ST_CHANGE	14
-// Globale Resourcen ********************************************************
+// global resources ********************************************************
 
 #define STR_DOC_TITLE  (RC_ENVLOP_BEGIN)
 
-// Ueberlaufpruefung ********************************************************
+// overflow check ********************************************************
 
 #define ENVLOP_ACT_END  STR_DOC_TITLE
 
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index 9915c9a..32a4dc2 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -105,7 +105,7 @@ void SwEnvPreview::Paint(const Rectangle &)
 
     SetLineColor( aFront );
 
-    // Umschlag
+    // Envelope 
     long   nW = (USHORT) (f * nPageW),
            nH = (USHORT) (f * nPageH),
            nX = (GetOutputSizePixel().Width () - nW) / 2,
@@ -159,7 +159,7 @@ SwEnvDlg::SwEnvDlg(Window* pParent, const SfxItemSet& rSet,
 
     GetOKButton().SetText(String(SW_RES(STR_BTN_NEWDOC)));
     GetOKButton().SetHelpId(HID_ENVELOP_PRINT);
-    GetOKButton().SetHelpText(aEmptyStr);	// Damit generierter Hilfetext verwendet wird
+    GetOKButton().SetHelpText(aEmptyStr);	// in order for generated help text to get used
     if (GetUserButton())
     {
         GetUserButton()->SetText(bInsert ? sInsert : sChange);


More information about the Libreoffice-commits mailing list