From 9eac04654c3fa0b0c926cfc5077a1ba2e70e1826 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 10 Feb 2016 12:13:34 +0200 Subject: [PATCH 01/59] Refactoring. Always use AddTool method. --HG-- branch : develop --- src/app/valentina/mainwindow.cpp | 4 +--- src/libs/vtools/tools/vtooldetail.cpp | 3 +-- src/libs/vtools/tools/vtooluniondetails.cpp | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index effd02107..80eefb518 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -244,9 +244,7 @@ void MainWindow::AddPP(const QString &PPName) connect(sceneDraw, &VMainGraphicsScene::NewFactor, spoint, &VToolBasePoint::SetFactor); connect(sceneDraw, &VMainGraphicsScene::EnableToolMove, spoint, &VToolBasePoint::EnableToolMove); - QHash* tools = doc->getTools(); - SCASSERT(tools != nullptr); - tools->insert(id, spoint); + doc->AddTool(id, spoint); VDrawTool::AddRecord(id, Tool::BasePoint, doc); SetEnableTool(true); SetEnableWidgets(true); diff --git a/src/libs/vtools/tools/vtooldetail.cpp b/src/libs/vtools/tools/vtooldetail.cpp index cb9509464..07f1fa3c4 100644 --- a/src/libs/vtools/tools/vtooldetail.cpp +++ b/src/libs/vtools/tools/vtooldetail.cpp @@ -235,8 +235,7 @@ void VToolDetail::Create(const quint32 &_id, const VDetail &newDetail, VMainGrap VToolDetail *detail = new VToolDetail(doc, data, id, typeCreation, scene, drawName); scene->addItem(detail); connect(detail, &VToolDetail::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); - QHash* tools = doc->getTools(); - tools->insert(id, detail); + doc->AddTool(id, detail); } } diff --git a/src/libs/vtools/tools/vtooluniondetails.cpp b/src/libs/vtools/tools/vtooluniondetails.cpp index 1e966fcd7..8ab87b7ce 100644 --- a/src/libs/vtools/tools/vtooluniondetails.cpp +++ b/src/libs/vtools/tools/vtooluniondetails.cpp @@ -551,8 +551,7 @@ VToolUnionDetails* VToolUnionDetails::Create(const quint32 _id, const VDetail &d { //Scene doesn't show this tool, so doc will destroy this object. unionDetails = new VToolUnionDetails(doc, data, id, d1, d2, indexD1, indexD2, typeCreation, drawName, doc); - QHash* tools = doc->getTools(); - tools->insert(id, unionDetails); + doc->AddTool(id, unionDetails); } //Then create new details VNodeDetail det1p1; From 85f5df4b2115a00a790533992b98ccbe0149903d Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 10 Feb 2016 18:45:49 +0200 Subject: [PATCH 02/59] Removing objects before each FullParse. NodeArc, NodeSpline, NodeSplinePath are not part of a scene anymore. --HG-- branch : develop --- src/app/valentina/xml/vpattern.cpp | 7 +- src/libs/ifc/xml/vabstractpattern.cpp | 10 +- src/libs/ifc/xml/vabstractpattern.h | 4 + src/libs/vpatterndb/vcontainer.h | 2 +- .../vtools/tools/nodeDetails/vnodearc.cpp | 93 ++---------------- src/libs/vtools/tools/nodeDetails/vnodearc.h | 22 ++--- .../vtools/tools/nodeDetails/vnodepoint.cpp | 4 +- .../vtools/tools/nodeDetails/vnodepoint.h | 2 +- .../vtools/tools/nodeDetails/vnodespline.cpp | 93 ++---------------- .../vtools/tools/nodeDetails/vnodespline.h | 21 ++--- .../tools/nodeDetails/vnodesplinepath.cpp | 94 ++----------------- .../tools/nodeDetails/vnodesplinepath.h | 21 ++--- src/libs/vtools/tools/vtooldetail.cpp | 15 +-- src/libs/vtools/tools/vtooluniondetails.cpp | 17 ++-- src/libs/vtools/tools/vtooluniondetails.h | 2 +- src/libs/vwidgets/vmaingraphicsscene.cpp | 8 +- 16 files changed, 91 insertions(+), 324 deletions(-) diff --git a/src/app/valentina/xml/vpattern.cpp b/src/app/valentina/xml/vpattern.cpp index 8f1011f4f..9a1fdcb42 100644 --- a/src/app/valentina/xml/vpattern.cpp +++ b/src/app/valentina/xml/vpattern.cpp @@ -1940,7 +1940,7 @@ void VPattern::ParseNodeSpline(const QDomElement &domElement, const Document &pa spl->setIdObject(idObject); spl->setMode(Draw::Modeling); data->UpdateGObject(id, spl); - VNodeSpline::Create(this, data, sceneDetail, id, idObject, parse, Source::FromFile, idTool); + VNodeSpline::Create(this, data, id, idObject, parse, Source::FromFile, idTool); } catch (const VExceptionBadId &e) { @@ -1966,7 +1966,7 @@ void VPattern::ParseNodeSplinePath(const QDomElement &domElement, const Document path->setIdObject(idObject); path->setMode(Draw::Modeling); data->UpdateGObject(id, path); - VNodeSplinePath::Create(this, data, sceneDetail, id, idObject, parse, Source::FromFile, idTool); + VNodeSplinePath::Create(this, data, id, idObject, parse, Source::FromFile, idTool); } catch (const VExceptionBadId &e) { @@ -2037,7 +2037,7 @@ void VPattern::ParseNodeArc(const QDomElement &domElement, const Document &parse arc->setIdObject(idObject); arc->setMode(Draw::Modeling); data->UpdateGObject(id, arc); - VNodeArc::Create(this, data, sceneDetail, id, idObject, parse, Source::FromFile, idTool); + VNodeArc::Create(this, data, id, idObject, parse, Source::FromFile, idTool); } catch (const VExceptionBadId &e) { @@ -2767,6 +2767,7 @@ void VPattern::PrepareForParse(const Document &parse) data->ClearForFullParse(); nameActivPP.clear(); patternPieces.clear(); + qDeleteAll(toolsOnRemove);//Remove all invisible on a scene objects. tools.clear(); cursor = 0; history.clear(); diff --git a/src/libs/ifc/xml/vabstractpattern.cpp b/src/libs/ifc/xml/vabstractpattern.cpp index 78bd24f0d..32220e939 100644 --- a/src/libs/ifc/xml/vabstractpattern.cpp +++ b/src/libs/ifc/xml/vabstractpattern.cpp @@ -107,7 +107,8 @@ const QString VAbstractPattern::IncrementDescription = QStringLiteral("descripti //--------------------------------------------------------------------------------------------------------------------- VAbstractPattern::VAbstractPattern(QObject *parent) : QObject(parent), VDomDocument(), nameActivPP(QString()), cursor(0), tools(QHash()), - history(QVector()), patternPieces(QStringList()), modified(false) + toolsOnRemove(QVector()), history(QVector()), patternPieces(QStringList()), + modified(false) {} //--------------------------------------------------------------------------------------------------------------------- @@ -431,6 +432,13 @@ void VAbstractPattern::AddTool(const quint32 &id, VDataTool *tool) tools.insert(id, tool); } +//--------------------------------------------------------------------------------------------------------------------- +void VAbstractPattern::AddToolOnRemove(VDataTool *tool) +{ + SCASSERT(tool != nullptr); + toolsOnRemove.append(tool); +} + //--------------------------------------------------------------------------------------------------------------------- /** * @brief getHistory return list with list of history records. diff --git a/src/libs/ifc/xml/vabstractpattern.h b/src/libs/ifc/xml/vabstractpattern.h index c77fe9e32..46c99eb85 100644 --- a/src/libs/ifc/xml/vabstractpattern.h +++ b/src/libs/ifc/xml/vabstractpattern.h @@ -81,6 +81,8 @@ public: VDataTool *getTool(const quint32 &id); void AddTool(const quint32 &id, VDataTool *tool); + void AddToolOnRemove(VDataTool *tool); + QVector *getHistory(); QVector getLocalHistory() const; @@ -240,6 +242,8 @@ protected: /** @brief tools list with pointer on tools. */ QHash tools; + QVector toolsOnRemove; + /** @brief history history records. */ QVector history; diff --git a/src/libs/vpatterndb/vcontainer.h b/src/libs/vpatterndb/vcontainer.h index e2f7c3770..2ceaf97b2 100644 --- a/src/libs/vpatterndb/vcontainer.h +++ b/src/libs/vpatterndb/vcontainer.h @@ -289,7 +289,7 @@ void VContainer::AddVariable(const QString& name, T *var) throw VExceptionBadId(tr("Can't find object. Type mismatch."), name); } } - d->variables[name] = QSharedPointer(var); + d->variables.insert(name, QSharedPointer(var)); uniqueNames.insert(name); } diff --git a/src/libs/vtools/tools/nodeDetails/vnodearc.cpp b/src/libs/vtools/tools/nodeDetails/vnodearc.cpp index 9e41cc818..b9863c4ea 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodearc.cpp +++ b/src/libs/vtools/tools/nodeDetails/vnodearc.cpp @@ -47,12 +47,9 @@ const QString VNodeArc::ToolType = QStringLiteral("modeling"); * @param parent parent object. */ VNodeArc::VNodeArc(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 idArc, const Source &typeCreation, - const quint32 &idTool, QObject *qoParent, QGraphicsItem *parent) - :VAbstractNode(doc, data, id, idArc, idTool, qoParent), QGraphicsPathItem(parent) + const quint32 &idTool, QObject *qoParent) + :VAbstractNode(doc, data, id, idArc, idTool, qoParent) { - RefreshGeometry(); - this->setPen(QPen(baseColor, qApp->toPixel(WidthHairLine(*VAbstractTool::data.GetPatternUnit())))); - ToolCreation(typeCreation); } @@ -68,13 +65,13 @@ VNodeArc::VNodeArc(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 * @param idTool tool id. * @param parent QObject parent */ -void VNodeArc::Create(VAbstractPattern *doc, VContainer *data, VMainGraphicsScene *scene, quint32 id, quint32 idArc, - const Document &parse, const Source &typeCreation, const quint32 &idTool, QObject *parent) +void VNodeArc::Create(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 idArc, + const Document &parse, const Source &typeCreation, const quint32 &idTool) { VAbstractTool::AddRecord(id, Tool::NodeArc, doc); if (parse == Document::FullParse) { - VNodeArc *arc = new VNodeArc(doc, data, id, idArc, typeCreation, idTool, parent); + VNodeArc *arc = new VNodeArc(doc, data, id, idArc, typeCreation, idTool, doc); doc->AddTool(id, arc); if (idTool != NULL_ID) @@ -86,10 +83,8 @@ void VNodeArc::Create(VAbstractPattern *doc, VContainer *data, VMainGraphicsScen } else { - // Try to prevent memory leak - scene->addItem(arc);// First adopted by scene - arc->hide();// If no one will use node, it will stay hidden - arc->SetParentType(ParentType::Scene); + // Help to delete the node before each FullParse + doc->AddToolOnRemove(arc); } } else @@ -104,15 +99,6 @@ QString VNodeArc::getTagName() const return VNodeArc::TagName; } -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief FullUpdateFromFile update tool data form file. - */ -void VNodeArc::FullUpdateFromFile() -{ - RefreshGeometry(); -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief AddToFile add tag with informations about tool into file. @@ -148,68 +134,3 @@ void VNodeArc::RefreshDataInFile() } } } - -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief mouseReleaseEvent handle mouse release events. - * @param event mouse release event. - */ -void VNodeArc::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) -{ - if (event->button() == Qt::LeftButton) - { - emit ChoosedTool(id, SceneObject::Arc); - } - QGraphicsItem::mouseReleaseEvent(event); -} - -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief hoverMoveEvent handle hover move events. - * @param event hover move event. - */ -// cppcheck-suppress unusedFunction -void VNodeArc::hoverMoveEvent(QGraphicsSceneHoverEvent *event) -{ - Q_UNUSED(event); - this->setPen(QPen(currentColor, qApp->toPixel(WidthMainLine(*VAbstractTool::data.GetPatternUnit())))); -} - -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief hoverLeaveEvent handle hover leave events. - * @param event hover leave event. - */ -void VNodeArc::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) -{ - Q_UNUSED(event); - this->setPen(QPen(currentColor, qApp->toPixel(WidthHairLine(*VAbstractTool::data.GetPatternUnit())))); -} - -//--------------------------------------------------------------------------------------------------------------------- -void VNodeArc::ShowNode() -{ - if (parentType != ParentType::Scene) - { - show(); - } -} - -//--------------------------------------------------------------------------------------------------------------------- -void VNodeArc::HideNode() -{ - hide(); -} - -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief RefreshGeometry refresh item on scene. - */ -void VNodeArc::RefreshGeometry() -{ -// const QSharedPointer arc = VAbstractTool::data.GeometricObject(id); -// QPainterPath path; -// path.addPath(arc->GetPath()); -// path.setFillRule( Qt::WindingFill ); -// this->setPath(path); -} diff --git a/src/libs/vtools/tools/nodeDetails/vnodearc.h b/src/libs/vtools/tools/nodeDetails/vnodearc.h index 1e87f74f0..cb416aaea 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodearc.h +++ b/src/libs/vtools/tools/nodeDetails/vnodearc.h @@ -35,33 +35,27 @@ /** * @brief The VNodeArc class arc detail node. */ -class VNodeArc :public VAbstractNode, public QGraphicsPathItem +class VNodeArc :public VAbstractNode { Q_OBJECT public: VNodeArc(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 idArc, const Source &typeCreation, - const quint32 &idTool = 0, QObject *qoParent = nullptr, QGraphicsItem * parent = nullptr); + const quint32 &idTool = 0, QObject *qoParent = nullptr); - static void Create(VAbstractPattern *doc, VContainer *data, VMainGraphicsScene *scene, quint32 id, - quint32 idArc, const Document &parse, - const Source &typeCreation, const quint32 &idTool = 0, QObject *parent = nullptr); + static void Create(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 idArc, const Document &parse, + const Source &typeCreation, const quint32 &idTool = 0); static const QString TagName; static const QString ToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} - enum { Type = UserType + static_cast(Tool::NodeArc)}; virtual QString getTagName() const Q_DECL_OVERRIDE; public slots: - virtual void FullUpdateFromFile() Q_DECL_OVERRIDE; + virtual void FullUpdateFromFile() Q_DECL_OVERRIDE {} protected: virtual void AddToFile() Q_DECL_OVERRIDE; virtual void RefreshDataInFile() Q_DECL_OVERRIDE; - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; - virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; - virtual void ShowNode() Q_DECL_OVERRIDE; - virtual void HideNode() Q_DECL_OVERRIDE; + virtual void ShowNode() Q_DECL_OVERRIDE {} + virtual void HideNode() Q_DECL_OVERRIDE {} private: - void RefreshGeometry(); + Q_DISABLE_COPY(VNodeArc) }; #endif // VNODEARC_H4 diff --git a/src/libs/vtools/tools/nodeDetails/vnodepoint.cpp b/src/libs/vtools/tools/nodeDetails/vnodepoint.cpp index 4ceca428e..08bb62969 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodepoint.cpp +++ b/src/libs/vtools/tools/nodeDetails/vnodepoint.cpp @@ -81,14 +81,14 @@ VNodePoint::VNodePoint(VAbstractPattern *doc, VContainer *data, quint32 id, quin */ void VNodePoint::Create(VAbstractPattern *doc, VContainer *data, VMainGraphicsScene *scene, quint32 id, quint32 idPoint, const Document &parse, - const Source &typeCreation, const quint32 &idTool, QObject *parent) + const Source &typeCreation, const quint32 &idTool) { VAbstractTool::AddRecord(id, Tool::NodePoint, doc); if (parse == Document::FullParse) { //TODO Need create garbage collector and remove all nodes, what we don't use. //Better check garbage before each saving file. Check only modeling tags. - VNodePoint *point = new VNodePoint(doc, data, id, idPoint, typeCreation, idTool, parent); + VNodePoint *point = new VNodePoint(doc, data, id, idPoint, typeCreation, idTool, doc); connect(scene, &VMainGraphicsScene::EnableToolMove, point, &VNodePoint::EnableToolMove); doc->AddTool(id, point); diff --git a/src/libs/vtools/tools/nodeDetails/vnodepoint.h b/src/libs/vtools/tools/nodeDetails/vnodepoint.h index 7a015e239..2b97b59de 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodepoint.h +++ b/src/libs/vtools/tools/nodeDetails/vnodepoint.h @@ -50,7 +50,7 @@ public: static void Create(VAbstractPattern *doc, VContainer *data, VMainGraphicsScene *scene, quint32 id, quint32 idPoint, const Document &parse, - const Source &typeCreation, const quint32 &idTool = 0, QObject *parent = nullptr); + const Source &typeCreation, const quint32 &idTool = 0); static const QString TagName; static const QString ToolType; virtual int type() const Q_DECL_OVERRIDE {return Type;} diff --git a/src/libs/vtools/tools/nodeDetails/vnodespline.cpp b/src/libs/vtools/tools/nodeDetails/vnodespline.cpp index 56211a3ac..65110fc3a 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodespline.cpp +++ b/src/libs/vtools/tools/nodeDetails/vnodespline.cpp @@ -47,13 +47,9 @@ const QString VNodeSpline::ToolType = QStringLiteral("modelingSpline"); * @param parent QGraphicsItem parent. */ VNodeSpline::VNodeSpline(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 idSpline, - const Source &typeCreation, const quint32 &idTool, QObject *qoParent, - QGraphicsItem * parent) - :VAbstractNode(doc, data, id, idSpline, idTool, qoParent), QGraphicsPathItem(parent) + const Source &typeCreation, const quint32 &idTool, QObject *qoParent) + :VAbstractNode(doc, data, id, idSpline, idTool, qoParent) { - RefreshGeometry(); - this->setPen(QPen(baseColor, qApp->toPixel(WidthHairLine(*VAbstractTool::data.GetPatternUnit())))); - ToolCreation(typeCreation); } @@ -69,15 +65,15 @@ VNodeSpline::VNodeSpline(VAbstractPattern *doc, VContainer *data, quint32 id, qu * @param idTool id node. * @return pointer to node. */ -VNodeSpline *VNodeSpline::Create(VAbstractPattern *doc, VContainer *data, VMainGraphicsScene *scene, quint32 id, +VNodeSpline *VNodeSpline::Create(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 idSpline, const Document &parse, - const Source &typeCreation, const quint32 &idTool, QObject *parent) + const Source &typeCreation, const quint32 &idTool) { VAbstractTool::AddRecord(id, Tool::NodeSpline, doc); VNodeSpline *spl = nullptr; if (parse == Document::FullParse) { - spl = new VNodeSpline(doc, data, id, idSpline, typeCreation, idTool, parent); + spl = new VNodeSpline(doc, data, id, idSpline, typeCreation, idTool, doc); doc->AddTool(id, spl); if (idTool != NULL_ID) @@ -89,10 +85,8 @@ VNodeSpline *VNodeSpline::Create(VAbstractPattern *doc, VContainer *data, VMainG } else { - // Try to prevent memory leak - scene->addItem(spl);// First adopted by scene - spl->hide();// If no one will use node, it will stay hidden - spl->SetParentType(ParentType::Scene); + // Help to delete the node before each FullParse + doc->AddToolOnRemove(spl); } } else @@ -108,15 +102,6 @@ QString VNodeSpline::getTagName() const return VNodeSpline::TagName; } -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief FullUpdateFromFile update tool data form file. - */ -void VNodeSpline::FullUpdateFromFile() -{ - RefreshGeometry(); -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief AddToFile add tag with informations about tool into file. @@ -152,67 +137,3 @@ void VNodeSpline::RefreshDataInFile() } } } - -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief mouseReleaseEvent handle mouse release events. - * @param event mouse release event. - */ -void VNodeSpline::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) -{ - if (event->button() == Qt::LeftButton) - { - emit ChoosedTool(id, SceneObject::Spline); - } - QGraphicsItem::mouseReleaseEvent(event); -} - -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief hoverMoveEvent handle hover move events. - * @param event hover move event. - */ -void VNodeSpline::hoverMoveEvent(QGraphicsSceneHoverEvent *event) -{ - Q_UNUSED(event); - this->setPen(QPen(currentColor, qApp->toPixel(WidthMainLine(*VAbstractTool::data.GetPatternUnit())))); -} - -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief hoverLeaveEvent handle hover leave events. - * @param event hover leave event. - */ -void VNodeSpline::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) -{ - Q_UNUSED(event); - this->setPen(QPen(currentColor, qApp->toPixel(WidthHairLine(*VAbstractTool::data.GetPatternUnit())))); -} - -//--------------------------------------------------------------------------------------------------------------------- -void VNodeSpline::ShowNode() -{ - if (parentType != ParentType::Scene) - { - show(); - } -} - -//--------------------------------------------------------------------------------------------------------------------- -void VNodeSpline::HideNode() -{ - hide(); -} - -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief RefreshGeometry refresh item on scene. - */ -void VNodeSpline::RefreshGeometry() -{ -// const QSharedPointer spl = VAbstractTool::data.GeometricObject(id); -// QPainterPath path; -// path.addPath(spl->GetPath()); -// path.setFillRule( Qt::WindingFill ); -// this->setPath(path); -} diff --git a/src/libs/vtools/tools/nodeDetails/vnodespline.h b/src/libs/vtools/tools/nodeDetails/vnodespline.h index d04ba33d6..0bfdd123d 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodespline.h +++ b/src/libs/vtools/tools/nodeDetails/vnodespline.h @@ -35,33 +35,28 @@ /** * @brief The VNodeSpline class spline detail node. */ -class VNodeSpline:public VAbstractNode, public QGraphicsPathItem +class VNodeSpline:public VAbstractNode { Q_OBJECT public: VNodeSpline(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 idSpline, const Source &typeCreation, - const quint32 &idTool = 0, QObject *qoParent = nullptr, QGraphicsItem * parent = nullptr); + const quint32 &idTool = 0, QObject *qoParent = nullptr); - static VNodeSpline *Create(VAbstractPattern *doc, VContainer *data, VMainGraphicsScene *scene, quint32 id, + static VNodeSpline *Create(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 idSpline, const Document &parse, - const Source &typeCreation, const quint32 &idTool = 0, QObject *parent = nullptr); + const Source &typeCreation, const quint32 &idTool = 0); static const QString TagName; static const QString ToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} - enum { Type = UserType + static_cast(Tool::NodeSpline)}; virtual QString getTagName() const Q_DECL_OVERRIDE; public slots: - virtual void FullUpdateFromFile () Q_DECL_OVERRIDE; + virtual void FullUpdateFromFile () Q_DECL_OVERRIDE {} protected: virtual void AddToFile () Q_DECL_OVERRIDE; virtual void RefreshDataInFile() Q_DECL_OVERRIDE; - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; - virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; - virtual void ShowNode() Q_DECL_OVERRIDE; - virtual void HideNode() Q_DECL_OVERRIDE; + virtual void ShowNode() Q_DECL_OVERRIDE {} + virtual void HideNode() Q_DECL_OVERRIDE {} private: - void RefreshGeometry (); + Q_DISABLE_COPY(VNodeSpline) }; #endif // VNODESPLINE_H diff --git a/src/libs/vtools/tools/nodeDetails/vnodesplinepath.cpp b/src/libs/vtools/tools/nodeDetails/vnodesplinepath.cpp index 06b547ac3..7bde3bcd3 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodesplinepath.cpp +++ b/src/libs/vtools/tools/nodeDetails/vnodesplinepath.cpp @@ -48,13 +48,9 @@ const QString VNodeSplinePath::ToolType = QStringLiteral("modelingPath"); * @param parent parent object. */ VNodeSplinePath::VNodeSplinePath(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 idSpline, - const Source &typeCreation, const quint32 &idTool, QObject *qoParent, - QGraphicsItem * parent) - :VAbstractNode(doc, data, id, idSpline, idTool, qoParent), QGraphicsPathItem(parent) + const Source &typeCreation, const quint32 &idTool, QObject *qoParent) + :VAbstractNode(doc, data, id, idSpline, idTool, qoParent) { - RefreshGeometry(); - this->setPen(QPen(baseColor, qApp->toPixel(WidthHairLine(*VAbstractTool::data.GetPatternUnit())))); - ToolCreation(typeCreation); } @@ -70,14 +66,13 @@ VNodeSplinePath::VNodeSplinePath(VAbstractPattern *doc, VContainer *data, quint3 * @param idTool tool id. * @param parent QObject parent. */ -void VNodeSplinePath::Create(VAbstractPattern *doc, VContainer *data, VMainGraphicsScene *scene, quint32 id, - quint32 idSpline, const Document &parse, - const Source &typeCreation, const quint32 &idTool, QObject *parent) +void VNodeSplinePath::Create(VAbstractPattern *doc, VContainer *data, quint32 id, + quint32 idSpline, const Document &parse, const Source &typeCreation, const quint32 &idTool) { VAbstractTool::AddRecord(id, Tool::NodeSplinePath, doc); if (parse == Document::FullParse) { - VNodeSplinePath *splPath = new VNodeSplinePath(doc, data, id, idSpline, typeCreation, idTool, parent); + VNodeSplinePath *splPath = new VNodeSplinePath(doc, data, id, idSpline, typeCreation, idTool, doc); doc->AddTool(id, splPath); if (idTool != NULL_ID) @@ -89,10 +84,8 @@ void VNodeSplinePath::Create(VAbstractPattern *doc, VContainer *data, VMainGraph } else { - // Try to prevent memory leak - scene->addItem(splPath);// First adopted by scene - splPath->hide();// If no one will use node, it will stay hidden - splPath->SetParentType(ParentType::Scene); + // Help to delete the node before each FullParse + doc->AddToolOnRemove(splPath); } } else @@ -107,15 +100,6 @@ QString VNodeSplinePath::getTagName() const return VNodeSplinePath::TagName; } -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief FullUpdateFromFile update tool data form file. - */ -void VNodeSplinePath::FullUpdateFromFile() -{ - RefreshGeometry(); -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief AddToFile add tag with informations about tool into file. @@ -151,67 +135,3 @@ void VNodeSplinePath::RefreshDataInFile() } } } - -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief mouseReleaseEvent handle mouse release events. - * @param event mouse release event. - */ -void VNodeSplinePath::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) -{ - if (event->button() == Qt::LeftButton) - { - emit ChoosedTool(id, SceneObject::SplinePath); - } - QGraphicsItem::mouseReleaseEvent(event); -} - -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief hoverMoveEvent handle hover move events. - * @param event hover move event. - */ -void VNodeSplinePath::hoverMoveEvent(QGraphicsSceneHoverEvent *event) -{ - Q_UNUSED(event); - this->setPen(QPen(currentColor, qApp->toPixel(WidthMainLine(*VAbstractTool::data.GetPatternUnit())))); -} - -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief hoverLeaveEvent handle hover leave events. - * @param event hover leave event. - */ -void VNodeSplinePath::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) -{ - Q_UNUSED(event); - this->setPen(QPen(currentColor, qApp->toPixel(WidthHairLine(*VAbstractTool::data.GetPatternUnit())))); -} - -//--------------------------------------------------------------------------------------------------------------------- -void VNodeSplinePath::ShowNode() -{ - if (parentType != ParentType::Scene) - { - show(); - } -} - -//--------------------------------------------------------------------------------------------------------------------- -void VNodeSplinePath::HideNode() -{ - hide(); -} - -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief RefreshGeometry refresh item on scene. - */ -void VNodeSplinePath::RefreshGeometry() -{ -// const QSharedPointer splPath = VAbstractTool::data.GeometricObject(id); -// QPainterPath path; -// path.addPath(splPath->GetPath()); -// path.setFillRule( Qt::WindingFill ); -// this->setPath(path); -} diff --git a/src/libs/vtools/tools/nodeDetails/vnodesplinepath.h b/src/libs/vtools/tools/nodeDetails/vnodesplinepath.h index c82d3787d..3fefc0fb9 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodesplinepath.h +++ b/src/libs/vtools/tools/nodeDetails/vnodesplinepath.h @@ -35,32 +35,27 @@ /** * @brief The VNodeSplinePath class spline path detail node. */ -class VNodeSplinePath : public VAbstractNode, public QGraphicsPathItem +class VNodeSplinePath : public VAbstractNode { Q_OBJECT public: VNodeSplinePath(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 idSpline, const Source &typeCreation, - const quint32 &idTool = 0, QObject *qoParent = nullptr, QGraphicsItem * parent = nullptr); - static void Create(VAbstractPattern *doc, VContainer *data, VMainGraphicsScene *scene, quint32 id, + const quint32 &idTool = 0, QObject *qoParent = nullptr); + static void Create(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 idSpline, const Document &parse, - const Source &typeCreation, const quint32 &idTool = 0, QObject *parent = 0); + const Source &typeCreation, const quint32 &idTool = 0); static const QString TagName; static const QString ToolType; - virtual int type() const Q_DECL_OVERRIDE {return Type;} - enum { Type = UserType + static_cast(Tool::SplinePath)}; virtual QString getTagName() const Q_DECL_OVERRIDE; public slots: - virtual void FullUpdateFromFile() Q_DECL_OVERRIDE; + virtual void FullUpdateFromFile() Q_DECL_OVERRIDE {} protected: virtual void AddToFile() Q_DECL_OVERRIDE; virtual void RefreshDataInFile() Q_DECL_OVERRIDE; - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; - virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; - virtual void ShowNode() Q_DECL_OVERRIDE; - virtual void HideNode() Q_DECL_OVERRIDE; + virtual void ShowNode() Q_DECL_OVERRIDE {} + virtual void HideNode() Q_DECL_OVERRIDE {} private: - void RefreshGeometry(); + Q_DISABLE_COPY(VNodeSplinePath) }; #endif // VNODESPLINEPATH_H diff --git a/src/libs/vtools/tools/vtooldetail.cpp b/src/libs/vtools/tools/vtooldetail.cpp index 07f1fa3c4..b3f222d32 100644 --- a/src/libs/vtools/tools/vtooldetail.cpp +++ b/src/libs/vtools/tools/vtooldetail.cpp @@ -88,13 +88,13 @@ VToolDetail::VToolDetail(VAbstractPattern *doc, VContainer *data, const quint32 InitTool(scene, detail.at(i)); break; case (Tool::NodeArc): - InitTool(scene, detail.at(i)); + doc->IncrementReferens(detail.at(i).getId()); break; case (Tool::NodeSpline): - InitTool(scene, detail.at(i)); + doc->IncrementReferens(detail.at(i).getId()); break; case (Tool::NodeSplinePath): - InitTool(scene, detail.at(i)); + doc->IncrementReferens(detail.at(i).getId()); break; default: qDebug()<<"Get wrong tool type. Ignore."; @@ -173,26 +173,27 @@ void VToolDetail::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstrac case (Tool::NodeArc): { id = CreateNode(data, nodeD.getId()); - VNodeArc::Create(doc, data, scene, id, nodeD.getId(), Document::FullParse, Source::FromGui); + VNodeArc::Create(doc, data, id, nodeD.getId(), Document::FullParse, Source::FromGui); } break; case (Tool::NodeSpline): { id = CreateNode(data, nodeD.getId()); - VNodeSpline::Create(doc, data, scene, id, nodeD.getId(), Document::FullParse, Source::FromGui); + VNodeSpline::Create(doc, data, id, nodeD.getId(), Document::FullParse, Source::FromGui); } break; case (Tool::NodeSplinePath): { id = CreateNode(data, nodeD.getId()); - VNodeSplinePath::Create(doc, data, scene, id, nodeD.getId(), Document::FullParse, Source::FromGui); + VNodeSplinePath::Create(doc, data, id, nodeD.getId(), Document::FullParse, Source::FromGui); } break; default: qDebug()<<"May be wrong tool type!!! Ignoring."< &children, const qreal &dx, const qreal &dy, const quint32 &pRotate, const qreal &angle) @@ -127,7 +127,7 @@ void VToolUnionDetails::AddToNewDetail(QObject *tool, VMainGraphicsScene *scene, VPointF *point1 = new VPointF(*point); point1->setMode(Draw::Modeling); id = data->AddGObject(point1); - VNodePoint::Create(doc, data, scene, id, idObject, Document::FullParse, Source::FromGui, idTool, tool); + VNodePoint::Create(doc, data, scene, id, idObject, Document::FullParse, Source::FromGui, idTool); } } break; @@ -164,7 +164,7 @@ void VToolUnionDetails::AddToNewDetail(QObject *tool, VMainGraphicsScene *scene, arc2->setMode(Draw::Modeling); id = data->AddGObject(arc2); - VNodeArc::Create(doc, data, scene, id, idObject, Document::FullParse, Source::FromGui, idTool, tool); + VNodeArc::Create(doc, data, id, idObject, Document::FullParse, Source::FromGui, idTool); } } break; @@ -199,7 +199,7 @@ void VToolUnionDetails::AddToNewDetail(QObject *tool, VMainGraphicsScene *scene, VSpline *spl1 = new VSpline(*spl); spl1->setMode(Draw::Modeling); id = data->AddGObject(spl1); - VNodeSpline::Create(doc, data, scene, id, idObject, Document::FullParse, Source::FromGui, idTool, tool); + VNodeSpline::Create(doc, data, id, idObject, Document::FullParse, Source::FromGui, idTool); delete p4; delete p1; @@ -255,8 +255,7 @@ void VToolUnionDetails::AddToNewDetail(QObject *tool, VMainGraphicsScene *scene, VSplinePath *path1 = new VSplinePath(*path); path1->setMode(Draw::Modeling); id = data->AddGObject(path1); - VNodeSplinePath::Create(doc, data, scene, id, idObject, Document::FullParse, Source::FromGui, idTool, - tool); + VNodeSplinePath::Create(doc, data, id, idObject, Document::FullParse, Source::FromGui, idTool); } } break; @@ -552,6 +551,8 @@ VToolUnionDetails* VToolUnionDetails::Create(const quint32 _id, const VDetail &d //Scene doesn't show this tool, so doc will destroy this object. unionDetails = new VToolUnionDetails(doc, data, id, d1, d2, indexD1, indexD2, typeCreation, drawName, doc); doc->AddTool(id, unionDetails); + // Unfortunatelly doc will destroy all objects only in the end, but we should delete them before each FullParse + doc->AddToolOnRemove(unionDetails); } //Then create new details VNodeDetail det1p1; @@ -592,7 +593,7 @@ VToolUnionDetails* VToolUnionDetails::Create(const quint32 _id, const VDetail &d QVector children; do { - AddToNewDetail(unionDetails, scene, doc, data, newDetail, d1.RemoveEdge(indexD1), i, id, children); + AddToNewDetail(scene, doc, data, newDetail, d1.RemoveEdge(indexD1), i, id, children); ++i; if (i > d1.indexOfNode(det1p1.getId()) && pointsD2 < countNodeD2-1) { @@ -604,7 +605,7 @@ VToolUnionDetails* VToolUnionDetails::Create(const quint32 _id, const VDetail &d { j=0; } - AddToNewDetail(unionDetails, scene, doc, data, newDetail, d2.RemoveEdge(indexD2), j, id, children, + AddToNewDetail(scene, doc, data, newDetail, d2.RemoveEdge(indexD2), j, id, children, dx, dy, det1p1.getId(), angle); ++pointsD2; ++j; diff --git a/src/libs/vtools/tools/vtooluniondetails.h b/src/libs/vtools/tools/vtooluniondetails.h index 53abece45..ae2a5791b 100644 --- a/src/libs/vtools/tools/vtooluniondetails.h +++ b/src/libs/vtools/tools/vtooluniondetails.h @@ -71,7 +71,7 @@ public: static const QString AttrNodeType; static const QString NodeTypeContour; static const QString NodeTypeModeling; - static void AddToNewDetail(QObject *tool, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data, + static void AddToNewDetail(VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data, VDetail &newDetail, const VDetail &det, const int &i, const quint32 &idTool, QVector &children, const qreal &dx = 0, const qreal &dy = 0, const quint32 &pRotate = 0, const qreal &angle = 0); diff --git a/src/libs/vwidgets/vmaingraphicsscene.cpp b/src/libs/vwidgets/vmaingraphicsscene.cpp index 2cafdfb56..2642ddc4f 100644 --- a/src/libs/vwidgets/vmaingraphicsscene.cpp +++ b/src/libs/vwidgets/vmaingraphicsscene.cpp @@ -89,7 +89,13 @@ void VMainGraphicsScene::mousePressEvent(QGraphicsSceneMouseEvent *event) //--------------------------------------------------------------------------------------------------------------------- void VMainGraphicsScene::InitOrigins() { - qDeleteAll(origins); + foreach (QGraphicsItem *item, origins) + { + if (this->items().contains(item)) + { + delete item; + } + } QPen originsPen(Qt::green, ToPixel(WidthHairLine(Unit::Mm), Unit::Mm), Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); QBrush axisTextBrush(Qt::green); From aa67e04a3e1d0e79717a571ff3eb559f72b3544d Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 10 Feb 2016 19:32:26 +0200 Subject: [PATCH 03/59] Improved exporting to dxf. QPainterPath export as Polyline. --HG-- branch : develop --- ChangeLog.txt | 1 + src/libs/vdxf/vdxfengine.cpp | 71 ++++++++++++++++++------------------ 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 51c4745a7..386c32898 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,5 @@ # Version 0.5.0 +- Improved exporting to dxf. QPainterPath export as Polyline. - Show additional message dialog if measurements was changed. Related to issue [#440]. - [#132] Intersect Curves. - Added language Chinese (China). diff --git a/src/libs/vdxf/vdxfengine.cpp b/src/libs/vdxf/vdxfengine.cpp index 071ded8f0..55a130517 100644 --- a/src/libs/vdxf/vdxfengine.cpp +++ b/src/libs/vdxf/vdxfengine.cpp @@ -245,43 +245,41 @@ void VDxfEngine::drawPath(const QPainterPath &path) for (int j=0; j < subpaths.size(); ++j) { const QPolygonF polygon = subpaths.at(j); - if (polygon.size() < 3) + if (polygon.isEmpty()) { return; } - for (int i=1; i < polygon.count(); i++) + dxf->writePolyline(*dw, + DL_PolylineData(polygon.size(), 0, 0, 0), + DL_Attributes("0", getPenColor(), -1, getPenStyle(), 1.0)); + + for (int i=0; i < polygon.count(); ++i) { - dxf->writeLine( - *dw, - DL_LineData(polygon.at(i-1).x(), // start point - getSize().height() - polygon.at(i-1).y(), - 0.0, - polygon.at(i).x(), // end point - getSize().height() - polygon.at(i).y(), - 0.0), - DL_Attributes("0", getPenColor(), -1, getPenStyle(), 1.0)); + dxf->writeVertex(*dw, DL_VertexData(polygon.at(i).x(), getSize().height() - polygon.at(i).y(), 0, 0)); } + + dxf->writePolylineEnd(*dw); } } //--------------------------------------------------------------------------------------------------------------------- void VDxfEngine::drawLines(const QLineF * lines, int lineCount) { - for (int i = 0; i < lineCount; i++) + for (int i = 0; i < lineCount; ++i) { - QPointF p1 = matrix.map(lines[i].p1()); - QPointF p2 = matrix.map(lines[i].p2()); + QPointF p1 = matrix.map(lines[i].p1()); + QPointF p2 = matrix.map(lines[i].p2()); - dxf->writeLine( - *dw, - DL_LineData(p1.x(), // start point - getSize().height() - p1.y(), - 0.0, - p2.x(), // end point - getSize().height() - p2.y(), - 0.0), - DL_Attributes("0", getPenColor(), -1, getPenStyle(), 1.0)); + dxf->writeLine( + *dw, + DL_LineData(p1.x(), // start point + getSize().height() - p1.y(), + 0.0, + p2.x(), // end point + getSize().height() - p2.y(), + 0.0), + DL_Attributes("0", getPenColor(), -1, getPenStyle(), 1.0)); } } @@ -296,21 +294,22 @@ void VDxfEngine::drawPolygon(const QPointF *points, int pointCount, PolygonDrawM { Q_UNUSED(mode) - for (int i = 1; i < pointCount; i++) + if (pointCount <= 0) { - QPointF p1 = matrix.map(points[i-1]); - QPointF p2 = matrix.map(points[i]); - - dxf->writeLine( - *dw, - DL_LineData(p1.x(), // start point - getSize().height() - p1.y(), - 0.0, - p2.x(), // end point - getSize().height() - p2.y(), - 0.0), - DL_Attributes("0", getPenColor(), -1, getPenStyle(), 1.0)); + return; } + + dxf->writePolyline(*dw, + DL_PolylineData(pointCount, 0, 0, 0), + DL_Attributes("0", getPenColor(), -1, getPenStyle(), 1.0)); + + for (int i = 0; i < pointCount; ++i) + { + QPointF p = matrix.map(points[i]); + dxf->writeVertex(*dw, DL_VertexData(p.x(), getSize().height() - p.y(), 0, 0)); + } + + dxf->writePolylineEnd(*dw); } //--------------------------------------------------------------------------------------------------------------------- From 44aac2179bc24a3c7e6c2c3ab3801f779e424430 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 10 Feb 2016 21:39:20 +0200 Subject: [PATCH 04/59] Fixed triggering validation a detail. Two new cases: has been changed Reverse option and the list has been scrolled. Fixed validation when the list conatains only curve. (grafted from 87af46985d0867d550605810c5c5a9c2c72f4a0b) --HG-- branch : develop --- ChangeLog.txt | 1 + src/libs/vtools/dialogs/tools/dialogdetail.cpp | 16 +++++++--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 386c32898..15028da9c 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -7,6 +7,7 @@ - [#325] Check pattern for inverse compatibility. # Version 0.4.2 +- Fixed triggering validation a detail. Two new cases: has been changed Reverse option and the list has been scrolled. - Fixed broken path to measurements after using Save As option. - Tool line. Block selecting the same point twice. - [#443] Not valid dxf file. libdxf updated to version 3.12.2.0. Fixed drawing subpaths. diff --git a/src/libs/vtools/dialogs/tools/dialogdetail.cpp b/src/libs/vtools/dialogs/tools/dialogdetail.cpp index 4ea1f7f0d..b81f76934 100644 --- a/src/libs/vtools/dialogs/tools/dialogdetail.cpp +++ b/src/libs/vtools/dialogs/tools/dialogdetail.cpp @@ -387,6 +387,7 @@ void DialogDetail::ClickedReverse(bool checked) VNodeDetail node = qvariant_cast(item->data(Qt::UserRole)); node.setReverse(checked); item->setData(Qt::UserRole, QVariant::fromValue(node)); + ValidObjects(DetailIsValid()); } //--------------------------------------------------------------------------------------------------------------------- @@ -450,6 +451,7 @@ void DialogDetail::ScrollUp() { QListWidgetItem *item = ui.listWidget->takeItem(0); ui.listWidget->addItem(item); + ValidObjects(DetailIsValid()); } } @@ -460,6 +462,7 @@ void DialogDetail::ScrollDown() { QListWidgetItem *item = ui.listWidget->takeItem(ui.listWidget->count()-1); ui.listWidget->insertItem(0, item); + ValidObjects(DetailIsValid()); } } @@ -475,7 +478,7 @@ bool DialogDetail::DetailIsValid() const pixmap.save(&buffer, "PNG"); QString url = QString(" "); - if (ui.listWidget->count() < 3) + if(CreateDetail().ContourPoints(data).count() < 3) { url += tr("You need more points!"); ui.helpLabel->setText(url); @@ -538,17 +541,12 @@ bool DialogDetail::FirstPointEqualLast() const //--------------------------------------------------------------------------------------------------------------------- bool DialogDetail::DetailIsClockwise() const { - if(ui.listWidget->count() < 3) + const QVector points = CreateDetail().ContourPoints(data); + + if(points.count() < 3) { return false; } - VDetail detail; - for (qint32 i = 0; i < ui.listWidget->count(); ++i) - { - QListWidgetItem *item = ui.listWidget->item(i); - detail.append( qvariant_cast(item->data(Qt::UserRole))); - } - const QVector points = detail.ContourPoints(data); const qreal res = VDetail::SumTrapezoids(points); if (res < 0) From 623c28eb9f82e2445e7155cdffebb7b0dd85f0d6 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 10 Feb 2016 21:39:26 +0200 Subject: [PATCH 05/59] Fixed getting correct reversed segment for single in the list curve. (grafted from c45cc62df72241692b4bf035f779a34add622b37) --HG-- branch : develop --- ChangeLog.txt | 4 +++- src/libs/vpatterndb/vdetail.cpp | 28 ++++++++++++++++++++-------- src/libs/vpatterndb/vdetail.h | 4 ++-- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 15028da9c..e9b004218 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -7,7 +7,9 @@ - [#325] Check pattern for inverse compatibility. # Version 0.4.2 -- Fixed triggering validation a detail. Two new cases: has been changed Reverse option and the list has been scrolled. +- Fixed getting correct reversed segment for single in the list curve. +- Fixed triggering validation a detail. Two new cases: has been changed Reverse option and the list +has been scrolled. Fixed validation when the list conatains only curve. - Fixed broken path to measurements after using Save As option. - Tool line. Block selecting the same point twice. - [#443] Not valid dxf file. libdxf updated to version 3.12.2.0. Fixed drawing subpaths. diff --git a/src/libs/vpatterndb/vdetail.cpp b/src/libs/vpatterndb/vdetail.cpp index 05d123893..3c09862e0 100644 --- a/src/libs/vpatterndb/vdetail.cpp +++ b/src/libs/vpatterndb/vdetail.cpp @@ -371,8 +371,8 @@ QVector VDetail::ContourPoints(const VContainer *data) const { const QSharedPointer curve = data->GeometricObject(at(i).getId()); - const QPointF begin = StartSegment(data, i); - const QPointF end = EndSegment(data, i); + const QPointF begin = StartSegment(data, i, at(i).getReverse()); + const QPointF end = EndSegment(data, i, at(i).getReverse()); points << curve->GetSegmentPoints(begin, end, at(i).getReverse()); } @@ -415,8 +415,8 @@ QVector VDetail::SeamAllowancePoints(const VContainer *data) const { const QSharedPointer curve = data->GeometricObject(at(i).getId()); - const QPointF begin = StartSegment(data, i); - const QPointF end = EndSegment(data, i); + const QPointF begin = StartSegment(data, i, at(i).getReverse()); + const QPointF end = EndSegment(data, i, at(i).getReverse()); const QVector nodePoints = curve->GetSegmentPoints(begin, end, at(i).getReverse()); pointsEkv << biasPoints(nodePoints, at(i).getMx(), at(i).getMy()); @@ -524,7 +524,7 @@ int VDetail::indexOfNode(const QVector &list, const quint32 &id) } //--------------------------------------------------------------------------------------------------------------------- -QPointF VDetail::StartSegment(const VContainer *data, const int &i) const +QPointF VDetail::StartSegment(const VContainer *data, const int &i, bool reverse) const { if (i < 0 && i > CountNode()-1) { @@ -533,7 +533,13 @@ QPointF VDetail::StartSegment(const VContainer *data, const int &i) const const QSharedPointer curve = data->GeometricObject(at(i).getId()); - QPointF begin = curve->GetPoints().first(); + QVector points = curve->GetPoints(); + if (reverse) + { + points = VGObject::GetReversePoints(points); + } + + QPointF begin = points.first(); if (CountNode() > 1) { if (i == 0) @@ -555,7 +561,7 @@ QPointF VDetail::StartSegment(const VContainer *data, const int &i) const } //--------------------------------------------------------------------------------------------------------------------- -QPointF VDetail::EndSegment(const VContainer *data, const int &i) const +QPointF VDetail::EndSegment(const VContainer *data, const int &i, bool reverse) const { if (i < 0 && i > CountNode()-1) { @@ -564,7 +570,13 @@ QPointF VDetail::EndSegment(const VContainer *data, const int &i) const const QSharedPointer curve = data->GeometricObject(at(i).getId()); - QPointF end = curve->GetPoints().last(); + QVector points = curve->GetPoints(); + if (reverse) + { + points = VGObject::GetReversePoints(points); + } + + QPointF end = points.last(); if (CountNode() > 2) { if (i == CountNode() - 1) diff --git a/src/libs/vpatterndb/vdetail.h b/src/libs/vpatterndb/vdetail.h index aa7262342..ae72e2b94 100644 --- a/src/libs/vpatterndb/vdetail.h +++ b/src/libs/vpatterndb/vdetail.h @@ -89,8 +89,8 @@ private: static int indexOfNode(const QVector &list, const quint32 &id); - QPointF StartSegment(const VContainer *data, const int &i) const; - QPointF EndSegment(const VContainer *data, const int &i) const; + QPointF StartSegment(const VContainer *data, const int &i, bool reverse) const; + QPointF EndSegment(const VContainer *data, const int &i, bool reverse) const; static QVector biasPoints(const QVector &points, const qreal &mx, const qreal &my); }; From 8683b69f13b188b2583ebdff76ae42bc0ad36a34 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 11 Feb 2016 13:05:08 +0200 Subject: [PATCH 06/59] Select an item inside mousePressEvent() instead mouseReleaseEvent(). --HG-- branch : feature --- .../tools/drawTools/toolcurve/vabstractspline.cpp | 6 +++--- .../vtools/tools/drawTools/toolcurve/vabstractspline.h | 2 +- .../toolpoint/toolsinglepoint/vtoolsinglepoint.cpp | 6 +++--- .../toolpoint/toolsinglepoint/vtoolsinglepoint.h | 2 +- src/libs/vtools/tools/vtooldetail.cpp | 10 +++++++--- src/libs/vwidgets/vgraphicssimpletextitem.cpp | 8 ++++---- src/libs/vwidgets/vsimplepoint.cpp | 4 ++-- src/libs/vwidgets/vsimplepoint.h | 2 +- 8 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp index 2648fc3b1..ca01fb50b 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp @@ -204,16 +204,16 @@ void VAbstractSpline::keyReleaseEvent(QKeyEvent *event) //--------------------------------------------------------------------------------------------------------------------- /** - * @brief mouseReleaseEvent handle mouse release events. + * @brief mousePressEvent handle mouse press events. * @param event mouse release event. */ -void VAbstractSpline::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) +void VAbstractSpline::mousePressEvent(QGraphicsSceneMouseEvent *event) { if (event->button() == Qt::LeftButton) { emit ChoosedTool(id, sceneType); } - QGraphicsItem::mouseReleaseEvent(event); + QGraphicsPathItem::mousePressEvent(event); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h index 61aca125e..54129b110 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h @@ -88,7 +88,7 @@ protected: virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; virtual QVariant itemChange ( GraphicsItemChange change, const QVariant &value ) Q_DECL_OVERRIDE; virtual void keyReleaseEvent(QKeyEvent * event) Q_DECL_OVERRIDE; - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; + virtual void mousePressEvent ( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; QPainterPath ToolPath(PathDirection direction = PathDirection::Hide) const; virtual void ReadToolAttributes(const QDomElement &domElement) Q_DECL_OVERRIDE; virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj) Q_DECL_OVERRIDE; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp index 63d995980..d0cf96a75 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp @@ -177,16 +177,16 @@ void VToolSinglePoint::FullUpdateFromFile() //--------------------------------------------------------------------------------------------------------------------- /** - * @brief mouseReleaseEvent handle mouse release events. + * @brief mousePressEvent handle mouse press events. * @param event mouse release event. */ -void VToolSinglePoint::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) +void VToolSinglePoint::mousePressEvent(QGraphicsSceneMouseEvent *event) { if (event->button() == Qt::LeftButton) { PointChoosed(); } - QGraphicsEllipseItem::mouseReleaseEvent(event); + QGraphicsEllipseItem::mousePressEvent(event); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h index 112285ee8..0a1c7f809 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h @@ -73,7 +73,7 @@ protected: QGraphicsLineItem *lineName; virtual void UpdateNamePosition(quint32 id) Q_DECL_OVERRIDE; - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; + virtual void mousePressEvent ( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; virtual void RefreshPointGeometry(const VPointF &point); diff --git a/src/libs/vtools/tools/vtooldetail.cpp b/src/libs/vtools/tools/vtooldetail.cpp index b3f222d32..7262c5258 100644 --- a/src/libs/vtools/tools/vtooldetail.cpp +++ b/src/libs/vtools/tools/vtooldetail.cpp @@ -446,9 +446,14 @@ void VToolDetail::mousePressEvent(QGraphicsSceneMouseEvent *event) if (event->button() == Qt::LeftButton && event->type() != QEvent::GraphicsSceneMouseDoubleClick) { SetOverrideCursor(cursorArrowCloseHand, 1, 1); - event->accept(); } } + + if (event->button() == Qt::LeftButton && event->type() != QEvent::GraphicsSceneMouseDoubleClick) + { + emit ChoosedTool(id, SceneObject::Detail); + } + VNoBrushScalePathItem::mousePressEvent(event); } @@ -461,11 +466,10 @@ void VToolDetail::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { if (event->button() == Qt::LeftButton) { - emit ChoosedTool(id, SceneObject::Detail); //Disable cursor-arrow-closehand RestoreOverrideCursor(cursorArrowCloseHand); } - QGraphicsItem::mouseReleaseEvent(event); + VNoBrushScalePathItem::mouseReleaseEvent(event); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vwidgets/vgraphicssimpletextitem.cpp b/src/libs/vwidgets/vgraphicssimpletextitem.cpp index 5a92bac76..21b13359f 100644 --- a/src/libs/vwidgets/vgraphicssimpletextitem.cpp +++ b/src/libs/vwidgets/vgraphicssimpletextitem.cpp @@ -217,6 +217,9 @@ void VGraphicsSimpleTextItem::mousePressEvent(QGraphicsSceneMouseEvent *event) SetOverrideCursor(cursorArrowCloseHand, 1, 1); } } + + emit PointChoosed(); + QGraphicsSimpleTextItem::mousePressEvent(event); } @@ -231,10 +234,7 @@ void VGraphicsSimpleTextItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) RestoreOverrideCursor(cursorArrowCloseHand); } } - else - { - emit PointChoosed(); - } + QGraphicsSimpleTextItem::mouseReleaseEvent(event); } diff --git a/src/libs/vwidgets/vsimplepoint.cpp b/src/libs/vwidgets/vsimplepoint.cpp index 5cca38fdd..51447b629 100644 --- a/src/libs/vwidgets/vsimplepoint.cpp +++ b/src/libs/vwidgets/vsimplepoint.cpp @@ -173,13 +173,13 @@ void VSimplePoint::ContextMenu(QGraphicsSceneContextMenuEvent *event) } //--------------------------------------------------------------------------------------------------------------------- -void VSimplePoint::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) +void VSimplePoint::mousePressEvent(QGraphicsSceneMouseEvent *event) { if (event->button() == Qt::LeftButton) { emit Choosed(id); } - QGraphicsEllipseItem::mouseReleaseEvent(event); + QGraphicsEllipseItem::mousePressEvent(event); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vwidgets/vsimplepoint.h b/src/libs/vwidgets/vsimplepoint.h index 84d8fee0b..ffb45f869 100644 --- a/src/libs/vwidgets/vsimplepoint.h +++ b/src/libs/vwidgets/vsimplepoint.h @@ -75,7 +75,7 @@ public slots: void ContextMenu(QGraphicsSceneContextMenuEvent * event); protected: - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; + virtual void mousePressEvent ( QGraphicsSceneMouseEvent * event ) Q_DECL_OVERRIDE; virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; From 791d874c9a781816f4271fc4c87c47211c2c482d Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 12 Feb 2016 15:49:59 +0200 Subject: [PATCH 07/59] Little refactoring. --HG-- branch : feature --- src/app/valentina/mainwindow.cpp | 8 ++++++++ src/app/valentina/mainwindow.h | 15 +++++++-------- src/libs/vtools/dialogs/tools/dialogendline.cpp | 2 +- src/libs/vtools/tools/drawTools/vdrawtool.h | 2 -- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index 80eefb518..122b2b302 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -48,6 +48,12 @@ #include "../ifc/xml/vvstconverter.h" #include "../ifc/xml/vvitconverter.h" #include "../vwidgets/vwidgetpopup.h" +#include "../vwidgets/vmaingraphicsscene.h" +#include "tools/drawTools/drawtools.h" +#include "../vtools/dialogs/tooldialogs.h" +#include "tools/vtooldetail.h" +#include "tools/vtooluniondetails.h" +#include "dialogs/dialogs.h" #include #include @@ -66,6 +72,8 @@ #include #include #include +#include +#include #if defined(Q_OS_MAC) #include diff --git a/src/app/valentina/mainwindow.h b/src/app/valentina/mainwindow.h index 17d776d30..e3cfc6140 100644 --- a/src/app/valentina/mainwindow.h +++ b/src/app/valentina/mainwindow.h @@ -30,17 +30,10 @@ #define MAINWINDOW_H #include "mainwindowsnogui.h" -#include "../vwidgets/vmaingraphicsview.h" -#include "../vtools/dialogs/tooldialogs.h" -#include "dialogs/dialogs.h" -#include "tools/vtooldetail.h" -#include "tools/vtooluniondetails.h" -#include "tools/drawTools/drawtools.h" #include "core/vcmdexport.h" #include "../vmisc/vlockguard.h" -#include -#include +#include namespace Ui { @@ -49,6 +42,12 @@ namespace Ui class VToolOptionsPropertyBrowser; class VMeasurements; +class VMainGraphicsScene; +class QFileSystemWatcher; +class QLabel; +class DialogIncrements; +class DialogTool; +class DialogHistory; /** * @brief The MainWindow class main windows. diff --git a/src/libs/vtools/dialogs/tools/dialogendline.cpp b/src/libs/vtools/dialogs/tools/dialogendline.cpp index 668fc5a92..6f6f3df63 100644 --- a/src/libs/vtools/dialogs/tools/dialogendline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogendline.cpp @@ -279,7 +279,7 @@ void DialogEndLine::ShowDialog(bool click) { if (click) { - /*We will ignore click if poinet is in point circle*/ + /*We will ignore click if pointer is in point circle*/ VMainGraphicsScene *scene = qobject_cast(qApp->getCurrentScene()); SCASSERT(scene != nullptr); const QSharedPointer point = data->GeometricObject(GetBasePointId()); diff --git a/src/libs/vtools/tools/drawTools/vdrawtool.h b/src/libs/vtools/tools/drawTools/vdrawtool.h index 530cf4e17..5c6512247 100644 --- a/src/libs/vtools/tools/drawTools/vdrawtool.h +++ b/src/libs/vtools/tools/drawTools/vdrawtool.h @@ -31,12 +31,10 @@ #include "../vabstracttool.h" #include "../../dialogs/tools/dialogtool.h" -#include "../vwidgets/vmaingraphicsscene.h" #include "../vwidgets/vmaingraphicsview.h" #include #include -#include /** * @brief The VDrawTool abstract class for all draw tool. From 0f747ede7ef1d667946d90a6513bb66ef780afc0 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 12 Feb 2016 20:10:01 +0200 Subject: [PATCH 08/59] The first implementation for tool Spline. --HG-- branch : feature --- src/app/valentina/xml/vpattern.cpp | 1 + .../vtools/dialogs/tools/dialogspline.cpp | 64 +++++++----- src/libs/vtools/dialogs/tools/dialogspline.h | 1 + .../vtools/dialogs/tools/dialogsplinepath.cpp | 14 +-- src/libs/vtools/dialogs/tools/dialogtool.h | 1 + .../drawTools/toolcurve/vabstractspline.cpp | 2 + .../drawTools/toolcurve/vabstractspline.h | 12 +-- .../tools/drawTools/toolcurve/vtoolspline.cpp | 42 ++++---- .../tools/drawTools/toolcurve/vtoolspline.h | 2 + .../drawTools/toolcurve/vtoolsplinepath.cpp | 41 ++++---- .../drawTools/toolcurve/vtoolsplinepath.h | 4 + .../vtools/visualization/vistoolspline.cpp | 99 +++++++++++++++++-- src/libs/vtools/visualization/vistoolspline.h | 19 ++++ .../visualization/vistoolsplinepath.cpp | 15 +-- .../vtools/visualization/vistoolsplinepath.h | 5 - .../vtools/visualization/visualization.cpp | 25 ++++- src/libs/vtools/visualization/visualization.h | 6 ++ src/libs/vwidgets/vcontrolpointspline.cpp | 69 +++++++++---- src/libs/vwidgets/vcontrolpointspline.h | 18 +++- src/libs/vwidgets/vmaingraphicsscene.cpp | 16 ++- src/libs/vwidgets/vmaingraphicsscene.h | 10 +- 21 files changed, 323 insertions(+), 143 deletions(-) diff --git a/src/app/valentina/xml/vpattern.cpp b/src/app/valentina/xml/vpattern.cpp index 9a1fdcb42..4c8f714de 100644 --- a/src/app/valentina/xml/vpattern.cpp +++ b/src/app/valentina/xml/vpattern.cpp @@ -42,6 +42,7 @@ #include "../vmisc/vsettings.h" #include "../qmuparser/qmuparsererror.h" #include "../vgeometry/varc.h" +#include "../vgeometry/vsplinepath.h" #include "../core/vapplication.h" #include "../vpatterndb/calculator.h" diff --git a/src/libs/vtools/dialogs/tools/dialogspline.cpp b/src/libs/vtools/dialogs/tools/dialogspline.cpp index 0af494282..ed6913d19 100644 --- a/src/libs/vtools/dialogs/tools/dialogspline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogspline.cpp @@ -30,8 +30,10 @@ #include "ui_dialogspline.h" #include "../vgeometry/vpointf.h" +#include "../vgeometry/vspline.h" #include "../vpatterndb/vcontainer.h" #include "../../visualization/vistoolspline.h" + #include //--------------------------------------------------------------------------------------------------------------------- @@ -41,8 +43,7 @@ * @param parent parent widget */ DialogSpline::DialogSpline(const VContainer *data, const quint32 &toolId, QWidget *parent) - :DialogTool(data, toolId, parent), ui(new Ui::DialogSpline), angle1(0), angle2(0), kAsm1(1), kAsm2(1), - kCurve(1) + :DialogTool(data, toolId, parent), ui(new Ui::DialogSpline), angle1(0), angle2(0), kAsm1(1), kAsm2(1), kCurve(1) { ui->setupUi(this); InitOkCancelApply(ui); @@ -57,6 +58,13 @@ DialogSpline::DialogSpline(const VContainer *data, const quint32 &toolId, QWidge this, &DialogSpline::PointNameChanged); vis = new VisToolSpline(data); + auto path = qobject_cast(vis); + SCASSERT(path != nullptr); + + auto scene = qobject_cast(qApp->getCurrentScene()); + SCASSERT(scene != nullptr); + connect(scene, &VMainGraphicsScene::MouseLeftPressed, path, &VisToolSpline::MouseLeftPressed); + connect(scene, &VMainGraphicsScene::MouseLeftReleased, path, &VisToolSpline::MouseLeftReleased); } //--------------------------------------------------------------------------------------------------------------------- @@ -88,7 +96,7 @@ void DialogSpline::ChosenObject(quint32 id, const SceneObject &type) { if (type == SceneObject::Point) { - VisToolSpline *path = qobject_cast(vis); + auto *path = qobject_cast(vis); SCASSERT(path != nullptr); switch (number) @@ -96,7 +104,7 @@ void DialogSpline::ChosenObject(quint32 id, const SceneObject &type) case 0: if (SetObject(id, ui->comboBoxP1, tr("Select last point of curve"))) { - number++; + ++number; path->VisualMode(id); } break; @@ -104,29 +112,13 @@ void DialogSpline::ChosenObject(quint32 id, const SceneObject &type) { if (getCurrentObjectId(ui->comboBoxP1) != id) { - const QSharedPointer point = data->GeometricObject(id); - qint32 index = ui->comboBoxP4->findText(point->name()); - if ( index != -1 ) - { // -1 for not found - ui->comboBoxP4->setCurrentIndex(index); - emit ToolTip(""); - index = ui->comboBoxP1->currentIndex(); - quint32 p1Id = qvariant_cast(ui->comboBoxP1->itemData(index)); - - QPointF p1 = data->GeometricObject(p1Id)->toQPointF(); - QPointF p4 = data->GeometricObject(id)->toQPointF(); - - ui->spinBoxAngle1->setValue(static_cast(QLineF(p1, p4).angle())); - ui->spinBoxAngle2->setValue(static_cast(QLineF(p4, p1).angle())); + if (SetObject(id, ui->comboBoxP4, "")) + { + ++number; path->setObject4Id(id); path->RefreshGeometry(); prepare = true; - DialogAccepted(); - } - else - { - qWarning()<<"Can't find object by name"<name(); } } break; @@ -183,6 +175,32 @@ void DialogSpline::PointNameChanged() CheckState(); } +//--------------------------------------------------------------------------------------------------------------------- +void DialogSpline::ShowDialog(bool click) +{ + if (prepare && click) + { + const auto p1 = data->GeometricObject(getCurrentObjectId(ui->comboBoxP1)); + const auto p4 = data->GeometricObject(getCurrentObjectId(ui->comboBoxP4)); + + auto *path = qobject_cast(vis); + SCASSERT(path != nullptr); + + const QPointF p2 = path->GetP2(); + const QPointF p3 = path->GetP3(); + + VSpline spline(*p1, p2, p3, *p4, kCurve); + + ui->spinBoxAngle1->setValue(static_cast(spline.GetStartAngle())); + ui->spinBoxAngle2->setValue(static_cast(spline.GetEndAngle())); + + ui->doubleSpinBoxKasm1->setValue(spline.GetKasm1()); + ui->doubleSpinBoxKasm2->setValue(spline.GetKasm2()); + + DialogAccepted(); + } +} + //--------------------------------------------------------------------------------------------------------------------- void DialogSpline::ShowVisualization() { diff --git a/src/libs/vtools/dialogs/tools/dialogspline.h b/src/libs/vtools/dialogs/tools/dialogspline.h index ce36e4bb0..2d899aa64 100644 --- a/src/libs/vtools/dialogs/tools/dialogspline.h +++ b/src/libs/vtools/dialogs/tools/dialogspline.h @@ -72,6 +72,7 @@ public: public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; virtual void PointNameChanged() Q_DECL_OVERRIDE; + virtual void ShowDialog(bool click) Q_DECL_OVERRIDE; protected: virtual void ShowVisualization() Q_DECL_OVERRIDE; /** diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp index 57b9a0bfd..2bb688d12 100644 --- a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp @@ -271,19 +271,7 @@ void DialogSplinePath::PathUpdated(const VSplinePath &path) //--------------------------------------------------------------------------------------------------------------------- void DialogSplinePath::ShowVisualization() { - if (prepare == false) - { - VMainGraphicsScene *scene = qobject_cast(qApp->getCurrentScene()); - SCASSERT(scene != nullptr); - - VisToolSplinePath *visPath = qobject_cast(vis); - SCASSERT(visPath != nullptr); - - connect(scene, &VMainGraphicsScene::NewFactor, visPath, &Visualization::SetFactor); - scene->addItem(visPath); - visPath->setMode(Mode::Show); - visPath->RefreshGeometry(); - } + AddVisualization(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogtool.h b/src/libs/vtools/dialogs/tools/dialogtool.h index c2cdec515..c95109718 100644 --- a/src/libs/vtools/dialogs/tools/dialogtool.h +++ b/src/libs/vtools/dialogs/tools/dialogtool.h @@ -349,6 +349,7 @@ inline void DialogTool::AddVisualization() scene->addItem(toolVis); } + toolVis->SetMode(Mode::Show); toolVis->RefreshGeometry(); } } diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp index ca01fb50b..6c32892c1 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp @@ -27,6 +27,8 @@ *************************************************************************/ #include "vabstractspline.h" +#include "../vwidgets/vcontrolpointspline.h" + #include const QString VAbstractSpline::TagName = QStringLiteral("spline"); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h index 54129b110..e6ca060ba 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h @@ -30,10 +30,11 @@ #define VABSTRACTSPLINE_H #include "../vdrawtool.h" -#include "../vwidgets/vcontrolpointspline.h" #include +class VControlPointSpline; + class VAbstractSpline:public VDrawTool, public QGraphicsPathItem { Q_OBJECT @@ -56,15 +57,6 @@ public slots: virtual void Disable(bool disable, const QString &namePP) Q_DECL_OVERRIDE; void DetailsMode(bool mode); signals: - /** - * @brief RefreshLine refresh control line. - * @param indexSpline position spline in spline list. - * @param pos position point in spline. - * @param controlPoint new position control point. - * @param splinePoint new position spline point. - */ - void RefreshLine(const qint32 &indexSpline, SplinePointPosition pos, - const QPointF &controlPoint, const QPointF &splinePoint); /** * @brief setEnabledPoint disable control points. * @param enable enable or diasable points. diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp index b2ef1b955..729b8b804 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp @@ -31,6 +31,7 @@ #include "../../../dialogs/tools/dialogspline.h" #include "../../../undocommands/movespline.h" #include "../../../visualization/vistoolspline.h" +#include "../vwidgets/vcontrolpointspline.h" #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) # include "../vmisc/vmath.h" @@ -64,23 +65,20 @@ VToolSpline::VToolSpline(VAbstractPattern *doc, VContainer *data, quint32 id, co this->setAcceptHoverEvents(true); this->setPath(ToolPath()); - const QSharedPointer spl = VAbstractTool::data.GeometricObject(id); - VControlPointSpline *controlPoint1 = new VControlPointSpline(1, SplinePointPosition::FirstPoint, spl->GetP2(), - spl->GetP1().toQPointF(), *data->GetPatternUnit(), - this); + const auto spl = VAbstractTool::data.GeometricObject(id); + + auto *controlPoint1 = new VControlPointSpline(1, SplinePointPosition::FirstPoint, spl->GetP2(), + spl->GetP1().toQPointF(), *data->GetPatternUnit(), this); connect(controlPoint1, &VControlPointSpline::ControlPointChangePosition, this, &VToolSpline::ControlPointChangePosition); - connect(this, &VToolSpline::RefreshLine, controlPoint1, &VControlPointSpline::RefreshLine); connect(this, &VToolSpline::setEnabledPoint, controlPoint1, &VControlPointSpline::setEnabledPoint); connect(controlPoint1, &VControlPointSpline::ShowContextMenu, this, &VToolSpline::contextMenuEvent); controlPoints.append(controlPoint1); - VControlPointSpline *controlPoint2 = new VControlPointSpline(1, SplinePointPosition::LastPoint, spl->GetP3(), - spl->GetP4().toQPointF(), *data->GetPatternUnit(), - this); + auto *controlPoint2 = new VControlPointSpline(1, SplinePointPosition::LastPoint, spl->GetP3(), + spl->GetP4().toQPointF(), *data->GetPatternUnit(), this); connect(controlPoint2, &VControlPointSpline::ControlPointChangePosition, this, &VToolSpline::ControlPointChangePosition); - connect(this, &VToolSpline::RefreshLine, controlPoint2, &VControlPointSpline::RefreshLine); connect(this, &VToolSpline::setEnabledPoint, controlPoint2, &VControlPointSpline::setEnabledPoint); connect(controlPoint2, &VControlPointSpline::ShowContextMenu, this, &VToolSpline::contextMenuEvent); controlPoints.append(controlPoint2); @@ -488,6 +486,7 @@ void VToolSpline::SetVisualization() visual->SetKAsm1(spl->GetKasm1()); visual->SetKAsm2(spl->GetKasm2()); visual->SetKCurve(spl->GetKcurve()); + visual->SetMode(Mode::Show); visual->RefreshGeometry(); } } @@ -499,7 +498,7 @@ void VToolSpline::SetVisualization() void VToolSpline::RefreshGeometry() { // Very important to disable control points. Without it the pogram can't move the curve. - foreach (VControlPointSpline *point, controlPoints) + foreach (auto *point, controlPoints) { point->setFlag(QGraphicsItem::ItemSendsGeometryChanges, false); } @@ -515,26 +514,27 @@ void VToolSpline::RefreshGeometry() this->setPath(ToolPath()); } - const QSharedPointer spl = VAbstractTool::data.GeometricObject(id); - QPointF splinePoint = VAbstractTool::data.GeometricObject(spl->GetP1().id())->toQPointF(); - QPointF controlPoint = spl->GetP2(); - emit RefreshLine(1, SplinePointPosition::FirstPoint, controlPoint, splinePoint); - splinePoint = VAbstractTool::data.GeometricObject(spl->GetP4().id())->toQPointF(); - controlPoint = spl->GetP3(); - emit RefreshLine(1, SplinePointPosition::LastPoint, controlPoint, splinePoint); - controlPoints[0]->blockSignals(true); controlPoints[1]->blockSignals(true); - controlPoints[0]->setPos(spl->GetP2()); - controlPoints[1]->setPos(spl->GetP3()); + const auto spl = VAbstractTool::data.GeometricObject(id); + + { + const QPointF splinePoint = VAbstractTool::data.GeometricObject(spl->GetP1().id())->toQPointF(); + controlPoints[0]->RefreshCtrlPoint(1, SplinePointPosition::FirstPoint, spl->GetP2(), splinePoint); + } + + { + const QPointF splinePoint = VAbstractTool::data.GeometricObject(spl->GetP4().id())->toQPointF(); + controlPoints[1]->RefreshCtrlPoint(1, SplinePointPosition::LastPoint, spl->GetP3(), splinePoint); + } controlPoints[0]->blockSignals(false); controlPoints[1]->blockSignals(false); SetVisualization(); - foreach (VControlPointSpline *point, controlPoints) + foreach (auto *point, controlPoints) { point->setFlag(QGraphicsItem::ItemSendsGeometryChanges, true); } diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.h index 19d4a937f..0204e4c69 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.h @@ -31,6 +31,8 @@ #include "vabstractspline.h" +class VSpline; + /** * @brief The VToolSpline class tool for creation spline. I mean bezier curve. */ diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp index adef7f429..04ec5fcb0 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp @@ -30,6 +30,7 @@ #include "../../../dialogs/tools/dialogsplinepath.h" #include "../../../undocommands/movesplinepath.h" #include "../../../visualization/vistoolsplinepath.h" +#include "../vwidgets/vcontrolpointspline.h" #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) # include "../vmisc/vmath.h" @@ -66,12 +67,10 @@ VToolSplinePath::VToolSplinePath(VAbstractPattern *doc, VContainer *data, quint3 for (qint32 i = 1; i<=splPath->Count(); ++i) { VSpline spl = splPath->GetSpline(i); - VControlPointSpline *controlPoint = new VControlPointSpline(i, SplinePointPosition::FirstPoint, spl.GetP2(), - spl.GetP1().toQPointF(), *data->GetPatternUnit(), - this); + auto *controlPoint = new VControlPointSpline(i, SplinePointPosition::FirstPoint, spl.GetP2(), + spl.GetP1().toQPointF(), *data->GetPatternUnit(), this); connect(controlPoint, &VControlPointSpline::ControlPointChangePosition, this, &VToolSplinePath::ControlPointChangePosition); - connect(this, &VToolSplinePath::RefreshLine, controlPoint, &VControlPointSpline::RefreshLine); connect(this, &VToolSplinePath::setEnabledPoint, controlPoint, &VControlPointSpline::setEnabledPoint); connect(controlPoint, &VControlPointSpline::ShowContextMenu, this, &VToolSplinePath::contextMenuEvent); controlPoints.append(controlPoint); @@ -80,7 +79,6 @@ VToolSplinePath::VToolSplinePath(VAbstractPattern *doc, VContainer *data, quint3 *data->GetPatternUnit(), this); connect(controlPoint, &VControlPointSpline::ControlPointChangePosition, this, &VToolSplinePath::ControlPointChangePosition); - connect(this, &VToolSplinePath::RefreshLine, controlPoint, &VControlPointSpline::RefreshLine); connect(this, &VToolSplinePath::setEnabledPoint, controlPoint, &VControlPointSpline::setEnabledPoint); connect(controlPoint, &VControlPointSpline::ShowContextMenu, this, &VToolSplinePath::contextMenuEvent); controlPoints.append(controlPoint); @@ -559,7 +557,7 @@ void VToolSplinePath::SetVisualization() QSharedPointer splPath = VAbstractTool::data.GeometricObject(id); visual->setPath(*splPath.data()); - visual->setMode(Mode::Show); + visual->SetMode(Mode::Show); visual->RefreshGeometry(); } } @@ -571,7 +569,7 @@ void VToolSplinePath::SetVisualization() void VToolSplinePath::RefreshGeometry() { // Very important to disable control points. Without it the pogram can't move the curve. - foreach (VControlPointSpline *point, controlPoints) + foreach (auto *point, controlPoints) { point->setFlag(QGraphicsItem::ItemSendsGeometryChanges, false); } @@ -584,26 +582,29 @@ void VToolSplinePath::RefreshGeometry() { this->setPath(ToolPath()); } + this->setPen(QPen(CorrectColor(lineColor), qApp->toPixel(WidthHairLine(*VAbstractTool::data.GetPatternUnit()))/factor)); - const QSharedPointer splPath = VAbstractTool::data.GeometricObject(id); + + const auto splPath = VAbstractTool::data.GeometricObject(id); for (qint32 i = 1; i<=splPath->Count(); ++i) { - VSpline spl = splPath->GetSpline(i); - QPointF splinePoint = spl.GetP1().toQPointF(); - QPointF controlPoint = spl.GetP2(); - emit RefreshLine(i, SplinePointPosition::FirstPoint, controlPoint, splinePoint); - splinePoint = spl.GetP4().toQPointF(); - controlPoint = spl.GetP3(); - emit RefreshLine(i, SplinePointPosition::LastPoint, controlPoint, splinePoint); - - qint32 j = i*2; + const qint32 j = i*2; controlPoints[j-2]->blockSignals(true); controlPoints[j-1]->blockSignals(true); - controlPoints[j-2]->setPos(spl.GetP2()); - controlPoints[j-1]->setPos(spl.GetP3()); + const auto spl = splPath->GetSpline(i); + + { + const auto splinePoint = spl.GetP1().toQPointF(); + controlPoints[j-2]->RefreshCtrlPoint(i, SplinePointPosition::FirstPoint, spl.GetP2(), splinePoint); + } + + { + const auto splinePoint = spl.GetP4().toQPointF(); + controlPoints[j-1]->RefreshCtrlPoint(i, SplinePointPosition::LastPoint, spl.GetP3(), splinePoint); + } controlPoints[j-2]->blockSignals(false); controlPoints[j-1]->blockSignals(false); @@ -611,7 +612,7 @@ void VToolSplinePath::RefreshGeometry() SetVisualization(); - foreach (VControlPointSpline *point, controlPoints) + foreach (auto *point, controlPoints) { point->setFlag(QGraphicsItem::ItemSendsGeometryChanges, true); } diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.h index f09e09233..ab6ca7db6 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.h @@ -31,6 +31,10 @@ #include "vabstractspline.h" +class VSplinePath; +class VSplinePoint; +class VSpline; + /** * @brief The VToolSplinePath class tool for creation spline path. */ diff --git a/src/libs/vtools/visualization/vistoolspline.cpp b/src/libs/vtools/visualization/vistoolspline.cpp index 229c959ed..91ebe9da6 100644 --- a/src/libs/vtools/visualization/vistoolspline.cpp +++ b/src/libs/vtools/visualization/vistoolspline.cpp @@ -30,17 +30,40 @@ #include "../../vgeometry/vpointf.h" #include "../../vgeometry/vspline.h" #include "../../vpatterndb/vcontainer.h" +#include "../vwidgets/vcontrolpointspline.h" const int EMPTY_ANGLE = -1; //--------------------------------------------------------------------------------------------------------------------- VisToolSpline::VisToolSpline(const VContainer *data, QGraphicsItem *parent) - : VisPath(data, parent), object4Id(NULL_ID), lineP1(nullptr), lineP4(nullptr), line(nullptr), angle1(EMPTY_ANGLE), - angle2(EMPTY_ANGLE), kAsm1(1), kAsm2(1), kCurve(1) + : VisPath(data, parent), + object4Id(NULL_ID), + lineP1(nullptr), + lineP4(nullptr), + line(nullptr), + angle1(EMPTY_ANGLE), + angle2(EMPTY_ANGLE), + kAsm1(1), + kAsm2(1), + kCurve(1), + isLeftMousePressed(false), + p2Selected(false), + p3Selected(false), + p2(), + p3(), + controlPoints() { lineP1 = InitPoint(supportColor, this); lineP4 = InitPoint(supportColor, this); //-V656 line = InitItem(mainColor, this); + + auto *controlPoint1 = new VControlPointSpline(1, SplinePointPosition::FirstPoint, *data->GetPatternUnit(), this); + controlPoint1->hide(); + controlPoints.append(controlPoint1); + + auto *controlPoint2 = new VControlPointSpline(1, SplinePointPosition::LastPoint, *data->GetPatternUnit(), this); + controlPoint2->hide(); + controlPoints.append(controlPoint2); } //--------------------------------------------------------------------------------------------------------------------- @@ -52,21 +75,54 @@ void VisToolSpline::RefreshGeometry() { if (object1Id > NULL_ID) { - const QSharedPointer first = Visualization::data->GeometricObject(object1Id); + const auto first = Visualization::data->GeometricObject(object1Id); DrawPoint(lineP1, first->toQPointF(), supportColor); + if (mode == Mode::Creation) + { + if (isLeftMousePressed && not p2Selected) + { + p2 = Visualization::scenePos; + controlPoints[0]->RefreshCtrlPoint(1, SplinePointPosition::FirstPoint, p2, first->toQPointF()); + controlPoints[0]->show(); + } + else + { + p2Selected = true; + } + } + if (object4Id <= NULL_ID) { - DrawLine(line, QLineF(first->toQPointF(), Visualization::scenePos), mainColor); + VSpline spline(*first, p2, Visualization::scenePos, VPointF(Visualization::scenePos), kCurve); + DrawPath(this, spline.GetPath(PathDirection::Hide), mainColor, Qt::SolidLine, Qt::RoundCap); } else { - const QSharedPointer second = Visualization::data->GeometricObject(object4Id); + const auto second = Visualization::data->GeometricObject(object4Id); DrawPoint(lineP4, second->toQPointF(), supportColor); + if (mode == Mode::Creation) + { + if (isLeftMousePressed && not p3Selected) + { + QLineF ctrlLine (second->toQPointF(), Visualization::scenePos); + ctrlLine.setAngle(ctrlLine.angle()+180); + p3 = ctrlLine.p2(); + + controlPoints[1]->RefreshCtrlPoint(1, SplinePointPosition::LastPoint, p3, second->toQPointF()); + controlPoints[1]->show(); + } + else + { + p3Selected = true; + } + } + if (qFuzzyCompare(angle1, EMPTY_ANGLE) || qFuzzyCompare(angle2, EMPTY_ANGLE)) { - DrawLine(line, QLineF(first->toQPointF(), second->toQPointF()), mainColor); + VSpline spline(*first, p2, p3, *second, kCurve); + DrawPath(this, spline.GetPath(PathDirection::Hide), mainColor, Qt::SolidLine, Qt::RoundCap); } else { @@ -112,3 +168,34 @@ void VisToolSpline::SetKCurve(const qreal &value) { kCurve = value; } + +//--------------------------------------------------------------------------------------------------------------------- +QPointF VisToolSpline::GetP2() const +{ + return p2; +} + +//--------------------------------------------------------------------------------------------------------------------- +QPointF VisToolSpline::GetP3() const +{ + return p3; +} + +//--------------------------------------------------------------------------------------------------------------------- +void VisToolSpline::MouseLeftPressed() +{ + if (mode == Mode::Creation) + { + isLeftMousePressed = true; + } +} + +//--------------------------------------------------------------------------------------------------------------------- +void VisToolSpline::MouseLeftReleased() +{ + if (mode == Mode::Creation) + { + isLeftMousePressed = false; + RefreshGeometry(); + } +} diff --git a/src/libs/vtools/visualization/vistoolspline.h b/src/libs/vtools/visualization/vistoolspline.h index fb6f780d3..ebd193cc8 100644 --- a/src/libs/vtools/visualization/vistoolspline.h +++ b/src/libs/vtools/visualization/vistoolspline.h @@ -31,6 +31,8 @@ #include "vispath.h" +class VControlPointSpline; + class VisToolSpline : public VisPath { Q_OBJECT @@ -47,8 +49,16 @@ public: void SetKAsm2(const qreal &value); void SetKCurve(const qreal &value); + QPointF GetP2() const; + QPointF GetP3() const; + virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::ToolSpline)}; + +public slots: + void MouseLeftPressed(); + void MouseLeftReleased(); + protected: Q_DISABLE_COPY(VisToolSpline) quint32 object4Id; @@ -60,6 +70,15 @@ protected: qreal kAsm1; qreal kAsm2; qreal kCurve; + + bool isLeftMousePressed; + bool p2Selected; + bool p3Selected; + + QPointF p2; + QPointF p3; + + QVector controlPoints; }; #endif // VISTOOLSPLINE_H diff --git a/src/libs/vtools/visualization/vistoolsplinepath.cpp b/src/libs/vtools/visualization/vistoolsplinepath.cpp index d0f42833b..0e1af6107 100644 --- a/src/libs/vtools/visualization/vistoolsplinepath.cpp +++ b/src/libs/vtools/visualization/vistoolsplinepath.cpp @@ -30,8 +30,7 @@ //--------------------------------------------------------------------------------------------------------------------- VisToolSplinePath::VisToolSplinePath(const VContainer *data, QGraphicsItem *parent) - : VisPath(data, parent), points(QVector()), line(nullptr), path(VSplinePath()), - mode(Mode::Creation) + : VisPath(data, parent), points(QVector()), line(nullptr), path(VSplinePath()) { line = InitItem(mainColor, this); } @@ -107,18 +106,6 @@ VSplinePath VisToolSplinePath::getPath() return path; } -//--------------------------------------------------------------------------------------------------------------------- -Mode VisToolSplinePath::getMode() const -{ - return mode; -} - -//--------------------------------------------------------------------------------------------------------------------- -void VisToolSplinePath::setMode(const Mode &value) -{ - mode = value; -} - //--------------------------------------------------------------------------------------------------------------------- QGraphicsEllipseItem *VisToolSplinePath::getPoint(quint32 i) { diff --git a/src/libs/vtools/visualization/vistoolsplinepath.h b/src/libs/vtools/visualization/vistoolsplinepath.h index b1f69fb5d..d37178326 100644 --- a/src/libs/vtools/visualization/vistoolsplinepath.h +++ b/src/libs/vtools/visualization/vistoolsplinepath.h @@ -32,8 +32,6 @@ #include "vispath.h" #include "../../vgeometry/vsplinepath.h" -enum class Mode : char {Creation, Show}; - class VisToolSplinePath : public VisPath { Q_OBJECT @@ -49,8 +47,6 @@ public: virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Vis::ToolSplinePath)}; - Mode getMode() const; - void setMode(const Mode &value); signals: void PathChanged(const VSplinePath &path); @@ -59,7 +55,6 @@ protected: QVector points; QGraphicsLineItem *line; VSplinePath path; - Mode mode; QGraphicsEllipseItem * getPoint(quint32 i); }; diff --git a/src/libs/vtools/visualization/visualization.cpp b/src/libs/vtools/visualization/visualization.cpp index 021fe639a..a9f872d80 100644 --- a/src/libs/vtools/visualization/visualization.cpp +++ b/src/libs/vtools/visualization/visualization.cpp @@ -37,8 +37,16 @@ Q_LOGGING_CATEGORY(vVis, "v.visualization") //--------------------------------------------------------------------------------------------------------------------- Visualization::Visualization(const VContainer *data) - :QObject(), data(data), factor(VDrawTool::factor), scenePos(QPointF()), - mainColor(Qt::red), supportColor(Qt::magenta), lineStyle(Qt::SolidLine), object1Id(NULL_ID), toolTip(QString()) + :QObject(), + data(data), + factor(VDrawTool::factor), + scenePos(QPointF()), + mainColor(Qt::red), + supportColor(Qt::magenta), + lineStyle(Qt::SolidLine), + object1Id(NULL_ID), + toolTip(QString()), + mode(Mode::Creation) {} //--------------------------------------------------------------------------------------------------------------------- @@ -196,3 +204,16 @@ void Visualization::DrawPath(QGraphicsPathItem *pathItem, const QPainterPath &pa pathItem->setPath(path); pathItem->setVisible(true); } + + +//--------------------------------------------------------------------------------------------------------------------- +Mode Visualization::GetMode() const +{ + return mode; +} + +//--------------------------------------------------------------------------------------------------------------------- +void Visualization::SetMode(const Mode &value) +{ + mode = value; +} diff --git a/src/libs/vtools/visualization/visualization.h b/src/libs/vtools/visualization/visualization.h index a43f0bd36..e2cff633c 100644 --- a/src/libs/vtools/visualization/visualization.h +++ b/src/libs/vtools/visualization/visualization.h @@ -39,6 +39,8 @@ Q_DECLARE_LOGGING_CATEGORY(vVis) +enum class Mode : char {Creation, Show}; + class Visualization : public QObject { Q_OBJECT @@ -53,6 +55,9 @@ public: void setScenePos(const QPointF &value); virtual void VisualMode(const quint32 &pointId); void setMainColor(const QColor &value); + + Mode GetMode() const; + void SetMode(const Mode &value); signals: void ToolTip(const QString &toolTip); public slots: @@ -67,6 +72,7 @@ protected: Qt::PenStyle lineStyle; quint32 object1Id; QString toolTip; + Mode mode; virtual void InitPen()=0; virtual void AddOnScene()=0; diff --git a/src/libs/vwidgets/vcontrolpointspline.cpp b/src/libs/vwidgets/vcontrolpointspline.cpp index 1047608e9..2ed632242 100644 --- a/src/libs/vwidgets/vcontrolpointspline.cpp +++ b/src/libs/vwidgets/vcontrolpointspline.cpp @@ -36,6 +36,19 @@ #include "vmaingraphicsview.h" #include "vmaingraphicsscene.h" +//--------------------------------------------------------------------------------------------------------------------- +VControlPointSpline::VControlPointSpline(const qint32 &indexSpline, SplinePointPosition position, Unit patternUnit, + QGraphicsItem *parent) + :QGraphicsEllipseItem(parent), + radius(CircleRadius()), + controlLine(nullptr), + indexSpline(indexSpline), + position(position), + patternUnit(patternUnit) +{ + Init(); +} + //--------------------------------------------------------------------------------------------------------------------- /** * @brief VControlPointSpline constructor. @@ -48,28 +61,22 @@ VControlPointSpline::VControlPointSpline(const qint32 &indexSpline, SplinePointPosition position, const QPointF &controlPoint, const QPointF &splinePoint, Unit patternUnit, QGraphicsItem *parent) - :QGraphicsEllipseItem(parent), radius(0), controlLine(nullptr), indexSpline(indexSpline), position(position), + :QGraphicsEllipseItem(parent), + radius(CircleRadius()), + controlLine(nullptr), + indexSpline(indexSpline), + position(position), patternUnit(patternUnit) { - //create circle - radius = (1.5/*mm*/ / 25.4) * PrintDPI; - QRectF rec = QRectF(0, 0, radius*2, radius*2); - rec.translate(-rec.center().x(), -rec.center().y()); - this->setRect(rec); - this->setPen(QPen(Qt::black, ToPixel(WidthHairLine(patternUnit), patternUnit))); - this->setBrush(QBrush(Qt::NoBrush)); + Init(); + this->setFlag(QGraphicsItem::ItemIsSelectable, true); this->setFlag(QGraphicsItem::ItemIsMovable, true); this->setFlag(QGraphicsItem::ItemSendsGeometryChanges, true); this->setAcceptHoverEvents(true); this->setPos(controlPoint); - this->setZValue(100); - QPointF p1, p2; - VGObject::LineIntersectCircle(QPointF(), radius, QLineF( QPointF(), splinePoint-controlPoint), p1, p2); - controlLine = new QGraphicsLineItem(QLineF(splinePoint-controlPoint, p1), this); - controlLine->setPen(QPen(Qt::red, ToPixel(WidthHairLine(patternUnit), patternUnit))); - controlLine->setFlag(QGraphicsItem::ItemStacksBehindParent, true); + SetCtrlLine(controlPoint, splinePoint); } //--------------------------------------------------------------------------------------------------------------------- @@ -196,22 +203,44 @@ void VControlPointSpline::contextMenuEvent(QGraphicsSceneContextMenuEvent *event emit ShowContextMenu(event); } +//--------------------------------------------------------------------------------------------------------------------- +void VControlPointSpline::Init() +{ + auto rec = QRectF(0, 0, radius*2, radius*2); + rec.translate(-rec.center().x(), -rec.center().y()); + this->setRect(rec); + this->setPen(QPen(Qt::black, ToPixel(WidthHairLine(patternUnit), patternUnit))); + this->setBrush(QBrush(Qt::NoBrush)); + this->setZValue(100); + + controlLine = new QGraphicsLineItem(this); + controlLine->setPen(QPen(Qt::red, ToPixel(WidthHairLine(patternUnit), patternUnit))); + controlLine->setFlag(QGraphicsItem::ItemStacksBehindParent, true); +} + +//--------------------------------------------------------------------------------------------------------------------- +void VControlPointSpline::SetCtrlLine(const QPointF &controlPoint, const QPointF &splinePoint) +{ + QPointF p1, p2; + VGObject::LineIntersectCircle(QPointF(), radius, QLineF( QPointF(), splinePoint-controlPoint), p1, p2); + controlLine->setLine(QLineF(splinePoint-controlPoint, p1)); +} + //--------------------------------------------------------------------------------------------------------------------- /** - * @brief RefreshLine refresh line control point. + * @brief RefreshCtrlPoint refresh the control point. * @param indexSpline index spline in list. * @param pos position point in spline. * @param controlPoint control point. * @param splinePoint spline point. */ -void VControlPointSpline::RefreshLine(const qint32 &indexSpline, SplinePointPosition pos, - const QPointF &controlPoint, const QPointF &splinePoint) +void VControlPointSpline::RefreshCtrlPoint(const qint32 &indexSpline, SplinePointPosition pos, + const QPointF &controlPoint, const QPointF &splinePoint) { if (this->indexSpline == indexSpline && this->position == pos) { - QPointF p1, p2; - VGObject::LineIntersectCircle(QPointF(), radius, QLineF( QPointF(), splinePoint-controlPoint), p1, p2); - controlLine->setLine(QLineF(splinePoint-controlPoint, p1)); + this->setPos(controlPoint); + SetCtrlLine(controlPoint, splinePoint); } } diff --git a/src/libs/vwidgets/vcontrolpointspline.h b/src/libs/vwidgets/vcontrolpointspline.h index 21b9eb629..a15e33756 100644 --- a/src/libs/vwidgets/vcontrolpointspline.h +++ b/src/libs/vwidgets/vcontrolpointspline.h @@ -41,6 +41,8 @@ class VControlPointSpline : public QObject, public QGraphicsEllipseItem { Q_OBJECT public: + VControlPointSpline(const qint32 &indexSpline, SplinePointPosition position, Unit patternUnit, + QGraphicsItem * parent = nullptr); VControlPointSpline(const qint32 &indexSpline, SplinePointPosition position, const QPointF &controlPoint, const QPointF &splinePoint, Unit patternUnit, QGraphicsItem * parent = nullptr); virtual ~VControlPointSpline() Q_DECL_OVERRIDE; @@ -63,12 +65,12 @@ signals: */ void ShowContextMenu(QGraphicsSceneContextMenuEvent *event); public slots: - void RefreshLine(const qint32 &indexSpline, SplinePointPosition pos, const QPointF &controlPoint, - const QPointF &splinePoint); + void RefreshCtrlPoint(const qint32 &indexSpline, SplinePointPosition pos, const QPointF &controlPoint, + const QPointF &splinePoint); void setEnabledPoint(bool enable); protected: /** @brief radius radius circle. */ - qreal radius; + const qreal radius; /** @brief controlLine pointer to line control point. */ QGraphicsLineItem *controlLine; @@ -88,6 +90,16 @@ private: SplinePointPosition position; Unit patternUnit; + + inline qreal CircleRadius() const; + void Init(); + void SetCtrlLine(const QPointF &controlPoint, const QPointF &splinePoint); }; +//--------------------------------------------------------------------------------------------------------------------- +qreal VControlPointSpline::CircleRadius() const +{ + return (1.5/*mm*/ / 25.4) * PrintDPI; +} + #endif // VCONTROLPOINTSPLINE_H diff --git a/src/libs/vwidgets/vmaingraphicsscene.cpp b/src/libs/vwidgets/vmaingraphicsscene.cpp index 2642ddc4f..b0c6f709a 100644 --- a/src/libs/vwidgets/vmaingraphicsscene.cpp +++ b/src/libs/vwidgets/vmaingraphicsscene.cpp @@ -74,7 +74,11 @@ void VMainGraphicsScene::mouseMoveEvent(QGraphicsSceneMouseEvent* event) */ void VMainGraphicsScene::mousePressEvent(QGraphicsSceneMouseEvent *event) { - emit mousePress(event->scenePos()); + if (event->button() == Qt::LeftButton && event->type() != QEvent::GraphicsSceneMouseDoubleClick) + { + emit MouseLeftPressed(); + } + QGraphicsScene::mousePressEvent(event); if (QGuiApplication::keyboardModifiers() == Qt::ControlModifier) { @@ -86,6 +90,16 @@ void VMainGraphicsScene::mousePressEvent(QGraphicsSceneMouseEvent *event) } } +//--------------------------------------------------------------------------------------------------------------------- +void VMainGraphicsScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) +{ + if (event->button() == Qt::LeftButton && event->type() != QEvent::GraphicsSceneMouseDoubleClick) + { + emit MouseLeftReleased(); + } + QGraphicsScene::mouseReleaseEvent(event); +} + //--------------------------------------------------------------------------------------------------------------------- void VMainGraphicsScene::InitOrigins() { diff --git a/src/libs/vwidgets/vmaingraphicsscene.h b/src/libs/vwidgets/vmaingraphicsscene.h index faa9fbd4b..20526b9d2 100644 --- a/src/libs/vwidgets/vmaingraphicsscene.h +++ b/src/libs/vwidgets/vmaingraphicsscene.h @@ -61,17 +61,17 @@ public slots: protected: virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; virtual void mousePressEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; signals: /** * @brief mouseMove send new mouse position. * @param scenePos new mouse position. */ void mouseMove(const QPointF &scenePos); - /** - * @brief mousePress send new mouse press position. - * @param scenePos new mouse press position. - */ - void mousePress(QPointF scenePos); + + void MouseLeftPressed(); + void MouseLeftReleased(); + /** * @brief ChoosedObject send option choosed object. * @param id object id. From 6dd26ddd73a266058b95b56bd8968ab910b9446f Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 12 Feb 2016 20:31:08 +0200 Subject: [PATCH 09/59] Refactoring. Use qFuzzyIsNull. --HG-- branch : feature --- src/libs/vtools/visualization/vistoolendline.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/vtools/visualization/vistoolendline.cpp b/src/libs/vtools/visualization/vistoolendline.cpp index 779bf342e..dcdde7a83 100644 --- a/src/libs/vtools/visualization/vistoolendline.cpp +++ b/src/libs/vtools/visualization/vistoolendline.cpp @@ -51,7 +51,7 @@ void VisToolEndLine::RefreshGeometry() { const QSharedPointer first = Visualization::data->GeometricObject(object1Id); QLineF line; - if (qFuzzyCompare(1 + length, 1 + 0)) + if (qFuzzyIsNull(length)) { line = QLineF(first->toQPointF(), Ray(first->toQPointF())); } From 1924b30f6f57231857a8953a780378d7a91ee1e7 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 12 Feb 2016 20:32:31 +0200 Subject: [PATCH 10/59] Don't show control points if too close to start and end points. --HG-- branch : feature --- .../vtools/visualization/vistoolspline.cpp | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/libs/vtools/visualization/vistoolspline.cpp b/src/libs/vtools/visualization/vistoolspline.cpp index 91ebe9da6..6f276e644 100644 --- a/src/libs/vtools/visualization/vistoolspline.cpp +++ b/src/libs/vtools/visualization/vistoolspline.cpp @@ -73,6 +73,9 @@ VisToolSpline::~VisToolSpline() //--------------------------------------------------------------------------------------------------------------------- void VisToolSpline::RefreshGeometry() { + //Radius of point circle, but little bigger. Need handle with hover sizes. + const static qreal radius = ToPixel(DefPointRadius/*mm*/, Unit::Mm)*1.5; + if (object1Id > NULL_ID) { const auto first = Visualization::data->GeometricObject(object1Id); @@ -84,7 +87,14 @@ void VisToolSpline::RefreshGeometry() { p2 = Visualization::scenePos; controlPoints[0]->RefreshCtrlPoint(1, SplinePointPosition::FirstPoint, p2, first->toQPointF()); - controlPoints[0]->show(); + + if (not controlPoints[0]->isVisible()) + { + if (QLineF(first->toQPointF(), p2).length() > radius) + { + controlPoints[0]->show(); + } + } } else { @@ -109,9 +119,15 @@ void VisToolSpline::RefreshGeometry() QLineF ctrlLine (second->toQPointF(), Visualization::scenePos); ctrlLine.setAngle(ctrlLine.angle()+180); p3 = ctrlLine.p2(); - controlPoints[1]->RefreshCtrlPoint(1, SplinePointPosition::LastPoint, p3, second->toQPointF()); - controlPoints[1]->show(); + + if (not controlPoints[1]->isVisible()) + { + if (QLineF(second->toQPointF(), p3).length() > radius) + { + controlPoints[1]->show(); + } + } } else { From 0405a54bf8f867f0ca31337bcbb31b945ab2008b Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 12 Feb 2016 21:43:33 +0200 Subject: [PATCH 11/59] Removed unused QGraphicsLineItem item. --HG-- branch : feature --- src/libs/vtools/visualization/vistoolspline.cpp | 14 ++++++-------- src/libs/vtools/visualization/vistoolspline.h | 5 ++--- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/libs/vtools/visualization/vistoolspline.cpp b/src/libs/vtools/visualization/vistoolspline.cpp index 6f276e644..2b731e44d 100644 --- a/src/libs/vtools/visualization/vistoolspline.cpp +++ b/src/libs/vtools/visualization/vistoolspline.cpp @@ -38,9 +38,8 @@ const int EMPTY_ANGLE = -1; VisToolSpline::VisToolSpline(const VContainer *data, QGraphicsItem *parent) : VisPath(data, parent), object4Id(NULL_ID), - lineP1(nullptr), - lineP4(nullptr), - line(nullptr), + point1(nullptr), + point4(nullptr), angle1(EMPTY_ANGLE), angle2(EMPTY_ANGLE), kAsm1(1), @@ -53,9 +52,8 @@ VisToolSpline::VisToolSpline(const VContainer *data, QGraphicsItem *parent) p3(), controlPoints() { - lineP1 = InitPoint(supportColor, this); - lineP4 = InitPoint(supportColor, this); //-V656 - line = InitItem(mainColor, this); + point1 = InitPoint(supportColor, this); + point4 = InitPoint(supportColor, this); //-V656 auto *controlPoint1 = new VControlPointSpline(1, SplinePointPosition::FirstPoint, *data->GetPatternUnit(), this); controlPoint1->hide(); @@ -79,7 +77,7 @@ void VisToolSpline::RefreshGeometry() if (object1Id > NULL_ID) { const auto first = Visualization::data->GeometricObject(object1Id); - DrawPoint(lineP1, first->toQPointF(), supportColor); + DrawPoint(point1, first->toQPointF(), supportColor); if (mode == Mode::Creation) { @@ -110,7 +108,7 @@ void VisToolSpline::RefreshGeometry() else { const auto second = Visualization::data->GeometricObject(object4Id); - DrawPoint(lineP4, second->toQPointF(), supportColor); + DrawPoint(point4, second->toQPointF(), supportColor); if (mode == Mode::Creation) { diff --git a/src/libs/vtools/visualization/vistoolspline.h b/src/libs/vtools/visualization/vistoolspline.h index ebd193cc8..531619efc 100644 --- a/src/libs/vtools/visualization/vistoolspline.h +++ b/src/libs/vtools/visualization/vistoolspline.h @@ -62,9 +62,8 @@ public slots: protected: Q_DISABLE_COPY(VisToolSpline) quint32 object4Id; - QGraphicsEllipseItem *lineP1; - QGraphicsEllipseItem *lineP4; - QGraphicsLineItem *line; + QGraphicsEllipseItem *point1; + QGraphicsEllipseItem *point4; qreal angle1; qreal angle2; qreal kAsm1; From e68c64e8f1856491eb80e11a390d5eebb5a69193 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 13 Feb 2016 18:24:32 +0200 Subject: [PATCH 12/59] Implementation for tool Spline path. --HG-- branch : feature --- .../vtools/dialogs/tools/dialogsplinepath.cpp | 9 +- .../visualization/vistoolsplinepath.cpp | 213 +++++++++++++++--- .../vtools/visualization/vistoolsplinepath.h | 16 +- 3 files changed, 203 insertions(+), 35 deletions(-) diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp index 2bb688d12..f53504de0 100644 --- a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp @@ -61,6 +61,13 @@ DialogSplinePath::DialogSplinePath(const VContainer *data, const quint32 &toolId this, &DialogSplinePath::KAsm2Changed); vis = new VisToolSplinePath(data); + auto path = qobject_cast(vis); + SCASSERT(path != nullptr); + + auto scene = qobject_cast(qApp->getCurrentScene()); + SCASSERT(scene != nullptr); + connect(scene, &VMainGraphicsScene::MouseLeftPressed, path, &VisToolSplinePath::MouseLeftPressed); + connect(scene, &VMainGraphicsScene::MouseLeftReleased, path, &VisToolSplinePath::MouseLeftReleased); } //--------------------------------------------------------------------------------------------------------------------- @@ -126,7 +133,7 @@ void DialogSplinePath::ChosenObject(quint32 id, const SceneObject &type) SavePath(); - VisToolSplinePath *visPath = qobject_cast(vis); + auto visPath = qobject_cast(vis); SCASSERT(visPath != nullptr); visPath->setPath(path); diff --git a/src/libs/vtools/visualization/vistoolsplinepath.cpp b/src/libs/vtools/visualization/vistoolsplinepath.cpp index 0e1af6107..3618257d9 100644 --- a/src/libs/vtools/visualization/vistoolsplinepath.cpp +++ b/src/libs/vtools/visualization/vistoolsplinepath.cpp @@ -27,18 +27,27 @@ *************************************************************************/ #include "vistoolsplinepath.h" +#include "../vwidgets/vcontrolpointspline.h" //--------------------------------------------------------------------------------------------------------------------- VisToolSplinePath::VisToolSplinePath(const VContainer *data, QGraphicsItem *parent) - : VisPath(data, parent), points(QVector()), line(nullptr), path(VSplinePath()) + : VisPath(data, parent), + points(QVector()), + ctrlPoints(QVector()), + newCurveSegment(nullptr), + path(VSplinePath()), + isLeftMousePressed(false), + pointSelected(false), + ctrlPoint() { - line = InitItem(mainColor, this); + newCurveSegment = InitItem(mainColor, this); } //--------------------------------------------------------------------------------------------------------------------- VisToolSplinePath::~VisToolSplinePath() { - qDeleteAll(points.begin(), points.end()); + qDeleteAll(ctrlPoints); + qDeleteAll(points); } //--------------------------------------------------------------------------------------------------------------------- @@ -46,41 +55,25 @@ void VisToolSplinePath::RefreshGeometry() { if (path.CountPoint() > 0) { - QVector pathPoints = path.GetSplinePath(); - if (path.CountPoint() == 1) + const QVector pathPoints = path.GetSplinePath(); + const int size = pathPoints.size(); + + for (int i = 0; i < size; ++i) { - QGraphicsEllipseItem *point = this->getPoint(0); - DrawPoint(point, pathPoints.at(0).P().toQPointF(), supportColor); - - if (mode == Mode::Creation) - { - QLineF sceneLine = QLineF(pathPoints.at(0).P().toQPointF(), Visualization::scenePos); - DrawLine(line, sceneLine, mainColor, lineStyle); - - path[0].SetAngle2(sceneLine.angle()); - emit PathChanged(path); - } + QGraphicsEllipseItem *point = this->getPoint(static_cast(i)); + DrawPoint(point, pathPoints.at(i).P().toQPointF(), supportColor); } - else + + if (mode == Mode::Creation) { - for (int i = 0; i < pathPoints.size(); ++i) - { - QGraphicsEllipseItem *point = this->getPoint(static_cast(i)); - DrawPoint(point, pathPoints.at(i).P().toQPointF(), supportColor); - } - - if (mode == Mode::Creation) - { - QLineF sceneLine = QLineF(pathPoints.at(pathPoints.size() - 1).P().toQPointF(), - Visualization::scenePos); - DrawLine(line, sceneLine, mainColor, lineStyle); - - path[pathPoints.size() - 1].SetAngle2(sceneLine.angle()); - emit PathChanged(path); - } + Creating(pathPoints.at(size-1).P().toQPointF(), size); + } + if (size > 1) + { DrawPath(this, path.GetPath(PathDirection::Show), mainColor, Qt::SolidLine, Qt::RoundCap); } + if (path.CountPoint() < 3) { Visualization::toolTip = tr("Curved path: select three or more points"); @@ -106,6 +99,25 @@ VSplinePath VisToolSplinePath::getPath() return path; } +//--------------------------------------------------------------------------------------------------------------------- +void VisToolSplinePath::MouseLeftPressed() +{ + if (mode == Mode::Creation) + { + isLeftMousePressed = true; + } +} + +//--------------------------------------------------------------------------------------------------------------------- +void VisToolSplinePath::MouseLeftReleased() +{ + if (mode == Mode::Creation) + { + isLeftMousePressed = false; + RefreshGeometry(); + } +} + //--------------------------------------------------------------------------------------------------------------------- QGraphicsEllipseItem *VisToolSplinePath::getPoint(quint32 i) { @@ -115,9 +127,144 @@ QGraphicsEllipseItem *VisToolSplinePath::getPoint(quint32 i) } else { - QGraphicsEllipseItem * point = InitPoint(supportColor, this); + pointSelected = false; + + auto point = InitPoint(supportColor, this); points.append(point); + + if (points.size() == 1) + { + auto *controlPoint1 = new VControlPointSpline(points.size(), SplinePointPosition::FirstPoint, + *Visualization::data->GetPatternUnit(), + this); + controlPoint1->hide(); + ctrlPoints.append(controlPoint1); + } + else + { + auto *controlPoint1 = new VControlPointSpline(points.size()-1, SplinePointPosition::LastPoint, + *Visualization::data->GetPatternUnit(), + this); + controlPoint1->hide(); + ctrlPoints.append(controlPoint1); + + auto *controlPoint2 = new VControlPointSpline(points.size(), SplinePointPosition::FirstPoint, + *Visualization::data->GetPatternUnit(), + this); + controlPoint2->hide(); + ctrlPoints.append(controlPoint2); + } + return point; } return nullptr; } + +//--------------------------------------------------------------------------------------------------------------------- +QSharedPointer VisToolSplinePath::NewCurveSegmen(const QPointF &pSpl, int size) +{ + auto spline = QSharedPointer(new VSpline(VPointF(pSpl), ctrlPoint, Visualization::scenePos, + VPointF(Visualization::scenePos), path.GetKCurve())); + + if (size == 1) + { + path[size-1].SetAngle2(spline->GetStartAngle()); + path[size-1].SetKAsm2(spline->GetKasm1()); + emit PathChanged(path); + } + else + { + path[size-1].SetAngle2(spline->GetStartAngle()); + path[size-1].SetKAsm1(spline->GetKasm1()); + path[size-1].SetKAsm2(spline->GetKasm1()); + emit PathChanged(path); + } + + return spline; +} + +//--------------------------------------------------------------------------------------------------------------------- +void VisToolSplinePath::Creating(const QPointF &pSpl, int size) +{ + //Radius of point circle, but little bigger. Need handle with hover sizes. + const static qreal radius = ToPixel(DefPointRadius/*mm*/, Unit::Mm)*1.5; + + int lastPoint = 0; + int preLastPoint = 0; + + if (size > 1) + { + lastPoint = (size - 1) * 2; + preLastPoint = lastPoint - 1; + } + + if (isLeftMousePressed && not pointSelected) + { + newCurveSegment->hide(); + + ctrlPoint = Visualization::scenePos; + + if (not ctrlPoints[lastPoint]->isVisible()) + { + if (QLineF(pSpl, ctrlPoint).length() > radius) + { + if (size == 1) + { + ctrlPoints[lastPoint]->show(); + } + else + { + ctrlPoints[preLastPoint]->show(); + ctrlPoints[lastPoint]->show(); + } + } + else + { + ctrlPoint = pSpl; + } + } + + if (size == 1) + { + ctrlPoints[lastPoint]->RefreshCtrlPoint(size, SplinePointPosition::FirstPoint, ctrlPoint, pSpl); + } + else + { + QLineF ctrlLine (pSpl, Visualization::scenePos); + ctrlLine.setAngle(ctrlLine.angle()+180); + + ctrlPoints[preLastPoint]->RefreshCtrlPoint(size-1, SplinePointPosition::LastPoint, ctrlLine.p2(), pSpl); + ctrlPoints[lastPoint]->RefreshCtrlPoint(size, SplinePointPosition::FirstPoint, ctrlPoint, pSpl); + } + + VSpline spline(VPointF(pSpl), ctrlPoint, Visualization::scenePos, + VPointF(Visualization::scenePos), path.GetKCurve()); + + if (size == 1) + { + path[size-1].SetAngle2(spline.GetStartAngle()); + path[size-1].SetKAsm2(spline.GetKasm1()); + emit PathChanged(path); + } + else + { + path[size-1].SetAngle2(spline.GetStartAngle()); + path[size-1].SetKAsm1(spline.GetKasm1()); + path[size-1].SetKAsm2(spline.GetKasm1()); + emit PathChanged(path); + } + } + else + { + pointSelected = true; + + VSpline spline(VPointF(pSpl), ctrlPoint, Visualization::scenePos, + VPointF(Visualization::scenePos), path.GetKCurve()); + + path[size-1].SetAngle2(spline.GetStartAngle()); + path[size-1].SetKAsm2(spline.GetKasm1()); + emit PathChanged(path); + + DrawPath(newCurveSegment, spline.GetPath(PathDirection::Hide), mainColor, Qt::SolidLine, Qt::RoundCap); + } +} diff --git a/src/libs/vtools/visualization/vistoolsplinepath.h b/src/libs/vtools/visualization/vistoolsplinepath.h index d37178326..309f57127 100644 --- a/src/libs/vtools/visualization/vistoolsplinepath.h +++ b/src/libs/vtools/visualization/vistoolsplinepath.h @@ -32,6 +32,8 @@ #include "vispath.h" #include "../../vgeometry/vsplinepath.h" +class VControlPointSpline; + class VisToolSplinePath : public VisPath { Q_OBJECT @@ -50,13 +52,25 @@ public: signals: void PathChanged(const VSplinePath &path); +public slots: + void MouseLeftPressed(); + void MouseLeftReleased(); + protected: Q_DISABLE_COPY(VisToolSplinePath) QVector points; - QGraphicsLineItem *line; + QVector ctrlPoints; + QGraphicsPathItem *newCurveSegment; VSplinePath path; + bool isLeftMousePressed; + bool pointSelected; + + QPointF ctrlPoint; + QGraphicsEllipseItem * getPoint(quint32 i); + QSharedPointer NewCurveSegmen(const QPointF &pSpl, int size); + void Creating(const QPointF &pSpl, int size); }; #endif // VISTOOLSPLINEPATH_H From b124b8402e88f2cb2607ed8234270dc83cd759e8 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 13 Feb 2016 18:30:21 +0200 Subject: [PATCH 13/59] The control point should be on some distance before we will begin count this distance. --HG-- branch : feature --- src/libs/vtools/visualization/vistoolspline.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/libs/vtools/visualization/vistoolspline.cpp b/src/libs/vtools/visualization/vistoolspline.cpp index 2b731e44d..8ac602a4e 100644 --- a/src/libs/vtools/visualization/vistoolspline.cpp +++ b/src/libs/vtools/visualization/vistoolspline.cpp @@ -92,6 +92,10 @@ void VisToolSpline::RefreshGeometry() { controlPoints[0]->show(); } + else + { + p2 = first->toQPointF(); + } } } else @@ -125,6 +129,10 @@ void VisToolSpline::RefreshGeometry() { controlPoints[1]->show(); } + else + { + p3 = second->toQPointF(); + } } } else From 35b9dea4b2ab3950f993f44f5bcb23cb159742d3 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 13 Feb 2016 23:39:47 +0200 Subject: [PATCH 14/59] Fixes creating spline path. --HG-- branch : feature --- src/libs/vgeometry/vsplinepoint.cpp | 4 +- .../vtools/dialogs/tools/dialogspline.cpp | 3 +- .../vtools/dialogs/tools/dialogsplinepath.cpp | 5 +- .../visualization/vistoolsplinepath.cpp | 79 ++++++++++++------- .../vtools/visualization/vistoolsplinepath.h | 1 - 5 files changed, 56 insertions(+), 36 deletions(-) diff --git a/src/libs/vgeometry/vsplinepoint.cpp b/src/libs/vgeometry/vsplinepoint.cpp index 0168b0312..3f89f2805 100644 --- a/src/libs/vgeometry/vsplinepoint.cpp +++ b/src/libs/vgeometry/vsplinepoint.cpp @@ -87,7 +87,7 @@ void VSplinePoint::SetAngle1(const qreal &value) line.setAngle(value); d->angle1 = line.angle(); - line.setAngle(value+180); + line.setAngle(d->angle1+180); d->angle2 = line.angle(); } @@ -102,7 +102,7 @@ void VSplinePoint::SetAngle2(const qreal &value) line.setAngle(value); d->angle2 = line.angle(); - line.setAngle(value-180); + line.setAngle(d->angle2+180); d->angle1 = line.angle(); } diff --git a/src/libs/vtools/dialogs/tools/dialogspline.cpp b/src/libs/vtools/dialogs/tools/dialogspline.cpp index ed6913d19..cf91e8bf0 100644 --- a/src/libs/vtools/dialogs/tools/dialogspline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogspline.cpp @@ -139,7 +139,7 @@ void DialogSpline::SaveData() kAsm2 = ui->doubleSpinBoxKasm2->value(); kCurve = ui->doubleSpinBoxKcurve->value(); - VisToolSpline *path = qobject_cast(vis); + auto path = qobject_cast(vis); SCASSERT(path != nullptr); path->setObject1Id(GetP1()); @@ -149,6 +149,7 @@ void DialogSpline::SaveData() path->SetKAsm1(kAsm1); path->SetKAsm2(kAsm2); path->SetKCurve(kCurve); + path->SetMode(Mode::Show); path->RefreshGeometry(); } diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp index f53504de0..dde11226a 100644 --- a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp @@ -95,7 +95,7 @@ void DialogSplinePath::SetPath(const VSplinePath &value) ui->listWidget->setFocus(Qt::OtherFocusReason); ui->doubleSpinBoxKcurve->setValue(path.GetKCurve()); - VisToolSplinePath *visPath = qobject_cast(vis); + auto visPath = qobject_cast(vis); SCASSERT(visPath != nullptr); visPath->setPath(path); ui->listWidget->blockSignals(false); @@ -155,9 +155,10 @@ void DialogSplinePath::SaveData() { SavePath(); - VisToolSplinePath *visPath = qobject_cast(vis); + auto visPath = qobject_cast(vis); SCASSERT(visPath != nullptr); visPath->setPath(path); + visPath->SetMode(Mode::Show); visPath->RefreshGeometry(); } diff --git a/src/libs/vtools/visualization/vistoolsplinepath.cpp b/src/libs/vtools/visualization/vistoolsplinepath.cpp index 3618257d9..c1b388ecb 100644 --- a/src/libs/vtools/visualization/vistoolsplinepath.cpp +++ b/src/libs/vtools/visualization/vistoolsplinepath.cpp @@ -66,6 +66,22 @@ void VisToolSplinePath::RefreshGeometry() if (mode == Mode::Creation) { + if (size > 1) + { + for (qint32 i = 1; i<=path.Count(); ++i) + { + const int preLastPoint = (path.Count() - 1) * 2; + const int lastPoint = preLastPoint + 1; + + VSpline spl = path.GetSpline(i); + + ctrlPoints[preLastPoint]->RefreshCtrlPoint(i, SplinePointPosition::FirstPoint, spl.GetP2(), + spl.GetP1().toQPointF()); + ctrlPoints[lastPoint]->RefreshCtrlPoint(i, SplinePointPosition::LastPoint, spl.GetP3(), + spl.GetP4().toQPointF()); + } + } + Creating(pathPoints.at(size-1).P().toQPointF(), size); } @@ -160,29 +176,6 @@ QGraphicsEllipseItem *VisToolSplinePath::getPoint(quint32 i) return nullptr; } -//--------------------------------------------------------------------------------------------------------------------- -QSharedPointer VisToolSplinePath::NewCurveSegmen(const QPointF &pSpl, int size) -{ - auto spline = QSharedPointer(new VSpline(VPointF(pSpl), ctrlPoint, Visualization::scenePos, - VPointF(Visualization::scenePos), path.GetKCurve())); - - if (size == 1) - { - path[size-1].SetAngle2(spline->GetStartAngle()); - path[size-1].SetKAsm2(spline->GetKasm1()); - emit PathChanged(path); - } - else - { - path[size-1].SetAngle2(spline->GetStartAngle()); - path[size-1].SetKAsm1(spline->GetKasm1()); - path[size-1].SetKAsm2(spline->GetKasm1()); - emit PathChanged(path); - } - - return spline; -} - //--------------------------------------------------------------------------------------------------------------------- void VisToolSplinePath::Creating(const QPointF &pSpl, int size) { @@ -224,15 +217,15 @@ void VisToolSplinePath::Creating(const QPointF &pSpl, int size) } } + QLineF ctrlLine (pSpl, Visualization::scenePos); + ctrlLine.setAngle(ctrlLine.angle()+180); + if (size == 1) { ctrlPoints[lastPoint]->RefreshCtrlPoint(size, SplinePointPosition::FirstPoint, ctrlPoint, pSpl); } else { - QLineF ctrlLine (pSpl, Visualization::scenePos); - ctrlLine.setAngle(ctrlLine.angle()+180); - ctrlPoints[preLastPoint]->RefreshCtrlPoint(size-1, SplinePointPosition::LastPoint, ctrlLine.p2(), pSpl); ctrlPoints[lastPoint]->RefreshCtrlPoint(size, SplinePointPosition::FirstPoint, ctrlPoint, pSpl); } @@ -243,14 +236,32 @@ void VisToolSplinePath::Creating(const QPointF &pSpl, int size) if (size == 1) { path[size-1].SetAngle2(spline.GetStartAngle()); - path[size-1].SetKAsm2(spline.GetKasm1()); + if (ctrlPoint != pSpl) + { + path[size-1].SetKAsm2(spline.GetKasm1()); + } + else + { + path[size-1].SetKAsm2(0); + } emit PathChanged(path); } else { + const VSpline spl = path.GetSpline(size - 1); + VSpline preSpl(spl.GetP1(), spl.GetP2(), ctrlLine.p2(), VPointF(pSpl), path.GetKCurve()); + path[size-1].SetAngle2(spline.GetStartAngle()); - path[size-1].SetKAsm1(spline.GetKasm1()); - path[size-1].SetKAsm2(spline.GetKasm1()); + if (ctrlPoint != pSpl) + { + path[size-1].SetKAsm1(preSpl.GetKasm2()); + path[size-1].SetKAsm2(spline.GetKasm1()); + } + else + { + path[size-1].SetKAsm1(0); + path[size-1].SetKAsm2(0); + } emit PathChanged(path); } } @@ -262,7 +273,15 @@ void VisToolSplinePath::Creating(const QPointF &pSpl, int size) VPointF(Visualization::scenePos), path.GetKCurve()); path[size-1].SetAngle2(spline.GetStartAngle()); - path[size-1].SetKAsm2(spline.GetKasm1()); + + if (ctrlPoint != pSpl) + { + path[size-1].SetKAsm2(spline.GetKasm1()); + } + else + { + path[size-1].SetKAsm2(0); + } emit PathChanged(path); DrawPath(newCurveSegment, spline.GetPath(PathDirection::Hide), mainColor, Qt::SolidLine, Qt::RoundCap); diff --git a/src/libs/vtools/visualization/vistoolsplinepath.h b/src/libs/vtools/visualization/vistoolsplinepath.h index 309f57127..cbddfef70 100644 --- a/src/libs/vtools/visualization/vistoolsplinepath.h +++ b/src/libs/vtools/visualization/vistoolsplinepath.h @@ -69,7 +69,6 @@ protected: QPointF ctrlPoint; QGraphicsEllipseItem * getPoint(quint32 i); - QSharedPointer NewCurveSegmen(const QPointF &pSpl, int size); void Creating(const QPointF &pSpl, int size); }; From 6350d78ce460c9953ed62a559a8398c705437b5e Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 13 Feb 2016 23:41:12 +0200 Subject: [PATCH 15/59] Changelog. --HG-- branch : feature --- ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index e9b004218..442eafb15 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,5 @@ # Version 0.5.0 +- [#216] Better powerful way creation curved path. - Improved exporting to dxf. QPainterPath export as Polyline. - Show additional message dialog if measurements was changed. Related to issue [#440]. - [#132] Intersect Curves. From f264206aab8a123a1fb9f9b96d3189dd26779ee0 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 15 Feb 2016 11:02:55 +0200 Subject: [PATCH 16/59] Refactoring DialogSpline. --HG-- branch : feature --- src/app/valentina/xml/vpattern.cpp | 8 +- .../vtools/dialogs/tools/dialogspline.cpp | 238 ++++-------------- src/libs/vtools/dialogs/tools/dialogspline.h | 44 +--- .../tools/drawTools/toolcurve/vtoolspline.cpp | 78 ++---- .../tools/drawTools/toolcurve/vtoolspline.h | 10 +- 5 files changed, 97 insertions(+), 281 deletions(-) diff --git a/src/app/valentina/xml/vpattern.cpp b/src/app/valentina/xml/vpattern.cpp index 4c8f714de..519eb06b5 100644 --- a/src/app/valentina/xml/vpattern.cpp +++ b/src/app/valentina/xml/vpattern.cpp @@ -1861,8 +1861,12 @@ void VPattern::ParseToolSpline(VMainGraphicsScene *scene, const QDomElement &dom const qreal kCurve = GetParametrDouble(domElement, AttrKCurve, "1.0"); const QString color = GetParametrString(domElement, AttrColor, ColorBlack); - VToolSpline::Create(id, point1, point4, kAsm1, kAsm2, angle1, angle2, kCurve, color, scene, this, data, - parse, Source::FromFile); + const auto p1 = data->GeometricObject(point1); + const auto p4 = data->GeometricObject(point4); + + VSpline spline(*p1, *p4, angle1, angle2, kAsm1, kAsm2, kCurve); + + VToolSpline::Create(id, spline, color, scene, this, data, parse, Source::FromFile); } catch (const VExceptionBadId &e) { diff --git a/src/libs/vtools/dialogs/tools/dialogspline.cpp b/src/libs/vtools/dialogs/tools/dialogspline.cpp index cf91e8bf0..3c6155d88 100644 --- a/src/libs/vtools/dialogs/tools/dialogspline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogspline.cpp @@ -43,7 +43,7 @@ * @param parent parent widget */ DialogSpline::DialogSpline(const VContainer *data, const quint32 &toolId, QWidget *parent) - :DialogTool(data, toolId, parent), ui(new Ui::DialogSpline), angle1(0), angle2(0), kAsm1(1), kAsm2(1), kCurve(1) + :DialogTool(data, toolId, parent), ui(new Ui::DialogSpline), spl() { ui->setupUi(this); InitOkCancelApply(ui); @@ -74,16 +74,6 @@ DialogSpline::~DialogSpline() delete ui; } -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief GetP1 return id first point of spline - * @return id - */ -quint32 DialogSpline::GetP1() const -{ - return getCurrentObjectId(ui->comboBoxP1); -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief ChoosedObject gets id and type of selected object. Save right data and ignore wrong. @@ -133,17 +123,19 @@ void DialogSpline::ChosenObject(quint32 id, const SceneObject &type) //--------------------------------------------------------------------------------------------------------------------- void DialogSpline::SaveData() { - angle1 = ui->spinBoxAngle1->value(); - angle2 = ui->spinBoxAngle2->value(); - kAsm1 = ui->doubleSpinBoxKasm1->value(); - kAsm2 = ui->doubleSpinBoxKasm2->value(); - kCurve = ui->doubleSpinBoxKcurve->value(); + const qreal angle1 = ui->spinBoxAngle1->value(); + const qreal angle2 = ui->spinBoxAngle2->value(); + const qreal kAsm1 = ui->doubleSpinBoxKasm1->value(); + const qreal kAsm2 = ui->doubleSpinBoxKasm2->value(); + const qreal kCurve = ui->doubleSpinBoxKcurve->value(); + + spl = VSpline(*GetP1(), *GetP4(), angle1, angle2, kAsm1, kAsm2, kCurve); auto path = qobject_cast(vis); SCASSERT(path != nullptr); - path->setObject1Id(GetP1()); - path->setObject4Id(GetP4()); + path->setObject1Id(GetP1()->id()); + path->setObject4Id(GetP4()->id()); path->SetAngle1(angle1); path->SetAngle2(angle2); path->SetKAsm1(kAsm1); @@ -153,6 +145,18 @@ void DialogSpline::SaveData() path->RefreshGeometry(); } +//--------------------------------------------------------------------------------------------------------------------- +const QSharedPointer DialogSpline::GetP1() const +{ + return data->GeometricObject(getCurrentObjectId(ui->comboBoxP1)); +} + +//--------------------------------------------------------------------------------------------------------------------- +const QSharedPointer DialogSpline::GetP4() const +{ + return data->GeometricObject(getCurrentObjectId(ui->comboBoxP4)); +} + //--------------------------------------------------------------------------------------------------------------------- void DialogSpline::PointNameChanged() { @@ -181,22 +185,16 @@ void DialogSpline::ShowDialog(bool click) { if (prepare && click) { - const auto p1 = data->GeometricObject(getCurrentObjectId(ui->comboBoxP1)); - const auto p4 = data->GeometricObject(getCurrentObjectId(ui->comboBoxP4)); - auto *path = qobject_cast(vis); SCASSERT(path != nullptr); - const QPointF p2 = path->GetP2(); - const QPointF p3 = path->GetP3(); + VSpline spl(*GetP1(), path->GetP2(), path->GetP3(), *GetP4(), 1); - VSpline spline(*p1, p2, p3, *p4, kCurve); + ui->spinBoxAngle1->setValue(static_cast(spl.GetStartAngle())); + ui->spinBoxAngle2->setValue(static_cast(spl.GetEndAngle())); - ui->spinBoxAngle1->setValue(static_cast(spline.GetStartAngle())); - ui->spinBoxAngle2->setValue(static_cast(spline.GetEndAngle())); - - ui->doubleSpinBoxKasm1->setValue(spline.GetKasm1()); - ui->doubleSpinBoxKasm2->setValue(spline.GetKasm2()); + ui->doubleSpinBoxKasm1->setValue(spl.GetKasm1()); + ui->doubleSpinBoxKasm2->setValue(spl.GetKasm2()); DialogAccepted(); } @@ -209,18 +207,34 @@ void DialogSpline::ShowVisualization() } //--------------------------------------------------------------------------------------------------------------------- -/** - * @brief SetKCurve set coefficient curve - * @param value value. Can be >= 0. - */ -void DialogSpline::SetKCurve(const qreal &value) +VSpline DialogSpline::GetSpline() const { - kCurve = value; - ui->doubleSpinBoxKcurve->setValue(value); + return spl; +} - VisToolSpline *path = qobject_cast(vis); +//--------------------------------------------------------------------------------------------------------------------- +void DialogSpline::SetSpline(const VSpline &spline) +{ + spl = spline; + + setCurrentPointId(ui->comboBoxP1, spl.GetP1().id()); + setCurrentPointId(ui->comboBoxP4, spl.GetP4().id()); + ui->spinBoxAngle1->setValue(static_cast(spl.GetStartAngle())); + ui->spinBoxAngle2->setValue(static_cast(spl.GetEndAngle())); + ui->doubleSpinBoxKasm1->setValue(spl.GetKasm1()); + ui->doubleSpinBoxKasm2->setValue(spl.GetKasm2()); + ui->doubleSpinBoxKcurve->setValue(spl.GetKcurve()); + + auto path = qobject_cast(vis); SCASSERT(path != nullptr); - path->SetKCurve(kCurve); + + path->setObject1Id(spl.GetP1().id()); + path->setObject4Id(spl.GetP4().id()); + path->SetAngle1(spl.GetStartAngle()); + path->SetAngle2(spl.GetEndAngle()); + path->SetKAsm1(spl.GetKasm1()); + path->SetKAsm2(spl.GetKasm2()); + path->SetKCurve(spl.GetKcurve()); } //--------------------------------------------------------------------------------------------------------------------- @@ -234,151 +248,3 @@ void DialogSpline::SetColor(const QString &value) { ChangeCurrentData(ui->comboBoxColor, value); } - -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief SetKAsm2 set second coefficient asymmetry - * @param value value. Can be >= 0. - */ -void DialogSpline::SetKAsm2(const qreal &value) -{ - kAsm2 = value; - ui->doubleSpinBoxKasm2->setValue(value); - - VisToolSpline *path = qobject_cast(vis); - SCASSERT(path != nullptr); - path->SetKAsm2(kAsm2); -} - -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief SetKAsm1 set first coefficient asymmetry - * @param value value. Can be >= 0. - */ -void DialogSpline::SetKAsm1(const qreal &value) -{ - kAsm1 = value; - ui->doubleSpinBoxKasm1->setValue(value); - - VisToolSpline *path = qobject_cast(vis); - SCASSERT(path != nullptr); - path->SetKAsm1(kAsm1); -} - -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief SetAngle2 set second angle of spline - * @param value angle in degree - */ -void DialogSpline::SetAngle2(const qreal &value) -{ - angle2 = value; - ui->spinBoxAngle2->setValue(static_cast(value)); - - VisToolSpline *path = qobject_cast(vis); - SCASSERT(path != nullptr); - path->SetAngle2(angle2); -} - -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief SetAngle1 set first angle of spline - * @param value angle in degree - */ -void DialogSpline::SetAngle1(const qreal &value) -{ - angle1 = value; - ui->spinBoxAngle1->setValue(static_cast(value)); - - VisToolSpline *path = qobject_cast(vis); - SCASSERT(path != nullptr); - path->SetAngle1(angle1); -} - -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief SetP4 set id fourth point of spline - * @param value id - */ -void DialogSpline::SetP4(const quint32 &value) -{ - setCurrentPointId(ui->comboBoxP4, value); - - VisToolSpline *path = qobject_cast(vis); - SCASSERT(path != nullptr); - path->setObject4Id(value); -} - -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief SetP1 set id first point of spline - * @param value id - */ -void DialogSpline::SetP1(const quint32 &value) -{ - setCurrentPointId(ui->comboBoxP1, value); - - VisToolSpline *path = qobject_cast(vis); - SCASSERT(path != nullptr); - path->setObject1Id(value); -} - -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief GetP4 return id fourth point of spline - * @return id - */ -quint32 DialogSpline::GetP4() const -{ - return getCurrentObjectId(ui->comboBoxP4); -} - -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief GetAngle1 return first angle of spline - * @return angle in degree - */ -qreal DialogSpline::GetAngle1() const -{ - return angle1; -} - -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief GetAngle2 return second angle of spline - * @return angle in degree - */ -qreal DialogSpline::GetAngle2() const -{ - return angle2; -} - -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief GetKAsm1 return first coefficient asymmetry - * @return value. Can be >= 0. - */ -qreal DialogSpline::GetKAsm1() const -{ - return kAsm1; -} - -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief GetKAsm2 return second coefficient asymmetry - * @return value. Can be >= 0. - */ -qreal DialogSpline::GetKAsm2() const -{ - return kAsm2; -} - -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief GetKCurve return coefficient curve - * @return value. Can be >= 0. - */ -qreal DialogSpline::GetKCurve() const -{ - return kCurve; -} diff --git a/src/libs/vtools/dialogs/tools/dialogspline.h b/src/libs/vtools/dialogs/tools/dialogspline.h index 2d899aa64..19c0a8108 100644 --- a/src/libs/vtools/dialogs/tools/dialogspline.h +++ b/src/libs/vtools/dialogs/tools/dialogspline.h @@ -30,6 +30,7 @@ #define DIALOGSPLINE_H #include "dialogtool.h" +#include "../vgeometry/vspline.h" namespace Ui { @@ -46,29 +47,11 @@ public: DialogSpline(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); virtual ~DialogSpline() Q_DECL_OVERRIDE; - quint32 GetP1() const; - void SetP1(const quint32 &value); + VSpline GetSpline() const; + void SetSpline(const VSpline &spline); - quint32 GetP4() const; - void SetP4(const quint32 &value); - - qreal GetAngle1() const; - void SetAngle1(const qreal &value); - - qreal GetAngle2() const; - void SetAngle2(const qreal &value); - - qreal GetKAsm1() const; - void SetKAsm1(const qreal &value); - - qreal GetKAsm2() const; - void SetKAsm2(const qreal &value); - - qreal GetKCurve() const; - void SetKCurve(const qreal &value); - - QString GetColor() const; - void SetColor(const QString &value); + QString GetColor() const; + void SetColor(const QString &value); public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; virtual void PointNameChanged() Q_DECL_OVERRIDE; @@ -85,20 +68,11 @@ private: /** @brief ui keeps information about user interface */ Ui::DialogSpline *ui; - /** @brief angle1 first angle of spline in degree */ - qreal angle1; + /** @brief spl spline */ + VSpline spl; - /** @brief angle2 second angle of spline in degree */ - qreal angle2; - - /** @brief kAsm1 first coefficient asymmetry */ - qreal kAsm1; - - /** @brief kAsm2 second coefficient asymmetry */ - qreal kAsm2; - - /** @brief kCurve coefficient curve */ - qreal kCurve; + const QSharedPointer GetP1() const; + const QSharedPointer GetP4() const; }; #endif // DIALOGSPLINE_H diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp index 729b8b804..688eff422 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp @@ -104,14 +104,8 @@ void VToolSpline::setDialog() SCASSERT(dialog != nullptr); DialogSpline *dialogTool = qobject_cast(dialog); SCASSERT(dialogTool != nullptr); - const QSharedPointer spl = VAbstractTool::data.GeometricObject(id); - dialogTool->SetP1(spl->GetP1().id()); - dialogTool->SetP4(spl->GetP4().id()); - dialogTool->SetAngle1(spl->GetStartAngle()); - dialogTool->SetAngle2(spl->GetEndAngle()); - dialogTool->SetKAsm1(spl->GetKasm1()); - dialogTool->SetKAsm2(spl->GetKasm2()); - dialogTool->SetKCurve(spl->GetKcurve()); + const auto spl = VAbstractTool::data.GeometricObject(id); + dialogTool->SetSpline(*spl); dialogTool->SetColor(lineColor); } @@ -127,18 +121,12 @@ void VToolSpline::setDialog() VToolSpline* VToolSpline::Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data) { SCASSERT(dialog != nullptr); - DialogSpline *dialogTool = qobject_cast(dialog); + auto dialogTool = qobject_cast(dialog); SCASSERT(dialogTool != nullptr); - const quint32 p1 = dialogTool->GetP1(); - const quint32 p4 = dialogTool->GetP4(); - const qreal kAsm1 = dialogTool->GetKAsm1(); - const qreal kAsm2 = dialogTool->GetKAsm2(); - const qreal angle1 = dialogTool->GetAngle1(); - const qreal angle2 = dialogTool->GetAngle2(); - const qreal kCurve = dialogTool->GetKCurve(); - const QString color = dialogTool->GetColor(); - VToolSpline *spl = Create(0, p1, p4, kAsm1, kAsm2, angle1, angle2, kCurve, color, scene, doc, data, - Document::FullParse, Source::FromGui); + + auto spl = Create(0, dialogTool->GetSpline(), dialogTool->GetColor(), scene, doc, data, Document::FullParse, + Source::FromGui); + if (spl != nullptr) { spl->dialog=dialogTool; @@ -150,13 +138,8 @@ VToolSpline* VToolSpline::Create(DialogTool *dialog, VMainGraphicsScene *scene, /** * @brief Create help create tool. * @param _id tool id, 0 if tool doesn't exist yet. - * @param p1 id first spline point. - * @param p4 id last spline point. - * @param kAsm1 coefficient of length first control line. - * @param kAsm2 coefficient of length second control line. - * @param angle1 angle from first point to first control point. - * @param angle2 angle from second point to second control point. - * @param kCurve coefficient of curvature spline. + * @param spl spline. + * @param color spline color. * @param scene pointer to scene. * @param doc dom document container. * @param data container with variables. @@ -164,15 +147,11 @@ VToolSpline* VToolSpline::Create(DialogTool *dialog, VMainGraphicsScene *scene, * @param typeCreation way we create this tool. * @return the created tool */ -VToolSpline* VToolSpline::Create(const quint32 _id, const quint32 &p1, const quint32 &p4, const qreal &kAsm1, - const qreal kAsm2, const qreal &angle1, const qreal &angle2, const qreal &kCurve, - const QString &color, VMainGraphicsScene *scene, VAbstractPattern *doc, - VContainer *data, - const Document &parse, const Source &typeCreation) +VToolSpline* VToolSpline::Create(const quint32 _id, const VSpline &spl, const QString &color, VMainGraphicsScene *scene, + VAbstractPattern *doc, VContainer *data, const Document &parse, + const Source &typeCreation) { - VPointF point1 = *data->GeometricObject(p1); - VPointF point4 = *data->GeometricObject(p4); - VSpline *spline = new VSpline(point1, point4, angle1, angle2, kAsm1, kAsm2, kCurve); + auto spline = new VSpline(spl); quint32 id = _id; if (typeCreation == Source::FromGui) { @@ -191,17 +170,17 @@ VToolSpline* VToolSpline::Create(const quint32 _id, const quint32 &p1, const qui VDrawTool::AddRecord(id, Tool::Spline, doc); if (parse == Document::FullParse) { - VToolSpline *spl = new VToolSpline(doc, data, id, color, typeCreation); - scene->addItem(spl); - connect(spl, &VToolSpline::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); - connect(scene, &VMainGraphicsScene::NewFactor, spl, &VToolSpline::SetFactor); - connect(scene, &VMainGraphicsScene::DisableItem, spl, &VToolSpline::Disable); - connect(scene, &VMainGraphicsScene::EnableToolMove, spl, &VToolSpline::EnableToolMove); - connect(scene, &VMainGraphicsScene::CurveDetailsMode, spl, &VToolSpline::DetailsMode); - doc->AddTool(id, spl); - doc->IncrementReferens(point1.getIdTool()); - doc->IncrementReferens(point4.getIdTool()); - return spl; + auto _spl = new VToolSpline(doc, data, id, color, typeCreation); + scene->addItem(_spl); + connect(_spl, &VToolSpline::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); + connect(scene, &VMainGraphicsScene::NewFactor, _spl, &VToolSpline::SetFactor); + connect(scene, &VMainGraphicsScene::DisableItem, _spl, &VToolSpline::Disable); + connect(scene, &VMainGraphicsScene::EnableToolMove, _spl, &VToolSpline::EnableToolMove); + connect(scene, &VMainGraphicsScene::CurveDetailsMode, _spl, &VToolSpline::DetailsMode); + doc->AddTool(id, _spl); + doc->IncrementReferens(spline->GetP1().id()); + doc->IncrementReferens(spline->GetP4().id()); + return _spl; } return nullptr; } @@ -297,13 +276,10 @@ void VToolSpline::RemoveReferens() void VToolSpline::SaveDialog(QDomElement &domElement) { SCASSERT(dialog != nullptr); - DialogSpline *dialogTool = qobject_cast(dialog); + auto dialogTool = qobject_cast(dialog); SCASSERT(dialogTool != nullptr); - VPointF point1 = *VAbstractTool::data.GeometricObject(dialogTool->GetP1()); - VPointF point4 = *VAbstractTool::data.GeometricObject(dialogTool->GetP4()); - VSpline spl = VSpline (point1, point4, dialogTool->GetAngle1(), dialogTool->GetAngle2(), - dialogTool->GetKAsm1(), dialogTool->GetKAsm2(), dialogTool->GetKCurve()); + const VSpline spl = dialogTool->GetSpline(); controlPoints[0]->blockSignals(true); controlPoints[1]->blockSignals(true); @@ -314,8 +290,6 @@ void VToolSpline::SaveDialog(QDomElement &domElement) controlPoints[0]->blockSignals(false); controlPoints[1]->blockSignals(false); - spl = VSpline (point1, controlPoints[0]->pos(), controlPoints[1]->pos(), point4, dialogTool->GetKCurve()); - doc->SetAttribute(domElement, AttrPoint1, spl.GetP1().id()); doc->SetAttribute(domElement, AttrPoint4, spl.GetP4().id()); doc->SetAttribute(domElement, AttrAngle1, spl.GetStartAngle()); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.h index 0204e4c69..6d563b57b 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.h @@ -44,12 +44,10 @@ public: QGraphicsItem * parent = nullptr ); virtual ~VToolSpline() Q_DECL_OVERRIDE; virtual void setDialog() Q_DECL_OVERRIDE; - static VToolSpline *Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); - static VToolSpline *Create(const quint32 _id, const quint32 &p1, const quint32 &p4, const qreal &kAsm1, - const qreal kAsm2, const qreal &angle1, const qreal &angle2, const qreal &kCurve, - const QString &color, VMainGraphicsScene *scene, VAbstractPattern *doc, - VContainer *data, - const Document &parse, const Source &typeCreation); + static VToolSpline *Create(DialogTool *dialog, VMainGraphicsScene *scene, VAbstractPattern *doc, VContainer *data); + static VToolSpline *Create(const quint32 _id, const VSpline &spl, const QString &color, VMainGraphicsScene *scene, + VAbstractPattern *doc, VContainer *data, const Document &parse, + const Source &typeCreation); static const QString ToolType; virtual int type() const Q_DECL_OVERRIDE {return Type;} enum { Type = UserType + static_cast(Tool::Spline)}; From be3fc296f4b43da6b385ad3787ffda564de43a47 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 15 Feb 2016 16:30:48 +0200 Subject: [PATCH 17/59] Untested changes for the tool Spline. --HG-- branch : feature --- src/app/valentina/xml/vpattern.cpp | 5 ++ src/libs/ifc/ifcdef.cpp | 1 + src/libs/ifc/ifcdef.h | 1 + src/libs/vgeometry/vabstractcurve.cpp | 23 ++++++- src/libs/vgeometry/vabstractcurve.h | 10 +++ src/libs/vgeometry/vabstractcurve_p.h | 67 +++++++++++++++++++ src/libs/vgeometry/varc.cpp | 28 +++++--- src/libs/vgeometry/varc.h | 3 +- src/libs/vgeometry/vgeometry.pri | 3 +- src/libs/vgeometry/vspline.cpp | 8 ++- src/libs/vgeometry/vspline.h | 2 +- src/libs/vgeometry/vsplinepath.cpp | 57 ++++++++++------ src/libs/vgeometry/vsplinepath.h | 2 + .../vtools/dialogs/tools/dialogspline.cpp | 59 +++++++++++++++- src/libs/vtools/dialogs/tools/dialogspline.h | 4 ++ src/libs/vtools/dialogs/tools/dialogspline.ui | 16 ++++- .../tools/drawTools/toolcurve/vtoolspline.cpp | 12 ++++ 17 files changed, 263 insertions(+), 38 deletions(-) create mode 100644 src/libs/vgeometry/vabstractcurve_p.h diff --git a/src/app/valentina/xml/vpattern.cpp b/src/app/valentina/xml/vpattern.cpp index 519eb06b5..7573dee59 100644 --- a/src/app/valentina/xml/vpattern.cpp +++ b/src/app/valentina/xml/vpattern.cpp @@ -1860,11 +1860,16 @@ void VPattern::ParseToolSpline(VMainGraphicsScene *scene, const QDomElement &dom const qreal kAsm2 = GetParametrDouble(domElement, AttrKAsm2, "1.0"); const qreal kCurve = GetParametrDouble(domElement, AttrKCurve, "1.0"); const QString color = GetParametrString(domElement, AttrColor, ColorBlack); + const quint32 duplicate = GetParametrUInt(domElement, AttrDuplicate, "0"); const auto p1 = data->GeometricObject(point1); const auto p4 = data->GeometricObject(point4); VSpline spline(*p1, *p4, angle1, angle2, kAsm1, kAsm2, kCurve); + if (duplicate > 0) + { + spline.SetDuplicate(duplicate); + } VToolSpline::Create(id, spline, color, scene, this, data, parse, Source::FromFile); } diff --git a/src/libs/ifc/ifcdef.cpp b/src/libs/ifc/ifcdef.cpp index 58566ee35..e086d1c20 100644 --- a/src/libs/ifc/ifcdef.cpp +++ b/src/libs/ifc/ifcdef.cpp @@ -102,6 +102,7 @@ const QString AttrPoint4 = QStringLiteral("point4"); const QString AttrKAsm1 = QStringLiteral("kAsm1"); const QString AttrKAsm2 = QStringLiteral("kAsm2"); const QString AttrKCurve = QStringLiteral("kCurve"); +const QString AttrDuplicate = QStringLiteral("duplicate"); const QString AttrPathPoint = QStringLiteral("pathPoint"); const QString AttrPSpline = QStringLiteral("pSpline"); const QString AttrAxisP1 = QStringLiteral("axisP1"); diff --git a/src/libs/ifc/ifcdef.h b/src/libs/ifc/ifcdef.h index f630b509d..8553e8d15 100644 --- a/src/libs/ifc/ifcdef.h +++ b/src/libs/ifc/ifcdef.h @@ -104,6 +104,7 @@ extern const QString AttrPoint4; extern const QString AttrKAsm1; extern const QString AttrKAsm2; extern const QString AttrKCurve; +extern const QString AttrDuplicate; extern const QString AttrPathPoint; extern const QString AttrPSpline; extern const QString AttrAxisP1; diff --git a/src/libs/vgeometry/vabstractcurve.cpp b/src/libs/vgeometry/vabstractcurve.cpp index 704de469b..dfe580ce8 100644 --- a/src/libs/vgeometry/vabstractcurve.cpp +++ b/src/libs/vgeometry/vabstractcurve.cpp @@ -27,17 +27,18 @@ *************************************************************************/ #include "vabstractcurve.h" +#include "vabstractcurve_p.h" #include #include VAbstractCurve::VAbstractCurve(const GOType &type, const quint32 &idObject, const Draw &mode) - :VGObject(type, idObject, mode) + :VGObject(type, idObject, mode), d (new VAbstractCurveData()) {} //--------------------------------------------------------------------------------------------------------------------- VAbstractCurve::VAbstractCurve(const VAbstractCurve &curve) - :VGObject(curve) + :VGObject(curve), d (curve.d) {} //--------------------------------------------------------------------------------------------------------------------- @@ -48,9 +49,14 @@ VAbstractCurve &VAbstractCurve::operator=(const VAbstractCurve &curve) return *this; } VGObject::operator=(curve); + d = curve.d; return *this; } +//--------------------------------------------------------------------------------------------------------------------- +VAbstractCurve::~VAbstractCurve() +{} + //--------------------------------------------------------------------------------------------------------------------- QVector VAbstractCurve::GetSegmentPoints(const QPointF &begin, const QPointF &end, bool reverse) const { @@ -165,6 +171,19 @@ bool VAbstractCurve::IsIntersectLine(const QLineF &line) const return not points.isEmpty(); } +//--------------------------------------------------------------------------------------------------------------------- +quint32 VAbstractCurve::GetDuplicate() const +{ + return d->duplicate; +} + +//--------------------------------------------------------------------------------------------------------------------- +void VAbstractCurve::SetDuplicate(quint32 number) +{ + d->duplicate = number; + CreateName(); +} + //--------------------------------------------------------------------------------------------------------------------- QVector VAbstractCurve::CurveIntersectLine(const QVector &points, const QLineF &line) { diff --git a/src/libs/vgeometry/vabstractcurve.h b/src/libs/vgeometry/vabstractcurve.h index adeee8942..536406a95 100644 --- a/src/libs/vgeometry/vabstractcurve.h +++ b/src/libs/vgeometry/vabstractcurve.h @@ -37,6 +37,7 @@ enum class PathDirection : char { Hide, Show }; class QPainterPath; class QLineF; +class VAbstractCurveData; class VAbstractCurve :public VGObject { @@ -45,6 +46,7 @@ public: const Draw &mode = Draw::Calculation); explicit VAbstractCurve(const VAbstractCurve &curve); VAbstractCurve& operator= (const VAbstractCurve &curve); + virtual ~VAbstractCurve() Q_DECL_OVERRIDE; virtual QVector GetPoints() const =0; QVector GetSegmentPoints(const QPointF &begin, const QPointF &end, bool reverse = false) const; @@ -57,12 +59,20 @@ public: virtual qreal GetStartAngle () const=0; virtual qreal GetEndAngle () const=0; + quint32 GetDuplicate() const; + void SetDuplicate(quint32 number); + static QVector CurveIntersectLine(const QVector &points, const QLineF &line); protected: QPainterPath ShowDirection(const QVector &points) const; + virtual void CreateName() =0; private: + QSharedDataPointer d; + static QVector FromBegin(const QVector &points, const QPointF &begin); static QVector ToEnd(const QVector &points, const QPointF &end); }; +Q_DECLARE_TYPEINFO(VAbstractCurve, Q_MOVABLE_TYPE); + #endif // VABSTRACTCURVE_H diff --git a/src/libs/vgeometry/vabstractcurve_p.h b/src/libs/vgeometry/vabstractcurve_p.h new file mode 100644 index 000000000..0bcdbc26c --- /dev/null +++ b/src/libs/vgeometry/vabstractcurve_p.h @@ -0,0 +1,67 @@ +/************************************************************************ + ** + ** @file vabstractcurve_p.h + ** @author Roman Telezhynskyi + ** @date 15 2, 2016 + ** + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2016 Valentina project + ** All Rights Reserved. + ** + ** Valentina is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Valentina is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + *************************************************************************/ + +#ifndef VABSTRACTCURVE_P_H +#define VABSTRACTCURVE_P_H + +#include + +#ifdef Q_CC_GNU + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Weffc++" +#endif + +class VAbstractCurveData : public QSharedData +{ +public: + + VAbstractCurveData () + : duplicate(0) + {} + + VAbstractCurveData(const VAbstractCurveData &curve) + : QSharedData(curve), duplicate(curve.duplicate) + {} + + virtual ~VAbstractCurveData(); + + /** @brief duplicate helps create unique name for curves that connects the same start and finish points. */ + quint32 duplicate; + +private: + VAbstractCurveData &operator=(const VAbstractCurveData &) Q_DECL_EQ_DELETE; +}; + +VAbstractCurveData::~VAbstractCurveData() +{} + +#ifdef Q_CC_GNU +#pragma GCC diagnostic pop +#endif + +#endif // VABSTRACTCURVE_P_H diff --git a/src/libs/vgeometry/varc.cpp b/src/libs/vgeometry/varc.cpp index fc87a77d1..f15de23a2 100644 --- a/src/libs/vgeometry/varc.cpp +++ b/src/libs/vgeometry/varc.cpp @@ -58,14 +58,14 @@ VArc::VArc (VPointF center, qreal radius, QString formulaRadius, qreal f1, QStri : VAbstractCurve(GOType::Arc, idObject, mode), d (new VArcData(center, radius, formulaRadius, f1, formulaF1, f2, formulaF2)) { - ArcName(); + CreateName(); } //--------------------------------------------------------------------------------------------------------------------- VArc::VArc(VPointF center, qreal radius, qreal f1, qreal f2) : VAbstractCurve(GOType::Arc, NULL_ID, Draw::Calculation), d (new VArcData(center, radius, f1, f2)) { - ArcName(); + CreateName(); } //--------------------------------------------------------------------------------------------------------------------- @@ -74,7 +74,7 @@ VArc::VArc(qreal length, QString formulaLength, VPointF center, qreal radius, QS : VAbstractCurve(GOType::Arc, idObject, mode), d (new VArcData(formulaLength, center, radius, formulaRadius, f1, formulaF1)) { - ArcName(); + CreateName(); FindF2(length); } @@ -82,7 +82,7 @@ VArc::VArc(qreal length, QString formulaLength, VPointF center, qreal radius, QS VArc::VArc(qreal length, VPointF center, qreal radius, qreal f1) : VAbstractCurve(GOType::Arc, NULL_ID, Draw::Calculation), d (new VArcData(center, radius, f1)) { - ArcName(); + CreateName(); FindF2(length); } @@ -126,7 +126,7 @@ qreal VArc::GetLength() const qreal length = (M_PI * d->radius)/180 * AngleArc(); if (d->isFlipped) { - length = length * -1; + length *= -1; } return length; @@ -312,13 +312,25 @@ QPointF VArc::CutArc(const qreal &length) const void VArc::setId(const quint32 &id) { VAbstractCurve::setId(id); - setName(ARC_ + QString("%1_%2").arg(d->center.name()).arg(id)); + CreateName(); } //--------------------------------------------------------------------------------------------------------------------- -void VArc::ArcName() +void VArc::CreateName() { - setName(ARC_ + QString("%1").arg(this->GetCenter().name())); + QString name = ARC_ + QString("%1").arg(this->GetCenter().name()); + + if (VAbstractCurve::id() != NULL_ID) + { + name += QString("_%1").arg(VAbstractCurve::id()); + } + + if (GetDuplicate() > 0) + { + name += QString("_%1").arg(GetDuplicate()); + } + + setName(name); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vgeometry/varc.h b/src/libs/vgeometry/varc.h index 7802eaab7..89ac7b4a2 100644 --- a/src/libs/vgeometry/varc.h +++ b/src/libs/vgeometry/varc.h @@ -80,10 +80,11 @@ public: QPointF CutArc (const qreal &length, VArc &arc1, VArc &arc2) const; QPointF CutArc (const qreal &length) const; virtual void setId(const quint32 &id) Q_DECL_OVERRIDE; +protected: + virtual void CreateName() Q_DECL_OVERRIDE; private: QSharedDataPointer d; - void ArcName(); void FindF2(qreal length); qreal MaxLength() const; diff --git a/src/libs/vgeometry/vgeometry.pri b/src/libs/vgeometry/vgeometry.pri index c88e4f97d..d195e20c9 100644 --- a/src/libs/vgeometry/vgeometry.pri +++ b/src/libs/vgeometry/vgeometry.pri @@ -27,4 +27,5 @@ HEADERS += \ $$PWD/vsplinepath_p.h \ $$PWD/vsplinepoint.h \ $$PWD/vsplinepoint_p.h \ - $$PWD/vgeometrydef.h + $$PWD/vgeometrydef.h \ + $$PWD/vabstractcurve_p.h diff --git a/src/libs/vgeometry/vspline.cpp b/src/libs/vgeometry/vspline.cpp index 9a22810e7..6a3771b3a 100644 --- a/src/libs/vgeometry/vspline.cpp +++ b/src/libs/vgeometry/vspline.cpp @@ -600,7 +600,13 @@ qreal VSpline::CalcSqDistance (qreal x1, qreal y1, qreal x2, qreal y2) */ void VSpline::CreateName() { - setName(SPL_ + QString("%1_%2").arg(this->GetP1().name(), this->GetP4().name())); + QString name = SPL_ + QString("%1_%2").arg(this->GetP1().name()).arg(this->GetP4().name()); + if (GetDuplicate() > 0) + { + name += QString("_%1").arg(GetDuplicate()); + } + + setName(name); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vgeometry/vspline.h b/src/libs/vgeometry/vspline.h index 44b5f3dba..aca2919e4 100644 --- a/src/libs/vgeometry/vspline.h +++ b/src/libs/vgeometry/vspline.h @@ -76,13 +76,13 @@ public: qreal ParamT(const QPointF &pBt) const; protected: static QVector GetPoints (const QPointF &p1, const QPointF &p2, const QPointF &p3, const QPointF &p4 ); + virtual void CreateName() Q_DECL_OVERRIDE; private: QSharedDataPointer d; static qreal LengthBezier (const QPointF &p1, const QPointF &p2, const QPointF &p3, const QPointF &p4 ); static void PointBezier_r ( qreal x1, qreal y1, qreal x2, qreal y2, qreal x3, qreal y3, qreal x4, qreal y4, qint16 level, QVector &px, QVector &py); static qreal CalcSqDistance ( qreal x1, qreal y1, qreal x2, qreal y2); - void CreateName(); QVector CalcT(qreal curveCoord1, qreal curveCoord2, qreal curveCoord3, qreal curveCoord4, qreal pointCoord) const; static qint32 Cubic(QVector &x, qreal a, qreal b, qreal c); diff --git a/src/libs/vgeometry/vsplinepath.cpp b/src/libs/vgeometry/vsplinepath.cpp index a4ea4a8ff..214bd2c63 100644 --- a/src/libs/vgeometry/vsplinepath.cpp +++ b/src/libs/vgeometry/vsplinepath.cpp @@ -59,13 +59,7 @@ void VSplinePath::append(const VSplinePoint &point) } d->path.append(point); - QString name = splPath; - name.append(QString("_%1").arg(d->path.first().P().name())); - if (d->path.size() > 1) - { - name.append(QString("_%1").arg(d->path.last().P().name())); - } - setName(name); + CreateName(); } //--------------------------------------------------------------------------------------------------------------------- @@ -92,8 +86,8 @@ VSpline VSplinePath::GetSpline(qint32 index) const { throw VException(tr("This spline does not exist.")); } - const VSplinePoint &p1 = d->path.at(index-1); - const VSplinePoint &p2 = d->path.at(index); + const VSplinePoint &p1 = d->path.at(index-1); + const VSplinePoint &p2 = d->path.at(index); VSpline spl(p1.P(), p2.P(), p1.Angle2(), p2.Angle1(), p1.KAsm2(), p2.KAsm1(), d->kCurve); return spl; } @@ -104,8 +98,8 @@ QPainterPath VSplinePath::GetPath(PathDirection direction) const QPainterPath painterPath; for (qint32 i = 1; i <= Count(); ++i) { - const VSplinePoint &p1 = d->path.at(i-1); - const VSplinePoint &p2 = d->path.at(i); + const VSplinePoint &p1 = d->path.at(i-1); + const VSplinePoint &p2 = d->path.at(i); VSpline spl(p1.P(), p2.P(), p1.Angle2(), p2.Angle1(), p1.KAsm2(), p2.KAsm1(), d->kCurve); painterPath.addPath(spl.GetPath(direction)); } @@ -118,8 +112,8 @@ QVector VSplinePath::GetPoints() const QVector pathPoints; for (qint32 i = 1; i <= Count(); ++i) { - const VSplinePoint &p1 = d->path.at(i-1); - const VSplinePoint &p2 = d->path.at(i); + const VSplinePoint &p1 = d->path.at(i-1); + const VSplinePoint &p2 = d->path.at(i); VSpline spl(p1.P(), p2.P(), p1.Angle2(), p2.Angle1(), p1.KAsm2(), p2.KAsm1(), d->kCurve); pathPoints += spl.GetPoints(); } @@ -132,8 +126,8 @@ qreal VSplinePath::GetLength() const qreal length = 0; for (qint32 i = 1; i <= Count(); ++i) { - const VSplinePoint &p1 = d->path.at(i-1); - const VSplinePoint &p2 = d->path.at(i); + const VSplinePoint &p1 = d->path.at(i-1); + const VSplinePoint &p2 = d->path.at(i); VSpline spl(p1.P(), p2.P(), p1.Angle2(), p2.Angle1(), p1.KAsm2(), p2.KAsm1(), d->kCurve); length += spl.GetLength(); @@ -222,10 +216,10 @@ QPointF VSplinePath::CutSplinePath(qreal length, qint32 &p1, qint32 &p2, QPointF fullLength = 0; for (qint32 i = 1; i <= Count(); ++i) { - const VSplinePoint &point1 = d->path.at(i-1); - const VSplinePoint &point2 = d->path.at(i); - VSpline spl = VSpline(point1.P(), point2.P(), point1.Angle2(), point2.Angle1(), point1.KAsm2(), - point2.KAsm1(), d->kCurve); + const VSplinePoint &point1 = d->path.at(i-1); + const VSplinePoint &point2 = d->path.at(i); + VSpline spl = VSpline(point1.P(), point2.P(), point1.Angle2(), point2.Angle1(), point1.KAsm2(), + point2.KAsm1(), d->kCurve); fullLength += spl.GetLength(); if (fullLength > length) { @@ -243,8 +237,8 @@ int VSplinePath::Segment(const QPointF &p) const int index = -1; for (qint32 i = 1; i <= Count(); ++i) { - const VSplinePoint &p1 = d->path.at(i-1); - const VSplinePoint &p2 = d->path.at(i); + const VSplinePoint &p1 = d->path.at(i-1); + const VSplinePoint &p2 = d->path.at(i); VSpline spl = VSpline(p1.P(), p2.P(), p1.Angle2(), p2.Angle1(), p1.KAsm2(), p2.KAsm1(), d->kCurve); const qreal t = spl.ParamT(p); @@ -288,6 +282,27 @@ qreal VSplinePath::GetEndAngle() const } } +//--------------------------------------------------------------------------------------------------------------------- +void VSplinePath::CreateName() +{ + QString name; + if (not d->path.isEmpty()) + { + name = splPath; + name.append(QString("_%1").arg(d->path.first().P().name())); + if (d->path.size() > 1) + { + name.append(QString("_%1").arg(d->path.last().P().name())); + } + + if (GetDuplicate() > 0) + { + name += QString("_%1").arg(GetDuplicate()); + } + } + setName(name); +} + //--------------------------------------------------------------------------------------------------------------------- qint32 VSplinePath::CountPoint() const { diff --git a/src/libs/vgeometry/vsplinepath.h b/src/libs/vgeometry/vsplinepath.h index 04ea29fb0..739f89623 100644 --- a/src/libs/vgeometry/vsplinepath.h +++ b/src/libs/vgeometry/vsplinepath.h @@ -178,6 +178,8 @@ public: virtual qreal GetStartAngle () const Q_DECL_OVERRIDE; virtual qreal GetEndAngle () const Q_DECL_OVERRIDE; +protected: + virtual void CreateName() Q_DECL_OVERRIDE; private: QSharedDataPointer d; }; diff --git a/src/libs/vtools/dialogs/tools/dialogspline.cpp b/src/libs/vtools/dialogs/tools/dialogspline.cpp index 3c6155d88..a276e781a 100644 --- a/src/libs/vtools/dialogs/tools/dialogspline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogspline.cpp @@ -43,7 +43,7 @@ * @param parent parent widget */ DialogSpline::DialogSpline(const VContainer *data, const quint32 &toolId, QWidget *parent) - :DialogTool(data, toolId, parent), ui(new Ui::DialogSpline), spl() + :DialogTool(data, toolId, parent), ui(new Ui::DialogSpline), spl(), newDuplicate(-1) { ui->setupUi(this); InitOkCancelApply(ui); @@ -129,8 +129,18 @@ void DialogSpline::SaveData() const qreal kAsm2 = ui->doubleSpinBoxKasm2->value(); const qreal kCurve = ui->doubleSpinBoxKcurve->value(); + const quint32 d = spl.GetDuplicate();//Save previous value spl = VSpline(*GetP1(), *GetP4(), angle1, angle2, kAsm1, kAsm2, kCurve); + if (newDuplicate <= -1) + { + spl.SetDuplicate(d); + } + else + { + spl.SetDuplicate(static_cast(newDuplicate)); + } + auto path = qobject_cast(vis); SCASSERT(path != nullptr); @@ -157,6 +167,20 @@ const QSharedPointer DialogSpline::GetP4() const return data->GeometricObject(getCurrentObjectId(ui->comboBoxP4)); } +//--------------------------------------------------------------------------------------------------------------------- +quint32 DialogSpline::DNumber(const QString &baseName) const +{ + quint32 num = 1; + QString name; + do + { + name = baseName + QString("_%1").arg(num); + ++num; + } while (not data->IsUnique(name)); + + return num; +} + //--------------------------------------------------------------------------------------------------------------------- void DialogSpline::PointNameChanged() { @@ -169,11 +193,33 @@ void DialogSpline::PointNameChanged() { flagError = false; color = errorColor; + + ui->lineEditSplineName->setText(QString()); } else { flagError = true; color = okColor; + + if (getCurrentObjectId(ui->comboBoxP1) == spl.GetP1().id() && + getCurrentObjectId(ui->comboBoxP4) == spl.GetP4().id()) + { + newDuplicate = -1; + ui->lineEditSplineName->setText(spl.name()); + } + else + { + VSpline spline(*GetP1(), *GetP4(), spl.GetStartAngle(), spl.GetEndAngle(), spl.GetKasm1(), spl.GetKasm2(), + spl.GetKcurve()); + + if (not data->IsUnique(spline.name())) + { + newDuplicate = DNumber(spline.name()); + spline.SetDuplicate(newDuplicate); + + ui->lineEditSplineName->setText(spline.name()); + } + } } ChangeColor(ui->labelFirstPoint, color); ChangeColor(ui->labelSecondPoint, color); @@ -188,7 +234,7 @@ void DialogSpline::ShowDialog(bool click) auto *path = qobject_cast(vis); SCASSERT(path != nullptr); - VSpline spl(*GetP1(), path->GetP2(), path->GetP3(), *GetP4(), 1); + spl = VSpline(*GetP1(), path->GetP2(), path->GetP3(), *GetP4(), ui->doubleSpinBoxKcurve->value()); ui->spinBoxAngle1->setValue(static_cast(spl.GetStartAngle())); ui->spinBoxAngle2->setValue(static_cast(spl.GetEndAngle())); @@ -196,6 +242,13 @@ void DialogSpline::ShowDialog(bool click) ui->doubleSpinBoxKasm1->setValue(spl.GetKasm1()); ui->doubleSpinBoxKasm2->setValue(spl.GetKasm2()); + if (not data->IsUnique(spl.name())) + { + spl.SetDuplicate(DNumber(spl.name())); + } + + ui->lineEditSplineName->setText(spl.name()); + DialogAccepted(); } } @@ -225,6 +278,8 @@ void DialogSpline::SetSpline(const VSpline &spline) ui->doubleSpinBoxKasm2->setValue(spl.GetKasm2()); ui->doubleSpinBoxKcurve->setValue(spl.GetKcurve()); + ui->lineEditSplineName->setText(spl.name()); + auto path = qobject_cast(vis); SCASSERT(path != nullptr); diff --git a/src/libs/vtools/dialogs/tools/dialogspline.h b/src/libs/vtools/dialogs/tools/dialogspline.h index 19c0a8108..066f796a1 100644 --- a/src/libs/vtools/dialogs/tools/dialogspline.h +++ b/src/libs/vtools/dialogs/tools/dialogspline.h @@ -71,8 +71,12 @@ private: /** @brief spl spline */ VSpline spl; + qint32 newDuplicate; + const QSharedPointer GetP1() const; const QSharedPointer GetP4() const; + + quint32 DNumber(const QString &baseName) const; }; #endif // DIALOGSPLINE_H diff --git a/src/libs/vtools/dialogs/tools/dialogspline.ui b/src/libs/vtools/dialogs/tools/dialogspline.ui index 52c4af988..839a00e72 100644 --- a/src/libs/vtools/dialogs/tools/dialogspline.ui +++ b/src/libs/vtools/dialogs/tools/dialogspline.ui @@ -7,7 +7,7 @@ 0 0 540 - 233 + 273 @@ -207,6 +207,20 @@ + + + + Name: + + + + + + + true + + + diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp index 688eff422..c58ec1290 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp @@ -316,6 +316,18 @@ void VToolSpline::SaveOptions(QDomElement &tag, QSharedPointer &obj) doc->SetAttribute(tag, AttrKAsm1, spl->GetKasm1()); doc->SetAttribute(tag, AttrKAsm2, spl->GetKasm2()); doc->SetAttribute(tag, AttrKCurve, spl->GetKcurve()); + + if (spl->GetDuplicate() > 0) + { + doc->SetAttribute(tag, AttrDuplicate, spl->GetDuplicate()); + } + else + { + if (tag.hasAttribute(AttrDuplicate)) + { + tag.removeAttribute(AttrDuplicate); + } + } } //--------------------------------------------------------------------------------------------------------------------- From c36f1eb8ef75406c2f698bdc20a022786042d113 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 16 Feb 2016 14:00:56 +0200 Subject: [PATCH 18/59] Working with Spline Path. --HG-- branch : feature --- src/libs/vgeometry/vsplinepath.cpp | 1 + .../vtools/dialogs/tools/dialogspline.cpp | 31 ++----- src/libs/vtools/dialogs/tools/dialogspline.h | 2 - .../vtools/dialogs/tools/dialogsplinepath.cpp | 87 +++++++++++++++++-- .../vtools/dialogs/tools/dialogsplinepath.h | 5 ++ .../vtools/dialogs/tools/dialogsplinepath.ui | 18 +++- src/libs/vtools/dialogs/tools/dialogtool.cpp | 14 +++ src/libs/vtools/dialogs/tools/dialogtool.h | 1 + 8 files changed, 125 insertions(+), 34 deletions(-) diff --git a/src/libs/vgeometry/vsplinepath.cpp b/src/libs/vgeometry/vsplinepath.cpp index 214bd2c63..bde1dc103 100644 --- a/src/libs/vgeometry/vsplinepath.cpp +++ b/src/libs/vgeometry/vsplinepath.cpp @@ -319,6 +319,7 @@ QVector VSplinePath::GetSplinePath() const void VSplinePath::Clear() { d->path.clear(); + SetDuplicate(0); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogspline.cpp b/src/libs/vtools/dialogs/tools/dialogspline.cpp index a276e781a..578bd12d5 100644 --- a/src/libs/vtools/dialogs/tools/dialogspline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogspline.cpp @@ -52,6 +52,8 @@ DialogSpline::DialogSpline(const VContainer *data, const quint32 &toolId, QWidge FillComboBoxPoints(ui->comboBoxP4); FillComboBoxLineColors(ui->comboBoxColor); + CheckState(); + connect(ui->comboBoxP1, static_cast(&QComboBox::currentIndexChanged), this, &DialogSpline::PointNameChanged); connect(ui->comboBoxP4, static_cast(&QComboBox::currentIndexChanged), @@ -132,14 +134,7 @@ void DialogSpline::SaveData() const quint32 d = spl.GetDuplicate();//Save previous value spl = VSpline(*GetP1(), *GetP4(), angle1, angle2, kAsm1, kAsm2, kCurve); - if (newDuplicate <= -1) - { - spl.SetDuplicate(d); - } - else - { - spl.SetDuplicate(static_cast(newDuplicate)); - } + newDuplicate <= -1 ? spl.SetDuplicate(d) : spl.SetDuplicate(static_cast(newDuplicate)); auto path = qobject_cast(vis); SCASSERT(path != nullptr); @@ -167,20 +162,6 @@ const QSharedPointer DialogSpline::GetP4() const return data->GeometricObject(getCurrentObjectId(ui->comboBoxP4)); } -//--------------------------------------------------------------------------------------------------------------------- -quint32 DialogSpline::DNumber(const QString &baseName) const -{ - quint32 num = 1; - QString name; - do - { - name = baseName + QString("_%1").arg(num); - ++num; - } while (not data->IsUnique(name)); - - return num; -} - //--------------------------------------------------------------------------------------------------------------------- void DialogSpline::PointNameChanged() { @@ -194,7 +175,7 @@ void DialogSpline::PointNameChanged() flagError = false; color = errorColor; - ui->lineEditSplineName->setText(QString()); + ui->lineEditSplineName->setText(tr("Invalid spline")); } else { @@ -216,11 +197,11 @@ void DialogSpline::PointNameChanged() { newDuplicate = DNumber(spline.name()); spline.SetDuplicate(newDuplicate); - - ui->lineEditSplineName->setText(spline.name()); } + ui->lineEditSplineName->setText(spline.name()); } } + ChangeColor(ui->labelName, color); ChangeColor(ui->labelFirstPoint, color); ChangeColor(ui->labelSecondPoint, color); CheckState(); diff --git a/src/libs/vtools/dialogs/tools/dialogspline.h b/src/libs/vtools/dialogs/tools/dialogspline.h index 066f796a1..ab7160b5b 100644 --- a/src/libs/vtools/dialogs/tools/dialogspline.h +++ b/src/libs/vtools/dialogs/tools/dialogspline.h @@ -75,8 +75,6 @@ private: const QSharedPointer GetP1() const; const QSharedPointer GetP4() const; - - quint32 DNumber(const QString &baseName) const; }; #endif // DIALOGSPLINE_H diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp index dde11226a..26f87d18a 100644 --- a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp @@ -39,7 +39,7 @@ * @param parent parent widget */ DialogSplinePath::DialogSplinePath(const VContainer *data, const quint32 &toolId, QWidget *parent) - :DialogTool(data, toolId, parent), ui(new Ui::DialogSplinePath), path(VSplinePath()) + :DialogTool(data, toolId, parent), ui(new Ui::DialogSplinePath), path(VSplinePath()), newDuplicate(-1) { ui->setupUi(this); InitOkCancelApply(ui); @@ -94,6 +94,7 @@ void DialogSplinePath::SetPath(const VSplinePath &value) } ui->listWidget->setFocus(Qt::OtherFocusReason); ui->doubleSpinBoxKcurve->setValue(path.GetKCurve()); + ui->lineEditSplPathName->setText(path.name()); auto visPath = qobject_cast(vis); SCASSERT(visPath != nullptr); @@ -123,7 +124,7 @@ void DialogSplinePath::ChosenObject(quint32 id, const SceneObject &type) { if (type == SceneObject::Point) { - if (path.CountPoint() >= 2 && path.at(path.CountPoint()-1).P().id() == id) + if (AllIds().contains(id)) { return; } @@ -153,7 +154,9 @@ void DialogSplinePath::ChosenObject(quint32 id, const SceneObject &type) //--------------------------------------------------------------------------------------------------------------------- void DialogSplinePath::SaveData() { + const quint32 d = path.GetDuplicate();//Save previous value SavePath(); + newDuplicate <= -1 ? path.SetDuplicate(d) : path.SetDuplicate(static_cast(newDuplicate)); auto visPath = qobject_cast(vis); SCASSERT(visPath != nullptr); @@ -195,6 +198,45 @@ void DialogSplinePath::currentPointChanged(int index) DataPoint(p.P().id(), p.KAsm1(), p.Angle1(), p.KAsm2(), p.Angle2()); EnableFields(); item->setData(Qt::UserRole, QVariant::fromValue(p)); + item->setText(p.P().name()); + + QColor color = okColor; + if (not IsPathValid()) + { + flagError = false; + color = errorColor; + + ui->lineEditSplPathName->setText(tr("Invalid spline path")); + } + else + { + flagError = true; + color = okColor; + + auto first = qvariant_cast(ui->listWidget->item(0)->data(Qt::UserRole)); + auto last = qvariant_cast(ui->listWidget->item(ui->listWidget->count()-1)->data(Qt::UserRole)); + + if (first.P().id() == path.at(0).P().id() && last.P().id() == path.at(path.CountPoint()-1).P().id()) + { + newDuplicate = -1; + ui->lineEditSplPathName->setText(path.name()); + } + else + { + VSplinePath newPath = ExtractPath(); + + if (not data->IsUnique(newPath.name())) + { + newDuplicate = DNumber(newPath.name()); + newPath.SetDuplicate(newDuplicate); + } + + ui->lineEditSplPathName->setText(newPath.name()); + } + } + ChangeColor(ui->labelName, color); + ChangeColor(ui->labelPoint, color); + CheckState(); } //--------------------------------------------------------------------------------------------------------------------- @@ -265,6 +307,12 @@ void DialogSplinePath::ShowDialog(bool click) if (path.CountPoint() >= 3) { emit ToolTip(""); + + if (not data->IsUnique(path.name())) + { + path.SetDuplicate(DNumber(path.name())); + } + DialogAccepted(); } } @@ -368,10 +416,39 @@ void DialogSplinePath::EnableFields() void DialogSplinePath::SavePath() { path.Clear(); + path = ExtractPath(); +} + +//--------------------------------------------------------------------------------------------------------------------- +QSet DialogSplinePath::AllIds() const +{ + QSet ids; for (qint32 i = 0; i < ui->listWidget->count(); ++i) { - QListWidgetItem *item = ui->listWidget->item(i); - path.append( qvariant_cast(item->data(Qt::UserRole))); + ids.insert(qvariant_cast(ui->listWidget->item(i)->data(Qt::UserRole)).P().id()); } - path.SetKCurve(ui->doubleSpinBoxKcurve->value()); + + return ids; +} + +//--------------------------------------------------------------------------------------------------------------------- +bool DialogSplinePath::IsPathValid() const +{ + if (path.CountPoint() < 3) + { + return false; + } + + return (AllIds().size() == path.CountPoint()); +} + +//--------------------------------------------------------------------------------------------------------------------- +VSplinePath DialogSplinePath::ExtractPath() const +{ + VSplinePath path(ui->doubleSpinBoxKcurve->value()); + for (qint32 i = 0; i < ui->listWidget->count(); ++i) + { + path.append( qvariant_cast(ui->listWidget->item(i)->data(Qt::UserRole))); + } + return path; } diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.h b/src/libs/vtools/dialogs/tools/dialogsplinepath.h index c10146364..b992a697f 100644 --- a/src/libs/vtools/dialogs/tools/dialogsplinepath.h +++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.h @@ -77,10 +77,15 @@ private: /** @brief path spline path */ VSplinePath path; + qint32 newDuplicate; + void NewItem(quint32 id, qreal kAsm1, qreal angle1, qreal kAsm2, qreal angle2); void DataPoint(quint32 id, qreal kAsm1, qreal angle1, qreal kAsm2, qreal angle2); void EnableFields(); void SavePath(); + QSet AllIds() const; + bool IsPathValid() const; + VSplinePath ExtractPath() const; }; //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.ui b/src/libs/vtools/dialogs/tools/dialogsplinepath.ui index 1942bc658..140fe7fac 100644 --- a/src/libs/vtools/dialogs/tools/dialogsplinepath.ui +++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.ui @@ -7,7 +7,7 @@ 0 0 528 - 322 + 353 @@ -28,7 +28,7 @@ - + Point of curve @@ -196,6 +196,20 @@ + + + + Name: + + + + + + + true + + + diff --git a/src/libs/vtools/dialogs/tools/dialogtool.cpp b/src/libs/vtools/dialogs/tools/dialogtool.cpp index 5cff1eb04..fe1040147 100644 --- a/src/libs/vtools/dialogs/tools/dialogtool.cpp +++ b/src/libs/vtools/dialogs/tools/dialogtool.cpp @@ -311,6 +311,20 @@ bool DialogTool::eventFilter(QObject *object, QEvent *event) return false; } +//--------------------------------------------------------------------------------------------------------------------- +quint32 DialogTool::DNumber(const QString &baseName) const +{ + quint32 num = 0; + QString name; + do + { + ++num; + name = baseName + QString("_%1").arg(num); + } while (not data->IsUnique(name)); + + return num; +} + //--------------------------------------------------------------------------------------------------------------------- /** * @brief ValFormulaChanged handle change formula diff --git a/src/libs/vtools/dialogs/tools/dialogtool.h b/src/libs/vtools/dialogs/tools/dialogtool.h index c95109718..a715bb1f0 100644 --- a/src/libs/vtools/dialogs/tools/dialogtool.h +++ b/src/libs/vtools/dialogs/tools/dialogtool.h @@ -255,6 +255,7 @@ protected: virtual void SaveData() {} void MoveCursorToEnd(QPlainTextEdit *plainTextEdit); bool eventFilter(QObject *object, QEvent *event); + quint32 DNumber(const QString &baseName) const; private: void FillList(QComboBox *box, const QMap &list)const; From c80fe9c61b9b68143cda400c7c807ac7221375d1 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 16 Feb 2016 15:04:21 +0200 Subject: [PATCH 19/59] Show name in a property browser. --HG-- branch : feature --- .../core/vtooloptionspropertybrowser.cpp | 77 ++++++++++--------- .../core/vtooloptionspropertybrowser.h | 2 +- .../drawTools/toolcurve/vabstractspline.cpp | 6 ++ .../drawTools/toolcurve/vabstractspline.h | 2 + .../tooldoublepoint/vtooldoublepoint.cpp | 4 +- .../toolsinglepoint/vtoolsinglepoint.cpp | 2 +- .../drawTools/toolpoint/vabstractpoint.cpp | 15 ---- .../drawTools/toolpoint/vabstractpoint.h | 1 - src/libs/vtools/tools/drawTools/vdrawtool.h | 24 ++++++ 9 files changed, 78 insertions(+), 55 deletions(-) diff --git a/src/app/valentina/core/vtooloptionspropertybrowser.cpp b/src/app/valentina/core/vtooloptionspropertybrowser.cpp index e72b6d622..552ebbd17 100644 --- a/src/app/valentina/core/vtooloptionspropertybrowser.cpp +++ b/src/app/valentina/core/vtooloptionspropertybrowser.cpp @@ -445,11 +445,12 @@ void VToolOptionsPropertyBrowser::AddPropertyFormula(const QString &propertyName //--------------------------------------------------------------------------------------------------------------------- template -void VToolOptionsPropertyBrowser::AddPropertyPointName(Tool *i, const QString &propertyName) +void VToolOptionsPropertyBrowser::AddPropertyObjectName(Tool *i, const QString &propertyName, bool readOnly) { - VStringProperty *itemName = new VStringProperty(propertyName); + auto itemName = new VStringProperty(propertyName); itemName->setClearButtonEnable(true); itemName->setValue(i->name()); + itemName->setReadOnly(readOnly); AddProperty(itemName, AttrName); } @@ -1301,6 +1302,9 @@ void VToolOptionsPropertyBrowser::ChangeDataToolSpline(VProperty *property) SCASSERT(i != nullptr); switch (PropertiesList().indexOf(id)) { + case 0: // AttrName + Q_UNREACHABLE();//The attribute is read only + break; case 25: // AttrKCurve { VSpline spl = i->getSpline(); @@ -1329,6 +1333,9 @@ void VToolOptionsPropertyBrowser::ChangeDataToolSplinePath(VProperty *property) SCASSERT(i != nullptr); switch (PropertiesList().indexOf(id)) { + case 0: // AttrName + Q_UNREACHABLE();//The attribute is read only + break; case 25: // AttrKCurve { VSplinePath splPath = i->getSplinePath(); @@ -1431,7 +1438,7 @@ void VToolOptionsPropertyBrowser::ShowOptionsToolSinglePoint(QGraphicsItem *item i->ShowVisualization(true); formView->setTitle(tr("Base point")); - AddPropertyPointName(i, tr("Point label")); + AddPropertyObjectName(i, tr("Point label")); VPointFProperty* itemPosition = new VPointFProperty(tr("Position")); itemPosition->setValue(i->pos()); @@ -1445,7 +1452,7 @@ void VToolOptionsPropertyBrowser::ShowOptionsToolEndLine(QGraphicsItem *item) i->ShowVisualization(true); formView->setTitle(tr("Point at distance and angle")); - AddPropertyPointName(i, tr("Point label")); + AddPropertyObjectName(i, tr("Point label")); AddPropertyLineType(i, tr("Line type"), VAbstractTool::LineStylesPics()); AddPropertyLineColor(i, tr("Line color"), VAbstractTool::ColorsList(), AttrLineColor); AddPropertyFormula(tr("Length"), i->GetFormulaLength(), AttrLength); @@ -1459,7 +1466,7 @@ void VToolOptionsPropertyBrowser::ShowOptionsToolAlongLine(QGraphicsItem *item) i->ShowVisualization(true); formView->setTitle(tr("Point at distance along line")); - AddPropertyPointName(i, tr("Point label")); + AddPropertyObjectName(i, tr("Point label")); AddPropertyLineType(i, tr("Line type"), VAbstractTool::LineStylesPics()); AddPropertyLineColor(i, tr("Line color"), VAbstractTool::ColorsList(), AttrLineColor); AddPropertyFormula(tr("Length"), i->GetFormulaLength(), AttrLength); @@ -1498,7 +1505,7 @@ void VToolOptionsPropertyBrowser::ShowOptionsToolBisector(QGraphicsItem *item) i->ShowVisualization(true); formView->setTitle(tr("Point along bisector")); - AddPropertyPointName(i, tr("Point label")); + AddPropertyObjectName(i, tr("Point label")); AddPropertyLineType(i, tr("Line type"), VAbstractTool::LineStylesPics()); AddPropertyLineColor(i, tr("Line color"), VAbstractTool::ColorsList(), AttrLineColor); AddPropertyFormula(tr("Length"), i->GetFormulaLength(), AttrLength); @@ -1522,7 +1529,7 @@ void VToolOptionsPropertyBrowser::ShowOptionsToolCutArc(QGraphicsItem *item) i->ShowVisualization(true); formView->setTitle(tr("Cut arc tool")); - AddPropertyPointName(i, tr("Point label")); + AddPropertyObjectName(i, tr("Point label")); AddPropertyFormula(tr("Length"), i->GetFormula(), AttrLength); AddPropertyLineColor(i, tr("Color"), VAbstractTool::ColorsList(), AttrColor); } @@ -1534,7 +1541,7 @@ void VToolOptionsPropertyBrowser::ShowOptionsToolCutSpline(QGraphicsItem *item) i->ShowVisualization(true); formView->setTitle(tr("Tool for segmenting a curve")); - AddPropertyPointName(i, tr("Point label")); + AddPropertyObjectName(i, tr("Point label")); AddPropertyFormula(tr("Length"), i->GetFormula(), AttrLength); AddPropertyLineColor(i, tr("Color"), VAbstractTool::ColorsList(), AttrColor); } @@ -1546,7 +1553,7 @@ void VToolOptionsPropertyBrowser::ShowOptionsToolCutSplinePath(QGraphicsItem *it i->ShowVisualization(true); formView->setTitle(tr("Tool segment a pathed curve")); - AddPropertyPointName(i, tr("Point label")); + AddPropertyObjectName(i, tr("Point label")); AddPropertyFormula(tr("Length"), i->GetFormula(), AttrLength); AddPropertyLineColor(i, tr("Color"), VAbstractTool::ColorsList(), AttrColor); } @@ -1558,7 +1565,7 @@ void VToolOptionsPropertyBrowser::ShowOptionsToolHeight(QGraphicsItem *item) i->ShowVisualization(true); formView->setTitle(tr("Perpendicular point along line")); - AddPropertyPointName(i, tr("Point label")); + AddPropertyObjectName(i, tr("Point label")); AddPropertyLineType(i, tr("Line type"), VAbstractTool::LineStylesPics()); AddPropertyLineColor(i, tr("Line color"), VAbstractTool::ColorsList(), AttrLineColor); } @@ -1583,7 +1590,7 @@ void VToolOptionsPropertyBrowser::ShowOptionsToolLineIntersect(QGraphicsItem *it i->ShowVisualization(true); formView->setTitle(tr("Point at line intersection")); - AddPropertyPointName(i, tr("Point label")); + AddPropertyObjectName(i, tr("Point label")); } //--------------------------------------------------------------------------------------------------------------------- @@ -1594,7 +1601,7 @@ void VToolOptionsPropertyBrowser::ShowOptionsToolNormal(QGraphicsItem *item) formView->setTitle(tr("Point along perpendicular")); AddPropertyFormula(tr("Length"), i->GetFormulaLength(), AttrLength); - AddPropertyPointName(i, tr("Point label")); + AddPropertyObjectName(i, tr("Point label")); AddPropertyLineType(i, tr("Line type"), VAbstractTool::LineStylesPics()); AddPropertyLineColor(i, tr("Line color"), VAbstractTool::ColorsList(), AttrLineColor); @@ -1613,7 +1620,7 @@ void VToolOptionsPropertyBrowser::ShowOptionsToolPointOfContact(QGraphicsItem *i i->ShowVisualization(true); formView->setTitle(tr("Point at intersection of arc and line")); - AddPropertyPointName(i, tr("Point label")); + AddPropertyObjectName(i, tr("Point label")); AddPropertyFormula(tr("Radius"), i->getArcRadius(), AttrRadius); } @@ -1624,7 +1631,7 @@ void VToolOptionsPropertyBrowser::ShowOptionsToolPointOfIntersection(QGraphicsIt i->ShowVisualization(true); formView->setTitle(tr("Tool to make point from x & y of two other points")); - AddPropertyPointName(i, tr("Point label")); + AddPropertyObjectName(i, tr("Point label")); } //--------------------------------------------------------------------------------------------------------------------- @@ -1634,7 +1641,7 @@ void VToolOptionsPropertyBrowser::ShowOptionsToolPointOfIntersectionArcs(QGraphi i->ShowVisualization(true); formView->setTitle(tr("Tool to make point from intersection two arcs")); - AddPropertyPointName(i, tr("Point label")); + AddPropertyObjectName(i, tr("Point label")); AddPropertyCrossPoint(i, tr("Take")); } @@ -1645,7 +1652,7 @@ void VToolOptionsPropertyBrowser::ShowOptionsToolPointOfIntersectionCircles(QGra i->ShowVisualization(true); formView->setTitle(tr("Tool to make point from intersection two circles")); - AddPropertyPointName(i, tr("Point label")); + AddPropertyObjectName(i, tr("Point label")); AddPropertyFormula(tr("First circle radius"), i->GetFirstCircleRadius(), AttrC1Radius); AddPropertyFormula(tr("Second circle radius"), i->GetSecondCircleRadius(), AttrC2Radius); AddPropertyCrossPoint(i, tr("Take")); @@ -1658,7 +1665,7 @@ void VToolOptionsPropertyBrowser::ShowOptionsToolPointOfIntersectionCurves(QGrap i->ShowVisualization(true); formView->setTitle(tr("Tool to make point from intersection two curves")); - AddPropertyPointName(i, tr("Point label")); + AddPropertyObjectName(i, tr("Point label")); AddPropertyVCrossPoint(i, tr("Vertical correction")); AddPropertyHCrossPoint(i, tr("Horizontal correction")); } @@ -1670,7 +1677,7 @@ void VToolOptionsPropertyBrowser::ShowOptionsToolPointFromCircleAndTangent(QGrap i->ShowVisualization(true); formView->setTitle(tr("Tool to make point from circle and tangent")); - AddPropertyPointName(i, tr("Point label")); + AddPropertyObjectName(i, tr("Point label")); AddPropertyFormula(tr("Circle radius"), i->GetCircleRadius(), AttrCRadius); AddPropertyCrossPoint(i, tr("Take")); } @@ -1682,7 +1689,7 @@ void VToolOptionsPropertyBrowser::ShowOptionsToolPointFromArcAndTangent(QGraphic i->ShowVisualization(true); formView->setTitle(tr("Tool to make point from arc and tangent")); - AddPropertyPointName(i, tr("Point label")); + AddPropertyObjectName(i, tr("Point label")); AddPropertyCrossPoint(i, tr("Take")); } @@ -1693,7 +1700,7 @@ void VToolOptionsPropertyBrowser::ShowOptionsToolShoulderPoint(QGraphicsItem *it i->ShowVisualization(true); formView->setTitle(tr("Special point on shoulder")); - AddPropertyPointName(i, tr("Point label")); + AddPropertyObjectName(i, tr("Point label")); AddPropertyLineType(i, tr("Line type"), VAbstractTool::LineStylesPics()); AddPropertyLineColor(i, tr("Line color"), VAbstractTool::ColorsList(), AttrLineColor); AddPropertyFormula(tr("Length"), i->GetFormulaLength(), AttrLength); @@ -1706,6 +1713,8 @@ void VToolOptionsPropertyBrowser::ShowOptionsToolSpline(QGraphicsItem *item) i->ShowVisualization(true); formView->setTitle(tr("Curve tool")); + AddPropertyObjectName(i, tr("Name"), true); + VDoubleProperty* itemFactor = new VDoubleProperty(tr("Curve factor")); VSpline spl = i->getSpline(); itemFactor->setSetting("Min", 0.1); @@ -1724,6 +1733,8 @@ void VToolOptionsPropertyBrowser::ShowOptionsToolSplinePath(QGraphicsItem *item) i->ShowVisualization(true); formView->setTitle(tr("Tool for path curve")); + AddPropertyObjectName(i, tr("Name"), true); + VDoubleProperty* itemFactor = new VDoubleProperty(tr("Curve factor")); VSplinePath splPath = i->getSplinePath(); itemFactor->setSetting("Min", 0.1); @@ -1742,7 +1753,7 @@ void VToolOptionsPropertyBrowser::ShowOptionsToolTriangle(QGraphicsItem *item) i->ShowVisualization(true); formView->setTitle(tr("Tool triangle")); - AddPropertyPointName(i, tr("Point label")); + AddPropertyObjectName(i, tr("Point label")); } //--------------------------------------------------------------------------------------------------------------------- @@ -1752,7 +1763,7 @@ void VToolOptionsPropertyBrowser::ShowOptionsToolLineIntersectAxis(QGraphicsItem i->ShowVisualization(true); formView->setTitle(tr("Point intersection line and axis")); - AddPropertyPointName(i, tr("Point label")); + AddPropertyObjectName(i, tr("Point label")); AddPropertyLineType(i, tr("Line type"), VAbstractTool::LineStylesPics()); AddPropertyLineColor(i, tr("Line color"), VAbstractTool::ColorsList(), AttrLineColor); AddPropertyFormula(tr("Angle"), i->GetFormulaAngle(), AttrAngle); @@ -1765,7 +1776,7 @@ void VToolOptionsPropertyBrowser::ShowOptionsToolCurveIntersectAxis(QGraphicsIte i->ShowVisualization(true); formView->setTitle(tr("Point intersection curve and axis")); - AddPropertyPointName(i, tr("Point label")); + AddPropertyObjectName(i, tr("Point label")); AddPropertyLineType(i, tr("Line type"), VAbstractTool::LineStylesPics()); AddPropertyLineColor(i, tr("Line color"), VAbstractTool::ColorsList(), AttrLineColor); AddPropertyFormula(tr("Angle"), i->GetFormulaAngle(), AttrAngle); @@ -2112,25 +2123,21 @@ void VToolOptionsPropertyBrowser::UpdateOptionsToolShoulderPoint() //--------------------------------------------------------------------------------------------------------------------- void VToolOptionsPropertyBrowser::UpdateOptionsToolSpline() { - VToolSpline *i = qgraphicsitem_cast(currentItem); + auto i = qgraphicsitem_cast(currentItem); - VSpline spl = i->getSpline(); - idToProperty[AttrKCurve]->setValue(spl.GetKcurve()); - - const qint32 index = VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), i->GetLineColor()); - idToProperty[AttrColor]->setValue(index); + idToProperty[AttrName]->setValue(i->name()); + idToProperty[AttrKCurve]->setValue(i->getSpline().GetKcurve()); + idToProperty[AttrColor]->setValue(VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), i->GetLineColor())); } //--------------------------------------------------------------------------------------------------------------------- void VToolOptionsPropertyBrowser::UpdateOptionsToolSplinePath() { - VToolSplinePath *i = qgraphicsitem_cast(currentItem); + auto i = qgraphicsitem_cast(currentItem); - VSplinePath splPath = i->getSplinePath(); - idToProperty[AttrKCurve]->setValue(splPath.GetKCurve()); - - const qint32 index = VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), i->GetLineColor()); - idToProperty[AttrColor]->setValue(index); + idToProperty[AttrName]->setValue(i->name()); + idToProperty[AttrKCurve]->setValue(i->getSplinePath().GetKCurve()); + idToProperty[AttrColor]->setValue(VLineColorProperty::IndexOfColor(VAbstractTool::ColorsList(), i->GetLineColor())); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/valentina/core/vtooloptionspropertybrowser.h b/src/app/valentina/core/vtooloptionspropertybrowser.h index 6dabcd7e8..acb6b278d 100644 --- a/src/app/valentina/core/vtooloptionspropertybrowser.h +++ b/src/app/valentina/core/vtooloptionspropertybrowser.h @@ -87,7 +87,7 @@ private: void SetHCrossCurvesPoint(const QVariant &value); template - void AddPropertyPointName(Tool *i, const QString &propertyName); + void AddPropertyObjectName(Tool *i, const QString &propertyName, bool readOnly = false); template void AddPropertyPointName1(Tool *i, const QString &propertyName); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp index 6c32892c1..f6e31f2b9 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp @@ -266,3 +266,9 @@ void VAbstractSpline::setEnabled(bool enabled) qApp->toPixel(WidthHairLine(*VAbstractTool::data.GetPatternUnit()))/factor)); } } + +//--------------------------------------------------------------------------------------------------------------------- +QString VAbstractSpline::name() const +{ + return ObjectName(id); +} diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h index e6ca060ba..40f874c0d 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h @@ -52,6 +52,8 @@ public: void setEnabled(bool enabled); + QString name() const; + public slots: virtual void FullUpdateFromFile () Q_DECL_OVERRIDE; virtual void Disable(bool disable, const QString &namePP) Q_DECL_OVERRIDE; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp index 66b67a6c5..099e23a8d 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp @@ -76,7 +76,7 @@ void VToolDoublePoint::paint(QPainter *painter, const QStyleOptionGraphicsItem * //--------------------------------------------------------------------------------------------------------------------- QString VToolDoublePoint::nameP1() const { - return PointName(p1id); + return ObjectName(p1id); } //--------------------------------------------------------------------------------------------------------------------- @@ -88,7 +88,7 @@ void VToolDoublePoint::setNameP1(const QString &name) //--------------------------------------------------------------------------------------------------------------------- QString VToolDoublePoint::nameP2() const { - return PointName(p2id); + return ObjectName(p2id); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp index d0cf96a75..38d484b70 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp @@ -95,7 +95,7 @@ void VToolSinglePoint::paint(QPainter *painter, const QStyleOptionGraphicsItem * //--------------------------------------------------------------------------------------------------------------------- QString VToolSinglePoint::name() const { - return PointName(id); + return ObjectName(id); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.cpp index a0423c207..e7027800e 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.cpp @@ -71,21 +71,6 @@ void VAbstractPoint::DeleteFromLabel() } } -//--------------------------------------------------------------------------------------------------------------------- -QString VAbstractPoint::PointName(quint32 id) const -{ - try - { - return VAbstractTool::data.GeometricObject(id)->name(); - } - catch (const VExceptionBadId &e) - { - qCDebug(vTool, "Error! Couldn't get point name. %s %s", qUtf8Printable(e.ErrorMessage()), - qUtf8Printable(e.DetailedInformation())); - return QString("");// Return empty string for property browser - } -} - //--------------------------------------------------------------------------------------------------------------------- void VAbstractPoint::SetPointName(quint32 id, const QString &name) { diff --git a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h index ef8c02d76..c38bb4903 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h @@ -50,7 +50,6 @@ public slots: void DeleteFromLabel(); protected: - QString PointName(quint32 id) const; void SetPointName(quint32 id, const QString &name); template diff --git a/src/libs/vtools/tools/drawTools/vdrawtool.h b/src/libs/vtools/tools/drawTools/vdrawtool.h index 5c6512247..e9fba51a9 100644 --- a/src/libs/vtools/tools/drawTools/vdrawtool.h +++ b/src/libs/vtools/tools/drawTools/vdrawtool.h @@ -112,6 +112,9 @@ protected: template void ShowItem(Item *item, quint32 id, bool enable); + + template + QString ObjectName(quint32 id) const; private: Q_DISABLE_COPY(VDrawTool) }; @@ -202,4 +205,25 @@ void VDrawTool::ShowItem(Item *item, quint32 id, bool enable) } } +//--------------------------------------------------------------------------------------------------------------------- +template +/** + * @brief ObjectName get object (point, curve, arc) name. + * @param id object id in container. + */ +QString VDrawTool::ObjectName(quint32 id) const +{ + try + { + return VAbstractTool::data.GeometricObject(id)->name(); + } + catch (const VExceptionBadId &e) + { + qCDebug(vTool, "Error! Couldn't get object name by id = %s. %s %s", qUtf8Printable(QString().setNum(id)), + qUtf8Printable(e.ErrorMessage()), + qUtf8Printable(e.DetailedInformation())); + return QString("");// Return empty string for property browser + } +} + #endif // VDRAWTOOL_H From 0846d3c282fd9fb3416626194d69da02b0aaf783 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 16 Feb 2016 15:37:01 +0200 Subject: [PATCH 20/59] Read and save a spline path attribute 'duplicate'. --HG-- branch : feature --- src/app/valentina/xml/vpattern.cpp | 8 +++++++- .../tools/drawTools/toolcurve/vtoolsplinepath.cpp | 12 ++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/app/valentina/xml/vpattern.cpp b/src/app/valentina/xml/vpattern.cpp index 7573dee59..7e21a3adc 100644 --- a/src/app/valentina/xml/vpattern.cpp +++ b/src/app/valentina/xml/vpattern.cpp @@ -1894,7 +1894,13 @@ void VPattern::ParseToolSplinePath(VMainGraphicsScene *scene, const QDomElement ToolsCommonAttributes(domElement, id); const qreal kCurve = GetParametrDouble(domElement, AttrKCurve, "1.0"); const QString color = GetParametrString(domElement, AttrColor, ColorBlack); - VSplinePath *path = new VSplinePath(kCurve); + const quint32 duplicate = GetParametrUInt(domElement, AttrDuplicate, "0"); + + auto path = new VSplinePath(kCurve); + if (duplicate > 0) + { + path->SetDuplicate(duplicate); + } const QDomNodeList nodeList = domElement.childNodes(); const qint32 num = nodeList.size(); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp index 04ec5fcb0..5027f90f5 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp @@ -404,6 +404,18 @@ void VToolSplinePath::SaveOptions(QDomElement &tag, QSharedPointer &ob doc->SetAttribute(tag, AttrType, ToolType); doc->SetAttribute(tag, AttrKCurve, splPath->GetKCurve()); + if (splPath->GetDuplicate() > 0) + { + doc->SetAttribute(tag, AttrDuplicate, splPath->GetDuplicate()); + } + else + { + if (tag.hasAttribute(AttrDuplicate)) + { + tag.removeAttribute(AttrDuplicate); + } + } + doc->RemoveAllChild(tag); for (qint32 i = 0; i < splPath->CountPoint(); ++i) { From 0ea99175b4235e4a6608b95868e597d955121f3b Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 16 Feb 2016 15:38:08 +0200 Subject: [PATCH 21/59] New VAL pattern format version that supports attribute 'duplicate'. --HG-- branch : feature --- src/libs/ifc/schema.qrc | 1 + src/libs/ifc/schema/pattern/v0.2.6.xsd | 435 +++++++++++++++++++++++++ src/libs/ifc/xml/vpatternconverter.cpp | 20 +- src/libs/ifc/xml/vpatternconverter.h | 1 + 4 files changed, 455 insertions(+), 2 deletions(-) create mode 100644 src/libs/ifc/schema/pattern/v0.2.6.xsd diff --git a/src/libs/ifc/schema.qrc b/src/libs/ifc/schema.qrc index 73c86c494..24a646a18 100644 --- a/src/libs/ifc/schema.qrc +++ b/src/libs/ifc/schema.qrc @@ -11,6 +11,7 @@ schema/pattern/v0.2.3.xsd schema/pattern/v0.2.4.xsd schema/pattern/v0.2.5.xsd + schema/pattern/v0.2.6.xsd schema/standard_measurements/v0.3.0.xsd schema/standard_measurements/v0.4.0.xsd schema/standard_measurements/v0.4.1.xsd diff --git a/src/libs/ifc/schema/pattern/v0.2.6.xsd b/src/libs/ifc/schema/pattern/v0.2.6.xsd new file mode 100644 index 000000000..5d01f9bb3 --- /dev/null +++ b/src/libs/ifc/schema/pattern/v0.2.6.xsd @@ -0,0 +1,435 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/libs/ifc/xml/vpatternconverter.cpp b/src/libs/ifc/xml/vpatternconverter.cpp index 84e02bf87..4814337dd 100644 --- a/src/libs/ifc/xml/vpatternconverter.cpp +++ b/src/libs/ifc/xml/vpatternconverter.cpp @@ -43,8 +43,8 @@ */ const QString VPatternConverter::PatternMinVerStr = QStringLiteral("0.1.0"); -const QString VPatternConverter::PatternMaxVerStr = QStringLiteral("0.2.5"); -const QString VPatternConverter::CurrentSchema = QStringLiteral("://schema/pattern/v0.2.5.xsd"); +const QString VPatternConverter::PatternMaxVerStr = QStringLiteral("0.2.6"); +const QString VPatternConverter::CurrentSchema = QStringLiteral("://schema/pattern/v0.2.6.xsd"); //--------------------------------------------------------------------------------------------------------------------- VPatternConverter::VPatternConverter(const QString &fileName) @@ -107,6 +107,8 @@ QString VPatternConverter::XSDSchema(int ver) const case (0x000204): return QStringLiteral("://schema/pattern/v0.2.4.xsd"); case (0x000205): + return QStringLiteral("://schema/pattern/v0.2.5.xsd"); + case (0x000206): return CurrentSchema; default: InvalidVersion(ver); @@ -192,6 +194,13 @@ void VPatternConverter::ApplyPatches() V_FALLTHROUGH } case (0x000205): + { + ToV0_2_6(); + const QString schema = XSDSchema(0x000206); + ValidateXML(schema, fileName); + V_FALLTHROUGH + } + case (0x000206): break; default: break; @@ -299,6 +308,13 @@ void VPatternConverter::ToV0_2_5() Save(); } +//--------------------------------------------------------------------------------------------------------------------- +void VPatternConverter::ToV0_2_6() +{ + SetVersion(QStringLiteral("0.2.6")); + Save(); +} + //--------------------------------------------------------------------------------------------------------------------- void VPatternConverter::TagUnitToV0_2_0() { diff --git a/src/libs/ifc/xml/vpatternconverter.h b/src/libs/ifc/xml/vpatternconverter.h index e49f04c19..7b6f76bb2 100644 --- a/src/libs/ifc/xml/vpatternconverter.h +++ b/src/libs/ifc/xml/vpatternconverter.h @@ -66,6 +66,7 @@ private: void ToV0_2_3(); void ToV0_2_4(); void ToV0_2_5(); + void ToV0_2_6(); void TagUnitToV0_2_0(); void TagIncrementToV0_2_0(); From ae1830617a361ebb40cf71b0a674e21f2a113cc5 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 16 Feb 2016 15:39:47 +0200 Subject: [PATCH 22/59] Changelog. --HG-- branch : feature --- ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 442eafb15..503a48765 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,5 @@ # Version 0.5.0 +- Fixed case with duplicate names of curves if they connect same points. - [#216] Better powerful way creation curved path. - Improved exporting to dxf. QPainterPath export as Polyline. - Show additional message dialog if measurements was changed. Related to issue [#440]. From 04ae26d1bdc8badc72775e015a521f63de6d0fa1 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 16 Feb 2016 18:08:51 +0200 Subject: [PATCH 23/59] Regesign dialogs tool 'Spline' and 'Spline Path' for avoiding text squeeze. --HG-- branch : develop --- src/libs/vtools/dialogs/tools/dialogspline.ui | 312 ++++++++++++------ .../vtools/dialogs/tools/dialogsplinepath.ui | 195 ++++++----- 2 files changed, 310 insertions(+), 197 deletions(-) diff --git a/src/libs/vtools/dialogs/tools/dialogspline.ui b/src/libs/vtools/dialogs/tools/dialogspline.ui index 839a00e72..153cbefc1 100644 --- a/src/libs/vtools/dialogs/tools/dialogspline.ui +++ b/src/libs/vtools/dialogs/tools/dialogspline.ui @@ -6,8 +6,8 @@ 0 0 - 540 - 273 + 459 + 289 @@ -20,132 +20,237 @@ - + - + + + 6 + - + - + + + + 89 + 0 + + - First point + First point: - - - - - - - - - - Length ratio of the first control point - - - true - - - - - - - 0.010000000000000 - - - 1.000000000000000 + + + + 0 + 0 + - - - - - The angle of the first control point - - - true - - - - - - - 360 - - - - + + + Control point + + + + + + + + + 0 + 0 + + + + 0.010000000000000 + + + 1.000000000000000 + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Angle: + + + true + + + + + + + + 0 + 0 + + + + 360 + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Length ratio: + + + true + + + + + + + - + - Second point + Second point: - - - - - - - - - - Length ratio of the second control point - - - true - - - - - - - 0.010000000000000 - - - 1.000000000000000 + + + + 0 + 0 + - - - - - The angle of the second control point - - - true - - - - - - - 360 - - - - + + + Control point + + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Length ratio: + + + true + + + + + + + + 0 + 0 + + + + 0.010000000000000 + + + 1.000000000000000 + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Angle: + + + true + + + + + + + + 0 + 0 + + + + 360 + + + + + + + @@ -178,7 +283,7 @@ - + 0 0 @@ -205,7 +310,14 @@ - + + + + 0 + 0 + + + @@ -242,6 +354,8 @@ comboBoxP4 doubleSpinBoxKasm2 spinBoxAngle2 + doubleSpinBoxKcurve + comboBoxColor buttonBox @@ -255,8 +369,8 @@ accept() - 248 - 254 + 257 + 246 157 @@ -271,8 +385,8 @@ reject() - 316 - 260 + 325 + 246 286 diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.ui b/src/libs/vtools/dialogs/tools/dialogsplinepath.ui index 140fe7fac..e5e2ebb88 100644 --- a/src/libs/vtools/dialogs/tools/dialogsplinepath.ui +++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.ui @@ -6,8 +6,8 @@ 0 0 - 528 - 353 + 519 + 401 @@ -20,17 +20,17 @@ - + - + - + - Point of curve + Point: @@ -40,94 +40,99 @@ - - - - - Length ratio of the first control point - - - true - - - - - - - 0.010000000000000 - - - 1.000000000000000 - - - - + + + First control point + + + + QFormLayout::AllNonFixedFieldsGrow + + + + + Angle: + + + true + + + + + + + 360.000000000000000 + + + + + + + 0.010000000000000 + + + 1.000000000000000 + + + + + + + Length ratio: + + + true + + + + + - - - - - The angle of the first control point - - - true - - - - - - - 360.000000000000000 - - - - - - - - - - - Length ratio of the second control point - - - true - - - - - - - 0.010000000000000 - - - 1.000000000000000 - - - - - - - - - - - The angle of the second control point - - - true - - - - - - - 360.000000000000000 - - - - + + + Second control point + + + + + + Length ratio: + + + true + + + + + + + 0.010000000000000 + + + 1.000000000000000 + + + + + + + Angle: + + + true + + + + + + + 360.000000000000000 + + + + + @@ -225,12 +230,6 @@ - comboBoxPoint - doubleSpinBoxKasm1 - doubleSpinBoxAngle1 - doubleSpinBoxKasm2 - doubleSpinBoxAngle2 - listWidget buttonBox From c68a11067fd797d6834ad2d172f71e938f092757 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 16 Feb 2016 18:10:03 +0200 Subject: [PATCH 24/59] Port changelog from the release branch. --HG-- branch : develop --- ChangeLog.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 503a48765..7c4b7442c 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -9,6 +9,8 @@ - [#325] Check pattern for inverse compatibility. # Version 0.4.2 +- In dialog 'tool Spline Path' fixed broken selecting new point into the list of points. +- Regesign dialogs tool 'Spline' and 'Spline Path' for avoiding text squeeze. - Fixed getting correct reversed segment for single in the list curve. - Fixed triggering validation a detail. Two new cases: has been changed Reverse option and the list has been scrolled. Fixed validation when the list conatains only curve. From 69bb0f4d9bc02ca344b3f40bba1344fe8af4ac4e Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 16 Feb 2016 18:21:00 +0200 Subject: [PATCH 25/59] Lupdate. --HG-- branch : develop --- share/translations/valentina.ts | 90 ++- share/translations/valentina_cs_CZ.ts | 82 ++- share/translations/valentina_de_DE.ts | 82 ++- share/translations/valentina_en_CA.ts | 82 ++- share/translations/valentina_en_IN.ts | 82 ++- share/translations/valentina_en_US.ts | 82 ++- share/translations/valentina_es_ES.ts | 82 ++- share/translations/valentina_fi_FI.ts | 82 ++- share/translations/valentina_fr_FR.ts | 82 ++- share/translations/valentina_he_IL.ts | 100 ++-- share/translations/valentina_id_ID.ts | 100 ++-- share/translations/valentina_it_IT.ts | 82 ++- share/translations/valentina_nl_NL.ts | 82 ++- share/translations/valentina_ro_RO.ts | 82 ++- share/translations/valentina_ru_RU.ts | 82 ++- share/translations/valentina_uk_UA.ts | 82 ++- share/translations/valentina_zh_CN.ts | 770 +++++++++++++------------- 17 files changed, 1520 insertions(+), 606 deletions(-) diff --git a/share/translations/valentina.ts b/share/translations/valentina.ts index 0261af474..bb21197a2 100644 --- a/share/translations/valentina.ts +++ b/share/translations/valentina.ts @@ -1673,7 +1673,7 @@ %1 - point of curves intersection - + %1 - point of curves intersection @@ -3520,27 +3520,27 @@ Apply settings anyway? DialogSpline First point - First point + First point Length ratio of the first control point - Length ratio of the first control point + Length ratio of the first control point The angle of the first control point - The angle of the first control point + The angle of the first control point Second point - Second point + Second point Length ratio of the second control point - Length ratio of the second control point + Length ratio of the second control point The angle of the second control point - The angle of the second control point + The angle of the second control point Coefficient of curvature of the curve @@ -3566,6 +3566,34 @@ Apply settings anyway? Color: Color: + + First point: + First point: + + + Control point + + + + Angle: + Angle: + + + Length ratio: + + + + Second point: + Second point: + + + Name: + Name: + + + Invalid spline + + DialogSplinePath @@ -3575,23 +3603,23 @@ Apply settings anyway? Point of curve - Point of curve + Point of curve Length ratio of the first control point - Length ratio of the first control point + Length ratio of the first control point The angle of the first control point - The angle of the first control point + The angle of the first control point Length ratio of the second control point - Length ratio of the second control point + Length ratio of the second control point The angle of the second control point - The angle of the second control point + The angle of the second control point List of points @@ -3617,6 +3645,34 @@ Apply settings anyway? Color: Color: + + Point: + + + + First control point + + + + Angle: + Angle: + + + Length ratio: + + + + Second control point + + + + Name: + Name: + + + Invalid spline path + + DialogTool @@ -4954,7 +5010,7 @@ Do you want to save your changes? Measurements was changed. Do you want to sync measurements now? - + Measurements was changed. Do you want to sync measurements now? @@ -5161,11 +5217,11 @@ Do you want to save your changes? QApplication The path to the measurments is already relative. - + The path to the measurments is already relative. The path to the measurments is already absolute. - + The path to the measurments is already absolute. @@ -7192,6 +7248,10 @@ Do you want to save your changes? Horizontal correction Horizontal correction + + Name + Name + VTranslateVars diff --git a/share/translations/valentina_cs_CZ.ts b/share/translations/valentina_cs_CZ.ts index b6bf9464d..ba4b35dd6 100644 --- a/share/translations/valentina_cs_CZ.ts +++ b/share/translations/valentina_cs_CZ.ts @@ -3432,27 +3432,27 @@ Apply settings anyway? DialogSpline First point - První bod + První bod Length ratio of the first control point - Poměr délky prvního ovládacího bodu + Poměr délky prvního ovládacího bodu The angle of the first control point - Úhel prvního ovládacího bodu + Úhel prvního ovládacího bodu Second point - Druhý bod + Druhý bod Length ratio of the second control point - Poměr délky druhého ovládacího bodu + Poměr délky druhého ovládacího bodu The angle of the second control point - Úhel druhého ovládacího bodu + Úhel druhého ovládacího bodu Coefficient of curvature of the curve @@ -3478,6 +3478,34 @@ Apply settings anyway? Color: + + First point: + + + + Control point + + + + Angle: + + + + Length ratio: + + + + Second point: + + + + Name: + Název: + + + Invalid spline + + DialogSplinePath @@ -3487,23 +3515,23 @@ Apply settings anyway? Point of curve - Bod křivky + Bod křivky Length ratio of the first control point - Poměr délky prvního ovládacího bodu + Poměr délky prvního ovládacího bodu The angle of the first control point - Úhel prvního ovládacího bodu + Úhel prvního ovládacího bodu Length ratio of the second control point - Poměr délky druhého ovládacího bodu + Poměr délky druhého ovládacího bodu The angle of the second control point - Úhel druhého ovládacího bodu + Úhel druhého ovládacího bodu List of points @@ -3529,6 +3557,34 @@ Apply settings anyway? Color: + + Point: + + + + First control point + + + + Angle: + + + + Length ratio: + + + + Second control point + + + + Name: + Název: + + + Invalid spline path + + DialogTool @@ -6967,6 +7023,10 @@ Do you want to save your changes? Horizontal correction + + Name + Název + VTranslateVars diff --git a/share/translations/valentina_de_DE.ts b/share/translations/valentina_de_DE.ts index d5913ffd2..bfbd66308 100644 --- a/share/translations/valentina_de_DE.ts +++ b/share/translations/valentina_de_DE.ts @@ -3503,27 +3503,27 @@ Apply settings anyway? DialogSpline First point - Erster Punkt + Erster Punkt Length ratio of the first control point - Längenverhältnis des ersten Kontrollpunktes + Längenverhältnis des ersten Kontrollpunktes The angle of the first control point - Winkel des ersten Kontrollpunktes + Winkel des ersten Kontrollpunktes Second point - Zweiter Punkt + Zweiter Punkt Length ratio of the second control point - Längenverhältnis des zweiten Kontrollpunktes + Längenverhältnis des zweiten Kontrollpunktes The angle of the second control point - Winkel des zweiten Kontrollpunktes + Winkel des zweiten Kontrollpunktes Coefficient of curvature of the curve @@ -3549,6 +3549,34 @@ Apply settings anyway? Color: Farbe: + + First point: + Erster Punkt: + + + Control point + + + + Angle: + + + + Length ratio: + + + + Second point: + + + + Name: + Name: + + + Invalid spline + + DialogSplinePath @@ -3558,23 +3586,23 @@ Apply settings anyway? Point of curve - Punkt der Kurve + Punkt der Kurve Length ratio of the first control point - Längenverhältnis des ersten Kontrollpunktes + Längenverhältnis des ersten Kontrollpunktes The angle of the first control point - Winkel des ersten Kontrollpunktes + Winkel des ersten Kontrollpunktes Length ratio of the second control point - Längenverhältnis des zweiten Kontrollpunktes + Längenverhältnis des zweiten Kontrollpunktes The angle of the second control point - Winkel des zweiten Kontrollpunktes + Winkel des zweiten Kontrollpunktes List of points @@ -3600,6 +3628,34 @@ Apply settings anyway? Color: Farbe: + + Point: + + + + First control point + + + + Angle: + + + + Length ratio: + + + + Second control point + + + + Name: + Name: + + + Invalid spline path + + DialogTool @@ -7143,6 +7199,10 @@ Do you want to save your changes? Horizontal correction + + Name + Bezeichnung + VTranslateVars diff --git a/share/translations/valentina_en_CA.ts b/share/translations/valentina_en_CA.ts index 90c495723..12223adcf 100644 --- a/share/translations/valentina_en_CA.ts +++ b/share/translations/valentina_en_CA.ts @@ -3520,27 +3520,27 @@ Apply settings anyway? DialogSpline First point - First point + First point Length ratio of the first control point - Length ratio of the first control point + Length ratio of the first control point The angle of the first control point - The angle of the first control point + The angle of the first control point Second point - Second point + Second point Length ratio of the second control point - Length ratio of the second control point + Length ratio of the second control point The angle of the second control point - The angle of the second control point + The angle of the second control point Coefficient of curvature of the curve @@ -3566,6 +3566,34 @@ Apply settings anyway? Color: Color: + + First point: + First point: + + + Control point + + + + Angle: + Angle: + + + Length ratio: + + + + Second point: + Second point: + + + Name: + Name: + + + Invalid spline + + DialogSplinePath @@ -3575,23 +3603,23 @@ Apply settings anyway? Point of curve - Point of curve + Point of curve Length ratio of the first control point - Length ratio of the first control point + Length ratio of the first control point The angle of the first control point - The angle of the first control point + The angle of the first control point Length ratio of the second control point - Length ratio of the second control point + Length ratio of the second control point The angle of the second control point - The angle of the second control point + The angle of the second control point List of points @@ -3617,6 +3645,34 @@ Apply settings anyway? Color: Color: + + Point: + + + + First control point + + + + Angle: + Angle: + + + Length ratio: + + + + Second control point + + + + Name: + Name: + + + Invalid spline path + + DialogTool @@ -7192,6 +7248,10 @@ Do you want to save your changes? Horizontal correction + + Name + Name + VTranslateVars diff --git a/share/translations/valentina_en_IN.ts b/share/translations/valentina_en_IN.ts index 9be2f4527..537a5bbfd 100644 --- a/share/translations/valentina_en_IN.ts +++ b/share/translations/valentina_en_IN.ts @@ -3520,27 +3520,27 @@ Apply settings anyway? DialogSpline First point - First point + First point Length ratio of the first control point - Length ratio of the first control point + Length ratio of the first control point The angle of the first control point - The angle of the first control point + The angle of the first control point Second point - Second point + Second point Length ratio of the second control point - Length ratio of the second control point + Length ratio of the second control point The angle of the second control point - The angle of the second control point + The angle of the second control point Coefficient of curvature of the curve @@ -3566,6 +3566,34 @@ Apply settings anyway? Color: Color: + + First point: + First point: + + + Control point + + + + Angle: + Angle: + + + Length ratio: + + + + Second point: + Second point: + + + Name: + Name: + + + Invalid spline + + DialogSplinePath @@ -3575,23 +3603,23 @@ Apply settings anyway? Point of curve - Point of curve + Point of curve Length ratio of the first control point - Length ratio of the first control point + Length ratio of the first control point The angle of the first control point - The angle of the first control point + The angle of the first control point Length ratio of the second control point - Length ratio of the second control point + Length ratio of the second control point The angle of the second control point - The angle of the second control point + The angle of the second control point List of points @@ -3617,6 +3645,34 @@ Apply settings anyway? Color: Color: + + Point: + + + + First control point + + + + Angle: + Angle: + + + Length ratio: + + + + Second control point + + + + Name: + Name: + + + Invalid spline path + + DialogTool @@ -7192,6 +7248,10 @@ Do you want to save your changes? Horizontal correction + + Name + Name + VTranslateVars diff --git a/share/translations/valentina_en_US.ts b/share/translations/valentina_en_US.ts index 099f62b2f..67530170f 100644 --- a/share/translations/valentina_en_US.ts +++ b/share/translations/valentina_en_US.ts @@ -3520,27 +3520,27 @@ Apply settings anyway? DialogSpline First point - First point + First point Length ratio of the first control point - Length ratio of the first control point + Length ratio of the first control point The angle of the first control point - The angle of the first control point + The angle of the first control point Second point - Second point + Second point Length ratio of the second control point - Length ratio of the second control point + Length ratio of the second control point The angle of the second control point - The angle of the second control point + The angle of the second control point Coefficient of curvature of the curve @@ -3566,6 +3566,34 @@ Apply settings anyway? Color: Color: + + First point: + First point: + + + Control point + + + + Angle: + Angle: + + + Length ratio: + + + + Second point: + Second point: + + + Name: + Name: + + + Invalid spline + + DialogSplinePath @@ -3575,23 +3603,23 @@ Apply settings anyway? Point of curve - Point of curve + Point of curve Length ratio of the first control point - Length ratio of the first control point + Length ratio of the first control point The angle of the first control point - The angle of the first control point + The angle of the first control point Length ratio of the second control point - Length ratio of the second control point + Length ratio of the second control point The angle of the second control point - The angle of the second control point + The angle of the second control point List of points @@ -3617,6 +3645,34 @@ Apply settings anyway? Color: Color: + + Point: + + + + First control point + + + + Angle: + Angle: + + + Length ratio: + + + + Second control point + + + + Name: + Name: + + + Invalid spline path + + DialogTool @@ -7192,6 +7248,10 @@ Do you want to save your changes? Horizontal correction + + Name + Name + VTranslateVars diff --git a/share/translations/valentina_es_ES.ts b/share/translations/valentina_es_ES.ts index 415477dc2..1e7ba0a98 100644 --- a/share/translations/valentina_es_ES.ts +++ b/share/translations/valentina_es_ES.ts @@ -3443,27 +3443,27 @@ Apply settings anyway? DialogSpline First point - Primer punto + Primer punto Length ratio of the first control point - Proporción de la longitud del primer punto de control + Proporción de la longitud del primer punto de control The angle of the first control point - El ángulo del primer punto de control + El ángulo del primer punto de control Second point - Segundo punto + Segundo punto Length ratio of the second control point - Proporción de la longitud del segundo punto de control + Proporción de la longitud del segundo punto de control The angle of the second control point - El ángulo del segundo punto de control + El ángulo del segundo punto de control Coefficient of curvature of the curve @@ -3489,6 +3489,34 @@ Apply settings anyway? Color: Color: + + First point: + Primer punto: + + + Control point + + + + Angle: + Ángulo: + + + Length ratio: + + + + Second point: + Segundo punto: + + + Name: + Nombre: + + + Invalid spline + + DialogSplinePath @@ -3498,23 +3526,23 @@ Apply settings anyway? Point of curve - Punto de curva + Punto de curva Length ratio of the first control point - Proporción de la longitud del primer punto de control + Proporción de la longitud del primer punto de control The angle of the first control point - El ángulo del primer punto de control + El ángulo del primer punto de control Length ratio of the second control point - Proporción de la longitud del segundo punto de control + Proporción de la longitud del segundo punto de control The angle of the second control point - El ángulo del segundo punto de control + El ángulo del segundo punto de control List of points @@ -3540,6 +3568,34 @@ Apply settings anyway? Color: Color: + + Point: + + + + First control point + + + + Angle: + Ángulo: + + + Length ratio: + + + + Second control point + + + + Name: + Nombre: + + + Invalid spline path + + DialogTool @@ -6952,6 +7008,10 @@ Do you want to save your changes? Horizontal correction + + Name + Nombre + VTranslateVars diff --git a/share/translations/valentina_fi_FI.ts b/share/translations/valentina_fi_FI.ts index b93d36025..1135b27ec 100644 --- a/share/translations/valentina_fi_FI.ts +++ b/share/translations/valentina_fi_FI.ts @@ -3432,27 +3432,27 @@ Apply settings anyway? DialogSpline First point - Ensimmäinen piste + Ensimmäinen piste Length ratio of the first control point - Ensimmäisen kontrollipisteen pituussuhde + Ensimmäisen kontrollipisteen pituussuhde The angle of the first control point - Ensimmäisen kontrollipisteen kulma + Ensimmäisen kontrollipisteen kulma Second point - Toinen piste + Toinen piste Length ratio of the second control point - Toisen kontrollipisteen pituussuhde + Toisen kontrollipisteen pituussuhde The angle of the second control point - Toisen kontrollipisteen kulma + Toisen kontrollipisteen kulma Coefficient of curvature of the curve @@ -3478,6 +3478,34 @@ Apply settings anyway? Color: + + First point: + + + + Control point + + + + Angle: + + + + Length ratio: + + + + Second point: + + + + Name: + Nmi: + + + Invalid spline + + DialogSplinePath @@ -3487,23 +3515,23 @@ Apply settings anyway? Point of curve - Käyrän piste + Käyrän piste Length ratio of the first control point - Ensimmäisen kontrollipisteen pituussuhde + Ensimmäisen kontrollipisteen pituussuhde The angle of the first control point - Ensimmäisen kontrollipisteen kulma + Ensimmäisen kontrollipisteen kulma Length ratio of the second control point - Toisen kontrollipisteen pituussuhde + Toisen kontrollipisteen pituussuhde The angle of the second control point - Toisen kontrollipisteen kulma + Toisen kontrollipisteen kulma List of points @@ -3529,6 +3557,34 @@ Apply settings anyway? Color: + + Point: + + + + First control point + + + + Angle: + + + + Length ratio: + + + + Second control point + + + + Name: + Nmi: + + + Invalid spline path + + DialogTool @@ -6967,6 +7023,10 @@ Do you want to save your changes? Horizontal correction + + Name + Nimi + VTranslateVars diff --git a/share/translations/valentina_fr_FR.ts b/share/translations/valentina_fr_FR.ts index 58b22c4b7..1ecef5e7f 100644 --- a/share/translations/valentina_fr_FR.ts +++ b/share/translations/valentina_fr_FR.ts @@ -3510,27 +3510,27 @@ Appliquer les réglages quand-même ? DialogSpline First point - Premier point + Premier point Length ratio of the first control point - Ratio de longueur du premier point de contrôle + Ratio de longueur du premier point de contrôle The angle of the first control point - Angle du premier point de contrôle + Angle du premier point de contrôle Second point - Deuxième point + Deuxième point Length ratio of the second control point - Ratio de longueur du deuxième point de contrôle + Ratio de longueur du deuxième point de contrôle The angle of the second control point - Angle du deuxième point de contrôle + Angle du deuxième point de contrôle Coefficient of curvature of the curve @@ -3556,6 +3556,34 @@ Appliquer les réglages quand-même ? Color: Couleur: + + First point: + Premier point: + + + Control point + + + + Angle: + Angle: + + + Length ratio: + + + + Second point: + Deuxième point: + + + Name: + Nom: + + + Invalid spline + + DialogSplinePath @@ -3565,23 +3593,23 @@ Appliquer les réglages quand-même ? Point of curve - Point de courbe + Point de courbe Length ratio of the first control point - Ratio de longueur du premier point de contrôle + Ratio de longueur du premier point de contrôle The angle of the first control point - Angle du premier point de contrôle + Angle du premier point de contrôle Length ratio of the second control point - Ratio de longueur du deuxième point de contrôle + Ratio de longueur du deuxième point de contrôle The angle of the second control point - Angle du deuxième point de contrôle + Angle du deuxième point de contrôle List of points @@ -3607,6 +3635,34 @@ Appliquer les réglages quand-même ? Color: Couleur: + + Point: + + + + First control point + + + + Angle: + Angle: + + + Length ratio: + + + + Second control point + + + + Name: + Nom: + + + Invalid spline path + + DialogTool @@ -7099,6 +7155,10 @@ Voulez-vous enregistrer les changements? Horizontal correction + + Name + Nom + VTranslateVars diff --git a/share/translations/valentina_he_IL.ts b/share/translations/valentina_he_IL.ts index 9dd932de8..2c1df7029 100644 --- a/share/translations/valentina_he_IL.ts +++ b/share/translations/valentina_he_IL.ts @@ -3144,27 +3144,11 @@ Apply settings anyway? DialogSpline First point - נקודה ראשונה - - - Length ratio of the first control point - - - - The angle of the first control point - + נקודה ראשונה Second point - נקודה שנייה - - - Length ratio of the second control point - - - - The angle of the second control point - + נקודה שנייה Select last point of curve @@ -3182,6 +3166,34 @@ Apply settings anyway? Color: + + First point: + + + + Control point + + + + Angle: + + + + Length ratio: + + + + Second point: + + + + Name: + + + + Invalid spline + + DialogSplinePath @@ -3189,26 +3201,6 @@ Apply settings anyway? Curved path - - Point of curve - - - - Length ratio of the first control point - - - - The angle of the first control point - - - - Length ratio of the second control point - - - - The angle of the second control point - - List of points @@ -3225,6 +3217,34 @@ Apply settings anyway? Color: + + Point: + + + + First control point + + + + Angle: + + + + Length ratio: + + + + Second control point + + + + Name: + + + + Invalid spline path + + DialogTool @@ -6595,6 +6615,10 @@ Do you want to save your changes? Horizontal correction + + Name + + VTranslateVars diff --git a/share/translations/valentina_id_ID.ts b/share/translations/valentina_id_ID.ts index bd01e270c..e4b85a495 100644 --- a/share/translations/valentina_id_ID.ts +++ b/share/translations/valentina_id_ID.ts @@ -3686,27 +3686,11 @@ Apply settings anyway? DialogSpline First point - Titik pertama - - - Length ratio of the first control point - - - - The angle of the first control point - + Titik pertama Second point - titik kedua - - - Length ratio of the second control point - - - - The angle of the second control point - + titik kedua Select last point of curve @@ -3724,6 +3708,34 @@ Apply settings anyway? Color: + + First point: + + + + Control point + + + + Angle: + + + + Length ratio: + + + + Second point: + + + + Name: + + + + Invalid spline + + DialogSplinePath @@ -3731,26 +3743,6 @@ Apply settings anyway? Curved path - - Point of curve - - - - Length ratio of the first control point - - - - The angle of the first control point - - - - Length ratio of the second control point - - - - The angle of the second control point - - List of points @@ -3767,6 +3759,34 @@ Apply settings anyway? Color: + + Point: + + + + First control point + + + + Angle: + + + + Length ratio: + + + + Second control point + + + + Name: + + + + Invalid spline path + + DialogStandardMeasurements @@ -7269,6 +7289,10 @@ Do you want to save your changes? Horizontal correction + + Name + Nama + VTranslateVars diff --git a/share/translations/valentina_it_IT.ts b/share/translations/valentina_it_IT.ts index dd938ff00..f6431b921 100644 --- a/share/translations/valentina_it_IT.ts +++ b/share/translations/valentina_it_IT.ts @@ -3521,27 +3521,27 @@ Applicare le impostazioni comunque? DialogSpline First point - Primo punto + Primo punto Length ratio of the first control point - Coefficiente di lunghezza del primo punto di controllo + Coefficiente di lunghezza del primo punto di controllo The angle of the first control point - Angolo del primo punto di controllo + Angolo del primo punto di controllo Second point - Secondo punto + Secondo punto Length ratio of the second control point - Coefficiente di lunghezza del secondo punto di controllo + Coefficiente di lunghezza del secondo punto di controllo The angle of the second control point - Angolo del secondo punto di controllo + Angolo del secondo punto di controllo Coefficient of curvature of the curve @@ -3567,6 +3567,34 @@ Applicare le impostazioni comunque? Color: Colore + + First point: + Primo punto + + + Control point + + + + Angle: + Angolo + + + Length ratio: + + + + Second point: + + + + Name: + Nome: + + + Invalid spline + + DialogSplinePath @@ -3576,23 +3604,23 @@ Applicare le impostazioni comunque? Point of curve - Punto della curva + Punto della curva Length ratio of the first control point - Coefficiente di lunghezza del primo punto di controllo + Coefficiente di lunghezza del primo punto di controllo The angle of the first control point - Angolo del primo punto di controllo + Angolo del primo punto di controllo Length ratio of the second control point - Coefficiente di lunghezza del secondo punto di controllo + Coefficiente di lunghezza del secondo punto di controllo The angle of the second control point - Angolo del secondo punto di controllo + Angolo del secondo punto di controllo List of points @@ -3618,6 +3646,34 @@ Applicare le impostazioni comunque? Color: Colore + + Point: + + + + First control point + + + + Angle: + Angolo + + + Length ratio: + + + + Second control point + + + + Name: + Nome: + + + Invalid spline path + + DialogTool @@ -7175,6 +7231,10 @@ Vuoi salvare le tue modifiche? Horizontal correction + + Name + Nome + VTranslateVars diff --git a/share/translations/valentina_nl_NL.ts b/share/translations/valentina_nl_NL.ts index aba28dabb..3659158d3 100644 --- a/share/translations/valentina_nl_NL.ts +++ b/share/translations/valentina_nl_NL.ts @@ -3511,27 +3511,27 @@ Apply settings anyway? DialogSpline First point - Eerste punt + Eerste punt Length ratio of the first control point - Lengteverhouding van het eerste controlepunt + Lengteverhouding van het eerste controlepunt The angle of the first control point - De hoek van het eerste controlepunt + De hoek van het eerste controlepunt Second point - Tweede punt + Tweede punt Length ratio of the second control point - Lengteverhouding van het tweede controlepunt + Lengteverhouding van het tweede controlepunt The angle of the second control point - De hoek van het tweede controlepunt + De hoek van het tweede controlepunt Coefficient of curvature of the curve @@ -3557,6 +3557,34 @@ Apply settings anyway? Color: + + First point: + + + + Control point + + + + Angle: + + + + Length ratio: + + + + Second point: + + + + Name: + Naam: + + + Invalid spline + + DialogSplinePath @@ -3566,23 +3594,23 @@ Apply settings anyway? Point of curve - Punt van kromming + Punt van kromming Length ratio of the first control point - Lengteverhouding van het eerste controlepunt + Lengteverhouding van het eerste controlepunt The angle of the first control point - De hoek van het eerste controlepunt + De hoek van het eerste controlepunt Length ratio of the second control point - Lengteverhouding van het tweede controlepunt + Lengteverhouding van het tweede controlepunt The angle of the second control point - De hoek van het tweede controlepunt + De hoek van het tweede controlepunt List of points @@ -3608,6 +3636,34 @@ Apply settings anyway? Color: + + Point: + + + + First control point + + + + Angle: + + + + Length ratio: + + + + Second control point + + + + Name: + Naam: + + + Invalid spline path + + DialogTool @@ -7126,6 +7182,10 @@ Wil je deze veranderingen opslaan? Horizontal correction + + Name + Naam + VTranslateVars diff --git a/share/translations/valentina_ro_RO.ts b/share/translations/valentina_ro_RO.ts index 363985603..f034bba16 100644 --- a/share/translations/valentina_ro_RO.ts +++ b/share/translations/valentina_ro_RO.ts @@ -3420,27 +3420,27 @@ Apply settings anyway? DialogSpline First point - Primul Punct + Primul Punct Length ratio of the first control point - Raport lungime al primului punct de control + Raport lungime al primului punct de control The angle of the first control point - Unghiul primului punct de control + Unghiul primului punct de control Second point - Al doilea punct + Al doilea punct Length ratio of the second control point - Raport lungime al celui de al doilea punct de control + Raport lungime al celui de al doilea punct de control The angle of the second control point - Unghiul celui de al doilea punct de control + Unghiul celui de al doilea punct de control Coefficient of curvature of the curve @@ -3466,6 +3466,34 @@ Apply settings anyway? Color: Culoare: + + First point: + Primul Punct: + + + Control point + + + + Angle: + Unghi: + + + Length ratio: + + + + Second point: + Al doilea punct: + + + Name: + + + + Invalid spline + + DialogSplinePath @@ -3475,23 +3503,23 @@ Apply settings anyway? Point of curve - Punctul curbei + Punctul curbei Length ratio of the first control point - Raport lungime al primului punct de control + Raport lungime al primului punct de control The angle of the first control point - Unghiul primului punct de control + Unghiul primului punct de control Length ratio of the second control point - Raport lungime al celui de al doilea punct de control + Raport lungime al celui de al doilea punct de control The angle of the second control point - Unghiul celui de al doilea punct de control + Unghiul celui de al doilea punct de control List of points @@ -3517,6 +3545,34 @@ Apply settings anyway? Color: Culoare: + + Point: + + + + First control point + + + + Angle: + Unghi: + + + Length ratio: + + + + Second control point + + + + Name: + + + + Invalid spline path + + DialogTool @@ -6924,6 +6980,10 @@ Do you want to save your changes? Horizontal correction + + Name + Nume + VTranslateVars diff --git a/share/translations/valentina_ru_RU.ts b/share/translations/valentina_ru_RU.ts index 0368d1891..15cd9e63d 100644 --- a/share/translations/valentina_ru_RU.ts +++ b/share/translations/valentina_ru_RU.ts @@ -3520,27 +3520,27 @@ Apply settings anyway? DialogSpline First point - Первая точка + Первая точка Length ratio of the first control point - Коэффициент длины первой контрольной точки + Коэффициент длины первой контрольной точки The angle of the first control point - Угол первой контрольной точки + Угол первой контрольной точки Second point - Вторая точка + Вторая точка Length ratio of the second control point - Коэффициент длины второй контрольной точки + Коэффициент длины второй контрольной точки The angle of the second control point - Угол второй контрольной точки + Угол второй контрольной точки Coefficient of curvature of the curve @@ -3566,6 +3566,34 @@ Apply settings anyway? Color: Цвет: + + First point: + Первая точка: + + + Control point + + + + Angle: + Угол: + + + Length ratio: + + + + Second point: + Вторая точка: + + + Name: + + + + Invalid spline + + DialogSplinePath @@ -3575,23 +3603,23 @@ Apply settings anyway? Point of curve - Точка кривой + Точка кривой Length ratio of the first control point - Коэффициент длины первой контрольной точки + Коэффициент длины первой контрольной точки The angle of the first control point - Угол первой контрольной точки + Угол первой контрольной точки Length ratio of the second control point - Коэффициент длины второй контрольной точки + Коэффициент длины второй контрольной точки The angle of the second control point - Угол второй контрольной точки + Угол второй контрольной точки List of points @@ -3617,6 +3645,34 @@ Apply settings anyway? Color: Цвет: + + Point: + + + + First control point + + + + Angle: + Угол: + + + Length ratio: + + + + Second control point + + + + Name: + + + + Invalid spline path + + DialogTool @@ -7192,6 +7248,10 @@ Do you want to save your changes? Horizontal correction + + Name + + VTranslateVars diff --git a/share/translations/valentina_uk_UA.ts b/share/translations/valentina_uk_UA.ts index 2626d2276..71bbe9425 100644 --- a/share/translations/valentina_uk_UA.ts +++ b/share/translations/valentina_uk_UA.ts @@ -3522,27 +3522,27 @@ Apply settings anyway? DialogSpline First point - Перша точка + Перша точка Length ratio of the first control point - Коефіцієнт довжини першої контрольної точки + Коефіцієнт довжини першої контрольної точки The angle of the first control point - Кут першої контрольної точки + Кут першої контрольної точки Second point - Друга точка + Друга точка Length ratio of the second control point - Коефіцієнт довжини другої контрольної точки + Коефіцієнт довжини другої контрольної точки The angle of the second control point - Кут другої контрольної точки + Кут другої контрольної точки Coefficient of curvature of the curve @@ -3568,6 +3568,34 @@ Apply settings anyway? Color: Колір: + + First point: + Перша точка: + + + Control point + + + + Angle: + Кут: + + + Length ratio: + + + + Second point: + Друга точка: + + + Name: + Імя: + + + Invalid spline + + DialogSplinePath @@ -3577,23 +3605,23 @@ Apply settings anyway? Point of curve - Точка кривої + Точка кривої Length ratio of the first control point - Коефіцієнт довжини першої контрольної точки + Коефіцієнт довжини першої контрольної точки The angle of the first control point - Кут першої контрольної точки + Кут першої контрольної точки Length ratio of the second control point - Коефіцієнт довжини другої контрольної точки + Коефіцієнт довжини другої контрольної точки The angle of the second control point - Кут другої контрольної точки + Кут другої контрольної точки List of points @@ -3619,6 +3647,34 @@ Apply settings anyway? Color: Колір: + + Point: + + + + First control point + + + + Angle: + Кут: + + + Length ratio: + + + + Second control point + + + + Name: + Імя: + + + Invalid spline path + + DialogTool @@ -7192,6 +7248,10 @@ Do you want to save your changes? Horizontal correction + + Name + Позначення + VTranslateVars diff --git a/share/translations/valentina_zh_CN.ts b/share/translations/valentina_zh_CN.ts index 17824e2b1..853aeb3d2 100644 --- a/share/translations/valentina_zh_CN.ts +++ b/share/translations/valentina_zh_CN.ts @@ -1135,7 +1135,7 @@ - + Ready! @@ -1145,22 +1145,22 @@ - + You need more points! - + You have to choose points in a clockwise direction! - + First point cannot be equal to the last point! - + You have double points! @@ -3505,50 +3505,58 @@ Apply settings anyway? - - First point + + First point: - - Length ratio of the first control point + + + Control point - - The angle of the first control point + + + Angle: - - Second point + + + Length ratio: - - Length ratio of the second control point + + Second point: - - The angle of the second control point - - - - + Coefficient of curvature of the curve: - + Color: + + + Name: + + Select last point of curve + + + Invalid spline + + DialogSplinePath @@ -3559,49 +3567,61 @@ Apply settings anyway? - Point of curve + Point: - - Length ratio of the first control point + + First control point - - The angle of the first control point + + + Angle: - - Length ratio of the second control point + + + Length ratio: - - The angle of the second control point + + Second control point - + List of points - + Coefficient of curvature of the curve: - + Color: - + + Name: + + + + Select point of curve path + + + Invalid spline path + + DialogTool @@ -3636,34 +3656,34 @@ Apply settings anyway? - - - - + + + + Error - - - + + + Empty field - + Value can't be 0 - + Value - - + + Parser error: %1 @@ -4242,7 +4262,7 @@ Apply settings anyway? - + Measurements @@ -4334,7 +4354,7 @@ Apply settings anyway? - + Save @@ -4445,7 +4465,7 @@ Apply settings anyway? - + Preferences @@ -4661,549 +4681,549 @@ Apply settings anyway? - + New pattern - + Open pattern - + Create/Edit measurements - - + + Pattern piece %1 - - + + Measurement file has unknown format. - - + + Measurement file contains invalid known measurement(s). - - + + Measurement file doesn't include all required measurements. - - + + Please, additionaly provide: %1 - + Wrong units. - + Application doesn't support standard table with inches. - - - - - + + + + + File error. - + Measurement files types have not match. - - - + + + Select point - + Select first point - - - + + + Select first point of line - + Select first point of angle - + Select first point of first line - + Select first point curve - + Select simple curve - + Select point of center of arc - + Select point of curve path - + Select curve path - + Select points, arcs, curves clockwise. - + Select base point - + Select first point of axis - + Select point for X value (vertical) - + Select detail - - + + Select arc - + Select curve - + Select first an arc - + Select first circle center - + Select first curve - - + + Select point on tangent - + Select point of the center of the arc - + Select the first base line point - + About Qt - - + + &Undo - - + + &Redo - - + + Pattern Piece: - - + + Individual measurements (*.vit);;Standard measurements (*.vst) - - - - - - + + + + + + Open file - - + + Measurements loaded - + Standard measurements (*.vst);;Individual measurements (*.vit) - + Measurements unloaded - + Couldn't unload measurements. Some of them are used in the pattern. - + Measurements was synced - + Couldn't sync measurements. - + Measurements was changed. Do you want to sync measurements now? - + Height: - + Size: - + %1, %2 (%3) Coords in status line: "X, Y (units)" - + Detail mode - + You can't use now the Detail mode. Please, create at least one workpiece. - + Layout mode - + You can't use now the Layout mode. Please, create at least one workpiece. - - + + Pattern files (*.val) - - + + pattern - + Save as - + Failed to lock. This file already opened in another window. - - + + Could not save file - + Failed to lock. This file already opened in another window. Expect collissions when run 2 copies of the program. - - + + Error parsing file. - + Error can't convert value. - - + + Error empty parameter. - + Error wrong id. - + Error parsing file (std::bad_alloc). - + Bad id. - - + + Couldn't update measurements. - + File saved - + Unsaved changes - + The pattern has been modified. Do you want to save your changes? - + Save... - + Don't Save - + Pattern piece: - + Enter a new label for the pattern piece. - - + + The measurements file '%1' could not be found. - + File loaded - + Valentina didn't shut down correctly. Do you want reopen files (%1) you had open? - + Reopen files. - + The measurements file <br/><br/> <b>%1</b> <br/><br/> could not be found. Do you want to update the file location - + Loading measurements file - + Standard measurements (*.vst) - + Individual measurements (*.vit) - + You can't export empty scene. - + Export error. - + Not supported size value '%1' for this pattern file. - + Couldn't set size. Need a file with standard measurements. - + Couldn't set size. File wasn't opened. - - + + The method %1 does nothing in GUI mode - + Not supported height value '%1' for this pattern file. - + Couldn't set height. Need a file with standard measurements. - + Couldn't set height. File wasn't opened. - + Please, provide one input file. - + untitled.val - + (read only) - - + + Locking file - + This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption). - + The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption). - + Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption). - + This file already opened in another window. - + The lock file could not be created, for lack of permissions. - + Unknown error happened, for instance a full partition prevented writing out the lock file. @@ -5520,12 +5540,12 @@ Do you want to save your changes? QObject - + Create new pattern piece to start working. - + Changes applied. @@ -6792,7 +6812,7 @@ Do you want to save your changes? VAbstractPattern - + Can't find tool in table. @@ -7268,12 +7288,12 @@ Do you want to save your changes? - + Options - + Delete @@ -7350,234 +7370,234 @@ Do you want to save your changes? VPattern - + Error not unique id. - - + + Error parsing file. - + Error can't convert value. - + Error empty parameter. - + Error wrong id. - + Error parsing file (std::bad_alloc). - - - + + + Wrong tag name '%1'. - + Error creating or updating detail - + Unknown point type '%1'. - + Error creating or updating line - + Error creating or updating single point - - + + Error creating or updating point of end line - - + + Error creating or updating point along line - - + + Error creating or updating point of shoulder - - + + Error creating or updating point of normal - - + + Error creating or updating point of bisector - + Error creating or updating point of lineintersection - - + + Error creating or updating point of contact - + Error creating or updating modeling point - + Error creating or updating height - + Error creating or updating triangle - + Error creating or updating point of intersection - - + + Error creating or updating cut spline point - - + + Error creating or updating cut spline path point - - + + Error creating or updating cut arc point - - + + Error creating or updating point of intersection line and axis - - + + Error creating or updating point of intersection curve and axis - + Error creating or updating point of intersection arcs - + Error creating or updating point of intersection circles - + Error creating or updating point of intersection curves - + Error creating or updating point from circle and tangent - + Error creating or updating point from arc and tangent - + Error creating or updating true darts - + Error creating or updating simple curve - + Error creating or updating curve path - + Error creating or updating modeling simple curve - + Error creating or updating modeling curve path - - - - + + + + Error creating or updating simple arc - + Error creating or updating modeling arc - + Unknown spline type '%1'. - + Unknown arc type '%1'. - + Error creating or updating union details - + Unknown tools type '%1'. @@ -7585,7 +7605,7 @@ Do you want to save your changes? VPatternConverter - + Error restoring backup file: %1. @@ -7593,19 +7613,19 @@ Do you want to save your changes? VSplinePath - + Not enough points to create the spline. - - - + + + This spline does not exist. - + Can't cut spline path with one point @@ -7613,12 +7633,12 @@ Do you want to save your changes? VToolDetail - + Options - + Delete @@ -7626,326 +7646,332 @@ Do you want to save your changes? VToolOptionsPropertyBrowser - + First point - + Second point - + Highest point - + Lowest point - + Leftmost point - + Rightmost point - + Base point - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + Point label - + Position - + Point at distance and angle - - - - - - - - - + + + + + + + + + Line type - - - - - - - - - + + + + + + + + + Line color - - - - - - - - - + + + + + + + + + Length - - - + + + Angle - + Point at distance along line - + Arc - - - + + + Radius - - + + First angle - + Second angle - - - - - - - + + + + + + + Color - + Arc with given length - + Point along bisector - + True darts - + Point 1 label - + Point 2 label - + Cut arc tool - + Tool for segmenting a curve - + Tool segment a pathed curve - + Perpendicular point along line - + Line between points - + Point at line intersection - + Point along perpendicular - + Additional angle degrees - + Point at intersection of arc and line - + Tool to make point from x & y of two other points - + Tool to make point from intersection two arcs - - - - + + + + Take - + Tool to make point from intersection two circles - + First circle radius - + Second circle radius - + Tool to make point from intersection two curves - + Vertical correction - + Horizontal correction - + Tool to make point from circle and tangent - + Circle radius - + Tool to make point from arc and tangent - + Special point on shoulder - + Curve tool - - + + + Name + + + + + Curve factor - + Tool for path curve - + Tool triangle - + Point intersection line and axis - + Point intersection curve and axis @@ -9225,12 +9251,12 @@ Do you want to save your changes? VisToolSplinePath - + <b>Curved path</b>: select three or more points - + <b>Curved path</b>: select three or more points, <b>Enter</b> - finish creation From 39c88a812e0598b43ba20884058a26f532ada4c7 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 16 Feb 2016 20:55:52 +0200 Subject: [PATCH 26/59] Correct path to NSIS on Win x64. --HG-- branch : develop --- scripts/make_install.bat | 11 ++++++++--- src/app/valentina/valentina.pro | 6 +++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/scripts/make_install.bat b/scripts/make_install.bat index cd0b1cc79..71d9ef8b2 100644 --- a/scripts/make_install.bat +++ b/scripts/make_install.bat @@ -1,7 +1,12 @@ rem script helps create installer -rem Path to NSIS -set nsis_path="C:\Program Files\NSIS\makensisw.exe" +rem find target architecture +reg Query "HKLM\Hardware\Description\System\CentralProcessor\0" | find /i "x86" > NUL && set ARCHITECTURE=32BIT || set ARCHITECTURE=64BIT + +rem Path to NSIS according to architecture +if %ARCHITECTURE%==32BIT set nsis_path="C:\Program Files\NSIS\makensisw.exe" +if %ARCHITECTURE%==64BIT set nsis_path="C:\Program Files (x86)\NSIS\makensisw.exe" + if not exist %nsis_path% ( SET /P promt="Coudn't find NSIS. Do you want to continue?[Y\N]" IF "%promt%" == "Y" GOTO PREPARE @@ -50,4 +55,4 @@ echo Failed to make the first run qmake! exit /b 1 :ONEXIT echo Done! -@pause \ No newline at end of file +@pause diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index f0645eaeb..a7ce989f4 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -431,7 +431,11 @@ win32:*-g++ { package_printsupport.files += $$[QT_INSTALL_PLUGINS]/printsupport/windowsprintersupport.dll INSTALLS += package_printsupport - NSIS_MAKENSISW = "C:/Program Files/NSIS/makensisw.exe" + contains(QT_ARCH, i386) { + NSIS_MAKENSISW = "C:/Program Files/NSIS/makensisw.exe" + } else { + NSIS_MAKENSISW = "C:/Program Files (x86)/NSIS/makensisw.exe" + } exists($$NSIS_MAKENSISW) { package_nsis.path = $${OUT_PWD}/../../../package From b42710f8d008d31c7ee3f8ca8b41cd64759ababc Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 17 Feb 2016 10:11:36 +0200 Subject: [PATCH 27/59] Measurement Diagram is not shown on Mac OS X. (grafted from 34490ebbc73d0f9c0360883903cd010fb6bea8f8) --HG-- branch : develop --- src/app/tape/tape.pro | 2 +- src/app/valentina/valentina.pro | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro index a0dfb7f3d..d91843c06 100644 --- a/src/app/tape/tape.pro +++ b/src/app/tape/tape.pro @@ -231,7 +231,7 @@ unix{ # Copy to bundle standard measurements files # We cannot add none exist files to bundle through QMAKE_BUNDLE_DATA. That's why we must do this manually. - forceCopyToDestdir($${OUT_PWD}/$${DESTDIR}/diagrams.rcc, $$shell_path($${OUT_PWD}/$$DESTDIR/$${TARGET}.app/$$RESOURCES_DIR/)) + QMAKE_POST_LINK += $$VCOPY $$quote($${OUT_PWD}/$${DESTDIR}/diagrams.rcc) $$quote($$shell_path($${OUT_PWD}/$$DESTDIR/$${TARGET}.app/$$RESOURCES_DIR/)) $$escape_expand(\\n\\t) format.path = $$RESOURCES_DIR/ format.files += $$PWD/../../../dist/macx/i-measurements.icns diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index a7ce989f4..7fd1bf6a7 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -294,6 +294,10 @@ unix{ icns_resources.files += $$PWD/../../../dist/macx/s-measurements.icns icns_resources.files += $$PWD/../../../dist/macx/pattern.icns + # Copy to bundle standard measurements files + # We cannot add none exist files to bundle through QMAKE_BUNDLE_DATA. That's why we must do this manually. + QMAKE_POST_LINK += $$VCOPY $$quote($${OUT_PWD}/../tape/$${DESTDIR}/tape.app/$$RESOURCES_DIR/diagrams.rcc) $$quote($$shell_path($${OUT_PWD}/$$DESTDIR/$${TARGET}.app/$$RESOURCES_DIR/)) $$escape_expand(\\n\\t) + QMAKE_BUNDLE_DATA += \ templates \ standard \ From e0d7f8c12f2c208f9a179c375da34c3d8d3f8111 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 17 Feb 2016 10:11:43 +0200 Subject: [PATCH 28/59] Changelog. (grafted from 91f98f5481b4493c02c29739a9be48421d803579) --HG-- branch : develop --- ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 7c4b7442c..4d7038b75 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -9,6 +9,7 @@ - [#325] Check pattern for inverse compatibility. # Version 0.4.2 +- Measurement Diagram is not shown on Mac OS X. - In dialog 'tool Spline Path' fixed broken selecting new point into the list of points. - Regesign dialogs tool 'Spline' and 'Spline Path' for avoiding text squeeze. - Fixed getting correct reversed segment for single in the list curve. From 40806aea1b0a9201a13206f56a7f5afda7cbc215 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 17 Feb 2016 12:58:18 +0200 Subject: [PATCH 29/59] Updated Info.plist files. --HG-- branch : develop --- dist/macx/tape/Info.plist | 2 +- dist/macx/valentina/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/macx/tape/Info.plist b/dist/macx/tape/Info.plist index 2b12a39d2..89c9297e2 100755 --- a/dist/macx/tape/Info.plist +++ b/dist/macx/tape/Info.plist @@ -11,7 +11,7 @@ LSMinimumSystemVersion 10.6 NSHumanReadableCopyright - © 2013-2015, Valentina project + © 2013-2016, Valentina project CFBundleSignature @TYPEINFO@ CFBundleExecutable diff --git a/dist/macx/valentina/Info.plist b/dist/macx/valentina/Info.plist index ea18f432a..e4a9abb3e 100755 --- a/dist/macx/valentina/Info.plist +++ b/dist/macx/valentina/Info.plist @@ -11,7 +11,7 @@ LSMinimumSystemVersion 10.6 NSHumanReadableCopyright - © 2013-2015, Valentina project + © 2013-2016, Valentina project CFBundleSignature @TYPEINFO@ CFBundleExecutable From ed3a35d8aa956a07cf6cb38a75e344dddcd106ad Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 17 Feb 2016 13:00:01 +0200 Subject: [PATCH 30/59] Updated changelog. Release 0.4.2. (grafted from f484ccea54f7e8a5846fb4bc16be114a9b891946) --HG-- branch : develop --- ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 4d7038b75..cdb2804f2 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -8,7 +8,7 @@ - New icon for VAL file. Updated Tape logo. Updated ico for standard measurements. - [#325] Check pattern for inverse compatibility. -# Version 0.4.2 +# Version 0.4.2 February 17, 2016 - Measurement Diagram is not shown on Mac OS X. - In dialog 'tool Spline Path' fixed broken selecting new point into the list of points. - Regesign dialogs tool 'Spline' and 'Spline Path' for avoiding text squeeze. From 701fd529ddbb270f6ff31c4b4095a2a4c62f4225 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 17 Feb 2016 13:01:41 +0200 Subject: [PATCH 31/59] Updated version inside package scripts. (grafted from 25b56016a52ee0e1410cd812855862250ac308bc) --HG-- branch : develop --- dist/debian/changelog | 2 +- dist/rpm/_service | 2 +- dist/rpm/valentina.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/debian/changelog b/dist/debian/changelog index a16a008c0..c8d384446 100644 --- a/dist/debian/changelog +++ b/dist/debian/changelog @@ -1,4 +1,4 @@ -valentina (0.4.0) trusty; urgency=low +valentina (0.4.2) trusty; urgency=low * Auto build. diff --git a/dist/rpm/_service b/dist/rpm/_service index 2793420ad..f89890779 100644 --- a/dist/rpm/_service +++ b/dist/rpm/_service @@ -1,7 +1,7 @@ https://github.com/dismine/Valentina.git - 0.4.0 + 0.4.2 valentina git %at diff --git a/dist/rpm/valentina.spec b/dist/rpm/valentina.spec index ba7ca9f4b..0f6d30427 100644 --- a/dist/rpm/valentina.spec +++ b/dist/rpm/valentina.spec @@ -45,7 +45,7 @@ BuildRequires: libqt5-qtxmlpatterns-devel Requires: poppler-utils -Version: 0.4.0 +Version: 0.4.2 Release: 0 URL: https://bitbucket.org/dismine/valentina License: GPL-3.0+ From b449e16b8159a0f7cb1bbdd8d7290672030ef1c7 Mon Sep 17 00:00:00 2001 From: Thomas HOCEDEZ Date: Thu, 18 Feb 2016 12:18:14 +0100 Subject: [PATCH 32/59] #385 : final version --HG-- branch : feature --- src/app/tape/tmainwindow.cpp | 73 +++++++++++++++++++++++++++++++++++- src/app/tape/tmainwindow.h | 6 +++ 2 files changed, 78 insertions(+), 1 deletion(-) diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index 4581ad96d..7af449841 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -117,6 +117,12 @@ TMainWindow::TMainWindow(QWidget *parent) ui->mainToolBar->setContextMenuPolicy(Qt::PreventContextMenu); ui->toolBarGradation->setContextMenuPolicy(Qt::PreventContextMenu); + for (int i = 0; i < MaxRecentFiles; ++i) + { + recentFileActs[i] = nullptr; + } + separatorAct=nullptr; + SetupMenu(); setWindowTitle(tr("untitled %1").arg(qApp->MainWindows().size()+1)); @@ -165,7 +171,7 @@ void TMainWindow::RetranslateTable() } } -//--------------------------------------------------------------------------------------------------------------------- +//--------separatorAct------------------------------------------------------------------------------------------------------------- void TMainWindow::SetBaseMHeight(int height) { if (m != nullptr) @@ -1735,6 +1741,20 @@ void TMainWindow::SetupMenu() connect(ui->actionReadOnly, &QAction::triggered, this, &TMainWindow::ReadOnly); connect(ui->actionPreferences, &QAction::triggered, this, &TMainWindow::Preferences); + for (int i = 0; i < MaxRecentFiles; ++i) + { + recentFileActs[i] = new QAction(this); + connect(recentFileActs[i], &QAction::triggered, this, &TMainWindow::OpenRecentFile); + ui->menuFile->insertAction(ui->actionPreferences, recentFileActs[i]); + recentFileActs[i]->setVisible(false); + } + + separatorAct = new QAction(this); + separatorAct->setSeparator(true); + separatorAct->setVisible(false); + ui->menuFile->insertAction(ui->actionPreferences, separatorAct ); + + connect(ui->actionQuit, &QAction::triggered, this, &TMainWindow::close); ui->actionQuit->setShortcuts(QKeySequence::Quit); @@ -1755,6 +1775,10 @@ void TMainWindow::SetupMenu() // Help connect(ui->actionAboutQt, &QAction::triggered, this, &TMainWindow::AboutQt); connect(ui->actionAboutTape, &QAction::triggered, this, &TMainWindow::AboutApplication); + + //Actions for recent files loaded by a tape window application. + UpdateRecentFileActions(); + } //--------------------------------------------------------------------------------------------------------------------- @@ -2025,6 +2049,16 @@ void TMainWindow::SetCurrentFile(const QString &fileName) ui->lineEditPathToFile->setText(QDir::toNativeSeparators(curFile)); ui->lineEditPathToFile->setToolTip(QDir::toNativeSeparators(curFile)); ui->pushButtonShowInExplorer->setEnabled(true); + VTapeSettings *settings = qApp->TapeSettings(); + QStringList files = settings->GetRecentFileList(); + files.removeAll(fileName); + files.prepend(fileName); + while (files.size() > MaxRecentFiles) + { + files.removeLast(); + } + settings->SetRecentFileList(files); + UpdateRecentFileActions(); } shownName += "[*]"; setWindowTitle(shownName); @@ -2689,6 +2723,30 @@ bool TMainWindow::LoadFromExistingFile(const QString &path) return true; } +//--------------------------------------------------------------------------------------------------------------------- +void TMainWindow::UpdateRecentFileActions() +{ + qCDebug(tMainWindow, "Updating recent file actions."); + const QStringList files = qApp->TapeSettings()->GetRecentFileList(); + const int numRecentFiles = qMin(files.size(), static_cast(MaxRecentFiles)); + qCDebug(tMainWindow, "Updating recent file actions = %i ",numRecentFiles); + + for (int i = 0; i < numRecentFiles; ++i) + { + QString text = QString("&%1. %2").arg(i + 1).arg(StrippedName(files.at(i))); + qCDebug(tMainWindow, "file %i = %s",numRecentFiles,text); + recentFileActs[i]->setText(text); + recentFileActs[i]->setData(files.at(i)); + recentFileActs[i]->setVisible(true); + } + + for (int j = numRecentFiles; j < MaxRecentFiles; ++j) + { + recentFileActs[j]->setVisible(false); + } + + separatorAct->setVisible(numRecentFiles>0); +} //--------------------------------------------------------------------------------------------------------------------- void TMainWindow::CreateWindowMenu(QMenu *menu) @@ -2722,6 +2780,19 @@ void TMainWindow::CreateWindowMenu(QMenu *menu) } } +//--------------------------------------------------------------------------------------------------------------------- +void TMainWindow::OpenRecentFile() +{ + if (auto action=qobject_cast(sender())) + { + const QString filePath = action->data().toString(); + if (not filePath.isEmpty()) + { + LoadFile(filePath); + } + } +} + //--------------------------------------------------------------------------------------------------------------------- bool TMainWindow::IgnoreLocking(int error, const QString &path) { diff --git a/src/app/tape/tmainwindow.h b/src/app/tape/tmainwindow.h index e9225a279..49704b1c3 100644 --- a/src/app/tape/tmainwindow.h +++ b/src/app/tape/tmainwindow.h @@ -69,6 +69,7 @@ public slots: void OpenStandard(); void OpenTemplate(); void CreateFromExisting(); + void OpenRecentFile(); protected: virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; @@ -152,6 +153,10 @@ private: QAction *actionDockDiagram; bool dockDiagramVisible; bool isInitialized; + enum { MaxRecentFiles = 5 }; + QAction *recentFileActs[MaxRecentFiles]; + QAction *separatorAct; + void SetupMenu(); void InitWindow(); @@ -163,6 +168,7 @@ private: void ShowUnits(); void ShowHeaderUnits(QTableWidget *table, int column, const QString &unit); + void UpdateRecentFileActions(); void MeasurementsWasSaved(bool saved); void SetCurrentFile(const QString &fileName); From 207055925060cc62e3246132fdfaab63388c730d Mon Sep 17 00:00:00 2001 From: Thomas HOCEDEZ Date: Thu, 18 Feb 2016 11:23:00 +0000 Subject: [PATCH 33/59] =?UTF-8?q?tmainwindow.cpp=20=C3=A9dit=C3=A9=20en=20?= =?UTF-8?q?ligne=20via=20Bitbucket?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --HG-- branch : feature --- src/app/tape/tmainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index 7af449841..6cdccfe26 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -171,7 +171,7 @@ void TMainWindow::RetranslateTable() } } -//--------separatorAct------------------------------------------------------------------------------------------------------------- +//--------------------------------------------------------------------------------------------------------------------- void TMainWindow::SetBaseMHeight(int height) { if (m != nullptr) From 4c403056752b2a1c60446c1e495ffed8c768a3b9 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 18 Feb 2016 16:14:11 +0200 Subject: [PATCH 34/59] Gentoo ebuild templates for stable and unstable packages. --HG-- branch : develop --- .../valentina-0.0.0(template_stable).ebuild | 48 +++++++++++++++++++ ...tina-0.0.0_alpha(template_unstable).ebuild | 48 +++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 dist/ebuild/valentina-0.0.0(template_stable).ebuild create mode 100644 dist/ebuild/valentina-0.0.0_alpha(template_unstable).ebuild diff --git a/dist/ebuild/valentina-0.0.0(template_stable).ebuild b/dist/ebuild/valentina-0.0.0(template_stable).ebuild new file mode 100644 index 000000000..c44f37ef8 --- /dev/null +++ b/dist/ebuild/valentina-0.0.0(template_stable).ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit qmake-utils + +DESCRIPTION="Cloth patternmaking software" +HOMEPAGE="http://www.valentina-project.org/" +SRC_URI="https://bitbucket.org/dismine/valentina/get/v0.0.0.zip -> ${P}.zip" + +LICENSE="GPL-3" +SLOT="1" +KEYWORDS="~amd64 ~x86" + +LANGS="ru_RU uk_UA de_DE cs_CZ he_IL fr_FR it_IT nl_NL id_ID es_ES fi_FI en_US en_CA en_IN ro_RO" +for X in ${LANGS} ; do + if [[ ${X} != "en" ]]; then + IUSE="${IUSE} linguas_${X}" + fi +done + +CDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + dev-qt/qtsvg:5 + dev-qt/linguist:5 + dev-qt/qtxmlpatterns:5 + dev-qt/qtprintsupport:5 + dev-qt/qtnetwork:5 + app-text/popple" +RDEPEND="${CDEPEND} +DEPEND="${CDEPEND} + app-arch/unzip" + +S=${WORKDIR}/dismine-${PN}-44d43351cb59 + +src_configure() { + eqmake5 CONFIG+=no_ccache CONFIG+=noDebugSymbols Valentina.pro -r +} + +src_install() { + emake install INSTALL_ROOT="${D}" +# dodoc Changelog.txt README.txt +} diff --git a/dist/ebuild/valentina-0.0.0_alpha(template_unstable).ebuild b/dist/ebuild/valentina-0.0.0_alpha(template_unstable).ebuild new file mode 100644 index 000000000..bb47a96b7 --- /dev/null +++ b/dist/ebuild/valentina-0.0.0_alpha(template_unstable).ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit mercurial qmake-utils + +DESCRIPTION="Cloth patternmaking software" +HOMEPAGE="http://www.valentina-project.org/" +SRC_URI="" +EHG_REPO_URI="https://bitbucket.org/dismine/valentina" +EHG_REVISION="develop" + +LICENSE="GPL-3" +SLOT="1" +KEYWORDS="~amd64 ~x86" + +LANGS="ru_RU uk_UA de_DE cs_CZ he_IL fr_FR it_IT nl_NL id_ID es_ES fi_FI en_US en_CA en_IN ro_RO zh_CN" +for X in ${LANGS} ; do + if [[ ${X} != "en" ]]; then + IUSE="${IUSE} linguas_${X}" + fi +done + +CDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + dev-qt/qtsvg:5 + dev-qt/linguist:5 + dev-qt/qtxmlpatterns:5 + dev-qt/qtprintsupport:5 + dev-qt/qtnetwork:5 + app-text/popple" +RDEPEND="${CDEPEND} +DEPEND="${CDEPEND} + dev-util/ccache" + +src_configure() { + eqmake5 Valentina.pro -r +} + +src_install() { + emake install INSTALL_ROOT="${D}" +# dodoc Changelog.txt README.txt +} From f58cd8c352628e0cf69f33d948a2ddf8f1292fd6 Mon Sep 17 00:00:00 2001 From: Thomas HOCEDEZ Date: Thu, 18 Feb 2016 14:56:37 +0000 Subject: [PATCH 35/59] =?UTF-8?q?ChangeLog.txt=20=C3=A9dit=C3=A9=20en=20li?= =?UTF-8?q?gne=20via=20Bitbucket?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --HG-- branch : thomas_hocedez/changelogtxt-dit-en-ligne-via-bitbucket-1455807397194 --- ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 503a48765..44eaabe80 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -7,6 +7,7 @@ - Added language Chinese (China). - New icon for VAL file. Updated Tape logo. Updated ico for standard measurements. - [#325] Check pattern for inverse compatibility. +- [#385] : Add 'Open Recent' option in Tape.exe, 'File' dropdown menu. # Version 0.4.2 - Fixed getting correct reversed segment for single in the list curve. From b68653c6601178c7a5e762456fffcad87e802b19 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 18 Feb 2016 17:35:47 +0200 Subject: [PATCH 37/59] Wrong poppler package name in ebuild scripts. --HG-- branch : develop --- dist/ebuild/valentina-0.0.0(template_stable).ebuild | 2 +- dist/ebuild/valentina-0.0.0_alpha(template_unstable).ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/ebuild/valentina-0.0.0(template_stable).ebuild b/dist/ebuild/valentina-0.0.0(template_stable).ebuild index c44f37ef8..a72bbbb0b 100644 --- a/dist/ebuild/valentina-0.0.0(template_stable).ebuild +++ b/dist/ebuild/valentina-0.0.0(template_stable).ebuild @@ -31,7 +31,7 @@ CDEPEND=" dev-qt/qtxmlpatterns:5 dev-qt/qtprintsupport:5 dev-qt/qtnetwork:5 - app-text/popple" + app-text/poppler" RDEPEND="${CDEPEND} DEPEND="${CDEPEND} app-arch/unzip" diff --git a/dist/ebuild/valentina-0.0.0_alpha(template_unstable).ebuild b/dist/ebuild/valentina-0.0.0_alpha(template_unstable).ebuild index bb47a96b7..15eaadf3c 100644 --- a/dist/ebuild/valentina-0.0.0_alpha(template_unstable).ebuild +++ b/dist/ebuild/valentina-0.0.0_alpha(template_unstable).ebuild @@ -33,7 +33,7 @@ CDEPEND=" dev-qt/qtxmlpatterns:5 dev-qt/qtprintsupport:5 dev-qt/qtnetwork:5 - app-text/popple" + app-text/poppler" RDEPEND="${CDEPEND} DEPEND="${CDEPEND} dev-util/ccache" From e2bd5c51f29f96466f82932ccf4be955cd73ba2f Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 18 Feb 2016 20:14:57 +0200 Subject: [PATCH 38/59] Build and install only selected localizations. Use in Gentoo. --HG-- branch : develop --- .../valentina-0.0.0(template_stable).ebuild | 20 +++++++--- ...tina-0.0.0_alpha(template_unstable).ebuild | 19 ++++++--- src/app/translations.pri | 39 +++++++++++-------- 3 files changed, 49 insertions(+), 29 deletions(-) diff --git a/dist/ebuild/valentina-0.0.0(template_stable).ebuild b/dist/ebuild/valentina-0.0.0(template_stable).ebuild index a72bbbb0b..a9970c59e 100644 --- a/dist/ebuild/valentina-0.0.0(template_stable).ebuild +++ b/dist/ebuild/valentina-0.0.0(template_stable).ebuild @@ -14,11 +14,11 @@ LICENSE="GPL-3" SLOT="1" KEYWORDS="~amd64 ~x86" -LANGS="ru_RU uk_UA de_DE cs_CZ he_IL fr_FR it_IT nl_NL id_ID es_ES fi_FI en_US en_CA en_IN ro_RO" -for X in ${LANGS} ; do - if [[ ${X} != "en" ]]; then - IUSE="${IUSE} linguas_${X}" - fi +# en_IN not supported in Gentoo so not added here +LANGS="ru_RU uk_UA de_DE cs_CZ he_IL fr_FR it_IT nl_NL id_ID es_ES fi_FI en_US en_CA ro_RO" + +for LANG in ${LANGS}; do + IUSE="${IUSE} linguas_${LANG}" done CDEPEND=" @@ -39,7 +39,15 @@ DEPEND="${CDEPEND} S=${WORKDIR}/dismine-${PN}-44d43351cb59 src_configure() { - eqmake5 CONFIG+=no_ccache CONFIG+=noDebugSymbols Valentina.pro -r + local locales="" + + for LANG in ${LANGS}; do + if use linguas_${LANG}; then + locales="${locales} ${LANG}" + fi + done + + eqmake5 LOCALES="${locales}" CONFIG+=no_ccache CONFIG+=noDebugSymbols Valentina.pro -r } src_install() { diff --git a/dist/ebuild/valentina-0.0.0_alpha(template_unstable).ebuild b/dist/ebuild/valentina-0.0.0_alpha(template_unstable).ebuild index 15eaadf3c..ddd9512c8 100644 --- a/dist/ebuild/valentina-0.0.0_alpha(template_unstable).ebuild +++ b/dist/ebuild/valentina-0.0.0_alpha(template_unstable).ebuild @@ -16,11 +16,11 @@ LICENSE="GPL-3" SLOT="1" KEYWORDS="~amd64 ~x86" -LANGS="ru_RU uk_UA de_DE cs_CZ he_IL fr_FR it_IT nl_NL id_ID es_ES fi_FI en_US en_CA en_IN ro_RO zh_CN" -for X in ${LANGS} ; do - if [[ ${X} != "en" ]]; then - IUSE="${IUSE} linguas_${X}" - fi +# en_IN not supported in Gentoo so not added here +LANGS="ru_RU uk_UA de_DE cs_CZ he_IL fr_FR it_IT nl_NL id_ID es_ES fi_FI en_US en_CA ro_RO zh_CN" + +for LANG in ${LANGS}; do + IUSE="${IUSE} linguas_${LANG}" done CDEPEND=" @@ -39,7 +39,14 @@ DEPEND="${CDEPEND} dev-util/ccache" src_configure() { - eqmake5 Valentina.pro -r + local locales="" + + for LANG in ${LANGS}; do + if use linguas_${LANG}; then + locales="${locales} ${LANG}" + fi + done + eqmake5 LOCALES="${locales}" Valentina.pro -r } src_install() { diff --git a/src/app/translations.pri b/src/app/translations.pri index 16f2e73d0..b37203494 100755 --- a/src/app/translations.pri +++ b/src/app/translations.pri @@ -9,23 +9,28 @@ PMSYSTEMS += \ p0 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 p15 p16 p17 p18 p19 p20 p21 p22 p23 p24 p25 p26 p27 p28 p29 p30 \ p31 p32 p33 p34 p35 p36 p37 p38 p39 p40 p41 p42 p43 p44 p45 p46 p47 p48 p49 p50 p51 p52 p53 p54 p998 -LANGUAGES += \ - ru_RU \ - uk_UA \ - de_DE \ - cs_CZ \ - he_IL \ - fr_FR \ - it_IT \ - nl_NL \ - id_ID \ - es_ES \ - fi_FI \ - en_US \ - en_CA \ - en_IN \ - ro_RO \ - zh_CN +# An example of using LOCALES="de_DE nl_NL" +isEmpty(LOCALES){ + LANGUAGES += \ + ru_RU \ + uk_UA \ + de_DE \ + cs_CZ \ + he_IL \ + fr_FR \ + it_IT \ + nl_NL \ + id_ID \ + es_ES \ + fi_FI \ + en_US \ + en_CA \ + en_IN \ + ro_RO \ + zh_CN +} else { + LANGUAGES = $${LOCALES} +} for(lang, LANGUAGES) { INSTALL_TRANSLATIONS += $${TRANSLATIONS_PATH}/valentina_$${lang}.qm From 936a7fef075cff6b2cfe68f9c6c79641b50b7827 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 19 Feb 2016 16:34:32 +0200 Subject: [PATCH 39/59] Fixed issue #405. Crash after deleting first pattern piece in the list. --HG-- branch : develop --- ChangeLog.txt | 3 ++ src/app/valentina/xml/vpattern.cpp | 3 ++ .../undocommands/deletepatternpiece.cpp | 34 +++++++++++++++---- 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index cdb2804f2..a8cf8804b 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -8,6 +8,9 @@ - New icon for VAL file. Updated Tape logo. Updated ico for standard measurements. - [#325] Check pattern for inverse compatibility. +# Version 0.4.3 +- [#405] Fixed crash after deleting first pattern piece in the list. + # Version 0.4.2 February 17, 2016 - Measurement Diagram is not shown on Mac OS X. - In dialog 'tool Spline Path' fixed broken selecting new point into the list of points. diff --git a/src/app/valentina/xml/vpattern.cpp b/src/app/valentina/xml/vpattern.cpp index 7e21a3adc..077e5164b 100644 --- a/src/app/valentina/xml/vpattern.cpp +++ b/src/app/valentina/xml/vpattern.cpp @@ -2783,7 +2783,10 @@ void VPattern::PrepareForParse(const Document &parse) data->ClearForFullParse(); nameActivPP.clear(); patternPieces.clear(); + qDeleteAll(toolsOnRemove);//Remove all invisible on a scene objects. + toolsOnRemove.clear(); + tools.clear(); cursor = 0; history.clear(); diff --git a/src/libs/vtools/undocommands/deletepatternpiece.cpp b/src/libs/vtools/undocommands/deletepatternpiece.cpp index 65e774f1e..f7e38a19e 100644 --- a/src/libs/vtools/undocommands/deletepatternpiece.cpp +++ b/src/libs/vtools/undocommands/deletepatternpiece.cpp @@ -36,10 +36,13 @@ DeletePatternPiece::DeletePatternPiece(VAbstractPattern *doc, const QString &nam { setText(tr("delete pattern piece %1").arg(namePP)); - QDomElement patternP = doc->GetPPElement(namePP); + const QDomElement patternP = doc->GetPPElement(namePP); patternPiece = patternP.cloneNode().toElement(); - QDomNode previousPP = patternP.previousSibling();//find previous pattern piece - previousPPName = doc->GetParametrString(previousPP.toElement(), VAbstractPattern::AttrName, ""); + const QDomElement previousPP = patternP.previousSibling().toElement();//find previous pattern piece + if (not previousPP.isNull() && previousPP.tagName() == VAbstractPattern::TagDraw) + { + previousPPName = doc->GetParametrString(previousPP, VAbstractPattern::AttrName, ""); + } } //--------------------------------------------------------------------------------------------------------------------- @@ -52,11 +55,28 @@ void DeletePatternPiece::undo() qCDebug(vUndo, "Undo."); QDomElement rootElement = doc->documentElement(); - QDomNode previousPP = doc->GetPPElement(previousPPName); - rootElement.insertAfter(patternPiece, previousPP); + + if (not previousPPName.isEmpty()) + { // not first in the list, add after tag draw + const QDomNode previousPP = doc->GetPPElement(previousPPName); + rootElement.insertAfter(patternPiece, previousPP); + } + else + { // first in the list, add after tag increments + const QDomNodeList list = rootElement.elementsByTagName(VAbstractPattern::TagIncrements); + QDomElement increment; + + if (not list.isEmpty()) + { + increment = list.at(0).toElement(); + } + + Q_ASSERT_X(not increment.isNull(), Q_FUNC_INFO, "Couldn't' find tag Increments"); + rootElement.insertAfter(patternPiece, increment); + } emit NeedFullParsing(); - doc->ChangedActivPP(namePP); + doc->ChangeActivPP(namePP); } //--------------------------------------------------------------------------------------------------------------------- @@ -65,7 +85,7 @@ void DeletePatternPiece::redo() qCDebug(vUndo, "Redo."); QDomElement rootElement = doc->documentElement(); - QDomElement patternPiece = doc->GetPPElement(namePP); + const QDomElement patternPiece = doc->GetPPElement(namePP); rootElement.removeChild(patternPiece); emit NeedFullParsing(); } From 3a1818e53cad1d892ef512ccf2158ba8076a7d13 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 19 Feb 2016 16:37:19 +0200 Subject: [PATCH 40/59] Addition of builds for Leap 42.1. (grafted from 1f21289e9b73475035b4adb1795cc2b87ae2237a) --HG-- branch : develop --- dist/rpm/valentina.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dist/rpm/valentina.spec b/dist/rpm/valentina.spec index 0f6d30427..ba0e92a26 100644 --- a/dist/rpm/valentina.spec +++ b/dist/rpm/valentina.spec @@ -32,11 +32,11 @@ BuildRequires: libqt5-qttools BuildRequires: libQt5Svg-devel BuildRequires: update-desktop-files -%if 0%{?suse_version} >= 1310 +%if 0%{?suse_version} == 1310 BuildRequires: libQt5XmlPatterns-devel %endif -%if 0%{?suse_version} >= 1320 +%if 0%{?suse_version} >= 1315 BuildRequires: libqt5-linguist-devel BuildRequires: libqt5-qtxmlpatterns-devel %endif @@ -59,7 +59,7 @@ Packager: Roman Telezhinskyi %global _enable_debug_package 0 %global __debug_install_post %{nil} %global debug_package %{nil} -%if 0%{?suse_version} >= 1320 +%if 0%{?suse_version} >= 1315 %global suse_insert_debug_package %{nil} %global _suse_insert_debug_package %{nil} %global _suse_insert_debug_package_seen %{nil} @@ -76,7 +76,7 @@ a unique pattern making tool. %setup -q -n %{name}-%{version} %build -%if 0%{?suse_version} >= 1320 +%if 0%{?suse_version} >= 1315 qmake-qt5 PREFIX=%{_prefix} LRELEASE=lrelease-qt5 Valentina.pro -r CONFIG+=no_ccache %else qmake-qt5 PREFIX=%{_prefix} Valentina.pro -r CONFIG+=no_ccache From 3419476ee15041c4196544fa81a41291ed86ba1b Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 19 Feb 2016 16:50:20 +0200 Subject: [PATCH 41/59] Fixed failed build. --HG-- branch : develop --- ChangeLog.txt | 2 +- src/app/tape/tmainwindow.cpp | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 03cc12255..9f4ac6e0d 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -7,7 +7,7 @@ - Added language Chinese (China). - New icon for VAL file. Updated Tape logo. Updated ico for standard measurements. - [#325] Check pattern for inverse compatibility. -- [#385] : Add 'Open Recent' option in Tape.exe, 'File' dropdown menu. +- [#385] Add 'Open Recent' option in Tape.exe, 'File' dropdown menu. # Version 0.4.3 - [#405] Fixed crash after deleting first pattern piece in the list. diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index 6cdccfe26..9c5b119f0 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -98,7 +98,9 @@ TMainWindow::TMainWindow(QWidget *parent) labelPatternUnit(nullptr), actionDockDiagram(nullptr), dockDiagramVisible(false), - isInitialized(false) + isInitialized(false), + recentFileActs(), + separatorAct(nullptr) { ui->setupUi(this); @@ -117,11 +119,11 @@ TMainWindow::TMainWindow(QWidget *parent) ui->mainToolBar->setContextMenuPolicy(Qt::PreventContextMenu); ui->toolBarGradation->setContextMenuPolicy(Qt::PreventContextMenu); + //MSVC doesn't support int arrays in initializer list for (int i = 0; i < MaxRecentFiles; ++i) { recentFileActs[i] = nullptr; } - separatorAct=nullptr; SetupMenu(); @@ -2049,7 +2051,7 @@ void TMainWindow::SetCurrentFile(const QString &fileName) ui->lineEditPathToFile->setText(QDir::toNativeSeparators(curFile)); ui->lineEditPathToFile->setToolTip(QDir::toNativeSeparators(curFile)); ui->pushButtonShowInExplorer->setEnabled(true); - VTapeSettings *settings = qApp->TapeSettings(); + auto settings = qApp->TapeSettings(); QStringList files = settings->GetRecentFileList(); files.removeAll(fileName); files.prepend(fileName); @@ -2733,8 +2735,8 @@ void TMainWindow::UpdateRecentFileActions() for (int i = 0; i < numRecentFiles; ++i) { - QString text = QString("&%1. %2").arg(i + 1).arg(StrippedName(files.at(i))); - qCDebug(tMainWindow, "file %i = %s",numRecentFiles,text); + const QString text = QString("&%1. %2").arg(i + 1).arg(StrippedName(files.at(i))); + qCDebug(tMainWindow, "file %i = %s", numRecentFiles, qUtf8Printable(text)); recentFileActs[i]->setText(text); recentFileActs[i]->setData(files.at(i)); recentFileActs[i]->setVisible(true); From 122827f74ab63be9ead57b8e99c586e8cee73a9d Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 19 Feb 2016 16:55:03 +0200 Subject: [PATCH 42/59] New file in the collection. --HG-- branch : develop --- src/app/share/collection/Lara_Jil.vit | 129 +++++++++ src/app/share/collection/modell_2.val | 245 ++++++++++++++++++ src/test/ValentinaTest/ValentinaTest.pro | 4 +- .../tst_valentinacommandline.cpp | 1 + 4 files changed, 378 insertions(+), 1 deletion(-) create mode 100644 src/app/share/collection/Lara_Jil.vit create mode 100644 src/app/share/collection/modell_2.val diff --git a/src/app/share/collection/Lara_Jil.vit b/src/app/share/collection/Lara_Jil.vit new file mode 100644 index 000000000..aa1b06155 --- /dev/null +++ b/src/app/share/collection/Lara_Jil.vit @@ -0,0 +1,129 @@ + + + 0.3.3 + false + + cm + 998 + + Jil + Lara + 1997-01-01 + male + username@example.com + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/app/share/collection/modell_2.val b/src/app/share/collection/modell_2.val new file mode 100644 index 000000000..5c90a2ae1 --- /dev/null +++ b/src/app/share/collection/modell_2.val @@ -0,0 +1,245 @@ + + + + 0.2.4 + cm + Robin + + + Lara_Jil.vit + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + +
+ + diff --git a/src/test/ValentinaTest/ValentinaTest.pro b/src/test/ValentinaTest/ValentinaTest.pro index 9d1dd5c04..cba46d81f 100644 --- a/src/test/ValentinaTest/ValentinaTest.pro +++ b/src/test/ValentinaTest/ValentinaTest.pro @@ -297,7 +297,9 @@ COLLECTION_FILES += \ $${PWD}/../../app/share/collection/medidas_eli2015.vit \ $${PWD}/../../app/share/collection/pantalon_base_Eli.val \ $${PWD}/../../app/share/collection/Razmernye_priznaki_dlya_zhenskogo_zhaketa.vit \ - $${PWD}/../../app/share/collection/IMK_Zhaketa_poluprilegayuschego_silueta.val + $${PWD}/../../app/share/collection/IMK_Zhaketa_poluprilegayuschego_silueta.val \ + $${PWD}/../../app/share/collection/Lara_Jil.vit \ + $${PWD}/../../app/share/collection/modell_2.val # Compilation will fail without this files after we added them to this section. diff --git a/src/test/ValentinaTest/tst_valentinacommandline.cpp b/src/test/ValentinaTest/tst_valentinacommandline.cpp index c7a28e109..c2fb38c10 100644 --- a/src/test/ValentinaTest/tst_valentinacommandline.cpp +++ b/src/test/ValentinaTest/tst_valentinacommandline.cpp @@ -273,6 +273,7 @@ void TST_ValentinaCommandLine::TestOpenCollection_data() const QTest::newRow("PajamaTopWrap2") << "PajamaTopWrap2.val" << keyTest << true << V_EX_OK; QTest::newRow("Keiko_skirt") << "Keiko_skirt.val" << keyTest << true << V_EX_OK; QTest::newRow("pantalon_base_Eli") << "pantalon_base_Eli.val" << keyTest << true << V_EX_OK; + QTest::newRow("modell_2") << "modell_2.val" << keyTest << true << V_EX_OK; QTest::newRow("IMK_Zhaketa") << "IMK_Zhaketa_poluprilegayuschego_silueta.val" << keyTest << true << V_EX_OK; QTest::newRow("Moulage_0.5_armhole_neckline") << "Moulage_0.5_armhole_neckline.val" << keyTest << true << V_EX_OK; QTest::newRow("0.7_Armhole_adjustment_0.10") << "0.7_Armhole_adjustment_0.10.val" << keyTest << true << V_EX_OK; From 006dc35a4ac1b36157272e80dd9f5bd70da1050b Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 19 Feb 2016 17:03:39 +0200 Subject: [PATCH 43/59] Updated ebuild files. Added man pages, doc files and desktop info. --HG-- branch : develop --- .../valentina-0.0.0(template_stable).ebuild | 21 +++++++++++++++++-- ...tina-0.0.0_alpha(template_unstable).ebuild | 21 +++++++++++++++++-- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dist/ebuild/valentina-0.0.0(template_stable).ebuild b/dist/ebuild/valentina-0.0.0(template_stable).ebuild index a9970c59e..8ff8a6bac 100644 --- a/dist/ebuild/valentina-0.0.0(template_stable).ebuild +++ b/dist/ebuild/valentina-0.0.0(template_stable).ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit qmake-utils +inherit qmake-utils gnome2-utils fdo-mime DESCRIPTION="Cloth patternmaking software" HOMEPAGE="http://www.valentina-project.org/" @@ -13,6 +13,7 @@ SRC_URI="https://bitbucket.org/dismine/valentina/get/v0.0.0.zip -> ${P}.zip" LICENSE="GPL-3" SLOT="1" KEYWORDS="~amd64 ~x86" +IUSE="gnome" # en_IN not supported in Gentoo so not added here LANGS="ru_RU uk_UA de_DE cs_CZ he_IL fr_FR it_IT nl_NL id_ID es_ES fi_FI en_US en_CA ro_RO" @@ -52,5 +53,21 @@ src_configure() { src_install() { emake install INSTALL_ROOT="${D}" -# dodoc Changelog.txt README.txt + + dodoc LICENSE_GPL.txt ChangeLog.txt README.txt + + doman dist/debian/${PN}.1 + doman dist/debian/tape.1 + + cp dist/debian/valentina.sharedmimeinfo dist/debian/${PN}.xml || die + insinto /usr/share/mime/packages + doins dist/debian/${PN}.xml +} + +pkg_postinst() { + fdo-mime_desktop_database_update + + if use gnome ; then + gnome2_icon_cache_update + fi } diff --git a/dist/ebuild/valentina-0.0.0_alpha(template_unstable).ebuild b/dist/ebuild/valentina-0.0.0_alpha(template_unstable).ebuild index ddd9512c8..8b2191555 100644 --- a/dist/ebuild/valentina-0.0.0_alpha(template_unstable).ebuild +++ b/dist/ebuild/valentina-0.0.0_alpha(template_unstable).ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit mercurial qmake-utils +inherit mercurial qmake-utils gnome2-utils fdo-mime DESCRIPTION="Cloth patternmaking software" HOMEPAGE="http://www.valentina-project.org/" @@ -15,6 +15,7 @@ EHG_REVISION="develop" LICENSE="GPL-3" SLOT="1" KEYWORDS="~amd64 ~x86" +IUSE="gnome" # en_IN not supported in Gentoo so not added here LANGS="ru_RU uk_UA de_DE cs_CZ he_IL fr_FR it_IT nl_NL id_ID es_ES fi_FI en_US en_CA ro_RO zh_CN" @@ -51,5 +52,21 @@ src_configure() { src_install() { emake install INSTALL_ROOT="${D}" -# dodoc Changelog.txt README.txt + + dodoc LICENSE_GPL.txt ChangeLog.txt README.txt + + doman dist/debian/${PN}.1 + doman dist/debian/tape.1 + + cp dist/debian/valentina.sharedmimeinfo dist/debian/${PN}.xml || die + insinto /usr/share/mime/packages + doins dist/debian/${PN}.xml +} + +pkg_postinst() { + fdo-mime_desktop_database_update + + if use gnome ; then + gnome2_icon_cache_update + fi } From 48d58de871abaa548f7c2ed75f9080117b6f5fe2 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 19 Feb 2016 17:21:51 +0200 Subject: [PATCH 44/59] CONFIG key to disable setting custom rpath option. --HG-- branch : develop --- src/app/tape/tape.pro | 14 ++++++++++---- src/app/valentina/valentina.pro | 14 ++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro index d91843c06..1a400f944 100644 --- a/src/app/tape/tape.pro +++ b/src/app/tape/tape.pro @@ -348,10 +348,16 @@ CONFIG(debug, debug|release){ # Path to recource file. win32:RC_FILE = share/resources/tape.rc -unix:!macx{ - # suppress the default RPATH - QMAKE_LFLAGS_RPATH = - QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" +noRunPath{ # For enable run qmake with CONFIG+=noRunPath + # do nothing +} else { + unix:!macx{ + # suppress the default RPATH + # helps to run the program without Qt Creator + # see problem with path to libqmuparser and libpropertybrowser + QMAKE_LFLAGS_RPATH = + QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" + } } # When the GNU linker sees a library, it discards all symbols that it doesn't need. diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index 7fd1bf6a7..c7f8def52 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -476,10 +476,16 @@ win32 { copyToDestdir($$pdftops_path, $$shell_path($${OUT_PWD}/$$DESTDIR)) } -unix:!macx{ - # suppress the default RPATH - QMAKE_LFLAGS_RPATH = - QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" +noRunPath{ # For enable run qmake with CONFIG+=noRunPath + # do nothing +} else { + unix:!macx{ + # suppress the default RPATH + # helps to run the program without Qt Creator + # see problem with path to libqmuparser and libpropertybrowser + QMAKE_LFLAGS_RPATH = + QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" + } } # When the GNU linker sees a library, it discards all symbols that it doesn't need. From 63151e5ca206373ea7b1da33eb4816b46f302724 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 19 Feb 2016 17:25:37 +0200 Subject: [PATCH 45/59] Use noRunPath in ebuild for stable version. --HG-- branch : develop --- dist/ebuild/valentina-0.0.0(template_stable).ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/ebuild/valentina-0.0.0(template_stable).ebuild b/dist/ebuild/valentina-0.0.0(template_stable).ebuild index 8ff8a6bac..79d787d04 100644 --- a/dist/ebuild/valentina-0.0.0(template_stable).ebuild +++ b/dist/ebuild/valentina-0.0.0(template_stable).ebuild @@ -48,7 +48,7 @@ src_configure() { fi done - eqmake5 LOCALES="${locales}" CONFIG+=no_ccache CONFIG+=noDebugSymbols Valentina.pro -r + eqmake5 LOCALES="${locales}" CONFIG+=noRunPath CONFIG+=no_ccache CONFIG+=noDebugSymbols Valentina.pro -r } src_install() { From 06d88d66e58a19470509c211f842d10809e9879b Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 19 Feb 2016 20:31:01 +0200 Subject: [PATCH 46/59] CONFIG key to disable building tests. --HG-- branch : develop --- src/src.pro | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/src.pro b/src/src.pro index 93b34592a..d73d513e4 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,8 +1,17 @@ TEMPLATE = subdirs -SUBDIRS = \ - libs \ - app \ - test -app.depends = libs -test.depends = libs +noTests{ # For enable run qmake with CONFIG+=noTests + SUBDIRS = \ + libs \ + app + +} else { + SUBDIRS = \ + libs \ + app \ + test + + test.depends = libs +} + +app.depends = libs From d0bdd46d777063643cb1ad8a52b46aca3eced193 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 19 Feb 2016 20:37:41 +0200 Subject: [PATCH 47/59] Using CONFIG keys in package scripts. --HG-- branch : develop --- dist/debian/rules | 2 +- dist/ebuild/valentina-0.0.0(template_stable).ebuild | 2 +- dist/rpm/valentina.spec | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dist/debian/rules b/dist/debian/rules index d14fe3a43..e36187ef7 100755 --- a/dist/debian/rules +++ b/dist/debian/rules @@ -18,7 +18,7 @@ mkdir -p builddir builddir/Makefile: builddir - cd builddir && qmake PREFIX=/usr PREFIX_LIB=$(PREFIX_LIB) CONFIG+=no_ccache ../$(APPNAME).pro -r + cd builddir && qmake PREFIX=/usr PREFIX_LIB=$(PREFIX_LIB) "CONFIG += noTests noRunPath no_ccache noDebugSymbols" ../$(APPNAME).pro -r build: build-stamp build-stamp: builddir/Makefile dh_testdir diff --git a/dist/ebuild/valentina-0.0.0(template_stable).ebuild b/dist/ebuild/valentina-0.0.0(template_stable).ebuild index 79d787d04..a36c0c907 100644 --- a/dist/ebuild/valentina-0.0.0(template_stable).ebuild +++ b/dist/ebuild/valentina-0.0.0(template_stable).ebuild @@ -48,7 +48,7 @@ src_configure() { fi done - eqmake5 LOCALES="${locales}" CONFIG+=noRunPath CONFIG+=no_ccache CONFIG+=noDebugSymbols Valentina.pro -r + eqmake5 LOCALES="${locales}" "CONFIG += noTests noRunPath no_ccache noDebugSymbols" Valentina.pro -r } src_install() { diff --git a/dist/rpm/valentina.spec b/dist/rpm/valentina.spec index ba0e92a26..80bdc175e 100644 --- a/dist/rpm/valentina.spec +++ b/dist/rpm/valentina.spec @@ -77,9 +77,9 @@ a unique pattern making tool. %build %if 0%{?suse_version} >= 1315 -qmake-qt5 PREFIX=%{_prefix} LRELEASE=lrelease-qt5 Valentina.pro -r CONFIG+=no_ccache +qmake-qt5 PREFIX=%{_prefix} LRELEASE=lrelease-qt5 Valentina.pro -r "CONFIG += noTests noRunPath no_ccache noDebugSymbols" %else -qmake-qt5 PREFIX=%{_prefix} Valentina.pro -r CONFIG+=no_ccache +qmake-qt5 PREFIX=%{_prefix} Valentina.pro -r "CONFIG += noTests noRunPath no_ccache noDebugSymbols" %endif %{__make} %{?jobs:-j %jobs} From c3db8bab68449460c236bfa973795cf6c1bc7798 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 20 Feb 2016 10:05:18 +0200 Subject: [PATCH 48/59] For avoiding errors in future better seek the first tag draw and insert before it. --HG-- branch : develop --- src/libs/vtools/undocommands/deletepatternpiece.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libs/vtools/undocommands/deletepatternpiece.cpp b/src/libs/vtools/undocommands/deletepatternpiece.cpp index f7e38a19e..e518cba28 100644 --- a/src/libs/vtools/undocommands/deletepatternpiece.cpp +++ b/src/libs/vtools/undocommands/deletepatternpiece.cpp @@ -62,17 +62,17 @@ void DeletePatternPiece::undo() rootElement.insertAfter(patternPiece, previousPP); } else - { // first in the list, add after tag increments - const QDomNodeList list = rootElement.elementsByTagName(VAbstractPattern::TagIncrements); - QDomElement increment; + { // first in the list, add before tag draw + const QDomNodeList list = rootElement.elementsByTagName(VAbstractPattern::TagDraw); + QDomElement draw; if (not list.isEmpty()) { - increment = list.at(0).toElement(); + draw = list.at(0).toElement(); } - Q_ASSERT_X(not increment.isNull(), Q_FUNC_INFO, "Couldn't' find tag Increments"); - rootElement.insertAfter(patternPiece, increment); + Q_ASSERT_X(not draw.isNull(), Q_FUNC_INFO, "Couldn't' find tag draw"); + rootElement.insertBefore(patternPiece, draw); } emit NeedFullParsing(); From 06f0e715839d5637748bf1034ef98fa369338ec3 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 20 Feb 2016 10:21:37 +0200 Subject: [PATCH 49/59] Lupdate. --HG-- branch : develop --- share/translations/measurements_p0_de_DE.ts | 123 ++++---- share/translations/measurements_p10_de_DE.ts | 108 +++---- share/translations/measurements_p11_de_DE.ts | 108 +++---- share/translations/measurements_p12_de_DE.ts | 108 +++---- share/translations/measurements_p13_de_DE.ts | 108 +++---- share/translations/measurements_p14_de_DE.ts | 108 +++---- share/translations/measurements_p15_de_DE.ts | 108 +++---- share/translations/measurements_p16_de_DE.ts | 108 +++---- share/translations/measurements_p17_de_DE.ts | 108 +++---- share/translations/measurements_p18_de_DE.ts | 108 +++---- share/translations/measurements_p19_de_DE.ts | 108 +++---- share/translations/measurements_p1_de_DE.ts | 108 +++---- share/translations/measurements_p20_de_DE.ts | 108 +++---- share/translations/measurements_p21_de_DE.ts | 108 +++---- share/translations/measurements_p22_de_DE.ts | 108 +++---- share/translations/measurements_p23_de_DE.ts | 108 +++---- share/translations/measurements_p24_de_DE.ts | 108 +++---- share/translations/measurements_p25_de_DE.ts | 108 +++---- share/translations/measurements_p26_de_DE.ts | 108 +++---- share/translations/measurements_p27_de_DE.ts | 108 +++---- share/translations/measurements_p28_de_DE.ts | 108 +++---- share/translations/measurements_p29_de_DE.ts | 108 +++---- share/translations/measurements_p2_de_DE.ts | 108 +++---- share/translations/measurements_p30_de_DE.ts | 108 +++---- share/translations/measurements_p31_de_DE.ts | 108 +++---- share/translations/measurements_p32_de_DE.ts | 108 +++---- share/translations/measurements_p33_de_DE.ts | 108 +++---- share/translations/measurements_p34_de_DE.ts | 108 +++---- share/translations/measurements_p35_de_DE.ts | 108 +++---- share/translations/measurements_p36_de_DE.ts | 108 +++---- share/translations/measurements_p37_de_DE.ts | 108 +++---- share/translations/measurements_p38_de_DE.ts | 108 +++---- share/translations/measurements_p39_de_DE.ts | 108 +++---- share/translations/measurements_p3_de_DE.ts | 108 +++---- share/translations/measurements_p40_de_DE.ts | 108 +++---- share/translations/measurements_p41_de_DE.ts | 108 +++---- share/translations/measurements_p42_de_DE.ts | 108 +++---- share/translations/measurements_p43_de_DE.ts | 108 +++---- share/translations/measurements_p44_de_DE.ts | 108 +++---- share/translations/measurements_p45_de_DE.ts | 108 +++---- share/translations/measurements_p46_de_DE.ts | 108 +++---- share/translations/measurements_p47_de_DE.ts | 108 +++---- share/translations/measurements_p48_de_DE.ts | 108 +++---- share/translations/measurements_p49_de_DE.ts | 108 +++---- share/translations/measurements_p4_de_DE.ts | 108 +++---- share/translations/measurements_p50_de_DE.ts | 108 +++---- share/translations/measurements_p51_de_DE.ts | 108 +++---- share/translations/measurements_p52_de_DE.ts | 108 +++---- share/translations/measurements_p53_de_DE.ts | 108 +++---- share/translations/measurements_p54_de_DE.ts | 108 +++---- share/translations/measurements_p5_de_DE.ts | 108 +++---- share/translations/measurements_p6_de_DE.ts | 108 +++---- share/translations/measurements_p7_de_DE.ts | 108 +++---- share/translations/measurements_p8_de_DE.ts | 108 +++---- share/translations/measurements_p998_de_DE.ts | 108 +++---- share/translations/measurements_p9_de_DE.ts | 108 +++---- share/translations/valentina.ts | 30 +- share/translations/valentina_de_DE.ts | 277 ++++++++++-------- share/translations/valentina_zh_CN.ts | 164 +++++------ 59 files changed, 3275 insertions(+), 3259 deletions(-) diff --git a/share/translations/measurements_p0_de_DE.ts b/share/translations/measurements_p0_de_DE.ts index 85bbee8c3..558347fd3 100644 --- a/share/translations/measurements_p0_de_DE.ts +++ b/share/translations/measurements_p0_de_DE.ts @@ -7,7 +7,7 @@ height Name in a formula. Don't use math symbols and space in name!!!! - höhe + Höhe @@ -79,19 +79,19 @@ height_waist_side Name in a formula. Don't use math symbols and space in name!!!! - höhe_seitliche_taillie + höhe_seitliche_taille Height: Waist Side Full measurement name. - Höhe: Seitliche Taillie + Höhe: Seitliche Taille Vertical distance from the Waist Side to the floor. Full measurement description. - Vertikale Abmessung der Tallie bis zum Boden. + Vertikale Abmessung der Taille bis zum Boden. @@ -1537,13 +1537,13 @@ hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1597,25 +1597,25 @@ Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Torso herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Torso_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Torso @@ -1651,7 +1651,7 @@ Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1681,19 +1681,19 @@ armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2515,13 +2515,13 @@ Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2533,7 +2533,7 @@ Across Back Full measurement name. - + Über den Rücken gemessen @@ -2569,7 +2569,7 @@ Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2635,19 +2635,19 @@ neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3049,49 +3049,49 @@ arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3103,73 +3103,73 @@ arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3265,37 +3265,37 @@ arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3457,7 +3457,7 @@ Stand feet close together. Measure from crotch level (touching body, no extra space) down to floor. Full measurement description. - Füße eng zusammen stellen. Messen Sie vom Schritt-Höhe (Körper berühren, keine zusätzlichen Platz ) bis zum Boden. + Füße eng zusammen stellen. Von der Schritthöhe (Körper berühren, kein Abstand) bis zum Boden messen. @@ -3487,7 +3487,7 @@ This information is pulled from pattern charts in some patternmaking systems, e.g. Winifred P. Aldrich's "Metric Pattern Cutting". Full measurement description. - Diese Informationen wurden von den Schnittmuster-Tabellen von einigen Schnittmustersystemen wie z. B. Winifred P. Aldrich's "Metric Pattern Cutting". übernommen. + Diese Informationen wurden von den Schnittmuster-Tabellen von einigen Schnittmustersystemen wie z. B. Winifred P. Aldrich's "Metric Pattern Cutting" übernommen. @@ -3613,26 +3613,25 @@ Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels Ankle circumference where front of leg meets the top of the foot. Full measurement description. - - + Umfang des Knöchels da, wo die Vorderseite des Beins den höchsten Teil des Fußes trifft. @@ -3656,19 +3655,19 @@ leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_diagonaler_umfang_knöchel Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3710,13 +3709,13 @@ leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3974,19 +3973,19 @@ arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinternacken_bis_ellbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nackens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p10_de_DE.ts b/share/translations/measurements_p10_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p10_de_DE.ts +++ b/share/translations/measurements_p10_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p11_de_DE.ts b/share/translations/measurements_p11_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p11_de_DE.ts +++ b/share/translations/measurements_p11_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p12_de_DE.ts b/share/translations/measurements_p12_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p12_de_DE.ts +++ b/share/translations/measurements_p12_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p13_de_DE.ts b/share/translations/measurements_p13_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p13_de_DE.ts +++ b/share/translations/measurements_p13_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p14_de_DE.ts b/share/translations/measurements_p14_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p14_de_DE.ts +++ b/share/translations/measurements_p14_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p15_de_DE.ts b/share/translations/measurements_p15_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p15_de_DE.ts +++ b/share/translations/measurements_p15_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p16_de_DE.ts b/share/translations/measurements_p16_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p16_de_DE.ts +++ b/share/translations/measurements_p16_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p17_de_DE.ts b/share/translations/measurements_p17_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p17_de_DE.ts +++ b/share/translations/measurements_p17_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p18_de_DE.ts b/share/translations/measurements_p18_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p18_de_DE.ts +++ b/share/translations/measurements_p18_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p19_de_DE.ts b/share/translations/measurements_p19_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p19_de_DE.ts +++ b/share/translations/measurements_p19_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p1_de_DE.ts b/share/translations/measurements_p1_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p1_de_DE.ts +++ b/share/translations/measurements_p1_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p20_de_DE.ts b/share/translations/measurements_p20_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p20_de_DE.ts +++ b/share/translations/measurements_p20_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p21_de_DE.ts b/share/translations/measurements_p21_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p21_de_DE.ts +++ b/share/translations/measurements_p21_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p22_de_DE.ts b/share/translations/measurements_p22_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p22_de_DE.ts +++ b/share/translations/measurements_p22_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p23_de_DE.ts b/share/translations/measurements_p23_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p23_de_DE.ts +++ b/share/translations/measurements_p23_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p24_de_DE.ts b/share/translations/measurements_p24_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p24_de_DE.ts +++ b/share/translations/measurements_p24_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p25_de_DE.ts b/share/translations/measurements_p25_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p25_de_DE.ts +++ b/share/translations/measurements_p25_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p26_de_DE.ts b/share/translations/measurements_p26_de_DE.ts index a516d9f6a..f2ea3943b 100644 --- a/share/translations/measurements_p26_de_DE.ts +++ b/share/translations/measurements_p26_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p27_de_DE.ts b/share/translations/measurements_p27_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p27_de_DE.ts +++ b/share/translations/measurements_p27_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p28_de_DE.ts b/share/translations/measurements_p28_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p28_de_DE.ts +++ b/share/translations/measurements_p28_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p29_de_DE.ts b/share/translations/measurements_p29_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p29_de_DE.ts +++ b/share/translations/measurements_p29_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p2_de_DE.ts b/share/translations/measurements_p2_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p2_de_DE.ts +++ b/share/translations/measurements_p2_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p30_de_DE.ts b/share/translations/measurements_p30_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p30_de_DE.ts +++ b/share/translations/measurements_p30_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p31_de_DE.ts b/share/translations/measurements_p31_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p31_de_DE.ts +++ b/share/translations/measurements_p31_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p32_de_DE.ts b/share/translations/measurements_p32_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p32_de_DE.ts +++ b/share/translations/measurements_p32_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p33_de_DE.ts b/share/translations/measurements_p33_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p33_de_DE.ts +++ b/share/translations/measurements_p33_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p34_de_DE.ts b/share/translations/measurements_p34_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p34_de_DE.ts +++ b/share/translations/measurements_p34_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p35_de_DE.ts b/share/translations/measurements_p35_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p35_de_DE.ts +++ b/share/translations/measurements_p35_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p36_de_DE.ts b/share/translations/measurements_p36_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p36_de_DE.ts +++ b/share/translations/measurements_p36_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p37_de_DE.ts b/share/translations/measurements_p37_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p37_de_DE.ts +++ b/share/translations/measurements_p37_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p38_de_DE.ts b/share/translations/measurements_p38_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p38_de_DE.ts +++ b/share/translations/measurements_p38_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p39_de_DE.ts b/share/translations/measurements_p39_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p39_de_DE.ts +++ b/share/translations/measurements_p39_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p3_de_DE.ts b/share/translations/measurements_p3_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p3_de_DE.ts +++ b/share/translations/measurements_p3_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p40_de_DE.ts b/share/translations/measurements_p40_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p40_de_DE.ts +++ b/share/translations/measurements_p40_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p41_de_DE.ts b/share/translations/measurements_p41_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p41_de_DE.ts +++ b/share/translations/measurements_p41_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p42_de_DE.ts b/share/translations/measurements_p42_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p42_de_DE.ts +++ b/share/translations/measurements_p42_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p43_de_DE.ts b/share/translations/measurements_p43_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p43_de_DE.ts +++ b/share/translations/measurements_p43_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p44_de_DE.ts b/share/translations/measurements_p44_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p44_de_DE.ts +++ b/share/translations/measurements_p44_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p45_de_DE.ts b/share/translations/measurements_p45_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p45_de_DE.ts +++ b/share/translations/measurements_p45_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p46_de_DE.ts b/share/translations/measurements_p46_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p46_de_DE.ts +++ b/share/translations/measurements_p46_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p47_de_DE.ts b/share/translations/measurements_p47_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p47_de_DE.ts +++ b/share/translations/measurements_p47_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p48_de_DE.ts b/share/translations/measurements_p48_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p48_de_DE.ts +++ b/share/translations/measurements_p48_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p49_de_DE.ts b/share/translations/measurements_p49_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p49_de_DE.ts +++ b/share/translations/measurements_p49_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p4_de_DE.ts b/share/translations/measurements_p4_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p4_de_DE.ts +++ b/share/translations/measurements_p4_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p50_de_DE.ts b/share/translations/measurements_p50_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p50_de_DE.ts +++ b/share/translations/measurements_p50_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p51_de_DE.ts b/share/translations/measurements_p51_de_DE.ts index 938e21c34..cf62f677b 100644 --- a/share/translations/measurements_p51_de_DE.ts +++ b/share/translations/measurements_p51_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p52_de_DE.ts b/share/translations/measurements_p52_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p52_de_DE.ts +++ b/share/translations/measurements_p52_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p53_de_DE.ts b/share/translations/measurements_p53_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p53_de_DE.ts +++ b/share/translations/measurements_p53_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p54_de_DE.ts b/share/translations/measurements_p54_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p54_de_DE.ts +++ b/share/translations/measurements_p54_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p5_de_DE.ts b/share/translations/measurements_p5_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p5_de_DE.ts +++ b/share/translations/measurements_p5_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p6_de_DE.ts b/share/translations/measurements_p6_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p6_de_DE.ts +++ b/share/translations/measurements_p6_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p7_de_DE.ts b/share/translations/measurements_p7_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p7_de_DE.ts +++ b/share/translations/measurements_p7_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p8_de_DE.ts b/share/translations/measurements_p8_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p8_de_DE.ts +++ b/share/translations/measurements_p8_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p998_de_DE.ts b/share/translations/measurements_p998_de_DE.ts index 6ddebc9f9..e53399d1d 100644 --- a/share/translations/measurements_p998_de_DE.ts +++ b/share/translations/measurements_p998_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3597,19 +3597,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3640,19 +3640,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3694,13 +3694,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3983,19 +3983,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/measurements_p9_de_DE.ts b/share/translations/measurements_p9_de_DE.ts index 79540841a..0e38cbc42 100644 --- a/share/translations/measurements_p9_de_DE.ts +++ b/share/translations/measurements_p9_de_DE.ts @@ -1548,13 +1548,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba hip_arc_half_b Name in a formula. Don't use math symbols and space in name!!!! - + hüfte_bogen_halb_b Hip arc, back, half Full measurement name. - + Hälfte des hinteren Hüftumfanges @@ -1608,25 +1608,25 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Body circumference at Bust level Full measurement name. - + Körperumfang auf Brusthöhe Measure around arms and torso at Bust level. Full measurement description. - + Um Arme und Brustkorb herum auf Brusthöhe messen. body_torso_circ Name in a formula. Don't use math symbols and space in name!!!! - + Körper_Brustkorb_Umfang Body circumference of full torso Full measurement name. - + Körperumfang des gesamten Brustkorbs @@ -1662,7 +1662,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Neck Front to Waist Front Full measurement name. - + Hals vorne zu Taille vorne @@ -1692,19 +1692,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba armpit_to_waist_side Name in a formula. Don't use math symbols and space in name!!!! - + achsel_bis_taillenseite Armpit to Waist Side Full measurement name. - + Achselhöhle zur Taillenseite From Armpit down to Waist Side. Full measurement description. - + Von der Achselhöhle zur Seite der Taille messen. @@ -2526,13 +2526,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back Full measurement name. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken From Shoulder Tip to Shoulder Tip, across the back. Full measurement description. - + Horizontale Abmessung von Schulterspitze zu Schulterspitze, am Rücken. @@ -2544,7 +2544,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Across Back Full measurement name. - + Über den Rücken gemessen @@ -2580,7 +2580,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Shoulder Tip to Shoulder Tip, back, half Full measurement name. - + Hälfte der horizontalen Abmessung von Schulterspitze zu Schulterspitze am Rücken @@ -2646,19 +2646,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba neck_width Name in a formula. Don't use math symbols and space in name!!!! - + Halsbreite Neck Width Full measurement name. - + Halsbreite Measure between the 'legs' of an unclosed necklace or chain draped around the neck. Full measurement description. - + Zwischen den Enden einer ungeschlossenen Kette, die um den Hals gehängt wurde, messen. @@ -3060,49 +3060,49 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_shoulder_tip_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Handgelenk_gebeugt Arm: Shoulder Tip to Wrist, bent Full measurement name. - + Arm: Schulterspitze zum Handgelenk, gebeugt Bend Arm, measure from Shoulder Tip around Elbow to radial Wrist bone. Full measurement description. - + Arm beugen, von der Schulterspitze über den Ellenbogen bis zum Handgelenkknochen messen. arm_shoulder_tip_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_zum_Ellbogen_gebeugt Arm: Shoulder Tip to Elbow, bent Full measurement name. - + Arm: Schulterspitze zum Ellbogen, gebeugt Bend Arm, measure from Shoulder Tip to Elbow Tip. Full measurement description. - + Arm beugen, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellbogen_zum_Handgelenk_gebeugt Arm: Elbow to Wrist, bent Full measurement name. - + Arm: Ellbogen zum Handgelenk, gebeugt @@ -3114,73 +3114,73 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ_bent Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang_gebeugt Arm: Elbow circumference, bent Full measurement name. - + Arm: Umfang des Ellenbogens, gebeugt Elbow circumference, arm is bent. Full measurement description. - + Umfang des Ellenbogens messen, während dieser gebeugt ist. arm_shoulder_tip_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Handgelenk Arm: Shoulder Tip to Wrist Full measurement name. - + Arm: Schulterspitze zum Handgelenk From Shoulder Tip to Wrist bone, arm straight. Full measurement description. - + Von der Schulterspitze zum Handgelenk messen, während der Arm gerade gehalten wird. arm_shoulder_tip_to_elbow Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Schulterspitze_bis_Elllenbogen Arm: Shoulder Tip to Elbow Full measurement name. - + Arm: Schulterspitze zum Ellbogen From Shoulder tip to Elbow Tip, arm straight. Full measurement description. - + Arm gerade ausstrecken, von der Schulterspitze bis zum Ellbogen messen. arm_elbow_to_wrist Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_zum_Handgelenk Arm: Elbow to Wrist Full measurement name. - + Arm: Ellbogen zum Handgelenk From Elbow to Wrist, arm straight. ('Arm: Shoulder Tip to Wrist' - 'Arm: Shoulder Tip to Elbow'). Full measurement description. - + Vom Ellenbogen zum Handgelenk messen, den Arm dabei gestreckt halten. @@ -3276,37 +3276,37 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_elbow_circ Name in a formula. Don't use math symbols and space in name!!!! - + Arm_Ellenbogen_Umfang Arm: Elbow circumference Full measurement name. - + Arm: Umfang des Ellenbogens Elbow circumference, arm straight. Full measurement description. - + Arm: Umfang des Ellenbogens, gestreckt arm_lower_circ Name in a formula. Don't use math symbols and space in name!!!! - + Unterarm_Umfang Arm: Lower Arm circumference Full measurement name. - + Arm: Umfang des Unterarms Arm circumference where lower arm is widest. Full measurement description. - + Umfang der breitesten Stelle des Unterarms. @@ -3627,19 +3627,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba Ankle circumference where the indentation at the back of the ankle is the deepest. Full measurement description. - + Umfang des Knöchels da, wo die Einbuchtung an der Rückseite des Knöchels am stärksten ausgeprägt ist. leg_ankle_circ Name in a formula. Don't use math symbols and space in name!!!! - + bein_umfang_knöchel Leg: Ankle circumference Full measurement name. - + Bein: Umfang des Knöchels @@ -3670,19 +3670,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - + Bein: Diagonaler Umfang des Knöchels Leg: Ankle diagonal circumference Full measurement name. - + Bein: Diagonaler Umfang des Knöchels Ankle circumference diagonal from top of foot to bottom of heel. Full measurement description. - + Der Umfang des Knöchels diagonal von der Oberseite des Fußes zur Unterseite der Ferse. @@ -3724,13 +3724,13 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_waist_side_to_knee Name in a formula. Don't use math symbols and space in name!!!! - + bein_taillenseite_bis_knie Leg: Waist Side to Knee Full measurement name. - + Bein: Seitliche Taille zu den Knien @@ -3989,19 +3989,19 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba arm_neck_back_to_elbow_bent Name in a formula. Don't use math symbols and space in name!!!! - + arm_hinterseite_nacken_bis_ellenbogen_gebeugt Arm: Neck Back to Elbow, high bend Full measurement name. - + Arm: Hinterseite des Nachens bis zum Ellenbogen, hoch gebeugt Bend Arm with Elbow out, hand in front. Measure from Neck Back to Elbow Tip. Full measurement description. - + Arm mit dem Ellenbogen nach außen beugen, die Hand nach vorn gehalten. Von der Hinterseite des Nackens zur Ellenbogenspitze messen. diff --git a/share/translations/valentina.ts b/share/translations/valentina.ts index bb21197a2..2cd4b8f95 100644 --- a/share/translations/valentina.ts +++ b/share/translations/valentina.ts @@ -3568,31 +3568,31 @@ Apply settings anyway? First point: - First point: + First point: Control point - + Control point Angle: - Angle: + Angle: Length ratio: - + Length ratio: Second point: - Second point: + Second point: Name: - Name: + Name: Invalid spline - + Invalid spline @@ -3647,31 +3647,31 @@ Apply settings anyway? Point: - + Point: First control point - + First control point Angle: - Angle: + Angle: Length ratio: - + Length ratio: Second control point - + Second control point Name: - Name: + Name: Invalid spline path - + Invalid spline path @@ -7250,7 +7250,7 @@ Do you want to save your changes? Name - Name + Name diff --git a/share/translations/valentina_de_DE.ts b/share/translations/valentina_de_DE.ts index bfbd66308..39a52169b 100644 --- a/share/translations/valentina_de_DE.ts +++ b/share/translations/valentina_de_DE.ts @@ -65,7 +65,7 @@ Proxy pass - Proxy Passwort + Proxypasswort User settings @@ -101,7 +101,7 @@ Proxy pass: - Proxy Passwort: + Proxypasswort: User Name: @@ -124,7 +124,7 @@ &Ok - &Ok + &Okay Config Dialog @@ -179,7 +179,7 @@ GUI language - GUI Sprache + Sprache der Benutzeroberfläche Decimal separator parts @@ -207,7 +207,7 @@ Label language - Sprache für Label + Sprache der Bezeichnung Send crash reports @@ -231,7 +231,7 @@ Toolbar - Toolbar + Symbolleiste The text appears under the icon. (recommended for beginners.) @@ -239,7 +239,7 @@ GUI language: - GUI Sprache: + Sprache der Benutzeroberfläche: Decimal separator parts: @@ -271,11 +271,11 @@ The Default unit has been updated and will be used as the default for the next pattern you create. - + Die Standardmaßeinheit wurde geändert und wird als Standard für neu angelegte Schnittmuster wirksam. After each crash Valentina collects information that may help us fix the problem. We do not collect any personal information. Find more about what <a href="https://bitbucket.org/dismine/valentina/wiki/manual/Crash_reports">kind of information</a> we collect. - + Nach jedem Absturz stellt Valentina Informationen zusammen, die helfen können, das Problem zu beheben. Es werden keine persönlichen Daten übertragen. Finde mehr darüber heraus, <a href="https://bitbucket.org/dismine/valentina/wiki/manual/Crash_reports">welche Information</a> übertragen werden. @@ -307,7 +307,7 @@ Valentina version - Valentina Version + Valentina-Version Contributors @@ -327,7 +327,7 @@ Build revision: - Build revision: + Build-Revision: Built on %1 at %2 @@ -342,19 +342,19 @@ Tape version - Tape Version + Tape-Version Build revision: - Build revision: + Build-Revision: This program is part of Valentina project. - Dieses Programm ist teil des Valentina Projektes. + Dieses Programm ist Teil des Valentina-Projekts. Build revision: %1 - Build revision: %1 + Build-Revision: %1 Built on %3 at %4 @@ -381,7 +381,7 @@ Value of length - Länge + Wert der Länge <html><head/><body><p>Show full calculation in message box</p></body></html> @@ -560,7 +560,7 @@ Formula wizard - Formel Assistent + Formelassistent Value @@ -627,7 +627,7 @@ Arc length - Bogenlänge + Bogenlänge Center point @@ -663,7 +663,7 @@ Length can't be equal 0 - Länge kann nicht gleich 0 sein. + Länge kann nicht gleich 0 sein Radius: @@ -671,7 +671,7 @@ Formula wizard - Formel Assistent + Formelassistent Value @@ -683,7 +683,7 @@ First angle: - Erster Winkel + Erster Winkel: Length: @@ -790,7 +790,7 @@ Unique label - eindeutige Bezeichnung + Eindeutige Bezeichnung Choose unique label. @@ -825,7 +825,7 @@ Value of angle - Berecheter Winkel + Wert des Winkels <html><head/><body><p>Show full calculation in message box</p></body></html> @@ -889,11 +889,11 @@ Axis point: - Punkt der Schnittachse + Punkt der Schnittachse: Curve: - Kurve + Kurve: Point label: @@ -901,7 +901,7 @@ Unique label - eindeutige Bezeichnung + Eindeutige Bezeichnung Choose unique label. @@ -924,7 +924,7 @@ Value of length - Länge + Wert der Länge <html><head/><body><p>Show full calculation in message box</p></body></html> @@ -976,11 +976,11 @@ Point label: - Bezeichnung des Punktes + Bezeichnung des Punktes: Unique label - eindeutige Bezeichnung + Eindeutige Bezeichnung Choose unique label. @@ -999,7 +999,7 @@ Value of length - Länge + Wert der Länge <html><head/><body><p>Show full calculation in message box</p></body></html> @@ -1055,7 +1055,7 @@ Unique label - eindeutige Bezeichnung + Eindeutige Bezeichnung Choose unique label. @@ -1074,7 +1074,7 @@ Value of length - Länge + Wert der Länge <html><head/><body><p>Show full calculation in message box</p></body></html> @@ -1122,7 +1122,7 @@ Curve: - Kurve + Kurve: Point label: @@ -1130,7 +1130,7 @@ Unique label - eindeutige Bezeichnung + Eindeutige Bezeichnung Choose unique label. @@ -1149,7 +1149,7 @@ Bias X - Bias X + Fadenlauf X cm @@ -1157,7 +1157,7 @@ Bias Y - Bias Y + Fadenlauf Y Options @@ -1185,7 +1185,7 @@ Got wrong scene object. Ignore. - Falsches scene object. Wird ignoriert. + Falsches Szenenobjekt. Wird ignoriert. Reverse @@ -1241,7 +1241,7 @@ Name of detail: - Name des Details + Name des Details: Width: @@ -1272,7 +1272,7 @@ <html><head/><body><p>Show full calculation in message box</p></body></html> - <html><head/><body><p>Zeige die ganze Berechnung in der Nachrichtenbox box</p></body></html> + <html><head/><body><p>Zeige die ganze Berechnung in der Nachrichtenbox</p></body></html> Input data @@ -1280,7 +1280,7 @@ Size and height - Konfektion und Größe + Konfektions- und Körpergröße Measurements @@ -1324,31 +1324,31 @@ Line length - Linienlänge + Linienlänge Arc length - Bogenlänge + Bogenlänge Curve length - Kurvenlänge + Kurvenlänge Line Angle - Linienwerkzeug + Linienwinkel Radius of arcs - Radius des Bogens + Radius der Bögen Angles of arcs - Winkel des Bogens + Winkel der Bögen Angles of curves - Winkel der Kurve + Winkel der Kurven Arc radius @@ -1383,7 +1383,7 @@ Value of length - Länge + Längenwert <html><head/><body><p>Show full calculation in message box</p></body></html> @@ -1451,7 +1451,7 @@ Angle: - Winkel + Winkel: Base point: @@ -1463,7 +1463,7 @@ Unique label - eindeutige Bezeichnung + Eindeutige Bezeichnung Choose unique label. @@ -1530,7 +1530,7 @@ Unique label - eindeutige Bezeichnung + Eindeutige Bezeichnung Choose unique label. @@ -1831,7 +1831,7 @@ Several workpieces left not arranged, but none of them match for paper - + Mehrere Schnitteile wurden nicht arrangiert, da sie nicht auf das Papier passen Create a Layout @@ -1964,6 +1964,17 @@ Roll 44in Rolle 44 Inch + + + Three groups: big, middle, small = 0 + Two groups: big, small = 1 + Descending area = 2 + + +⇥Drei Gruppen: groß, mittel, klein = 0 +⇥Zwei Gruppen: groß, klein = 1 +⇥Absteigende Fläche = 2 + Paper format Papierformat @@ -2004,26 +2015,32 @@ Fields go beyond printing. Apply settings anyway? - + Felder gehen über den Druckbereich hinaus. + +Einstellungen trotzdem anwenden? Three groups: big, middle, small = 0; Two groups: big, small = 1; Descending area = 2 - + +⇥Drei Gruppen: groß, mittel, klein = 0 +⇥Zwei Gruppen: groß, klein = 1 +⇥Absteigende Fläche = 2 + Layout options - + Layoutoptionen Shift/Offset length: - + Verschiebungs-/Ausgleichslänge: Rule for choosing the next workpiece - + Regel zur Auswahl des nächsten Schnittteils @@ -2446,7 +2463,7 @@ Apply settings anyway? New pattern - Neues Schnittmuster + Neues Schnittmuster @@ -2616,11 +2633,11 @@ Apply settings anyway? Security - + Sicherheit Open only for read - + Schreibgeschützt öffnen @@ -2759,7 +2776,7 @@ Apply settings anyway? Immediately apply - + Sofort übernehmen @@ -3212,35 +3229,35 @@ Apply settings anyway? First curve: - + Erste Kurve: Second curve: - + Zweite Kurve: Point label: - + Bezeichnung des Punktes: Unique label - eindeutige Bezeichnung + eindeutige Bezeichnung: Choose unique label. - Eindeutige Bezeichnung wählen. + Eindeutige Bezeichnung wählen. Vertical correction: - + Vertikale Korrektur: Horizontal correction: - + Horizontale Korrektur: Select second curve - + Zweite Kurve auswählen @@ -3551,31 +3568,31 @@ Apply settings anyway? First point: - Erster Punkt: + Erster Punkt: Control point - + Kontrollpunkt Angle: - + Winkel: Length ratio: - + Längenverhältnis: Second point: - + Zweiter Punkt: Name: - Name: + Name: Invalid spline - + Ungültige Spline/glatte Kurve @@ -3630,31 +3647,31 @@ Apply settings anyway? Point: - + Punkt: First control point - + Erster Kontrollpunkt Angle: - + Winkel: Length ratio: - + Längenverhältnis: Second control point - + Zweiter Kontrollpunkt Name: - Name: + Name: Invalid spline path - + Ungültiger Spline-Pfad/glatte Kurve @@ -3689,19 +3706,19 @@ Apply settings anyway? Highest point - + Höchster Punkt Lowest point - + Unterster Punkt Leftmost point - + Punkt ganz links Rightmost point - + Punkt ganz rechts @@ -3914,7 +3931,7 @@ Apply settings anyway? Error while calculation formula. You can try to undo last operation or fix broken formula. - + Fehler beim Berechnen der Formel. Machen Sie den letzten Schritt rückgängig oder korrigieren Sie die Formel. @@ -4959,7 +4976,7 @@ Punkt schneidet Kreisbogen und Achse This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption). - + Diese Datei ist bereits in einem anderen Fenster geöffnet. Ignorieren Sie diese Nachricht, wenn Sie fortfahren wollen (nicht empfohlen, kann zu Datenverlust führen). The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption). @@ -4979,23 +4996,23 @@ Punkt schneidet Kreisbogen und Achse Report Bug... - + Programmfehler melden... Point intersection curves - + Schnittpunkt zwischen zwei Kurven Select first curve - + Erste Kurve auswählen (read only) - + (schreibgeschützt) Measurements was changed. Do you want to sync measurements now? - + Maße wurden geändert. Sollen die Maße jetzt synchronisiert werden? @@ -5054,7 +5071,7 @@ Punkt schneidet Kreisbogen und Achse Several workpieces left not arranged, but none of them match for paper - + Mehrere Schnitteile wurden nicht arrangiert, da sie nicht auf das Papier passen Can't open printer %1 @@ -5066,15 +5083,15 @@ Punkt schneidet Kreisbogen und Achse For saving multipage document all sheet should have the same size. Use export function instead. - + Zum Speichern eines mehrseitiges Dokument müssen alle Blätter die gleiche Größe haben. Verwenden Sie stattdessen die Exportfunktion. For previewing multipage document all sheet should have the same size. - + Zum Speichern eines mehrseitigen Dokuments müssen alle Blätter die gleiche Größe haben. For printing multipages document all sheet should have the same size. - + Zum Drucken eines mehrseitiges Dokument müssen alle Blätter die gleiche Größe haben. @@ -5301,22 +5318,22 @@ Punkt schneidet Kreisbogen und Achse Changes applied. - + Änderungen angewendet. QSaveFile Existing file %1 is not writable - + Die existierende Datei %1 kann nicht geschrieben werden Writing canceled by application - + Schreiben vom Programm abgebrochen Partial write. Partition full? - + Nur teilweise geschrieben. Partition voll? @@ -5402,7 +5419,7 @@ Punkt schneidet Kreisbogen und Achse Unexpected function "$TOK$" at position $POS$ Math parser error messages. Left untouched "$TOK$" and $POS$ - + Unerwartete Funktion "$TOK$" an Position $POS$ gefunden. Unexpected value "$TOK$" found at position $POS$ @@ -5412,17 +5429,17 @@ Punkt schneidet Kreisbogen und Achse Unexpected variable "$TOK$" found at position $POS$ Math parser error messages. Left untouched "$TOK$" and $POS$ - + Unerwartete Variable "$TOK$" an Position $POS$ gefunden. Function arguments used without a function (position: $POS$) Math parser error messages. Left untouched $POS$ - + Funktionsargument ohne Funktion benutzt (Position: $POS$) Missing parenthesis Math parser error messages. - + Fehlende Klammer Too many parameters for function "$TOK$" at expression position $POS$ @@ -5462,7 +5479,7 @@ Punkt schneidet Kreisbogen und Achse Unexpected string token found at position $POS$. Math parser error messages. Left untouched $POS$ - + Unerwarteter String "$TOK$" an Position $POS$ gefunden. Unterminated string starting at position $POS$. @@ -6076,7 +6093,7 @@ Do you want to save your changes? This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption). - + Diese Datei ist bereits in einem anderen Fenster geöffnet. Ignorieren Sie diese Nachricht, wenn Sie fortfahren wollen (nicht empfohlen, kann zu Datenverlust führen). The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption). @@ -6543,19 +6560,19 @@ Do you want to save your changes? Left margin must be used together with page units. - + Der linke Rand muss zusammen mit Seiteneinheiten genutzt werden. Right margin must be used together with page units. - + Der rechte Rand muss zusammen mit Seiteneinheiten genutzt werden. Top margin must be used together with page units. - + Der obere Rand muss zusammen mit Seiteneinheiten genutzt werden. Bottom margin must be used together with page units. - + Der untere Rand muss zusammen mit Seiteneinheiten genutzt werden. The path to output destination folder. By default the directory at which the application was started. @@ -6615,11 +6632,11 @@ Do you want to save your changes? Shift/Offset length - + Verschiebungs-/Ausgleichslänge Shift/Offset length must be used together with shift units. - + Die Verschiebungs-/Ausgleichslänge muss zusammen mit Verschiebungseinheiten genutzt werden. @@ -6941,7 +6958,7 @@ Do you want to save your changes? Error not unique id. - + Fehler: uneindeutige ID. Error creating or updating point of intersection curves @@ -7173,19 +7190,19 @@ Do you want to save your changes? Highest point - + Höchster Punkt Lowest point - + Unterster Punkt Leftmost point - + Punkt ganz links Rightmost point - + Punkt ganz rechts Tool to make point from intersection two curves @@ -8049,17 +8066,17 @@ Do you want to save your changes? RadiusArc_ Left symbol _ in name - + RadiusBogen_ Angle1Arc_ Left symbol _ in name - + Winkel1Bogen_ Angle2Arc_ Left symbol _ in name - + Winkel2Bogen_ Angle1Spl_ @@ -8285,7 +8302,7 @@ Do you want to save your changes? mNoisyHandler DEBUG: - + ENTBUGGEN: WARNING: @@ -8293,11 +8310,11 @@ Do you want to save your changes? CRITICAL: - + KRITISCH: FATAL: - + FATAL: INFO: @@ -8313,7 +8330,7 @@ Do you want to save your changes? Fatal error. - + Fataler Fehler. Information. @@ -8324,7 +8341,7 @@ Do you want to save your changes? vNoisyHandler DEBUG: - + ENTBUGGEN: WARNING: @@ -8332,11 +8349,11 @@ Do you want to save your changes? CRITICAL: - + KRITISCH: FATAL: - + FATAL: INFO: @@ -8352,7 +8369,7 @@ Do you want to save your changes? Fatal error. - + Fataler Fehler. Information. diff --git a/share/translations/valentina_zh_CN.ts b/share/translations/valentina_zh_CN.ts index 853aeb3d2..5dbe87f6c 100644 --- a/share/translations/valentina_zh_CN.ts +++ b/share/translations/valentina_zh_CN.ts @@ -6183,7 +6183,7 @@ Do you want to save your changes? - + Save @@ -6249,13 +6249,13 @@ Do you want to save your changes? - + Preferences - + Import from a pattern @@ -6270,300 +6270,300 @@ Do you want to save your changes? - + untitled %1 - - + + File '%1' doesn't exist! - - + + File has unknown format. - - + + File contains invalid known measurement(s). - - - + + + File error. - + Individual measurements (*.vit);;Standard measurements (*.vst);;All files (*.*) - + Standard measurements (*.vst);;Individual measurements (*.vit);;All files (*.*) - + Measurements (*.vst *.vit);;All files (*.*) - - + + Individual measurements (*.vit) - + Select file - - + + Standard measurements - - + + Height: - - + + Size: - - + + Individual measurements - - + + Pattern unit: - - + + Could not save file - + measurements - + Standard measurements (*.vst) - + Save as - + Failed to lock. This file already opened in another window. - + Failed to lock. This file already opened in another window. Expect collissions when run 2 copies of the program. - + About Qt - - - - - - - + + + + + + + Can't find measurement '%1'. - + Edit measurement - + M_%1 - + Pattern files (*.val) - - + + This file already opened in another window. - + <html><head/><body><p><span style=" font-size:340pt;">?</span></p><p align="center">Unknown measurement</p></body></html> - + The name of known measurement forbidden to change. - - - + + + Error - - + + Empty field. - + The full name of known measurement forbidden to change. - + untitled - + <Empty> - + File was not saved yet. - + Unsaved changes - + Measurements have been modified. Do you want to save your changes? - + Save... - + Don't Save - + Empty field - + Value - - + + Parser error: %1 - + Open file - + Export standard measurements not supported. - + &New Window - - - + + + Locking file - + This file already opened in another window. Ignore if you want to continue (not recommended, can cause a data corruption). - + The lock file could not be created, for lack of permissions. Ignore if you want to continue (not recommended, can cause a data corruption). - + Unknown error happened, for instance a full partition prevented writing out the lock file. Ignore if you want to continue (not recommended, can cause a data corruption). - + The lock file could not be created, for lack of permissions. - + Unknown error happened, for instance a full partition prevented writing out the lock file. - + unknown gender - + male gender - + female gender From b7069366ea419434d3e2b7a4083f40d2f0a873ca Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 20 Feb 2016 11:11:42 +0200 Subject: [PATCH 50/59] Fixed bugs in translation. --HG-- branch : develop --- share/translations/measurements_p10_de_DE.ts | 2 +- share/translations/measurements_p11_de_DE.ts | 2 +- share/translations/measurements_p12_de_DE.ts | 2 +- share/translations/measurements_p13_de_DE.ts | 2 +- share/translations/measurements_p14_de_DE.ts | 2 +- share/translations/measurements_p15_de_DE.ts | 2 +- share/translations/measurements_p16_de_DE.ts | 2 +- share/translations/measurements_p17_de_DE.ts | 2 +- share/translations/measurements_p18_de_DE.ts | 2 +- share/translations/measurements_p19_de_DE.ts | 2 +- share/translations/measurements_p1_de_DE.ts | 2 +- share/translations/measurements_p20_de_DE.ts | 2 +- share/translations/measurements_p21_de_DE.ts | 2 +- share/translations/measurements_p22_de_DE.ts | 2 +- share/translations/measurements_p23_de_DE.ts | 2 +- share/translations/measurements_p24_de_DE.ts | 2 +- share/translations/measurements_p25_de_DE.ts | 2 +- share/translations/measurements_p26_de_DE.ts | 2 +- share/translations/measurements_p27_de_DE.ts | 2 +- share/translations/measurements_p28_de_DE.ts | 2 +- share/translations/measurements_p29_de_DE.ts | 2 +- share/translations/measurements_p2_de_DE.ts | 2 +- share/translations/measurements_p30_de_DE.ts | 2 +- share/translations/measurements_p31_de_DE.ts | 2 +- share/translations/measurements_p32_de_DE.ts | 2 +- share/translations/measurements_p33_de_DE.ts | 2 +- share/translations/measurements_p34_de_DE.ts | 2 +- share/translations/measurements_p35_de_DE.ts | 2 +- share/translations/measurements_p36_de_DE.ts | 2 +- share/translations/measurements_p37_de_DE.ts | 2 +- share/translations/measurements_p38_de_DE.ts | 2 +- share/translations/measurements_p39_de_DE.ts | 2 +- share/translations/measurements_p3_de_DE.ts | 2 +- share/translations/measurements_p40_de_DE.ts | 2 +- share/translations/measurements_p41_de_DE.ts | 2 +- share/translations/measurements_p42_de_DE.ts | 2 +- share/translations/measurements_p43_de_DE.ts | 2 +- share/translations/measurements_p44_de_DE.ts | 2 +- share/translations/measurements_p45_de_DE.ts | 2 +- share/translations/measurements_p46_de_DE.ts | 2 +- share/translations/measurements_p47_de_DE.ts | 2 +- share/translations/measurements_p48_de_DE.ts | 2 +- share/translations/measurements_p49_de_DE.ts | 2 +- share/translations/measurements_p4_de_DE.ts | 2 +- share/translations/measurements_p50_de_DE.ts | 2 +- share/translations/measurements_p51_de_DE.ts | 2 +- share/translations/measurements_p52_de_DE.ts | 2 +- share/translations/measurements_p53_de_DE.ts | 2 +- share/translations/measurements_p54_de_DE.ts | 2 +- share/translations/measurements_p5_de_DE.ts | 2 +- share/translations/measurements_p6_de_DE.ts | 2 +- share/translations/measurements_p7_de_DE.ts | 2 +- share/translations/measurements_p8_de_DE.ts | 2 +- share/translations/measurements_p998_de_DE.ts | 2 +- share/translations/measurements_p9_de_DE.ts | 2 +- share/translations/valentina_de_DE.ts | 2 +- 56 files changed, 56 insertions(+), 56 deletions(-) diff --git a/share/translations/measurements_p10_de_DE.ts b/share/translations/measurements_p10_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p10_de_DE.ts +++ b/share/translations/measurements_p10_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p11_de_DE.ts b/share/translations/measurements_p11_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p11_de_DE.ts +++ b/share/translations/measurements_p11_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p12_de_DE.ts b/share/translations/measurements_p12_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p12_de_DE.ts +++ b/share/translations/measurements_p12_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p13_de_DE.ts b/share/translations/measurements_p13_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p13_de_DE.ts +++ b/share/translations/measurements_p13_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p14_de_DE.ts b/share/translations/measurements_p14_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p14_de_DE.ts +++ b/share/translations/measurements_p14_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p15_de_DE.ts b/share/translations/measurements_p15_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p15_de_DE.ts +++ b/share/translations/measurements_p15_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p16_de_DE.ts b/share/translations/measurements_p16_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p16_de_DE.ts +++ b/share/translations/measurements_p16_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p17_de_DE.ts b/share/translations/measurements_p17_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p17_de_DE.ts +++ b/share/translations/measurements_p17_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p18_de_DE.ts b/share/translations/measurements_p18_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p18_de_DE.ts +++ b/share/translations/measurements_p18_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p19_de_DE.ts b/share/translations/measurements_p19_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p19_de_DE.ts +++ b/share/translations/measurements_p19_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p1_de_DE.ts b/share/translations/measurements_p1_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p1_de_DE.ts +++ b/share/translations/measurements_p1_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p20_de_DE.ts b/share/translations/measurements_p20_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p20_de_DE.ts +++ b/share/translations/measurements_p20_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p21_de_DE.ts b/share/translations/measurements_p21_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p21_de_DE.ts +++ b/share/translations/measurements_p21_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p22_de_DE.ts b/share/translations/measurements_p22_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p22_de_DE.ts +++ b/share/translations/measurements_p22_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p23_de_DE.ts b/share/translations/measurements_p23_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p23_de_DE.ts +++ b/share/translations/measurements_p23_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p24_de_DE.ts b/share/translations/measurements_p24_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p24_de_DE.ts +++ b/share/translations/measurements_p24_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p25_de_DE.ts b/share/translations/measurements_p25_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p25_de_DE.ts +++ b/share/translations/measurements_p25_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p26_de_DE.ts b/share/translations/measurements_p26_de_DE.ts index f2ea3943b..70d6117d6 100644 --- a/share/translations/measurements_p26_de_DE.ts +++ b/share/translations/measurements_p26_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p27_de_DE.ts b/share/translations/measurements_p27_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p27_de_DE.ts +++ b/share/translations/measurements_p27_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p28_de_DE.ts b/share/translations/measurements_p28_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p28_de_DE.ts +++ b/share/translations/measurements_p28_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p29_de_DE.ts b/share/translations/measurements_p29_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p29_de_DE.ts +++ b/share/translations/measurements_p29_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p2_de_DE.ts b/share/translations/measurements_p2_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p2_de_DE.ts +++ b/share/translations/measurements_p2_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p30_de_DE.ts b/share/translations/measurements_p30_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p30_de_DE.ts +++ b/share/translations/measurements_p30_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p31_de_DE.ts b/share/translations/measurements_p31_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p31_de_DE.ts +++ b/share/translations/measurements_p31_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p32_de_DE.ts b/share/translations/measurements_p32_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p32_de_DE.ts +++ b/share/translations/measurements_p32_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p33_de_DE.ts b/share/translations/measurements_p33_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p33_de_DE.ts +++ b/share/translations/measurements_p33_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p34_de_DE.ts b/share/translations/measurements_p34_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p34_de_DE.ts +++ b/share/translations/measurements_p34_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p35_de_DE.ts b/share/translations/measurements_p35_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p35_de_DE.ts +++ b/share/translations/measurements_p35_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p36_de_DE.ts b/share/translations/measurements_p36_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p36_de_DE.ts +++ b/share/translations/measurements_p36_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p37_de_DE.ts b/share/translations/measurements_p37_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p37_de_DE.ts +++ b/share/translations/measurements_p37_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p38_de_DE.ts b/share/translations/measurements_p38_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p38_de_DE.ts +++ b/share/translations/measurements_p38_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p39_de_DE.ts b/share/translations/measurements_p39_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p39_de_DE.ts +++ b/share/translations/measurements_p39_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p3_de_DE.ts b/share/translations/measurements_p3_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p3_de_DE.ts +++ b/share/translations/measurements_p3_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p40_de_DE.ts b/share/translations/measurements_p40_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p40_de_DE.ts +++ b/share/translations/measurements_p40_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p41_de_DE.ts b/share/translations/measurements_p41_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p41_de_DE.ts +++ b/share/translations/measurements_p41_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p42_de_DE.ts b/share/translations/measurements_p42_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p42_de_DE.ts +++ b/share/translations/measurements_p42_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p43_de_DE.ts b/share/translations/measurements_p43_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p43_de_DE.ts +++ b/share/translations/measurements_p43_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p44_de_DE.ts b/share/translations/measurements_p44_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p44_de_DE.ts +++ b/share/translations/measurements_p44_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p45_de_DE.ts b/share/translations/measurements_p45_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p45_de_DE.ts +++ b/share/translations/measurements_p45_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p46_de_DE.ts b/share/translations/measurements_p46_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p46_de_DE.ts +++ b/share/translations/measurements_p46_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p47_de_DE.ts b/share/translations/measurements_p47_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p47_de_DE.ts +++ b/share/translations/measurements_p47_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p48_de_DE.ts b/share/translations/measurements_p48_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p48_de_DE.ts +++ b/share/translations/measurements_p48_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p49_de_DE.ts b/share/translations/measurements_p49_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p49_de_DE.ts +++ b/share/translations/measurements_p49_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p4_de_DE.ts b/share/translations/measurements_p4_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p4_de_DE.ts +++ b/share/translations/measurements_p4_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p50_de_DE.ts b/share/translations/measurements_p50_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p50_de_DE.ts +++ b/share/translations/measurements_p50_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p51_de_DE.ts b/share/translations/measurements_p51_de_DE.ts index cf62f677b..227421ec2 100644 --- a/share/translations/measurements_p51_de_DE.ts +++ b/share/translations/measurements_p51_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p52_de_DE.ts b/share/translations/measurements_p52_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p52_de_DE.ts +++ b/share/translations/measurements_p52_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p53_de_DE.ts b/share/translations/measurements_p53_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p53_de_DE.ts +++ b/share/translations/measurements_p53_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p54_de_DE.ts b/share/translations/measurements_p54_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p54_de_DE.ts +++ b/share/translations/measurements_p54_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p5_de_DE.ts b/share/translations/measurements_p5_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p5_de_DE.ts +++ b/share/translations/measurements_p5_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p6_de_DE.ts b/share/translations/measurements_p6_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p6_de_DE.ts +++ b/share/translations/measurements_p6_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p7_de_DE.ts b/share/translations/measurements_p7_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p7_de_DE.ts +++ b/share/translations/measurements_p7_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p8_de_DE.ts b/share/translations/measurements_p8_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p8_de_DE.ts +++ b/share/translations/measurements_p8_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p998_de_DE.ts b/share/translations/measurements_p998_de_DE.ts index e53399d1d..41e04dc55 100644 --- a/share/translations/measurements_p998_de_DE.ts +++ b/share/translations/measurements_p998_de_DE.ts @@ -3640,7 +3640,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/measurements_p9_de_DE.ts b/share/translations/measurements_p9_de_DE.ts index 0e38cbc42..9b5f21448 100644 --- a/share/translations/measurements_p9_de_DE.ts +++ b/share/translations/measurements_p9_de_DE.ts @@ -3670,7 +3670,7 @@ Vertikalen Abstand von der hohen Hüfte Ebene, stärkste Stelle des vorderen Ba leg_ankle_diag_circ Name in a formula. Don't use math symbols and space in name!!!! - Bein: Diagonaler Umfang des Knöchels + bein_diagonaler_umfang_knöchel diff --git a/share/translations/valentina_de_DE.ts b/share/translations/valentina_de_DE.ts index 39a52169b..f09297d38 100644 --- a/share/translations/valentina_de_DE.ts +++ b/share/translations/valentina_de_DE.ts @@ -5479,7 +5479,7 @@ Punkt schneidet Kreisbogen und Achse Unexpected string token found at position $POS$. Math parser error messages. Left untouched $POS$ - Unerwarteter String "$TOK$" an Position $POS$ gefunden. + Unerwarteter string zeichen an position $POS$ gefunden. Unterminated string starting at position $POS$. From 89c644ca9f4d4da199866c739e35a1a7f0c97bc0 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 20 Feb 2016 12:22:58 +0200 Subject: [PATCH 51/59] Fix for building unstable package. --HG-- branch : develop --- dist/rpm/_service | 4 ---- dist/rpm/valentina.spec | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dist/rpm/_service b/dist/rpm/_service index f89890779..eeee9fb2b 100644 --- a/dist/rpm/_service +++ b/dist/rpm/_service @@ -10,9 +10,5 @@ *.tar */dist/rpm/valentina.spec - - valentina.tar - gz - diff --git a/dist/rpm/valentina.spec b/dist/rpm/valentina.spec index 80bdc175e..c5f6f5b04 100644 --- a/dist/rpm/valentina.spec +++ b/dist/rpm/valentina.spec @@ -49,7 +49,7 @@ Version: 0.4.2 Release: 0 URL: https://bitbucket.org/dismine/valentina License: GPL-3.0+ -Source0: %{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar Group: Graphics Summary: Pattern Making Application BuildRoot: %{_tmppath}/%{name}-%{version}-build From e52acb8e28b6b49a49efffb57339c61d0acdebb8 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 20 Feb 2016 17:19:30 +0200 Subject: [PATCH 52/59] dsc file for building package for Debian. --HG-- branch : develop --- dist/OBS_debian/valentina.dsc | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 dist/OBS_debian/valentina.dsc diff --git a/dist/OBS_debian/valentina.dsc b/dist/OBS_debian/valentina.dsc new file mode 100644 index 000000000..8dce87f83 --- /dev/null +++ b/dist/OBS_debian/valentina.dsc @@ -0,0 +1,19 @@ +Format: 3.0 (native) +Source: valentina +Binary: valentina +Architecture: i386 amd64 +Version: 0.4.2 +Maintainer: Roman Telezhynskyi +Homepage: http://www.valentina-project.org/ +Standards-Version: 3.9.5 +Vcs-Browser: https://bitbucket.org/dismine/valentina +Build-Depends: debhelper (>= 8.0.0), qtbase5-dev (>= 5.0.0), libqt5svg5-dev (>= 5.0.0), g++ (>= 4.6.0), qt5-default (>= 5.0.0), qttools5-dev-tools (>= 5.0.0), libqt5xmlpatterns5-dev (>= 5.0.0) +Package-List: + valentina deb graphics optional +Files: + d09673bcc475067139b88cf875e5dc0c 20954240 valentina_0.4.2.orig.tar.gz + 2fecf324a32123b08cefc0f047bca5ee 63176 valentina_0.4.2.diff.tar.gz + +DEBTRANSFORM-TAR: valentina_0.4.2.orig.tar.gz +DEBTRANSFORM-FILES-TAR: debian.tar.gz +DEBTRANSFORM-RELEASE: 1 From f167467c2897cc5561e3c6dbc7e6709b2bb9a9a5 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 20 Feb 2016 18:44:08 +0200 Subject: [PATCH 53/59] Use debian.* files for building unstable package for Debian. --HG-- branch : develop --- dist/OBS_debian/README | 6 + dist/OBS_debian/debian.changelog | 5 + dist/OBS_debian/debian.compat | 1 + dist/OBS_debian/debian.control | 24 + dist/OBS_debian/debian.copyright | 67 ++ dist/OBS_debian/debian.docs | 3 + dist/OBS_debian/debian.files | 1 + dist/OBS_debian/debian.format | 1 + dist/OBS_debian/debian.include-binaries | 863 ++++++++++++++++++ dist/OBS_debian/debian.menu | 2 + dist/OBS_debian/debian.rules | 67 ++ dist/OBS_debian/debian.shlibs.local | 2 + dist/OBS_debian/debian.substvars | 1 + dist/OBS_debian/debian.tape.1 | 41 + dist/OBS_debian/debian.valentina.1 | 144 +++ dist/OBS_debian/debian.valentina.dirs | 7 + dist/OBS_debian/debian.valentina.install | 8 + dist/OBS_debian/debian.valentina.manpages | 2 + dist/OBS_debian/debian.valentina.mime | 3 + dist/OBS_debian/debian.valentina.postinst | 36 + dist/OBS_debian/debian.valentina.postrm | 37 + .../debian.valentina.sharedmimeinfo | 285 ++++++ dist/rpm/_service | 6 +- dist/rpm/valentina.spec | 2 +- scripts/obs_debian.sh | 19 + 25 files changed, 1631 insertions(+), 2 deletions(-) create mode 100644 dist/OBS_debian/README create mode 100644 dist/OBS_debian/debian.changelog create mode 100644 dist/OBS_debian/debian.compat create mode 100644 dist/OBS_debian/debian.control create mode 100644 dist/OBS_debian/debian.copyright create mode 100644 dist/OBS_debian/debian.docs create mode 100644 dist/OBS_debian/debian.files create mode 100644 dist/OBS_debian/debian.format create mode 100644 dist/OBS_debian/debian.include-binaries create mode 100644 dist/OBS_debian/debian.menu create mode 100755 dist/OBS_debian/debian.rules create mode 100644 dist/OBS_debian/debian.shlibs.local create mode 100644 dist/OBS_debian/debian.substvars create mode 100644 dist/OBS_debian/debian.tape.1 create mode 100644 dist/OBS_debian/debian.valentina.1 create mode 100644 dist/OBS_debian/debian.valentina.dirs create mode 100644 dist/OBS_debian/debian.valentina.install create mode 100644 dist/OBS_debian/debian.valentina.manpages create mode 100644 dist/OBS_debian/debian.valentina.mime create mode 100755 dist/OBS_debian/debian.valentina.postinst create mode 100755 dist/OBS_debian/debian.valentina.postrm create mode 100644 dist/OBS_debian/debian.valentina.sharedmimeinfo create mode 100755 scripts/obs_debian.sh diff --git a/dist/OBS_debian/README b/dist/OBS_debian/README new file mode 100644 index 000000000..ba25e269b --- /dev/null +++ b/dist/OBS_debian/README @@ -0,0 +1,6 @@ +Use debian.* files for building unstable package for Debian. +For stable version enought to ceate an archive debian.tar.gz with folder debian inside. + +Run obs_debian.sh for updating files. + +Don't forget to update version inside valentina.dsc if need! diff --git a/dist/OBS_debian/debian.changelog b/dist/OBS_debian/debian.changelog new file mode 100644 index 000000000..c8d384446 --- /dev/null +++ b/dist/OBS_debian/debian.changelog @@ -0,0 +1,5 @@ +valentina (0.4.2) trusty; urgency=low + + * Auto build. + + -- dismine Fri, 27 Jun 2014 09:51:38 +0300 diff --git a/dist/OBS_debian/debian.compat b/dist/OBS_debian/debian.compat new file mode 100644 index 000000000..ec635144f --- /dev/null +++ b/dist/OBS_debian/debian.compat @@ -0,0 +1 @@ +9 diff --git a/dist/OBS_debian/debian.control b/dist/OBS_debian/debian.control new file mode 100644 index 000000000..acba13fdd --- /dev/null +++ b/dist/OBS_debian/debian.control @@ -0,0 +1,24 @@ +Source: valentina +Section: graphics +Priority: optional +Maintainer: Roman Telezhynskyi +Build-Depends: debhelper (>= 8.0.0), + qtbase5-dev (>= 5.0.0), + libqt5svg5-dev (>= 5.0.0), + g++ (>= 4.6.0), + qt5-default (>= 5.0.0), + qttools5-dev-tools (>= 5.0.0), + libqt5xmlpatterns5-dev (>= 5.0.0) +Standards-Version: 3.9.5 +Homepage: http://www.valentina-project.org/ +Vcs-Browser: https://bitbucket.org/dismine/valentina + +Package: valentina +Architecture: i386 amd64 +Depends: libc6 (>= 2.4), libgcc1 (>= 1:4.1.1), libqt5core5a (>= 5.0.0) | libqt5core5 (>= 5.0.0), libqt5gui5 (>= 5.0.0) | libqt5gui5-gles (>= 5.0.0), libqt5printsupport5 (>= 5.0.0), libqt5svg5 (>= 5.0.0), libqt5widgets5 (>= 5.0.0), libqt5xml5 (>= 5.0.0), libqt5xmlpatterns5 (>= 5.0.0), libstdc++6 (>= 4.6), xpdf +Description: Pattern making program. + Valentina is a cross-platform patternmaking program which allows designers + to create and model patterns of clothing. This software allows pattern + creation, using either standard sizing tables or an individual’s set of + measurements. It blends new technologies with traditional methods to create + a unique pattern making tool. diff --git a/dist/OBS_debian/debian.copyright b/dist/OBS_debian/debian.copyright new file mode 100644 index 000000000..0a67fc1ae --- /dev/null +++ b/dist/OBS_debian/debian.copyright @@ -0,0 +1,67 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: valentina +Source: https://bitbucket.org/dismine/valentina + +Files: * +Copyright: 2013-2014 Roman Telezhynskyi +License: GPL-3.0+ + +Files: debian/* +Copyright: 2013-2014 Roman Telezhynskyi +License: GPL-3.0+ + +Files: usr/lib/libqmuparser.so.* +Copyright: 2004-2014 Ingo Berg , 2014 Roman Telezhynskyi +License: MIT + +Files: usr/lib/libvpropertyexplorer.so.* +Copyright: hedgeware , 2014 Roman Telezhynskyi +License: LGPL-2.1 + +License: GPL-3.0+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". + +License: MIT + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + +License: LGPL-2.1 + All rights reserved. This program and the accompanying materials + are made available under the terms of the GNU Lesser General Public License + (LGPL) version 2.1 which accompanies this distribution, and is available at + http://www.gnu.org/licenses/lgpl-2.1.html + . + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + diff --git a/dist/OBS_debian/debian.docs b/dist/OBS_debian/debian.docs new file mode 100644 index 000000000..48c085611 --- /dev/null +++ b/dist/OBS_debian/debian.docs @@ -0,0 +1,3 @@ +README.txt +AUTHORS.txt +ChangeLog.txt diff --git a/dist/OBS_debian/debian.files b/dist/OBS_debian/debian.files new file mode 100644 index 000000000..80ab1d10f --- /dev/null +++ b/dist/OBS_debian/debian.files @@ -0,0 +1 @@ +valentina_0.2.8+441+21+201406270651_i386.deb graphics optional diff --git a/dist/OBS_debian/debian.format b/dist/OBS_debian/debian.format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/dist/OBS_debian/debian.format @@ -0,0 +1 @@ +3.0 (native) diff --git a/dist/OBS_debian/debian.include-binaries b/dist/OBS_debian/debian.include-binaries new file mode 100644 index 000000000..5f9e9000a --- /dev/null +++ b/dist/OBS_debian/debian.include-binaries @@ -0,0 +1,863 @@ +debian/usr/share/pixmaps/valentina.png +debian/usr/share/pixmaps/tape.png +debian/usr/share/pixmaps/application-x-valentina-pattern.png +debian/usr/share/pixmaps/application-x-valentina-i-measurements.png +debian/usr/share/pixmaps/application-x-valentina-s-measurements.png +debian/valentina/usr/bin/valentina +debian/valentina/usr/bin/tape +debian/valentina/usr/share/valentina/diagrams.rcc +debian/valentina/usr/share/valentina/translations/measurements_p0_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p0_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p0_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p0_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p0_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p0_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p0_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p0_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p0_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p0_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p0_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p0_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p0_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p0_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p0_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p10_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p10_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p10_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p10_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p10_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p10_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p10_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p10_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p10_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p10_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p10_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p10_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p10_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p10_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p10_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p11_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p11_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p11_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p11_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p11_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p11_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p11_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p11_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p11_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p11_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p11_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p11_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p11_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p11_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p11_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p12_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p12_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p12_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p12_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p12_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p12_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p12_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p12_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p12_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p12_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p12_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p12_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p12_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p12_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p12_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p13_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p13_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p13_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p13_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p13_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p13_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p13_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p13_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p13_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p13_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p13_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p13_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p13_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p13_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p13_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p14_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p14_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p14_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p14_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p14_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p14_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p14_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p14_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p14_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p14_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p14_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p14_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p14_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p14_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p14_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p15_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p15_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p15_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p15_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p15_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p15_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p15_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p15_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p15_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p15_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p15_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p15_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p15_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p15_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p15_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p16_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p16_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p16_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p16_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p16_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p16_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p16_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p16_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p16_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p16_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p16_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p16_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p16_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p16_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p16_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p17_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p17_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p17_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p17_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p17_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p17_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p17_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p17_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p17_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p17_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p17_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p17_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p17_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p17_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p17_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p18_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p18_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p18_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p18_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p18_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p18_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p18_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p18_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p18_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p18_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p18_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p18_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p18_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p18_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p18_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p19_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p19_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p19_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p19_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p19_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p19_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p19_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p19_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p19_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p19_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p19_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p19_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p19_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p19_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p19_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p1_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p1_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p1_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p1_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p1_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p1_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p1_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p1_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p1_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p1_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p1_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p1_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p1_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p1_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p1_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p20_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p20_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p20_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p20_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p20_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p20_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p20_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p20_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p20_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p20_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p20_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p20_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p20_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p20_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p20_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p21_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p21_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p21_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p21_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p21_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p21_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p21_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p21_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p21_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p21_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p21_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p21_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p21_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p21_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p21_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p22_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p22_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p22_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p22_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p22_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p22_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p22_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p22_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p22_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p22_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p22_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p22_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p22_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p22_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p22_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p23_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p23_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p23_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p23_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p23_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p23_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p23_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p23_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p23_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p23_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p23_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p23_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p23_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p23_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p23_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p24_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p24_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p24_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p24_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p24_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p24_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p24_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p24_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p24_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p24_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p24_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p24_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p24_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p24_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p24_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p25_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p25_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p25_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p25_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p25_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p25_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p25_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p25_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p25_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p25_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p25_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p25_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p25_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p25_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p25_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p26_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p26_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p26_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p26_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p26_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p26_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p26_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p26_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p26_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p26_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p26_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p26_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p26_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p26_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p26_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p27_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p27_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p27_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p27_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p27_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p27_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p27_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p27_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p27_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p27_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p27_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p27_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p27_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p27_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p27_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p28_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p28_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p28_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p28_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p28_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p28_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p28_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p28_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p28_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p28_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p28_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p28_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p28_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p28_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p28_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p29_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p29_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p29_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p29_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p29_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p29_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p29_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p29_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p29_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p29_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p29_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p29_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p29_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p29_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p29_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p2_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p2_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p2_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p2_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p2_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p2_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p2_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p2_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p2_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p2_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p2_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p2_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p2_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p2_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p2_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p30_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p30_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p30_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p30_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p30_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p30_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p30_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p30_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p30_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p30_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p30_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p30_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p30_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p30_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p30_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p31_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p31_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p31_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p31_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p31_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p31_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p31_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p31_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p31_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p31_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p31_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p31_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p31_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p31_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p31_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p32_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p32_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p32_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p32_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p32_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p32_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p32_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p32_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p32_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p32_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p32_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p32_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p32_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p32_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p32_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p33_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p33_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p33_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p33_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p33_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p33_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p33_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p33_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p33_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p33_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p33_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p33_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p33_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p33_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p33_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p34_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p34_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p34_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p34_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p34_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p34_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p34_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p34_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p34_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p34_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p34_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p34_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p34_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p34_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p34_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p35_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p35_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p35_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p35_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p35_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p35_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p35_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p35_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p35_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p35_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p35_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p35_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p35_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p35_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p35_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p36_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p36_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p36_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p36_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p36_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p36_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p36_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p36_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p36_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p36_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p36_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p36_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p36_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p36_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p36_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p37_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p37_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p37_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p37_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p37_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p37_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p37_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p37_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p37_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p37_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p37_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p37_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p37_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p37_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p37_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p38_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p38_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p38_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p38_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p38_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p38_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p38_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p38_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p38_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p38_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p38_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p38_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p38_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p38_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p38_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p39_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p39_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p39_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p39_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p39_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p39_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p39_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p39_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p39_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p39_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p39_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p39_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p39_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p39_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p39_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p3_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p3_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p3_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p3_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p3_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p3_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p3_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p3_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p3_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p3_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p3_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p3_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p3_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p3_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p3_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p40_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p40_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p40_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p40_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p40_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p40_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p40_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p40_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p40_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p40_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p40_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p40_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p40_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p40_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p40_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p41_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p41_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p41_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p41_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p41_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p41_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p41_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p41_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p41_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p41_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p41_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p41_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p41_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p41_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p41_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p42_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p42_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p42_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p42_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p42_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p42_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p42_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p42_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p42_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p42_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p42_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p42_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p42_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p42_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p42_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p43_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p43_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p43_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p43_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p43_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p43_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p43_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p43_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p43_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p43_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p43_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p43_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p43_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p43_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p43_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p44_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p44_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p44_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p44_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p44_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p44_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p44_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p44_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p44_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p44_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p44_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p44_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p44_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p44_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p44_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p45_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p45_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p45_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p45_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p45_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p45_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p45_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p45_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p45_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p45_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p45_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p45_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p45_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p45_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p45_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p46_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p46_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p46_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p46_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p46_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p46_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p46_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p46_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p46_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p46_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p46_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p46_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p46_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p46_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p46_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p47_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p47_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p47_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p47_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p47_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p47_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p47_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p47_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p47_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p47_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p47_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p47_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p47_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p47_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p47_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p48_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p48_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p48_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p48_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p48_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p48_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p48_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p48_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p48_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p48_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p48_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p48_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p48_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p48_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p48_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p49_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p49_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p49_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p49_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p49_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p49_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p49_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p49_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p49_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p49_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p49_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p49_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p49_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p49_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p49_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p4_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p4_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p4_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p4_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p4_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p4_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p4_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p4_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p4_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p4_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p4_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p4_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p4_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p4_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p4_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p50_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p50_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p50_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p50_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p50_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p50_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p50_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p50_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p50_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p50_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p50_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p50_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p50_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p50_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p50_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p51_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p51_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p51_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p51_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p51_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p51_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p51_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p51_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p51_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p51_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p51_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p51_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p51_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p51_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p51_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p52_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p52_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p52_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p52_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p52_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p52_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p52_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p52_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p52_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p52_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p52_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p52_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p52_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p52_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p52_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p53_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p53_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p53_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p53_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p53_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p53_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p53_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p53_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p53_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p53_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p53_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p53_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p53_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p53_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p53_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p54_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p54_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p54_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p54_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p54_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p54_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p54_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p54_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p54_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p54_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p54_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p54_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p54_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p54_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p54_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p5_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p5_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p5_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p5_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p5_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p5_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p5_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p5_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p5_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p5_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p5_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p5_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p5_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p5_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p5_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p6_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p6_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p6_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p6_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p6_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p6_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p6_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p6_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p6_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p6_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p6_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p6_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p6_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p6_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p6_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p7_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p7_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p7_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p7_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p7_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p7_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p7_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p7_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p7_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p7_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p7_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p7_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p7_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p7_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p7_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p8_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p8_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p8_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p8_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p8_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p8_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p8_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p8_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p8_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p8_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p8_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p8_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p8_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p8_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p8_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p998_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p998_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p998_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p998_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p998_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p998_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p998_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p998_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p998_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p998_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p998_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p998_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p998_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p998_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p998_uk_UA.qm +debian/valentina/usr/share/valentina/translations/measurements_p9_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/measurements_p9_de_DE.qm +debian/valentina/usr/share/valentina/translations/measurements_p9_en_CA.qm +debian/valentina/usr/share/valentina/translations/measurements_p9_en_IN.qm +debian/valentina/usr/share/valentina/translations/measurements_p9_en_US.qm +debian/valentina/usr/share/valentina/translations/measurements_p9_es_ES.qm +debian/valentina/usr/share/valentina/translations/measurements_p9_fi_FI.qm +debian/valentina/usr/share/valentina/translations/measurements_p9_fr_FR.qm +debian/valentina/usr/share/valentina/translations/measurements_p9_he_IL.qm +debian/valentina/usr/share/valentina/translations/measurements_p9_id_ID.qm +debian/valentina/usr/share/valentina/translations/measurements_p9_it_IT.qm +debian/valentina/usr/share/valentina/translations/measurements_p9_nl_NL.qm +debian/valentina/usr/share/valentina/translations/measurements_p9_ro_RO.qm +debian/valentina/usr/share/valentina/translations/measurements_p9_ru_RU.qm +debian/valentina/usr/share/valentina/translations/measurements_p9_uk_UA.qm +debian/valentina/usr/share/valentina/translations/valentina_cs_CZ.qm +debian/valentina/usr/share/valentina/translations/valentina_de_DE.qm +debian/valentina/usr/share/valentina/translations/valentina_en_CA.qm +debian/valentina/usr/share/valentina/translations/valentina_en_IN.qm +debian/valentina/usr/share/valentina/translations/valentina_en_US.qm +debian/valentina/usr/share/valentina/translations/valentina_es_ES.qm +debian/valentina/usr/share/valentina/translations/valentina_fi_FI.qm +debian/valentina/usr/share/valentina/translations/valentina_fr_FR.qm +debian/valentina/usr/share/valentina/translations/valentina_he_IL.qm +debian/valentina/usr/share/valentina/translations/valentina_id_ID.qm +debian/valentina/usr/share/valentina/translations/valentina_it_IT.qm +debian/valentina/usr/share/valentina/translations/valentina_nl_NL.qm +debian/valentina/usr/share/valentina/translations/valentina_ro_RO.qm +debian/valentina/usr/share/valentina/translations/valentina_ru_RU.qm +debian/valentina/usr/share/valentina/translations/valentina_uk_UA.qm diff --git a/dist/OBS_debian/debian.menu b/dist/OBS_debian/debian.menu new file mode 100644 index 000000000..3addde6b9 --- /dev/null +++ b/dist/OBS_debian/debian.menu @@ -0,0 +1,2 @@ +?package(valentina): needs="X11" section="Applications/Graphics" title="Valentina" command="valentina" +?package(valentina): needs="X11" section="Applications/Data Management" title="Tape" command="tape" diff --git a/dist/OBS_debian/debian.rules b/dist/OBS_debian/debian.rules new file mode 100755 index 000000000..e36187ef7 --- /dev/null +++ b/dist/OBS_debian/debian.rules @@ -0,0 +1,67 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + APPNAME := Valentina + + DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) + ifeq ($(DEB_HOST_ARCH),amd64) + LIBPATH:= /debian/tmp/usr/lib/x86_64-linux-gnu + PREFIX_LIB:= /usr/lib/x86_64-linux-gnu + else + LIBPATH:= /debian/tmp/usr/lib/i386-linux-gnu + PREFIX_LIB:= /usr/lib/i386-linux-gnu + endif + + builddir: + mkdir -p builddir + + builddir/Makefile: builddir + cd builddir && qmake PREFIX=/usr PREFIX_LIB=$(PREFIX_LIB) "CONFIG += noTests noRunPath no_ccache noDebugSymbols" ../$(APPNAME).pro -r + build: build-stamp + build-stamp: builddir/Makefile + dh_testdir + # Add here commands to compile the package. + cd builddir && $(MAKE) + touch $@ + clean: + dh_testdir + dh_testroot + rm -f build-stamp + # Add here commands to clean up after the build process. + rm -rf builddir + dh_clean + install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + # Add here commands to install the package into debian/valentina + cd builddir && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp install + # Build architecture-independent files here. + binary-indep: build install + # We have nothing to do by default. + # Build architecture-dependent files here. + binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installmenu + dh_installmime + dh_install --sourcedir=$(CURDIR) -v + dh_installman + dh_installinfo + dh_link + dh_compress + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_shlibdeps -Llibqmuparser2 -l$(CURDIR)$(LIBPATH) -Llibvpropertyexplorer -l$(CURDIR)$(LIBPATH) + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + binary: binary-indep binary-arch + .PHONY: build clean binary-indep binary-arch binary install configure diff --git a/dist/OBS_debian/debian.shlibs.local b/dist/OBS_debian/debian.shlibs.local new file mode 100644 index 000000000..500b1cca8 --- /dev/null +++ b/dist/OBS_debian/debian.shlibs.local @@ -0,0 +1,2 @@ +libqmuparser 2 libqmuparser2 +libvpropertyexplorer 1 libvpropertyexplorer diff --git a/dist/OBS_debian/debian.substvars b/dist/OBS_debian/debian.substvars new file mode 100644 index 000000000..abd3ebebc --- /dev/null +++ b/dist/OBS_debian/debian.substvars @@ -0,0 +1 @@ +misc:Depends= diff --git a/dist/OBS_debian/debian.tape.1 b/dist/OBS_debian/debian.tape.1 new file mode 100644 index 000000000..0c2c5f40a --- /dev/null +++ b/dist/OBS_debian/debian.tape.1 @@ -0,0 +1,41 @@ +.\" Manpage for tape. +.\" Contact dismine@gmail.com to correct errors. +.TH tape 1 "21 October, 2015" "tape man page" +.SH NAME +Tape \- Valentina's measurements editor. +.SH SYNOPSIS +tape [options] file +.SH DESCRIPTION +.B Valentina +is a cross-platform patternmaking program which allows designers +to create and model patterns of clothing. This software allows pattern +creation, using either standard sizing tables or an individual’s set of +measurements. It blends new technologies with traditional methods to create +a unique pattern making tool. + +.B Tape +is a part of Valentina. And used for creating and editing measurement files. +.SH OPTIONS +.IP "-h, --help" +Displays this help. +.IP "-v, --version" +Displays version information. +.IP "-e, --height " +Open with the base height. Valid values: 92, 98, 104, 110, 116, 122, 128, 134, 140, 146, 152, 158, 164, 170, 176, 182, 188, 194cm. +.IP "-s, --size " +Open with the base size. Valid values: 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56cm. +.IP "-u, --unit " +Set pattern file unit: cm, mm, inch. +.IP "--test" +Use for unit testing. Run the program and open a file without showing the main window. +.IP Arguments: +.I filename +\- the measurement file. +.SH AUTHOR +.RI "This manual page was written by Roman Telezhynskyi <" dismine@gmail.com ">" +.SH "SEE ALSO" +.RB "Full " "User Manual" " is availiable in" +.UR https://bitbucket.org/dismine/valentina/wiki/manual/Content +.UE + +.BR valentina (1) diff --git a/dist/OBS_debian/debian.valentina.1 b/dist/OBS_debian/debian.valentina.1 new file mode 100644 index 000000000..6e3cc9df9 --- /dev/null +++ b/dist/OBS_debian/debian.valentina.1 @@ -0,0 +1,144 @@ +.\" Manpage for valentina. +.\" Contact dismine@gmail.com to correct errors. +.TH valentina 1 "21 October, 2015" "valentina man page" +.SH NAME +Valentina \- Pattern making program. +.SH SYNOPSIS +valentina [options] file +.SH DESCRIPTION +.B Valentina +is a cross-platform patternmaking program which allows designers +to create and model patterns of clothing. This software allows pattern +creation, using either standard sizing tables or an individual’s set of +measurements. It blends new technologies with traditional methods to create +a unique pattern making tool. +.SH OPTIONS +.IP "-h, --help" +Displays this help. +.IP "-v, --version" +Displays version information. +.IP "-b, --basename " +.RB "The base filename of exported layout files. Use it to enable console " "export mode" "." +.IP "-d, --destination " +The path to output destination folder. By default the directory at which the application was started. +.IP "-m, --mfile " +.RB "Path to custom measure file (" "export mode" ")." +.IP "-f, --format " +.RB "Number corresponding to output format (default = 0, " "export mode" "):" +.RS +.BR "*" " Svg files (*.svg) = 0," +.RE +.RS +.BR "*" " PDF files (*.pdf) = 1," +.RE +.RS +.BR "*" " Images (*.png) = 2," +.RE +.RS +.BR "*" " Wavefront OBJ (*.obj) = 3," +.RE +.RS +.BR "*" " PS files (*.ps) = 4," +.RE +.RS +.BR "*" " EPS files (*.eps) = 5," +.RE +.RS +.BR "*" " DXF files (*.dxf) = 6." +.RE +.IP "-x, --gsize " +.RB "Set size value a pattern file, that was opened with standard measurements " "(export mode)" ". Valid values: 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56cm." +.IP "-e, --gheight " +.RB "Set height value a pattern file, that was opened with standard measurements (" "export mode" "). Valid values: 92, 98, 104, 110, 116, 122, 128, 134, 140, 146, 152, 158, 164, 170, 176, 182, 188, 194cm." +.IP "-p, --pageformat