diff --git a/lang/qet_de.qm b/lang/qet_de.qm index cfa1727b8..03028bb79 100644 Binary files a/lang/qet_de.qm and b/lang/qet_de.qm differ diff --git a/lang/qet_de.ts b/lang/qet_de.ts index 0eb19a257..a813d0696 100644 --- a/lang/qet_de.ts +++ b/lang/qet_de.ts @@ -9101,7 +9101,7 @@ Möchten Sie sie ersetzen? Bloc auxiliaire 2 - Zusatzinfo 2 + Zusatzinfo Zusatzartikel 2 @@ -9642,7 +9642,7 @@ Fehler: Stellen Sie sicher, dass die Datei %1 eine gültige dxf-Datei ist See details here: - Fehlermeldung: + Details: diff --git a/sources/ElementsCollection/elementslocation.h b/sources/ElementsCollection/elementslocation.h index ebe5863d6..92fd2ea87 100644 --- a/sources/ElementsCollection/elementslocation.h +++ b/sources/ElementsCollection/elementslocation.h @@ -37,7 +37,7 @@ class XmlElementCollection; This class represents the location, the location of an element or of a category, even of a collection ... in a collection. - She encapsulates a virtual path. + It encapsulates a virtual path. \~French Cette classe represente la localisation, l'emplacement d'un element ou d'une categorie, voire d'une collection... dans une collection. diff --git a/sources/diagramcontext.cpp b/sources/diagramcontext.cpp index 5d067c845..5a1f74744 100644 --- a/sources/diagramcontext.cpp +++ b/sources/diagramcontext.cpp @@ -25,7 +25,7 @@ @brief DiagramContext::add Add all value of other to this. If a key already exist, the value is replaced. - If a key doesn't exist, she will be added. + If a key doesn't exist, it will be added. All other keys of this context, which are not present in other, stay unchanged. @param other */ @@ -124,7 +124,7 @@ int DiagramContext::count() /** @brief DiagramContext::keyMustShow - @return the value pairs with key, if key no found, return false + @return the value pairs with key, if key not found, return false */ bool DiagramContext::keyMustShow(const QString &key) const { @@ -135,7 +135,7 @@ bool DiagramContext::keyMustShow(const QString &key) const bool DiagramContext::operator==(const DiagramContext &dc) const { - return(m_content == dc.m_content && + return(m_content == dc.m_content && m_content_show == dc.m_content_show); } diff --git a/sources/project/projectpropertieshandler.h b/sources/project/projectpropertieshandler.h index 488d6cba8..10d310f07 100644 --- a/sources/project/projectpropertieshandler.h +++ b/sources/project/projectpropertieshandler.h @@ -26,15 +26,15 @@ class QETProject; /** * @brief The ProjectPropertiesHandler class - * A central class who handle, keep and provide all utilities + * A central class that handles, keeps and provides all utilities * to easily manage all kind of properties used in a project. * * This is a new class since QElectroTech 0.9 - * by consequent she is small and you can found a lot of properties (made before qet 0.9) + * by consequence it is small and you can find a lot of properties (made before qet 0.9) * everywhere in the code. * All new properties should be managed by this class - * (of course if it make sense to be managed by this class). - * Older properties who are not managed by this class but should be, + * (of course if it makes sense to be managed by this class). + * Older properties which are not managed by this class but should be, * will be managed in future. */ class ProjectPropertiesHandler diff --git a/sources/qetdiagrameditor.cpp b/sources/qetdiagrameditor.cpp index 9f753de12..a2d937f96 100644 --- a/sources/qetdiagrameditor.cpp +++ b/sources/qetdiagrameditor.cpp @@ -2083,10 +2083,10 @@ void QETDiagramEditor::projectWasClosed(ProjectView *project_view) undo_group.removeStack(project -> undoStack()); QETApp::unregisterProject(project); } - //When project is closed, a lot of signal are emitted, notably if there is an item selected in a diagram. - //In some special case, since signal/slot connection can be direct or queued, some signal are handled after QObject is deleted, and crash qet - //notably in the function Diagram::elements when she call items() (I don't know exactly why). - //set nullptr to "m_selection_properties_editor->setDiagram()" fix this crash + //When project is closed, a lot of signals are emitted, notably if there is an item selected in a diagram. + //In some special case, since signal/slot connection can be direct or queued, some signals are handled after QObject is deleted, and crash qet + //notably in the function Diagram::elements when it calls items() (I don't know exactly why). + //set nullptr to "m_selection_properties_editor->setDiagram()" fixes this crash m_selection_properties_editor->setDiagram(nullptr); project_view -> deleteLater(); project -> deleteLater();