[Libreoffice-commits] core.git: dbaccess/source dtrans/source
Johnny_M
klasse at partyheld.de
Mon May 22 20:07:18 UTC 2017
dbaccess/source/ui/app/dbu_app.hrc | 2 -
dbaccess/source/ui/control/TableGrantCtrl.cxx | 6 ++--
dbaccess/source/ui/dlg/RelationDlg.cxx | 6 ++--
dbaccess/source/ui/inc/GeneralUndo.hxx | 4 +--
dbaccess/source/ui/inc/browserids.hxx | 6 ++--
dbaccess/source/ui/inc/dbu_brw.hrc | 2 -
dbaccess/source/ui/inc/dbu_control.hrc | 2 -
dbaccess/source/ui/inc/dbu_misc.hrc | 2 -
dbaccess/source/ui/inc/dbu_rel.hrc | 2 -
dbaccess/source/ui/inc/dbu_resource.hrc | 2 -
dbaccess/source/ui/inc/dbu_tbl.hrc | 2 -
dbaccess/source/ui/inc/sbagrid.hrc | 8 +++---
dbaccess/source/ui/misc/TokenWriter.cxx | 2 -
dbaccess/source/ui/misc/WNameMatch.cxx | 2 -
dbaccess/source/ui/misc/WTypeSelect.cxx | 2 -
dbaccess/source/ui/querydesign/JoinController.cxx | 2 -
dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx | 4 +--
dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx | 5 +--
dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx | 2 -
dbaccess/source/ui/querydesign/QueryTableView.cxx | 2 -
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 4 +--
dbaccess/source/ui/querydesign/TableConnectionData.cxx | 2 -
dbaccess/source/ui/relationdesign/RTableConnection.hxx | 2 -
dbaccess/source/ui/relationdesign/RelationController.cxx | 4 +--
dbaccess/source/ui/tabledesign/TableDesignView.cxx | 14 +++++------
dbaccess/source/ui/tabledesign/table.src | 2 -
dbaccess/source/ui/uno/ColumnModel.hxx | 2 -
dtrans/source/win32/ftransl/ftransl.cxx | 2 -
28 files changed, 48 insertions(+), 49 deletions(-)
New commits:
commit 39adbb9593c764429e9ed2176dde755809b3af0f
Author: Johnny_M <klasse at partyheld.de>
Date: Sun May 14 15:55:54 2017 +0200
Translate German comments and debug strings (leftovers in dirs d...)
Translates all (leftovers) found using a custom regex, in directories not
shown by /bin/find-german-comments and beginning with "d".
Additionally, one FormatEntry in dtrans/source/win32/ftransl/ftransl.cxx
is translated as well.
Change-Id: Ia9b3df0210830bd65443883b5f27d56aef811437
Reviewed-on: https://gerrit.libreoffice.org/37600
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/dbaccess/source/ui/app/dbu_app.hrc b/dbaccess/source/ui/app/dbu_app.hrc
index d3a15355d897..e0a894a3331f 100644
--- a/dbaccess/source/ui/app/dbu_app.hrc
+++ b/dbaccess/source/ui/app/dbu_app.hrc
@@ -54,7 +54,7 @@
// please adjust checking before insert new strings
#if RID_STR_UNSUPPORTED_OBJECT_TYPE > RID_STR_APP_END
-#error Resource-Id Ueberlauf in #file, #line
+#error Resource ID overflow in #file, #line
#endif
#endif
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx
index 1651e0ba4dcc..08a16e8761e5 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.cxx
+++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx
@@ -52,7 +52,7 @@ OTableGrantControl::OTableGrantControl( vcl::Window* pParent, WinBits nBits)
,m_nDataPos( 0 )
,m_nDeactivateEvent(nullptr)
{
- // Spalten einfuegen
+ // insert columns
sal_uInt16 i=1;
InsertDataColumn( i, OUString(ModuleRes(STR_TABLE_PRIV_NAME) ), 75);
FreezeColumn(i++);
@@ -124,7 +124,7 @@ void OTableGrantControl::Init()
{
EditBrowseBox::Init();
- // ComboBox instanzieren
+ // instantiate ComboBox
if(!m_pCheckCell)
{
m_pCheckCell = VclPtr<CheckBoxControl>::Create( &GetDataWindow() );
@@ -136,7 +136,7 @@ void OTableGrantControl::Init()
}
UpdateTables();
- // Browser Mode setzen
+ // set browser mode
BrowserMode nMode = BrowserMode::COLUMNSELECTION | BrowserMode::HLINES | BrowserMode::VLINES |
BrowserMode::HIDECURSOR | BrowserMode::HIDESELECT;
diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx
index f3953eecacdd..de032266f634 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.cxx
+++ b/dbaccess/source/ui/dlg/RelationDlg.cxx
@@ -154,7 +154,7 @@ void ORelationDialog::Init(const TTableConnectionData::value_type& _pConnectionD
IMPL_LINK_NOARG( ORelationDialog, OKClickHdl, Button*, void )
{
- // RadioButtons auslesen
+ // Read out RadioButtons
sal_uInt16 nAttrib = 0;
// Delete Rules
@@ -184,8 +184,8 @@ IMPL_LINK_NOARG( ORelationDialog, OKClickHdl, Button*, void )
m_xTableControl->SaveModified();
- //// wenn die ComboBoxen fuer die Tabellenauswahl enabled sind (Constructor mit bAllowTableSelect==sal_True), dann muss ich in die
- //// Connection auch die Tabellennamen stecken
+ //// if the ComboBoxes for the table selection are enabled (constructor with bAllowTableSelect==sal_True),
+ //// then I must also put the table names into the connection
//m_pConnData->SetSourceWinName(m_xTableControl->getSourceWinName());
//m_pConnData->SetDestWinName(m_xTableControl->getDestWinName());
diff --git a/dbaccess/source/ui/inc/GeneralUndo.hxx b/dbaccess/source/ui/inc/GeneralUndo.hxx
index 956d354d3303..18f90fcc300a 100644
--- a/dbaccess/source/ui/inc/GeneralUndo.hxx
+++ b/dbaccess/source/ui/inc/GeneralUndo.hxx
@@ -24,8 +24,8 @@
namespace dbaui
{
- // SbaCommentUndoAction - Undo-Basisklasse fuer Aktionen, deren GetComment einen aus einer Sba-Resource
- // geladenen String liefert
+ // SbaCommentUndoAction - Undo base class for actions whose GetComment provides
+ // a string loaded from a Sba resource
class OCommentUndoAction : public SfxUndoAction
{
diff --git a/dbaccess/source/ui/inc/browserids.hxx b/dbaccess/source/ui/inc/browserids.hxx
index 5ce766602db5..34a83a6ae625 100644
--- a/dbaccess/source/ui/inc/browserids.hxx
+++ b/dbaccess/source/ui/inc/browserids.hxx
@@ -47,10 +47,10 @@
#define ID_BROWSER_REMOVEFILTER SID_FM_REMOVE_FILTER_SORT
#define ID_BROWSER_FILTERED SID_FM_FORM_FILTERED
#define ID_BROWSER_REFRESH SID_FM_REFRESH
-#define ID_BROWSER_COLATTRSET 20 // Spaltenformatierung
-#define ID_BROWSER_COLWIDTH 21 // Spaltenbreite
+#define ID_BROWSER_COLATTRSET 20 // column formatting
+#define ID_BROWSER_COLWIDTH 21 // column width
#define ID_BROWSER_TABLEATTR 22 // table format attributes
-#define ID_BROWSER_ROWHEIGHT 23 // Zeilenhoehe
+#define ID_BROWSER_ROWHEIGHT 23 // row height
#define ID_BROWSER_COLUMNINFO 24 // copies the column description to insert it into the table design
#define ID_BROWSER_ADDTABLE SID_FM_ADDTABLE
#define ID_BROWSER_EXPLORER SID_DSBROWSER_EXPLORER
diff --git a/dbaccess/source/ui/inc/dbu_brw.hrc b/dbaccess/source/ui/inc/dbu_brw.hrc
index a76785bd47a0..e9db2315c125 100644
--- a/dbaccess/source/ui/inc/dbu_brw.hrc
+++ b/dbaccess/source/ui/inc/dbu_brw.hrc
@@ -38,7 +38,7 @@
// please adjust checking before insert new strings
#if STR_LOADING_TABLE > RID_STR_BRW_END
-#error Resource-Id Ueberlauf in #file, #line
+#error Resource ID overflow in #file, #line
#endif
#endif
diff --git a/dbaccess/source/ui/inc/dbu_control.hrc b/dbaccess/source/ui/inc/dbu_control.hrc
index b3f80b058aef..8ae4595b628e 100644
--- a/dbaccess/source/ui/inc/dbu_control.hrc
+++ b/dbaccess/source/ui/inc/dbu_control.hrc
@@ -37,7 +37,7 @@
// please adjust checking before insert new strings
#if STR_ALL_VIEWS > RID_STR_CONTROL_END
-#error Resource-Id Ueberlauf in #file, #line
+#error Resource ID overflow in #file, #line
#endif
#endif
diff --git a/dbaccess/source/ui/inc/dbu_misc.hrc b/dbaccess/source/ui/inc/dbu_misc.hrc
index 8c62134ace7a..ae37b93478f1 100644
--- a/dbaccess/source/ui/inc/dbu_misc.hrc
+++ b/dbaccess/source/ui/inc/dbu_misc.hrc
@@ -45,7 +45,7 @@
// please adjust checking before insert new strings
#if STR_INVALID_TABLE_NAME_LENGTH > RID_STR_MISC_END
-#error Resource-Id Ueberlauf in #file, #line
+#error Resource ID overflow in #file, #line
#endif
#endif
diff --git a/dbaccess/source/ui/inc/dbu_rel.hrc b/dbaccess/source/ui/inc/dbu_rel.hrc
index 85e2bad4cf8b..f8586e40f8cd 100644
--- a/dbaccess/source/ui/inc/dbu_rel.hrc
+++ b/dbaccess/source/ui/inc/dbu_rel.hrc
@@ -31,7 +31,7 @@
// please adjust checking before insert new strings
#if STR_QUERY_REL_COULD_NOT_CREATE > RID_STR_REL_END
-#error Resource-Id Ueberlauf in #file, #line
+#error Resource ID overflow in #file, #line
#endif
#endif
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index d03ca555844c..d339c94cf65f 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -68,7 +68,7 @@
#define RID_STR_APP_END RID_STR_APP_START + 50 // 504 - 543
#if RID_STR_GEN_END > RID_DBACCESS_END
-#error Resource-Id Ueberlauf in #file, #line
+#error Resource ID overflow in #file, #line
#endif
// tab pages
diff --git a/dbaccess/source/ui/inc/dbu_tbl.hrc b/dbaccess/source/ui/inc/dbu_tbl.hrc
index 352ded3719c7..88821d2df8ef 100644
--- a/dbaccess/source/ui/inc/dbu_tbl.hrc
+++ b/dbaccess/source/ui/inc/dbu_tbl.hrc
@@ -73,7 +73,7 @@
// please adjust checking before insert new strings
#if STR_BUTTON_FORMAT > RID_STR_TBL_END
-#error Resource-Id Ueberlauf in #file, #line
+#error Resource ID overflow in #file, #line
#endif
#endif
diff --git a/dbaccess/source/ui/inc/sbagrid.hrc b/dbaccess/source/ui/inc/sbagrid.hrc
index 4940044f6e20..c84dbccead66 100644
--- a/dbaccess/source/ui/inc/sbagrid.hrc
+++ b/dbaccess/source/ui/inc/sbagrid.hrc
@@ -21,15 +21,15 @@
#define DBACCESS_SBA_GRID_HRC
//----------------Menueitems-------------------------------------------------
-// Tabelle
+// Table
#define SBA_WHICHID_START 100
-// Spalten
-// Formatierung
+// Columns
+// Formatting
#define SBA_DEF_RANGEFORMAT (SBA_WHICHID_START+143) // RangeItem
#define SBA_DEF_FMTVALUE (SBA_WHICHID_START+144) // SfxULONG, Format
-// Ausrichtung
+// Justification
#define SBA_ATTR_ALIGN_HOR_JUSTIFY (SBA_WHICHID_START + 145) // SvxHorJustifyItem
#endif // DBACCESS_SBA_GRID_HRC
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index f81c7fa651d0..c55f6b46e4e3 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -987,7 +987,7 @@ void OHTMLImportExport::FontOn()
inline void OHTMLImportExport::FontOff()
{
#if OSL_DEBUG_LEVEL > 0
- OSL_ENSURE(m_bCheckFont,"Kein FontOn() gerufen");
+ OSL_ENSURE(m_bCheckFont,"No FontOn() called");
#endif
TAG_OFF( OOO_STRING_SVTOOLS_HTML_font );
#if OSL_DEBUG_LEVEL > 0
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index 1724b643d1da..1a5938d3914e 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -96,7 +96,7 @@ void OWizNameMatching::dispose()
void OWizNameMatching::Reset()
{
- // urspr"unglichen zustand wiederherstellen
+ // restore original state;
// the left tree contains bitmaps so i need to resize the right one
if(m_bFirstTime)
{
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index b8dbea3c9fcc..cc3980d3e9a5 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -91,7 +91,7 @@ void OWizTypeSelectControl::DeactivateAggregate( EControlType eType )
void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId )
{
- OSL_ENSURE(nRow == -1,"nRow muss -1 sein!");
+ OSL_ENSURE(nRow == -1,"nRow must be -1!");
(void)nRow;
MultiListBox *pListBox = static_cast<OWizTypeSelect*>(m_pParentTabPage.get())->m_pColumnNames;
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index e894ee567e37..0c92646b4ba6 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -291,7 +291,7 @@ void OJoinController::SaveTabWinsPosSize( OJoinTableView::OTableWindowMap* pTabW
// If the TabWins had a SetData, I could save that effort... but they don't, further I also would still have to set information anew, which actually didn't change.
// So I don't delete the TabWinDatas, but only update them.
OSL_ENSURE(m_vTableData.size() == pTabWinList->size(),
- "OJoinController::SaveTabWinsPosSize : inkonsistenter Zustand : sollte genausviel TabWinDatas haben wie TabWins !");
+ "OJoinController::SaveTabWinsPosSize : inconsistent state : should have as many TabWinDatas as TabWins !");
OJoinTableView::OTableWindowMap::const_iterator aIter = pTabWinList->begin();
OJoinTableView::OTableWindowMap::const_iterator aEnd = pTabWinList->end();
diff --git a/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx
index e5fac04e8a51..37e13213d6c0 100644
--- a/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx
+++ b/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx
@@ -23,7 +23,7 @@
namespace dbaui
{
- // OQueryAddTabConnUndoAction - Undo-Klasse fuer Einfuegen einer Connection
+ // OQueryAddTabConnUndoAction - Undo class for inserting a connection
class OQueryTableView;
class OQueryAddTabConnUndoAction : public OQueryTabConnUndoAction
@@ -35,7 +35,7 @@ namespace dbaui
virtual void Redo() override;
};
- // OQueryDelTabConnUndoAction - Undo-Klasse fuer Einfuegen einer Connection
+ // OQueryDelTabConnUndoAction - Undo class for inserting a connection
class OQueryDelTabConnUndoAction : public OQueryTabConnUndoAction
{
diff --git a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
index cfcbb7950bba..543e6a7ca9b6 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
@@ -89,7 +89,7 @@ namespace dbaui
class OTabFieldUndoAct : public OQueryDesignFieldUndoAct
{
protected:
- OTableFieldDescRef pDescr; // geloeschte Spaltenbeschreibung
+ OTableFieldDescRef pDescr; // the deleted column description
public:
OTabFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, sal_uInt16 nCommentID) : OQueryDesignFieldUndoAct(pSelBrwBox, nCommentID) { }
@@ -109,8 +109,7 @@ namespace dbaui
explicit OTabFieldDelUndoAct(OSelectionBrowseBox* pSelBrwBox) : OTabFieldUndoAct(pSelBrwBox, STR_QUERY_UNDO_TABFIELDDELETE) { }
};
- // OTabFieldDelUndoAct - Undo-Klasse fuer Anlegen eines Feldes
- // OTabFieldDelUndoAct - undo class to create a field
+ // OTabFieldCreateUndoAct - undo class for creating a field
class OTabFieldCreateUndoAct : public OTabFieldUndoAct
{
diff --git a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx
index d8f027a37c65..a1790f977a6c 100644
--- a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx
@@ -26,7 +26,7 @@
namespace dbaui
{
- // OQueryMoveTabWinUndoAct - Undo-Klasse fuer Verschieben eines TabWins
+ // OQueryMoveTabWinUndoAct - Undo class for moving a TabWin
class OTableWindow;
class OJoinMoveTabWinUndoAct : public OQueryDesignUndoAction
{
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index a71c067a3d53..f96a49e61852 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -163,7 +163,7 @@ namespace
// we found a table in our view where we can insert some connections
// the key columns have a property called RelatedColumn
- // OQueryTableConnectionData aufbauen
+ // build OQueryTableConnectionData
OQueryTableConnectionData* pNewConnData = new OQueryTableConnectionData( _rSource.GetData(), _rDest.GetData() );
TTableConnectionData::value_type aNewConnData(pNewConnData);
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index b89c7f585ed1..80e8cd603343 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -1261,7 +1261,7 @@ void OSelectionBrowseBox::RemoveColumn(sal_uInt16 _nColumnId)
EditBrowseBox::RemoveColumn( _nColumnId );
InsertDataColumn( _nColumnId , OUString(), DEFAULT_SIZE );
- // Neuzeichnen
+ // redraw
tools::Rectangle aInvalidRect = GetInvalidRect( _nColumnId );
Invalidate( aInvalidRect );
@@ -2116,7 +2116,7 @@ OUString OSelectionBrowseBox::GetCellText(long nRow, sal_uInt16 nColId) const
case BROW_FIELD_ROW:
{
OUString aField = pEntry->GetField();
- if (!aField.isEmpty() && aField[0] == '*') // * durch alias.* ersetzen
+ if (!aField.isEmpty() && aField[0] == '*') // * replace with alias.*
{
aField = pEntry->GetAlias();
if(!aField.isEmpty())
diff --git a/dbaccess/source/ui/querydesign/TableConnectionData.cxx b/dbaccess/source/ui/querydesign/TableConnectionData.cxx
index 22fff0de020f..633af8529457 100644
--- a/dbaccess/source/ui/querydesign/TableConnectionData.cxx
+++ b/dbaccess/source/ui/querydesign/TableConnectionData.cxx
@@ -98,7 +98,7 @@ void OTableConnectionData::SetConnLine( sal_uInt16 nIndex, const OUString& rSour
}
OConnectionLineDataRef pConnLineData = m_vConnLineData[nIndex];
- OSL_ENSURE(pConnLineData != nullptr, "OTableConnectionData::SetConnLine : habe ungueltiges LineData-Objekt");
+ OSL_ENSURE(pConnLineData != nullptr, "OTableConnectionData::SetConnLine : have invalid LineData object");
pConnLineData->SetSourceFieldName( rSourceFieldName );
pConnLineData->SetDestFieldName( rDestFieldName );
diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.hxx b/dbaccess/source/ui/relationdesign/RTableConnection.hxx
index 4684b7c26417..d6621b729bb9 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnection.hxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnection.hxx
@@ -30,7 +30,7 @@ namespace dbaui
public:
ORelationTableConnection( ORelationTableView* pContainer, const TTableConnectionData::value_type& pTabConnData );
ORelationTableConnection( const ORelationTableConnection& rConn );
- // wichtiger Kommentar zum CopyConstructor siehe OTableConnection(const OTableConnection&)
+ // important comment to the CopyConstructor see OTableConnection(const OTableConnection&)
ORelationTableConnection& operator=( const ORelationTableConnection& rConn );
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 9c6ca8a42ec7..cf32dbacdd39 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -421,7 +421,7 @@ namespace
}
pTabConnData->SetConnLine( j, sColumnName, sRelatedName );
}
- // Update/Del-Flags setzen
+ // set update/del flags
sal_Int32 nUpdateRule = 0;
sal_Int32 nDeleteRule = 0;
xKey->getPropertyValue(PROPERTY_UPDATERULE) >>= nUpdateRule;
@@ -430,7 +430,7 @@ namespace
pTabConnData->SetUpdateRules( nUpdateRule );
pTabConnData->SetDeleteRules( nDeleteRule );
- // Kardinalitaet setzen
+ // set cardinality
pTabConnData->SetCardinality();
}
}
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index f21c4564d46e..19c48c2b457d 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -45,7 +45,7 @@ OTableBorderWindow::OTableBorderWindow(vcl::Window* pParent) : Window(pParent,WB
{
ImplInitSettings();
- // Children erzeugen
+ // create children
m_pEditorCtrl = VclPtr<OTableEditorCtrl>::Create( this);
m_pFieldDescWin = VclPtr<OTableFieldDescWin>::Create( this );
@@ -54,7 +54,7 @@ OTableBorderWindow::OTableBorderWindow(vcl::Window* pParent) : Window(pParent,WB
// set depending windows and controls
m_pEditorCtrl->SetDescrWin(m_pFieldDescWin);
- // Splitter einrichten
+ // set up splitter
m_aHorzSplitter->SetSplitHdl( LINK(this, OTableBorderWindow, SplitHdl) );
m_aHorzSplitter->Show();
}
@@ -66,7 +66,7 @@ OTableBorderWindow::~OTableBorderWindow()
void OTableBorderWindow::dispose()
{
- // Children zerstoeren
+ // destroy children
// ::dbaui::notifySystemWindow(this,m_pFieldDescWin,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
m_pEditorCtrl->Hide();
m_pFieldDescWin->Hide();
@@ -80,24 +80,24 @@ void OTableBorderWindow::Resize()
{
const long nSplitterHeight(3);
- // Abmessungen parent window
+ // dimensions of parent window
Size aOutputSize( GetOutputSize() );
long nOutputWidth = aOutputSize.Width();
long nOutputHeight = aOutputSize.Height();
long nSplitPos = m_aHorzSplitter->GetSplitPosPixel();
- // Verschiebebereich Splitter mittleres Drittel des Outputs
+ // shift range of the splitter is the middle third of the output
long nDragPosY = nOutputHeight/3;
long nDragSizeHeight = nOutputHeight/3;
m_aHorzSplitter->SetDragRectPixel( tools::Rectangle(Point(0,nDragPosY), Size(nOutputWidth,nDragSizeHeight) ), this );
if( (nSplitPos < nDragPosY) || (nSplitPos > (nDragPosY+nDragSizeHeight)) )
nSplitPos = nDragPosY+nDragSizeHeight-5;
- // Splitter setzen
+ // set splitter
m_aHorzSplitter->SetPosSizePixel( Point( 0, nSplitPos ), Size(nOutputWidth, nSplitterHeight));
m_aHorzSplitter->SetSplitPosPixel( nSplitPos );
- // Fenster setzen
+ // set window
m_pEditorCtrl->SetPosSizePixel( Point(0, 0), Size(nOutputWidth , nSplitPos) );
m_pFieldDescWin->SetPosSizePixel( Point(0, nSplitPos+nSplitterHeight),
diff --git a/dbaccess/source/ui/tabledesign/table.src b/dbaccess/source/ui/tabledesign/table.src
index 0f3b54f5d333..0d3375196f9f 100644
--- a/dbaccess/source/ui/tabledesign/table.src
+++ b/dbaccess/source/ui/tabledesign/table.src
@@ -44,7 +44,7 @@ String STR_VALUE_NO
String STR_VALUE_NONE
{
- // Bemerkung : sollte auch in anderen Sprachen irgendwie zum Wort 'Wert' passen : Wert - keiner ....
+ // Note: should somehow fit to the word "value" in other languages as well: value - none ....
Text [ en-US ] = "<none>";
};
diff --git a/dbaccess/source/ui/uno/ColumnModel.hxx b/dbaccess/source/ui/uno/ColumnModel.hxx
index 59e4311ea16d..e85b153cf7bf 100644
--- a/dbaccess/source/ui/uno/ColumnModel.hxx
+++ b/dbaccess/source/ui/uno/ColumnModel.hxx
@@ -69,7 +69,7 @@ protected:
public:
explicit OColumnControlModel(const css::uno::Reference< css::lang::XMultiServiceFactory>& _rxFactory);
-// UNO Anbindung
+// UNO connection
DECLARE_XINTERFACE( )
// css::lang::XServiceInfo
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx
index a5b7a9ee2d28..6cb028e95888 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.cxx
@@ -148,7 +148,7 @@ static const std::vector< FormatEntry > g_TranslTable {
// SotClipboardFormatId::EDITENGINE
FormatEntry("application/x-openoffice-editengine;windows_formatname=\"EditEngineFormat\"", "EditEngineFormat", nullptr, CF_INVALID, CPPUTYPE_DEFAULT),
// SotClipboardFormatId::INTERNALLINK_STATE
- FormatEntry("application/x-openoffice-internallink-state;windows_formatname=\"StatusInfo vom SvxInternalLink\"", "StatusInfo vom SvxInternalLink", nullptr, CF_INVALID, CPPUTYPE_DEFAULT),
+ FormatEntry("application/x-openoffice-internallink-state;windows_formatname=\"StatusInfo of SvxInternalLink\"", "StatusInfo of SvxInternalLink", nullptr, CF_INVALID, CPPUTYPE_DEFAULT),
// SotClipboardFormatId::SOLK
FormatEntry("application/x-openoffice-solk;windows_formatname=\"SOLK (StarOffice Link)\"", "SOLK (StarOffice Link)", nullptr, CF_INVALID, CPPUTYPE_DEFAULT),
// SotClipboardFormatId::NETSCAPE_BOOKMARK
More information about the Libreoffice-commits
mailing list