basctl/source/basicide/baside3.cxx | 2 +-
basctl/source/basicide/bastype3.cxx | 4 ++--
basctl/source/basicide/moduldlg.cxx | 4 ++--
cui/source/tabpages/paragrph.cxx | 2 +-
dbaccess/source/ui/misc/DExport.cxx | 2 +-
include/basic/sbxdef.hxx | 2 +-
rsc/inc/rscerror.h | 2 +-
rsc/source/parser/erscerr.cxx | 6 +++---
rsc/source/prj/start.cxx | 2 +-
sc/source/ui/unoobj/cellsuno.cxx | 2 +-
sc/source/ui/unoobj/styleuno.cxx | 4 ++--
sc/source/ui/view/tabvwsh5.cxx | 2 +-
svtools/source/svhtml/htmlout.cxx | 2 +-
svx/source/fmcomp/gridctrl.cxx | 2 +-
svx/source/items/numfmtsh.cxx | 10 +++++-----
svx/source/table/tablertfexporter.cxx | 2 +-
sw/source/core/txtnode/atrfld.cxx | 2 +-
sw/source/filter/ww8/ww8graf.cxx | 2 +-
18 files changed, 27 insertions(+), 27 deletions(-)
New commits:
commit f8a8a41c2ebbdf31127f74c6975fe140be0815e3
Author: Maarten Bosmans <mkbosm...@gmail.com>
Date: Sat Aug 27 23:27:21 2016 +0200
Translate some German comments and messages
Change-Id: Id15e1afd991f3476e260ba40a8c45c7261113577
Reviewed-on: https://gerrit.libreoffice.org/28493
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/basctl/source/basicide/baside3.cxx
b/basctl/source/basicide/baside3.cxx
index 5929df1..c318fc6 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -342,7 +342,7 @@ void DialogWindow::GetState( SfxItemSet& rSet )
case OBJ_DLG_TREECONTROL: nObj =
SVX_SNAP_TREECONTROL; break;
default: nObj = 0;
}
- SAL_INFO_IF( !nObj, "basctl.basicide",
"SID_CHOOSE_CONTROLS: Unbekannt!" );
+ SAL_INFO_IF( !nObj, "basctl.basicide",
"SID_CHOOSE_CONTROLS: unknown" );
aItem.SetValue( nObj );
}
diff --git a/basctl/source/basicide/bastype3.cxx
b/basctl/source/basicide/bastype3.cxx
index 612e69f..1472fa1 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -240,7 +240,7 @@ SbxVariable* TreeListBox::FindVariable( SvTreeListEntry*
pEntry )
// skip, to find the child entry.
continue;
default:
- OSL_FAIL( "FindVariable: Unbekannter Typ!" );
+ OSL_FAIL( "FindVariable: unknown type" );
pVar = nullptr;
break;
}
@@ -339,7 +339,7 @@ EntryDescriptor TreeListBox::GetEntryDescriptor(
SvTreeListEntry* pEntry )
break;
default:
{
- OSL_FAIL( "GetEntryDescriptor: Unbekannter Typ!" );
+ OSL_FAIL( "GetEntryDescriptor: unknown type" );
eType = OBJ_TYPE_UNKNOWN;
}
break;
diff --git a/basctl/source/basicide/moduldlg.cxx
b/basctl/source/basicide/moduldlg.cxx
index 71bdc91..02daa5d 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -536,9 +536,9 @@ IMPL_LINK_TYPED( OrganizeDialog, ActivatePageHdl,
TabControl *, pTabCtrl, void )
}
else
{
- OSL_FAIL( "PageHdl: Unbekannte ID!" );
+ OSL_FAIL( "PageHdl: Unknown ID" );
}
- DBG_ASSERT( pNewTabPage, "Keine Page!" );
+ DBG_ASSERT( pNewTabPage, "No page" );
pTabCtrl->SetTabPage( nId, pNewTabPage );
}
}
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index b48e793..5163fc6 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -247,7 +247,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet*
rOutSet )
break;
default:
- OSL_FAIL( "unbekannter Type fuer Zeilenabstand." );
+ OSL_FAIL( "unknown LineDist entry" );
break;
}
eState = GetItemSet().GetItemState( nWhich );
diff --git a/dbaccess/source/ui/misc/DExport.cxx
b/dbaccess/source/ui/misc/DExport.cxx
index 5ea7f36..afcfb55 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -540,7 +540,7 @@ sal_Int16 ODatabaseExport::CheckString(const OUString&
aCheckToken, sal_Int16 _n
}
break;
default:
- SAL_WARN("dbaccess.ui", "ODatabaseExport: Unbekanntes
Format");
+ SAL_WARN("dbaccess.ui", "ODatabaseExport: Unkown
NumberFormat");
}
}
}
diff --git a/include/basic/sbxdef.hxx b/include/basic/sbxdef.hxx
index f9fb5cc..24341c6 100644
--- a/include/basic/sbxdef.hxx
+++ b/include/basic/sbxdef.hxx
@@ -155,7 +155,7 @@ typedef sal_uIntPtr SbxError; // Preserve old type
#define ERRCODE_SBX_PROP_READONLY (15UL | ERRCODE_AREA_SBX |
ERRCODE_CLASS_READ) // Property is read only
#define ERRCODE_SBX_PROP_WRITEONLY (16UL | ERRCODE_AREA_SBX |
ERRCODE_CLASS_WRITE) // Property is write only
#define ERRCODE_SBX_INVALID_OBJECT (17UL | ERRCODE_AREA_SBX |
ERRCODE_CLASS_ACCESS) // Invalid object reference
-#define ERRCODE_SBX_NO_METHOD (18UL | ERRCODE_AREA_SBX |
ERRCODE_CLASS_RUNTIME) // Property oder Methode unbekannt
+#define ERRCODE_SBX_NO_METHOD (18UL | ERRCODE_AREA_SBX |
ERRCODE_CLASS_RUNTIME) // Property or Method unknown
#define ERRCODE_SBX_INVALID_USAGE_OBJECT (19UL | ERRCODE_AREA_SBX |
ERRCODE_CLASS_ACCESS) // Invalid object usage
#define ERRCODE_SBX_NO_OLE (20UL | ERRCODE_AREA_SBX |
ERRCODE_CLASS_ACCESS) // No OLE-Object
#define ERRCODE_SBX_BAD_METHOD (21UL | ERRCODE_AREA_SBX |
ERRCODE_CLASS_RUNTIME) // Method not supported
diff --git a/rsc/inc/rscerror.h b/rsc/inc/rscerror.h
index 89bbe56..758cf96 100644
--- a/rsc/inc/rscerror.h
+++ b/rsc/inc/rscerror.h
@@ -124,7 +124,7 @@ class RscError
public:
virtual ~RscError() {}
- sal_uInt32 nErrors;// Anzahl der Fehler
+ sal_uInt32 nErrors; // Number of errors
RscError( RscVerbosity _verbosity )
{
fListing = nullptr;
diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx
index 761dedb..30c9119 100644
--- a/rsc/source/parser/erscerr.cxx
+++ b/rsc/source/parser/erscerr.cxx
@@ -330,10 +330,10 @@ void RscError::ErrorFormat( const ERRTYPE& rError, RscTop
* pClass,
StdErr( "\n" );
StdErr( pFI->GetLine() );
StdErr( "\n" );
- // Fehlerposition anzeigen
+ // Show location of error
for( i = 0; (i +1) < pFI->GetScanPos(); i++ )
StdLstErr( " " );
- LstOut( " ^" ); //Zeilennummern beachten
+ LstOut( " ^" ); // for the linenumber
StdErr( "^" );
StdLstErr( "\n" );
}
@@ -375,7 +375,7 @@ void RscError::ErrorFormat( const ERRTYPE& rError, RscTop *
pClass,
void RscError::Error( const ERRTYPE& rError, RscTop * pClass,
const RscId & aId, const char * pMessage )
{
- if( WRN_LOCALID == rError ) // Keine Warning erzeugen
+ if( WRN_LOCALID == rError ) // ignore warnings
return;
if( rError.IsError() )
nErrors++;
diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx
index 1fd4ead..071350c 100644
--- a/rsc/source/prj/start.cxx
+++ b/rsc/source/prj/start.cxx
@@ -228,7 +228,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
RscStrList aTmpList;
char * pStr;
char ** ppStr;
- RscPtrPtr aCmdLine; // Kommandozeile
+ RscPtrPtr aCmdLine;
sal_uInt32 i;
pStr = ::ResponseFile( &aCmdLine, argv, argc );
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 58e5541..a234b54 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -1917,7 +1917,7 @@ beans::PropertyState
ScCellRangesBase::GetOnePropertyState( sal_uInt16 nItemWhic
eRet = beans::PropertyState_AMBIGUOUS_VALUE;
else
{
- OSL_FAIL("unbekannter ItemState");
+ OSL_FAIL("unknown ItemState");
}
}
}
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index e1b8789..4140596 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -1235,10 +1235,10 @@ beans::PropertyState SAL_CALL
ScStyleObj::getPropertyState( const OUString& aPro
else if ( eState == SfxItemState::DEFAULT )
eRet = beans::PropertyState_DEFAULT_VALUE;
else if ( eState == SfxItemState::DONTCARE )
- eRet = beans::PropertyState_AMBIGUOUS_VALUE; // kann
eigentlich nicht sein...
+ eRet = beans::PropertyState_AMBIGUOUS_VALUE; // should not
happen
else
{
- OSL_FAIL("unbekannter ItemState");
+ OSL_FAIL("unknown ItemState");
}
}
}
diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx
index 42888b6..6167187 100644
--- a/sc/source/ui/view/tabvwsh5.cxx
+++ b/sc/source/ui/view/tabvwsh5.cxx
@@ -229,7 +229,7 @@ void ScTabViewShell::Notify( SfxBroadcaster& rBC, const
SfxHint& rHint )
GetViewData().DeleteTabs( nTab1, nTab2 );
break;
default:
- OSL_FAIL("unbekannter ScTablesHint");
+ OSL_FAIL("unknown ScTablesHint");
}
// hier keine Abfrage auf IsActive() mehr, weil die Aktion von Basic
ausgehen
diff --git a/svtools/source/svhtml/htmlout.cxx
b/svtools/source/svhtml/htmlout.cxx
index 285718d..82e4f8c 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -702,7 +702,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
}
break;
default:
- DBG_ASSERT( pShape, "unbekanntes IMapObject" );
+ DBG_ASSERT( pShape, "unknown IMapObject" );
break;
}
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 50662ad..f2aa1f0 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -2016,7 +2016,7 @@ DbGridControl_Base::RowStatus
DbGridControl::GetRowStatus(long nRow) const
return DbGridControl_Base::FILTER;
else if (m_nCurrentPos >= 0 && nRow == m_nCurrentPos)
{
- // neue Zeile
+ // new row
if (!IsValid(m_xCurrentRow))
return DbGridControl_Base::DELETED;
else if (IsModified())
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index a1d2285..150a904 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -606,7 +606,7 @@ void SvxNumberFormatShell::FillEListWithStd_Impl(
std::vector<OUString>& rList,
* Ist die Liste leer oder gibt es kein aktuelles Format,
* so wird SELPOS_NONE geliefert.
*/
- DBG_ASSERT( pCurFmtTable != nullptr, "Unbekanntes Zahlenformat!" );
+ DBG_ASSERT( pCurFmtTable != nullptr, "unknown NumberFormat" );
aCurrencyFormatList.clear();
@@ -753,7 +753,7 @@ short SvxNumberFormatShell::FillEListWithCurrency_Impl(
std::vector<OUString>& r
* Ist die Liste leer oder gibt es kein aktuelles Format,
* so wird SELPOS_NONE geliefert.
*/
- DBG_ASSERT( pCurFmtTable != nullptr, "Unbekanntes Zahlenformat!" );
+ DBG_ASSERT( pCurFmtTable != nullptr, "unknown NumberFormat" );
const NfCurrencyEntry* pTmpCurrencyEntry;
bool bTmpBanking;
@@ -789,7 +789,7 @@ short SvxNumberFormatShell::FillEListWithSysCurrencys(
std::vector<OUString>& rL
*/
sal_uInt16 nMyType;
- DBG_ASSERT( pCurFmtTable != nullptr, "Unbekanntes Zahlenformat!" );
+ DBG_ASSERT( pCurFmtTable != nullptr, "unknown NumberFormat" );
sal_uInt32 nNFEntry;
OUString aStrComment;
@@ -875,7 +875,7 @@ short SvxNumberFormatShell::FillEListWithUserCurrencys(
std::vector<OUString>& r
*/
sal_uInt16 nMyType;
- DBG_ASSERT( pCurFmtTable != nullptr, "Unbekanntes Zahlenformat!" );
+ DBG_ASSERT( pCurFmtTable != nullptr, "unknown NumberFormat" );
OUString aStrComment;
OUString aNewFormNInfo;
@@ -1067,7 +1067,7 @@ short SvxNumberFormatShell::FillEListWithUsD_Impl(
std::vector<OUString>& rList,
*/
sal_uInt16 nMyType;
- DBG_ASSERT( pCurFmtTable != nullptr, "Unbekanntes Zahlenformat!" );
+ DBG_ASSERT( pCurFmtTable != nullptr, "unknown NumberFormat" );
OUString aStrComment;
OUString aNewFormNInfo;
diff --git a/svx/source/table/tablertfexporter.cxx
b/svx/source/table/tablertfexporter.cxx
index fdbc15e..7806c9d 100644
--- a/svx/source/table/tablertfexporter.cxx
+++ b/svx/source/table/tablertfexporter.cxx
@@ -146,7 +146,7 @@ void SdrTableRtfExporter::WriteRow( const Reference<
XPropertySet >& xRowSet, sa
mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_CELLX ).WriteCharPtr(
OString::number(aColumnStart[nCol]).getStr() );
if ( (nCol & 0x0F) == 0x0F )
- mrStrm.WriteCharPtr( SAL_NEWLINE_STRING ); // Zeilen nicht
zu lang werden lassen
+ mrStrm.WriteCharPtr( SAL_NEWLINE_STRING ); // prevent long
lines
}
mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PARD ).WriteCharPtr(
OOO_STRING_SVTOOLS_RTF_PLAIN ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_INTBL
).WriteCharPtr( SAL_NEWLINE_STRING );
diff --git a/sw/source/core/txtnode/atrfld.cxx
b/sw/source/core/txtnode/atrfld.cxx
index d19ec03..5d4f18f 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -451,7 +451,7 @@ void SwTextField::CopyTextField( SwTextField *pDest ) const
static_cast<SwDDEFieldType*>(pFieldType)->IncRefCnt();
}
- OSL_ENSURE( pFieldType, "unbekannter FieldType" );
+ OSL_ENSURE( pFieldType, "unknown FieldType" );
pFieldType->Add( &rDestFormatField ); // ummelden
rDestFormatField.GetField()->ChgTyp( pFieldType );
}
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 34c10ea..2d33d31 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -1371,7 +1371,7 @@ SdrObject* SwWW8ImplReader::ReadGrafPrimitive(short&
rLeft, SfxAllItemSet &rSet)
case 7:
pRet = ReadCaptionBox(&aHd, rSet);
break;
- default: // unbekannt
+ default: // unknown
m_pStrm->SeekRel(SVBT16ToShort(aHd.cb) - sizeof(WW8_DPHEAD));
break;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
