[Libreoffice-commits] core.git: dbaccess/source forms/qa forms/source fpicker/source framework/inc idl/source

[Jens Carl]

 dbaccess/source/core/api/RowSetCache.cxx     |    2 +-
 forms/qa/unoapi/forms_2.sce                  |    2 +-
 forms/source/component/ListBox.hxx           |    2 +-
 forms/source/inc/property.hrc                |    2 +-
 fpicker/source/office/iodlgimp.hxx           |    2 +-
 framework/inc/threadhelp/transactionbase.hxx |    2 +-
 idl/source/objects/slot.cxx                  |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit ad3681df0a1757bbb2c10326d701e36d336ff10c
Author: Jens Carl <j.carl43 at gmx.de>
Date:   Thu Mar 30 06:23:03 2017 +0000

    tdf#39468 Translate German comments
    
    Translate German comments and terms in dbaccess/, forms/, fpicker/, framework/,
    and idl/
    
    Change-Id: I08b3db9492f16fc1c457e8f5eff838c13561c945
    Reviewed-on: https://gerrit.libreoffice.org/35888
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx
index 0f340a5ed97e..4a5e2e447a13 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -1538,7 +1538,7 @@ bool ORowSetCache::checkInnerJoin(const ::connectivity::OSQLParseNode *pNode,con
     else if (SQL_ISRULE(pNode,comparison_predicate))
     {
         // only the comparison of columns is allowed
-        OSL_ENSURE(pNode->count() == 3,"checkInnerJoin: Fehler im Parse Tree");
+        OSL_ENSURE(pNode->count() == 3,"checkInnerJoin: Error in Parse Tree");
         if (!(SQL_ISRULE(pNode->getChild(0),column_ref) &&
                 SQL_ISRULE(pNode->getChild(2),column_ref) &&
                 pNode->getChild(1)->getNodeType() == SQLNodeType::Equal))
diff --git a/forms/qa/unoapi/forms_2.sce b/forms/qa/unoapi/forms_2.sce
index 102999ddc74c..30f4b2401875 100644
--- a/forms/qa/unoapi/forms_2.sce
+++ b/forms/qa/unoapi/forms_2.sce
@@ -22,6 +22,6 @@
 -o forms.OFixedTextModel
 -o forms.OFormattedControl
 #i109939 -o forms.OFormattedFieldWrapper
-# LäSST EIN DOKUMENT OFFEN -o forms.OFormsCollection
+# LETS A DOCUMENT OPEN -o forms.OFormsCollection
 -o forms.OGridControlModel
 -o forms.OGroupBoxControl
diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx
index 402f44d29e95..35398ca71d29 100644
--- a/forms/source/component/ListBox.hxx
+++ b/forms/source/component/ListBox.hxx
@@ -106,7 +106,7 @@ class OListBoxModel :public OBoundControlModel
     ::connectivity::ORowSetValue                m_aSaveValue;
 
     // <properties>
-    css::form::ListSourceType                   m_eListSourceType;      // type der list source
+    css::form::ListSourceType                   m_eListSourceType;      // type of list source
     css::uno::Any                               m_aBoundColumn;
     ValueList                                   m_aListSourceValues;
     ValueList                                   m_aBoundValues;         // do not write directly; use setBoundValues()
diff --git a/forms/source/inc/property.hrc b/forms/source/inc/property.hrc
index 57b6202d085e..b3ce46adb8c8 100644
--- a/forms/source/inc/property.hrc
+++ b/forms/source/inc/property.hrc
@@ -25,7 +25,7 @@
 namespace frm
 {
 
-// PropertyId's, welche eine Zuordnung zu einen PropertyName haben
+// PropertyId's, who have a mapping to a PropertyName
 #define PROPERTY_ID_START           0
 
 #define PROPERTY_ID_NAME                (PROPERTY_ID_START + 1)
diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx
index 8639ea78f489..789f3d7c2ff5 100644
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.hxx
@@ -166,7 +166,7 @@ public:
     bool                        m_bNeedDelayedFilterExecute;
 
     // list of the 5 most recently used filters
-    // Defaultfilter for <All> oder <All ...>
+    // Defaultfilter for <All> or <All ...>
     const SvtFileDialogFilter_Impl* _pDefaultFilter;
 
     // MultiSelection?
diff --git a/framework/inc/threadhelp/transactionbase.hxx b/framework/inc/threadhelp/transactionbase.hxx
index 9d57129a5c82..5ebaf770a0f8 100644
--- a/framework/inc/threadhelp/transactionbase.hxx
+++ b/framework/inc/threadhelp/transactionbase.hxx
@@ -29,7 +29,7 @@ namespace framework{
     @descr          If you use a transaction manager as a member of your class and wish to use it earlier then other ones
                     you should have a look on this implementation. You must use it as the first base class
                     of your implementation - because base classes are initialized by his order and before your
-                    member! Thats why ist a good place to declare this member.
+                    member! Thats why is a good place to declare this member.
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 struct TransactionBase
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 007f94fc85a3..27302f3c645e 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -379,7 +379,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList)
         while ( !bFound && nLow <= nHigh )
         {
             nMid = (nLow + nHigh) >> 1;
-            DBG_ASSERT( nMid < nListCount, "bsearch ist buggy" );
+            DBG_ASSERT( nMid < nListCount, "bsearch is buggy" );
             int nDiff = (int) nId - (int) rList[ nMid ]->GetSlotId().GetValue();
             if ( nDiff < 0)
             {