diff --git a/src/Gui/Language/FreeCAD_de.qm b/src/Gui/Language/FreeCAD_de.qm index aabc42f6c..9b516182a 100644 Binary files a/src/Gui/Language/FreeCAD_de.qm and b/src/Gui/Language/FreeCAD_de.qm differ diff --git a/src/Gui/Language/FreeCAD_de.ts b/src/Gui/Language/FreeCAD_de.ts index ba9af0248..87f3fc3f2 100644 --- a/src/Gui/Language/FreeCAD_de.ts +++ b/src/Gui/Language/FreeCAD_de.ts @@ -66,6 +66,22 @@ Visual size of the feature + + Base + Basis + + + Angle + Winkel + + + Axis + Achse + + + Position + Position + CmdTestConsoleOutput diff --git a/src/Gui/propertyeditor/PropertyItem.cpp b/src/Gui/propertyeditor/PropertyItem.cpp index bb1277cf6..3c2a108c9 100644 --- a/src/Gui/propertyeditor/PropertyItem.cpp +++ b/src/Gui/propertyeditor/PropertyItem.cpp @@ -259,6 +259,11 @@ int PropertyItem::decimals() const return precision; } +QVariant PropertyItem::displayName() const +{ + return QVariant(displayText); +} + QVariant PropertyItem::toolTip(const App::Property* prop) const { QString str = QApplication::translate("App::Property", @@ -333,7 +338,7 @@ QVariant PropertyItem::editorData(QWidget * /*editor*/) const QString PropertyItem::propertyName() const { if (propName.isEmpty()) - return QLatin1String(""); + return QLatin1String(QT_TRANSLATE_NOOP("App::Property", "")); return propName; } @@ -353,6 +358,9 @@ void PropertyItem::setPropertyName(const QString& name) } propName = display; + + QString str = QApplication::translate("App::Property", propName.toLatin1()); + displayText = str; } void PropertyItem::setPropertyValue(const QString& value) @@ -384,7 +392,7 @@ QVariant PropertyItem::data(int column, int role) const // property name if (column == 0) { if (role == Qt::DisplayRole) - return propertyName(); + return displayName(); // no properties set if (propertyItems.empty()) return QVariant(); @@ -1754,16 +1762,16 @@ PropertyPlacementItem::PropertyPlacementItem() : init_axis(false), changed_value { m_a = static_cast(PropertyUnitItem::create()); m_a->setParent(this); - m_a->setPropertyName(QLatin1String("Angle")); + m_a->setPropertyName(QLatin1String(QT_TRANSLATE_NOOP("App::Property", "Angle"))); this->appendChild(m_a); m_d = static_cast(PropertyVectorItem::create()); m_d->setParent(this); - m_d->setPropertyName(QLatin1String("Axis")); + m_d->setPropertyName(QLatin1String(QT_TRANSLATE_NOOP("App::Property", "Axis"))); m_d->setReadOnly(true); this->appendChild(m_d); m_p = static_cast(PropertyVectorDistanceItem::create()); m_p->setParent(this); - m_p->setPropertyName(QLatin1String("Position")); + m_p->setPropertyName(QLatin1String(QT_TRANSLATE_NOOP("App::Property", "Position"))); m_p->setReadOnly(true); this->appendChild(m_p); } diff --git a/src/Gui/propertyeditor/PropertyItem.h b/src/Gui/propertyeditor/PropertyItem.h index 3afe6240a..bc6ce3f03 100644 --- a/src/Gui/propertyeditor/PropertyItem.h +++ b/src/Gui/propertyeditor/PropertyItem.h @@ -158,6 +158,7 @@ public: protected: PropertyItem(); + virtual QVariant displayName() const; virtual QVariant decoration(const QVariant&) const; virtual QVariant toolTip(const App::Property*) const; virtual QVariant toString(const QVariant&) const; @@ -168,6 +169,7 @@ protected: private: QString propName; + QString displayText; QVariant propData; std::vector propertyItems; PropertyItem *parentItem; diff --git a/src/Gui/propertyeditor/PropertyModel.cpp b/src/Gui/propertyeditor/PropertyModel.cpp index 59e806670..597ba8fde 100644 --- a/src/Gui/propertyeditor/PropertyModel.cpp +++ b/src/Gui/propertyeditor/PropertyModel.cpp @@ -220,7 +220,7 @@ void PropertyModel::buildUp(const PropertyModel::PropertyList& props) App::Property* prop = jt->second.front(); const char* group = prop->getGroup(); bool isEmpty = (group == 0 || group[0] == '\0'); - std::string grp = isEmpty ? "Base" : group; + std::string grp = isEmpty ? QT_TRANSLATE_NOOP("App::Property", "Base") : group; propGroup[grp].push_back(jt->second); }