From 14423990dc275c6fa026262327871d4f4d8f484e Mon Sep 17 00:00:00 2001 From: dismine Date: Sat, 13 Sep 2014 21:14:14 +0300 Subject: [PATCH] Coverity warnings. --HG-- branch : develop --- src/app/container/vcontainer.h | 2 +- src/app/options.h | 2 + src/app/share/translations/valentina.ts | 411 +++++++++--------- src/app/share/translations/valentina_cs_CZ.ts | 411 +++++++++--------- src/app/share/translations/valentina_de_DE.ts | 411 +++++++++--------- src/app/share/translations/valentina_fr_FR.ts | 411 +++++++++--------- src/app/share/translations/valentina_he_IL.ts | 411 +++++++++--------- src/app/share/translations/valentina_it_IT.ts | 411 +++++++++--------- src/app/share/translations/valentina_nl_NL.ts | 411 +++++++++--------- src/app/share/translations/valentina_ru_RU.ts | 411 +++++++++--------- src/app/share/translations/valentina_uk_UA.ts | 411 +++++++++--------- src/libs/qmuparser/qmuparsertokenreader.cpp | 2 +- .../plugins/vboolproperty.cpp | 2 +- .../plugins/vcolorpropertyeditor.h | 1 - .../plugins/vnumberproperty.cpp | 2 +- src/libs/vpropertyexplorer/vfileproperty_p.h | 5 + 16 files changed, 1856 insertions(+), 1859 deletions(-) diff --git a/src/app/container/vcontainer.h b/src/app/container/vcontainer.h index 7c341899a..1b00c557d 100644 --- a/src/app/container/vcontainer.h +++ b/src/app/container/vcontainer.h @@ -38,6 +38,7 @@ #include #include #include +#include #ifdef Q_CC_GNU #pragma GCC diagnostic push @@ -116,7 +117,6 @@ public: { throw VExceptionBadId(tr("Can't cast object"), id); } - return QSharedPointer(); } const QSharedPointer GetGObject(quint32 id) const; diff --git a/src/app/options.h b/src/app/options.h index cf4c82516..851fea28e 100644 --- a/src/app/options.h +++ b/src/app/options.h @@ -35,6 +35,8 @@ # include #endif /*Q_OS_WIN32*/ +#include + class QString; static const quint32 null_id = 0; diff --git a/src/app/share/translations/valentina.ts b/src/app/share/translations/valentina.ts index 54fd08219..94d393417 100644 --- a/src/app/share/translations/valentina.ts +++ b/src/app/share/translations/valentina.ts @@ -1059,7 +1059,7 @@ - + Got wrong scene object. Ignore. @@ -1477,7 +1477,7 @@ - + Description @@ -1568,51 +1568,51 @@ - - - + + + File error. - + male - + female - + Measurements use different units than pattern. This pattern required measurements in %1 - + Individual measurements (*.vit) - - + + Open file - - + + Wrong units. - + Standard measurements (*.vst) - + Name_%1 @@ -2268,94 +2268,94 @@ - - - - + + + + No changes - + Cannot delete previously created node - + No changes left - + Cannot undo change - - + + <no value> - - + + Unchanged - + Cannot delete previously created attribute - + Node Name - - + + Name: - + Node Value (may be empty) - - + + Value: - + Attribute Name - + Attribute Value - + No selection - + Root node - + Node - + Attribute @@ -3339,137 +3339,137 @@ - + Tool options - + Save &As... - + Export pattern (layout) - + About &Qt - + &About Valentina - + E&xit - + Exit the application - + Preferences - + Zoom In - + zoom in - + Zoom Out - + Zoom out - + Edit pattern XML code - + ZoomOriginal - + ZoomFitBest - + Pattern properties - + New - + &New - + Create a new pattern - + Ctrl+N - + Open - + &Open - + Open file with pattern - + Save - + &Save - + Save pattern - + Ctrl+S @@ -3479,105 +3479,104 @@ - + Save not yet saved pattern - + Ctrl+Shift+S - + Draw - + Draw mode - + Ctrl+W - + Details - + Details mode - + Ctrl+E - - + + Pointer tools - + New pattern piece - + Add new pattern piece - + Ctrl+Shift+N - - + + Change the label of pattern piece - + Table of variables - + Tables of variables - + Ctrl+T - - + History - + Ctrl+H - + Create layout - + Ctrl+L @@ -3587,7 +3586,7 @@ - + Ctrl+Q @@ -3597,12 +3596,12 @@ - + Pattern piece: - + Enter a new label for the pattern piece. @@ -3729,42 +3728,42 @@ - + Wrong units. - + Application doesn't support standard table with inches. - + File error. - + The measurements file <br/><br/> <b>%1</b> <br/><br/> %3 - + could not be found. Do you want to update the file location - + Standard measurements (*.vst) - + Individual measurements (*.vit) - + File loaded @@ -3812,7 +3811,7 @@ Do you want to save your changes? - + Open file @@ -6499,12 +6498,12 @@ Do you want to save your changes? VAbstractTool - + Confirm the deletion. - + Do you really want delete? @@ -6658,183 +6657,183 @@ Do you want to save your changes? VPattern - + Can't find tool id = %1 in table. - + Error no unique id. - - + + Error parsing file. - + Error can't convert value. - + Error empty parameter. - + Error wrong id. - + Critical error! - + Error parsing file (std::bad_alloc). - + Error creating or updating detail - + 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 line - + 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 - + Error creating or updating union details - + Got wrong parameter id. Need only id > 0. - + This id is not unique. @@ -6875,12 +6874,12 @@ Do you want to save your changes? VToolDetail - + Options - + Delete @@ -6888,170 +6887,170 @@ Do you want to save your changes? VToolOptionsPropertyBrowser - + Base point - - - - - - - - - - - - - - + + + + + + + + + + + + + + Point label - + Position - + Point at distance and angle + + + + + + + + + Line type + + - - - + + + + - Line type - - - - - - - - - - - Length - + Angle - + Point at distance along line - + Arc - - + + Radius - + First angle - + Second angle - + Point along bisector - + 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 - + Special point on shoulder - + Curve tool - - + + Curve factor - + Tool for path curve - + Tool triangle diff --git a/src/app/share/translations/valentina_cs_CZ.ts b/src/app/share/translations/valentina_cs_CZ.ts index 3b9530a62..868652f16 100644 --- a/src/app/share/translations/valentina_cs_CZ.ts +++ b/src/app/share/translations/valentina_cs_CZ.ts @@ -1075,7 +1075,7 @@ Smazat - + Got wrong scene object. Ignore. @@ -1500,7 +1500,7 @@ - + Description Popis @@ -1596,51 +1596,51 @@ Oblouk - - - + + + File error. - + male - + female - + Measurements use different units than pattern. This pattern required measurements in %1 - + Individual measurements (*.vit) - - + + Open file Otevřít soubor - - + + Wrong units. - + Standard measurements (*.vst) - + Name_%1 @@ -2300,94 +2300,94 @@ - - - - + + + + No changes - + Cannot delete previously created node - + No changes left - + Cannot undo change - - + + <no value> - - + + Unchanged - + Cannot delete previously created attribute - + Node Name - - + + Name: - + Node Value (may be empty) - - + + Value: - + Attribute Name - + Attribute Value - + No selection - + Root node - + Node - + Attribute @@ -3330,42 +3330,42 @@ Nástrojový pruh 3 - + New Nový - + Create a new pattern Vytvořit nový vzor - + Ctrl+N - + Open Otevřít - + Open file with pattern Otevřít soubor se vzorem - + Save Uložit - + Save pattern Uložit vzor - + Ctrl+S @@ -3480,190 +3480,189 @@ - + Tool options - + &New - + &Open - + &Save - + Save &As... - + Save not yet saved pattern Uložit ještě neuložený vzor - + Ctrl+Shift+S - + Draw Kreslit - + Draw mode Režim kreslení - + Ctrl+W - + Details Podrobnosti - + Details mode - + Ctrl+E - - + + Pointer tools - + New pattern piece - + Add new pattern piece - + Ctrl+Shift+N - - + + Change the label of pattern piece - + Table of variables Tabulka proměnných - + Tables of variables Tabulky proměnných - + Ctrl+T - - + History Historie - + Ctrl+H - + Export pattern (layout) - + About &Qt - + &About Valentina - + E&xit - + Exit the application - + Preferences - + Pattern properties - + Zoom In Přiblížit - + zoom in - + Zoom Out Oddálit - + Zoom out - + Edit pattern XML code - + ZoomOriginal - + ZoomFitBest @@ -3672,12 +3671,12 @@ Rozvržení - + Create layout Vytvořit rozvržení - + Ctrl+L @@ -3695,7 +3694,7 @@ Ukončit - + Ctrl+Q @@ -3766,12 +3765,12 @@ Do you want to save your changes? - + Pattern piece: - + Enter a new label for the pattern piece. @@ -3867,42 +3866,42 @@ Do you want to save your changes? - + Wrong units. - + Application doesn't support standard table with inches. - + File error. - + File loaded - + The measurements file <br/><br/> <b>%1</b> <br/><br/> %3 - + could not be found. Do you want to update the file location - + Standard measurements (*.vst) - + Individual measurements (*.vit) @@ -3956,7 +3955,7 @@ Do you want to save your changes? - + Open file Otevřít soubor @@ -6678,12 +6677,12 @@ Do you want to save your changes? VAbstractTool - + Confirm the deletion. - + Do you really want delete? @@ -6953,183 +6952,183 @@ Do you want to save your changes? VPattern - + Can't find tool id = %1 in table. - + Error no unique id. - - + + Error parsing file. Chyba při zpracování souboru. - + Error can't convert value. Chyba. Nelze převést hodnotu. - + Error empty parameter. Chyba. Prázdný parametr. - + Error wrong id. Chyba. Špatné ID. - + Critical error! - + Error parsing file (std::bad_alloc). - + Error creating or updating detail Chyba při vytváření nebo aktualizaci detailu - + Error creating or updating single point Chyba při vytváření nebo aktualizaci základního bodu - - + + Error creating or updating point of end line Chyba při vytváření nebo aktualizaci bodu na konci čáry - - + + Error creating or updating point along line Chyba při vytváření nebo aktualizaci bodu podél čáry - - + + Error creating or updating point of shoulder Chyba při vytváření nebo aktualizaci bodu ramene - - + + Error creating or updating point of normal Chyba při vytváření nebo aktualizaci bodu kolmice - - + + Error creating or updating point of bisector Chyba při vytváření nebo aktualizaci bodu osy úhlu - + Error creating or updating point of lineintersection Chyba při vytváření nebo aktualizaci bodu průsečíku čar - - + + Error creating or updating point of contact Chyba při vytváření nebo aktualizaci bodu dotyku - + Error creating or updating modeling point Chyba při vytváření nebo aktualizaci bodu - + Error creating or updating height Chyba při vytváření nebo aktualizaci výšky - + Error creating or updating triangle Chyba při vytváření nebo aktualizaci trojúhelníku - + Error creating or updating point of intersection Chyba při vytváření nebo aktualizaci bodu průsečíku - - + + 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 line Chyba při vytváření nebo aktualizaci čáry - + Error creating or updating simple curve Chyba při vytváření nebo aktualizaci křivky - + Error creating or updating curve path Chyba při vytváření nebo aktualizaci cesty křivky - + Error creating or updating modeling simple curve Chyba při vytváření nebo aktualizaci modelové křivky - + Error creating or updating modeling curve path Chyba při vytváření nebo aktualizaci cesty modelové křivky - - + + Error creating or updating simple arc Chyba při vytváření nebo aktualizaci oblouku - + Error creating or updating modeling arc Chyba při vytváření nebo aktualizaci modelového oblouku - + Error creating or updating union details - + Got wrong parameter id. Need only id > 0. Obdrženo špatné ID parametru. Je potřeba jen ID > 0. - + This id is not unique. Toto ID není jedinečné. @@ -7170,12 +7169,12 @@ Do you want to save your changes? VToolDetail - + Options Volby - + Delete Smazat @@ -7183,170 +7182,170 @@ Do you want to save your changes? VToolOptionsPropertyBrowser - + Base point Základní bod - - - - - - - - - - - - - - + + + + + + + + + + + + + + Point label - + Position - + Point at distance and angle + + + + + + + + + Line type + + - - - + + + + - Line type - - - - - - - - - - - Length Délka - + Angle - + Point at distance along line - + Arc Oblouk - - + + Radius Poloměr - + First angle - + Second angle - + Point along bisector - + 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 Dodatečné úhlové stupně - + Point at intersection of arc and line - + Tool to make point from x & y of two other points - + Special point on shoulder - + Curve tool - - + + Curve factor - + Tool for path curve - + Tool triangle diff --git a/src/app/share/translations/valentina_de_DE.ts b/src/app/share/translations/valentina_de_DE.ts index c390325ce..3bb3f54ab 100644 --- a/src/app/share/translations/valentina_de_DE.ts +++ b/src/app/share/translations/valentina_de_DE.ts @@ -1111,7 +1111,7 @@ Löschen - + Got wrong scene object. Ignore. Falsches scene object. Wird ignoriert. @@ -1560,7 +1560,7 @@ - + Description Beschreibung @@ -1656,51 +1656,51 @@ Bogen - - - + + + File error. - + male - + female - + Measurements use different units than pattern. This pattern required measurements in %1 - + Individual measurements (*.vit) - - + + Open file Datei öffnen - - + + Wrong units. - + Standard measurements (*.vst) - + Name_%1 @@ -2364,94 +2364,94 @@ - - - - + + + + No changes - + Cannot delete previously created node - + No changes left - + Cannot undo change - - + + <no value> - - + + Unchanged - + Cannot delete previously created attribute - + Node Name - - + + Name: - + Node Value (may be empty) - - + + Value: - + Attribute Name - + Attribute Value - + No selection - + Root node - + Node - + Attribute @@ -3414,42 +3414,42 @@ Schnittteil - + New Neu - + Create a new pattern Neues Schnittmuster erstellen - + Ctrl+N Strg+N - + Open Öffnen - + Open file with pattern Datei mit Schnittmuster öffnen - + Save Speichern - + Save pattern Schnittmuster speichern - + Ctrl+S Strg+S @@ -3564,190 +3564,189 @@ - + Tool options - + &New - + &Open - + &Save - + Save &As... - + Save not yet saved pattern Speichere ungesichertes Schnittmuster - + Ctrl+Shift+S Strg+Umschalt+S - + Draw Zeichnen - + Draw mode Zeichnenmodus - + Ctrl+W Strg+W - + Details Details - + Details mode Detailmodus - + Ctrl+E Strg+E - - + + Pointer tools Zeigerwerkzeuge - + New pattern piece Neues Schnittteil - + Add new pattern piece Neues Schnittteil hinzufügen - + Ctrl+Shift+N Strg+Umschalt+N - - + + Change the label of pattern piece Das Label eines Schnittteils ändern - + Table of variables Variablentabelle - + Tables of variables Variablentabellen - + Ctrl+T Strg+T - - + History Chronik - + Ctrl+H Strg+H - + Export pattern (layout) - + About &Qt - + &About Valentina - + E&xit - + Exit the application - + Preferences - + Pattern properties - + Zoom In Vergrößern - + zoom in - + Zoom Out Verkleinern - + Zoom out - + Edit pattern XML code - + ZoomOriginal - + ZoomFitBest @@ -3756,12 +3755,12 @@ Layout - + Create layout Layout erstellen - + Ctrl+L Strg+L @@ -3779,7 +3778,7 @@ Beenden - + Ctrl+Q Strg+Q @@ -3854,7 +3853,7 @@ Do you want to save your changes? - + Pattern piece: Schnittteil: @@ -3871,7 +3870,7 @@ Do you want to save your changes? Fehler beim Erstellen eines Schnittmusters mit dem Namen - + Enter a new label for the pattern piece. Es muss ein neues Label für das Schnittteil eingegeben werden. @@ -3975,42 +3974,42 @@ Do you want to save your changes? - + Wrong units. - + Application doesn't support standard table with inches. - + File error. - + File loaded - + The measurements file <br/><br/> <b>%1</b> <br/><br/> %3 - + could not be found. Do you want to update the file location - + Standard measurements (*.vst) - + Individual measurements (*.vit) @@ -4060,7 +4059,7 @@ Do you want to save your changes? - + Open file Datei öffnen @@ -6790,12 +6789,12 @@ Do you want to save your changes? VAbstractTool - + Confirm the deletion. - + Do you really want delete? @@ -7085,183 +7084,183 @@ Do you want to save your changes? VPattern - + Can't find tool id = %1 in table. Kann das Tool mit id = %1 nicht in der Tabelle finden. - + Error no unique id. Fehler keine eindeutige id. - - + + Error parsing file. Fehler beim Parsen der Datei. - + Error can't convert value. Fehler Wert kann nicht konvertiert werden. - + Error empty parameter. Fehler leerer parameter. - + Error wrong id. Fehler falsche Id. - + Critical error! - + Error parsing file (std::bad_alloc). - + Error creating or updating detail Fehler beim Erstellen oder Aktualisieren des Details - + Error creating or updating single point Fehler beim Erstellen oder Aktualisieren eines Einzelpunktes - - + + Error creating or updating point of end line Fehler beim Erstellen oder Aktualisieren eines Punktes am Ende einer Linie - - + + Error creating or updating point along line Fehler beim Erstellen oder Aktualisieren eines Punktes auf einer Linie - - + + Error creating or updating point of shoulder Fehler beim Erstellen oder Aktualisieren eines Schulterpunktes - - + + Error creating or updating point of normal Fehler beim Erstellen oder Aktualisieren eines Punktes einer Normalen - - + + Error creating or updating point of bisector Fehler beim Erstellen oder Aktualisieren einer Winkelhalbierenden - + Error creating or updating point of lineintersection Fehler beim Erstellen oder Aktualisieren eines Linienschnittpunktes - - + + Error creating or updating point of contact Fehler beim Erstellen oder Aktualisieren eines Berührungpunktes - + Error creating or updating modeling point Fehler beim Erstellen oder Aktualisieren beim Modellieren eines Punktes - + Error creating or updating height Fehler beim Erstellen oder Aktualisieren der Größe - + Error creating or updating triangle Fehler beim Erstellen oder Aktualisieren eines Dreiecks - + Error creating or updating point of intersection Fehler beim Erstellen oder Aktualisieren eines Schnittpunktes - - + + Error creating or updating cut spline point Fehler beim Erstellen oder Aktualisieren eines geschnittenen Splinepunktes - - + + Error creating or updating cut spline path point Fehler beim Erstellen oder Aktualisieren eines Punktes eines geschnittenen Splinepfades - - + + Error creating or updating cut arc point Fehler beim Erstellen oder Aktualisieren eines geschnittenen Bogenpunktes - + Error creating or updating line Fehler beim Erstellen oder Aktualisieren einer Linie - + Error creating or updating simple curve Fehler beim Erstellen oder Aktualisieren einer einfachen Kurve - + Error creating or updating curve path Fehler beim Erstellen oder Aktualisieren eines Kurvenpfades - + Error creating or updating modeling simple curve Fehler beim Erstellen oder Aktuallisieren der Modellierung einer einfachen Kurve - + Error creating or updating modeling curve path Fehler beim Erstellen oder Aktualisieren der Modellierung eines Kurvenpfades - - + + Error creating or updating simple arc Fehler beim Erstellen oder Aktualsieren eines einfachen Bogens - + Error creating or updating modeling arc Fehler beim Erstellen oder Aktualisieren der Modellierung eines Bogens - + Error creating or updating union details Fehler beim Vereinigen der Details - + Got wrong parameter id. Need only id > 0. Falsche Parameter id übermittelt. Erwarte id > 0. - + This id is not unique. Diese Id ist kein Unikat. @@ -7302,12 +7301,12 @@ Do you want to save your changes? VToolDetail - + Options Optionen - + Delete Löschen @@ -7315,170 +7314,170 @@ Do you want to save your changes? VToolOptionsPropertyBrowser - + Base point Startpunkt - - - - - - - - - - - - - - + + + + + + + + + + + + + + Point label Bezeichnung des Punktes - + Position - + Point at distance and angle + + + + + + + + + Line type + + - - - + + + + - Line type - - - - - - - - - - - Length Länge - + Angle - + Point at distance along line - + Arc Bogen - - + + Radius Radius - + First angle - + Second angle - + Point along bisector - + 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 Zusätzlicher Winkel - + Point at intersection of arc and line - + Tool to make point from x & y of two other points - + Special point on shoulder - + Curve tool - - + + Curve factor - + Tool for path curve - + Tool triangle diff --git a/src/app/share/translations/valentina_fr_FR.ts b/src/app/share/translations/valentina_fr_FR.ts index f492b05dc..6d9ba957c 100644 --- a/src/app/share/translations/valentina_fr_FR.ts +++ b/src/app/share/translations/valentina_fr_FR.ts @@ -1111,7 +1111,7 @@ Supprimer - + Got wrong scene object. Ignore. @@ -1552,7 +1552,7 @@ - + Description Description @@ -1648,51 +1648,51 @@ Arc - - - + + + File error. - + male - + female - + Measurements use different units than pattern. This pattern required measurements in %1 - + Individual measurements (*.vit) - - + + Open file Ouvrir fichier - - + + Wrong units. - + Standard measurements (*.vst) - + Name_%1 Nom_%1 @@ -2352,94 +2352,94 @@ - - - - + + + + No changes - + Cannot delete previously created node - + No changes left - + Cannot undo change - - + + <no value> - - + + Unchanged - + Cannot delete previously created attribute - + Node Name - - + + Name: - + Node Value (may be empty) - - + + Value: - + Attribute Name - + Attribute Value - + No selection - + Root node - + Node - + Attribute @@ -3414,42 +3414,42 @@ toolBar_3 - + New Nouveau - + Create a new pattern Créer un nouveau patron - + Ctrl+N Ctrl+N - + Open Ouvrir - + Open file with pattern Ouvrir un fichier de patron - + Save Enregistrer - + Save pattern Enregistrer le patron - + Ctrl+S Ctrl+S @@ -3564,190 +3564,189 @@ - + Tool options - + &New - + &Open - + &Save - + Save &As... - + Save not yet saved pattern Enregistrer le patron en cours - + Ctrl+Shift+S Ctrl+Shift+S - + Draw Dessin - + Draw mode Mode dessin - + Ctrl+W Ctrl+W - + Details Détails - + Details mode Mode détails - + Ctrl+E Ctrl+E - - + + Pointer tools Outil pointeur - + New pattern piece Nouveau élément de patron - + Add new pattern piece Ajouter un nouveau élément de patron - + Ctrl+Shift+N Ctrl+Shift+N - - + + Change the label of pattern piece Changer la désignation de l'élément de patron - + Table of variables Tableau des variables - + Tables of variables Tableaux des variables - + Ctrl+T Ctrl+T - - + History Historique - + Ctrl+H Ctrl+H - + Export pattern (layout) - + About &Qt - + &About Valentina - + E&xit - + Exit the application - + Preferences - + Pattern properties - + Zoom In Zoom avant - + zoom in - + Zoom Out Zoom arrière - + Zoom out - + Edit pattern XML code - + ZoomOriginal - + ZoomFitBest @@ -3756,12 +3755,12 @@ Mise en page - + Create layout Créer une mise en page - + Ctrl+L Ctrl+L @@ -3779,7 +3778,7 @@ Fermer - + Ctrl+Q Ctrl+Q @@ -3854,7 +3853,7 @@ Do you want to save your changes? - + Pattern piece: Élément de patron: @@ -3871,7 +3870,7 @@ Do you want to save your changes? Erreur lors de la création du patron avec ce nom - + Enter a new label for the pattern piece. Saisir une nouvelle désignation pour cet élément de patron. @@ -3975,42 +3974,42 @@ Do you want to save your changes? Choisir un arc - + Wrong units. - + Application doesn't support standard table with inches. - + File error. - + File loaded - + The measurements file <br/><br/> <b>%1</b> <br/><br/> %3 - + could not be found. Do you want to update the file location - + Standard measurements (*.vst) - + Individual measurements (*.vit) @@ -4064,7 +4063,7 @@ Do you want to save your changes? - + Open file Ouvrir fichier @@ -6794,12 +6793,12 @@ Do you want to save your changes? VAbstractTool - + Confirm the deletion. - + Do you really want delete? @@ -6993,183 +6992,183 @@ Do you want to save your changes? VPattern - + Can't find tool id = %1 in table. Identifiant d'outil non trouvé = %1 dans la table. - + Error no unique id. Erreur : id non unique. - - + + Error parsing file. Erreur d'interprétation de fichier. - + Error can't convert value. Erreur : valeur non convertissable. - + Error empty parameter. Erreur : paramètre vide. - + Error wrong id. Erreur : mauvais id. - + Critical error! - + Error parsing file (std::bad_alloc). - + Error creating or updating detail Erreur lors de la création ou de la mise à jour du détail - + Error creating or updating single point Erreur lors de la création ou de la mise à jour d'un point unique - - + + Error creating or updating point of end line - - + + Error creating or updating point along line Erreur lors de la création ou de la mise à jour d'un point le long d'une ligne - - + + 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 Erreur lors de la création ou de la mise à jour de la stature - + 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 line - + 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 - + Error creating or updating union details - + Got wrong parameter id. Need only id > 0. Mauvais identifiant de paramètre. Identifiant doit être > 0. - + This id is not unique. Cet idientifiant n'est pas unique. @@ -7210,12 +7209,12 @@ Do you want to save your changes? VToolDetail - + Options Options - + Delete Supprimer @@ -7223,170 +7222,170 @@ Do you want to save your changes? VToolOptionsPropertyBrowser - + Base point Point de départ - - - - - - - - - - - - - - + + + + + + + + + + + + + + Point label Désignation du point - + Position - + Point at distance and angle + + + + + + + + + Line type + + - - - + + + + - Line type - - - - - - - - - - - Length - + Angle - + Point at distance along line - + Arc Arc - - + + Radius Rayon - + First angle - + Second angle - + Point along bisector - + 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 - + Special point on shoulder - + Curve tool - - + + Curve factor - + Tool for path curve - + Tool triangle diff --git a/src/app/share/translations/valentina_he_IL.ts b/src/app/share/translations/valentina_he_IL.ts index ea8518f90..5b3665564 100644 --- a/src/app/share/translations/valentina_he_IL.ts +++ b/src/app/share/translations/valentina_he_IL.ts @@ -1059,7 +1059,7 @@ למחוק - + Got wrong scene object. Ignore. @@ -1472,7 +1472,7 @@ - + Description @@ -1568,51 +1568,51 @@ - - - + + + File error. - + male - + female - + Measurements use different units than pattern. This pattern required measurements in %1 - + Individual measurements (*.vit) - - + + Open file - - + + Wrong units. - + Standard measurements (*.vst) - + Name_%1 @@ -2268,94 +2268,94 @@ - - - - + + + + No changes - + Cannot delete previously created node - + No changes left - + Cannot undo change - - + + <no value> - - + + Unchanged - + Cannot delete previously created attribute - + Node Name - - + + Name: - + Node Value (may be empty) - - + + Value: - + Attribute Name - + Attribute Value - + No selection - + Root node - + Node - + Attribute @@ -3246,42 +3246,42 @@ קובץ - + New חדש - + Create a new pattern - + Ctrl+N - + Open - + Open file with pattern - + Save שמור - + Save pattern - + Ctrl+S @@ -3396,200 +3396,199 @@ - + Tool options - + &New - + &Open - + &Save - + Save &As... - + Save not yet saved pattern - + Ctrl+Shift+S - + Draw - + Draw mode - + Ctrl+W - + Details - + Details mode - + Ctrl+E - - + + Pointer tools - + New pattern piece - + Add new pattern piece - + Ctrl+Shift+N - - + + Change the label of pattern piece - + Table of variables - + Tables of variables - + Ctrl+T - - + History - + Ctrl+H - + Export pattern (layout) - + About &Qt - + &About Valentina - + E&xit - + Exit the application - + Preferences - + Pattern properties - + Zoom In - + zoom in - + Zoom Out - + Zoom out - + Edit pattern XML code - + ZoomOriginal - + ZoomFitBest - + Create layout - + Ctrl+L @@ -3599,7 +3598,7 @@ - + Ctrl+Q @@ -3670,12 +3669,12 @@ Do you want to save your changes? - + Pattern piece: - + Enter a new label for the pattern piece. @@ -3767,42 +3766,42 @@ Do you want to save your changes? - + Wrong units. - + Application doesn't support standard table with inches. - + File error. - + File loaded - + The measurements file <br/><br/> <b>%1</b> <br/><br/> %3 - + could not be found. Do you want to update the file location - + Standard measurements (*.vst) - + Individual measurements (*.vit) @@ -3828,7 +3827,7 @@ Do you want to save your changes? - + Open file @@ -6515,12 +6514,12 @@ Do you want to save your changes? VAbstractTool - + Confirm the deletion. - + Do you really want delete? @@ -6674,183 +6673,183 @@ Do you want to save your changes? VPattern - + Can't find tool id = %1 in table. - + Error no unique id. - - + + Error parsing file. - + Error can't convert value. - + Error empty parameter. - + Error wrong id. - + Critical error! - + Error parsing file (std::bad_alloc). - + Error creating or updating detail - + 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 line - + 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 - + Error creating or updating union details - + Got wrong parameter id. Need only id > 0. - + This id is not unique. @@ -6891,12 +6890,12 @@ Do you want to save your changes? VToolDetail - + Options אפשרויות - + Delete למחוק @@ -6904,170 +6903,170 @@ Do you want to save your changes? VToolOptionsPropertyBrowser - + Base point - - - - - - - - - - - - - - + + + + + + + + + + + + + + Point label תווית הנקודה - + Position - + Point at distance and angle + + + + + + + + + Line type + + - - - + + + + - Line type - - - - - - - - - - - Length אורך - + Angle - + Point at distance along line - + Arc - - + + Radius רדיוס - + First angle - + Second angle - + Point along bisector - + 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 - + Special point on shoulder - + Curve tool - - + + Curve factor - + Tool for path curve - + Tool triangle diff --git a/src/app/share/translations/valentina_it_IT.ts b/src/app/share/translations/valentina_it_IT.ts index a4ec0d354..460540862 100644 --- a/src/app/share/translations/valentina_it_IT.ts +++ b/src/app/share/translations/valentina_it_IT.ts @@ -1059,7 +1059,7 @@ - + Got wrong scene object. Ignore. @@ -1472,7 +1472,7 @@ - + Description @@ -1568,51 +1568,51 @@ - - - + + + File error. - + male - + female - + Measurements use different units than pattern. This pattern required measurements in %1 - + Individual measurements (*.vit) - - + + Open file - - + + Wrong units. - + Standard measurements (*.vst) - + Name_%1 @@ -2268,94 +2268,94 @@ - - - - + + + + No changes - + Cannot delete previously created node - + No changes left - + Cannot undo change - - + + <no value> - - + + Unchanged - + Cannot delete previously created attribute - + Node Name - - + + Name: - + Node Value (may be empty) - - + + Value: - + Attribute Name - + Attribute Value - + No selection - + Root node - + Node - + Attribute @@ -3234,42 +3234,42 @@ - + New - + Create a new pattern - + Ctrl+N - + Open - + Open file with pattern - + Save - + Save pattern - + Ctrl+S @@ -3384,200 +3384,199 @@ - + Tool options - + &New - + &Open - + &Save - + Save &As... - + Save not yet saved pattern - + Ctrl+Shift+S - + Draw - + Draw mode - + Ctrl+W - + Details - + Details mode - + Ctrl+E Ctrl+E - - + + Pointer tools - + New pattern piece - + Add new pattern piece - + Ctrl+Shift+N Ctrl+Shift+N - - + + Change the label of pattern piece - + Table of variables - + Tables of variables - + Ctrl+T Ctrl+T - - + History - + Ctrl+H Ctrl+H - + Export pattern (layout) - + About &Qt - + &About Valentina - + E&xit - + Exit the application - + Preferences - + Pattern properties - + Zoom In - + zoom in - + Zoom Out - + Zoom out - + Edit pattern XML code - + ZoomOriginal - + ZoomFitBest - + Create layout - + Ctrl+L Ctrl+L @@ -3587,7 +3586,7 @@ - + Ctrl+Q Ctrl+Q @@ -3658,12 +3657,12 @@ Do you want to save your changes? - + Pattern piece: - + Enter a new label for the pattern piece. @@ -3755,42 +3754,42 @@ Do you want to save your changes? - + Wrong units. - + Application doesn't support standard table with inches. - + File error. - + File loaded - + The measurements file <br/><br/> <b>%1</b> <br/><br/> %3 - + could not be found. Do you want to update the file location - + Standard measurements (*.vst) - + Individual measurements (*.vit) @@ -3816,7 +3815,7 @@ Do you want to save your changes? - + Open file @@ -6503,12 +6502,12 @@ Do you want to save your changes? VAbstractTool - + Confirm the deletion. - + Do you really want delete? @@ -6662,183 +6661,183 @@ Do you want to save your changes? VPattern - + Can't find tool id = %1 in table. - + Error no unique id. - - + + Error parsing file. - + Error can't convert value. - + Error empty parameter. - + Error wrong id. - + Critical error! - + Error parsing file (std::bad_alloc). - + Error creating or updating detail - + 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 line - + 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 - + Error creating or updating union details - + Got wrong parameter id. Need only id > 0. - + This id is not unique. @@ -6879,12 +6878,12 @@ Do you want to save your changes? VToolDetail - + Options - + Delete @@ -6892,170 +6891,170 @@ Do you want to save your changes? VToolOptionsPropertyBrowser - + Base point - - - - - - - - - - - - - - + + + + + + + + + + + + + + Point label - + Position - + Point at distance and angle + + + + + + + + + Line type + + - - - + + + + - Line type - - - - - - - - - - - Length - + Angle - + Point at distance along line - + Arc - - + + Radius - + First angle - + Second angle - + Point along bisector - + 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 - + Special point on shoulder - + Curve tool - - + + Curve factor - + Tool for path curve - + Tool triangle diff --git a/src/app/share/translations/valentina_nl_NL.ts b/src/app/share/translations/valentina_nl_NL.ts index 950165428..1e253d5e1 100644 --- a/src/app/share/translations/valentina_nl_NL.ts +++ b/src/app/share/translations/valentina_nl_NL.ts @@ -1059,7 +1059,7 @@ - + Got wrong scene object. Ignore. @@ -1477,7 +1477,7 @@ - + Description @@ -1568,51 +1568,51 @@ - - - + + + File error. - + male - + female - + Measurements use different units than pattern. This pattern required measurements in %1 - + Individual measurements (*.vit) - - + + Open file - - + + Wrong units. - + Standard measurements (*.vst) - + Name_%1 @@ -2268,94 +2268,94 @@ - - - - + + + + No changes - + Cannot delete previously created node - + No changes left - + Cannot undo change - - + + <no value> - - + + Unchanged - + Cannot delete previously created attribute - + Node Name - - + + Name: - + Node Value (may be empty) - - + + Value: - + Attribute Name - + Attribute Value - + No selection - + Root node - + Node - + Attribute @@ -3234,42 +3234,42 @@ - + New - + Create a new pattern - + Ctrl+N - + Open - + Open file with pattern - + Save - + Save pattern - + Ctrl+S @@ -3384,200 +3384,199 @@ - + Tool options - + &New - + &Open - + &Save - + Save &As... - + Save not yet saved pattern - + Ctrl+Shift+S - + Draw - + Draw mode - + Ctrl+W - + Details - + Details mode - + Ctrl+E - - + + Pointer tools - + New pattern piece - + Add new pattern piece - + Ctrl+Shift+N - - + + Change the label of pattern piece - + Table of variables - + Tables of variables - + Ctrl+T - - + History - + Ctrl+H - + Export pattern (layout) - + ZoomOriginal - + ZoomFitBest - + Create layout - + Ctrl+L - + About &Qt - + &About Valentina - + E&xit - + Exit the application - + Preferences - + Zoom In - + zoom in - + Zoom Out - + Zoom out - + Edit pattern XML code - + Pattern properties @@ -3587,7 +3586,7 @@ - + Ctrl+Q @@ -3623,12 +3622,12 @@ Do you want to save your changes? - + Pattern piece: - + Enter a new label for the pattern piece. @@ -3755,42 +3754,42 @@ Do you want to save your changes? - + Wrong units. - + Application doesn't support standard table with inches. - + File error. - + File loaded - + The measurements file <br/><br/> <b>%1</b> <br/><br/> %3 - + could not be found. Do you want to update the file location - + Standard measurements (*.vst) - + Individual measurements (*.vit) @@ -3812,7 +3811,7 @@ Do you want to save your changes? - + Open file @@ -6499,12 +6498,12 @@ Do you want to save your changes? VAbstractTool - + Confirm the deletion. - + Do you really want delete? @@ -6658,183 +6657,183 @@ Do you want to save your changes? VPattern - + Can't find tool id = %1 in table. - + Error no unique id. - - + + Error parsing file. - + Error can't convert value. - + Error empty parameter. - + Error wrong id. - + Critical error! - + Error parsing file (std::bad_alloc). - + Error creating or updating detail - + 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 line - + 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 - + Error creating or updating union details - + Got wrong parameter id. Need only id > 0. - + This id is not unique. @@ -6875,12 +6874,12 @@ Do you want to save your changes? VToolDetail - + Options - + Delete @@ -6888,170 +6887,170 @@ Do you want to save your changes? VToolOptionsPropertyBrowser - + Base point - - - - - - - - - - - - - - + + + + + + + + + + + + + + Point label - + Position - + Point at distance and angle + + + + + + + + + Line type + + - - - + + + + - Line type - - - - - - - - - - - Length - + Angle - + Point at distance along line - + Arc - - + + Radius - + First angle - + Second angle - + Point along bisector - + 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 - + Special point on shoulder - + Curve tool - - + + Curve factor - + Tool for path curve - + Tool triangle diff --git a/src/app/share/translations/valentina_ru_RU.ts b/src/app/share/translations/valentina_ru_RU.ts index e6e6da18e..50345aaa9 100644 --- a/src/app/share/translations/valentina_ru_RU.ts +++ b/src/app/share/translations/valentina_ru_RU.ts @@ -1127,7 +1127,7 @@ Замкнутая - + Got wrong scene object. Ignore. Получен не правильный объект сцены. Ингорируем. @@ -1616,7 +1616,7 @@ - + Description Опис @@ -1693,51 +1693,51 @@ Обозначение %1 - - - + + + File error. Ошибка файла. - + male мужчина - + female женщина - + Measurements use different units than pattern. This pattern required measurements in %1 Мерки используют другие единицы измерения нежели лекало. Ето леколо требует мерки в %1 - + Individual measurements (*.vit) Индивидуальные мерки (*.vit) - - + + Open file Открыть файл - - + + Wrong units. Неправильные единицы измерения. - + Standard measurements (*.vst) Стандартные мерки (*.vst) - + Name_%1 Имя_%1 @@ -2432,94 +2432,94 @@ - - - - + + + + No changes - + Cannot delete previously created node - + No changes left - + Cannot undo change - - + + <no value> - - + + Unchanged - + Cannot delete previously created attribute - + Node Name - - + + Name: - + Node Value (may be empty) - - + + Value: - + Attribute Name - + Attribute Value - + No selection - + Root node - + Node - + Attribute @@ -3515,23 +3515,23 @@ Чертеж - + Details mode Режим деталей - - + + Pointer tools Инструмент указатель - + New pattern piece Новый чертеж - + Add new pattern piece Добавить новый чертеж @@ -3606,62 +3606,62 @@ &Чертеж - + New Новое - + &New &Новый - + Create a new pattern Создать новое лекало - + Ctrl+N Ctrl+N - + Open Открыть - + &Open &Открыть - + Open file with pattern Открыть файл с лекалом - + Save Сохранить - + &Save &Сохранить - + Save pattern Сохранить лекало - + Ctrl+S Ctrl+S - + Save &As... Сохранить &как... @@ -3670,7 +3670,7 @@ Параметры... - + Pattern properties Свойства лекала @@ -3710,123 +3710,123 @@ - + Tool options - + Save not yet saved pattern Сохранить еще не сохраненное лекало - + Ctrl+Shift+S Ctrl+Shift+S - + Draw Рисование - + Draw mode Режим рисования - + Ctrl+W Ctrl+W - + Details Детали - + Ctrl+E Ctrl+E - + Ctrl+Shift+N Ctrl+Shift+N - - + + Change the label of pattern piece Изменить имя чертежа - + Export pattern (layout) - + About &Qt Про &Qt - + &About Valentina &Про Valentina - + E&xit &Выход - + Exit the application Закрыть программу] - + Ctrl+Q Ctrl+Q - + Preferences - + Zoom In Увеличить - + zoom in - + Zoom Out Уменьшить - + Zoom out - + Edit pattern XML code - + ZoomOriginal - + ZoomFitBest @@ -3839,28 +3839,27 @@ Инструмент указатель - + Table of variables Таблица переменных - + Tables of variables Таблици переменных - + Ctrl+T Ctrl+T - - + History История - + Ctrl+H Ctrl+H @@ -3869,12 +3868,12 @@ Роскладка - + Create layout Создать раскладку - + Ctrl+L Ctrl+L @@ -3920,7 +3919,7 @@ Ошибка. Чертеж с таким именем уже сущевствует. - + Pattern piece: Чертеж: @@ -3934,7 +3933,7 @@ Ошибка создания чертежа с именем - + Enter a new label for the pattern piece. Введите новое имя для чертежа. @@ -4058,37 +4057,37 @@ Мерки используют другие единицы измерения нежели лекало. Ето леколо требует мерки в %1 - + Wrong units. Неправильные единицы измерения. - + Application doesn't support standard table with inches. - + File error. Ошибка файла. - + The measurements file <br/><br/> <b>%1</b> <br/><br/> %3 Файл мерок <br/><br/> <b>%1</b> <br/><br/> %3 - + could not be found. Do you want to update the file location не может быть найден. Вы хотите обновить путь к файлу - + Standard measurements (*.vst) Стандартные мерки (*.vst) - + Individual measurements (*.vit) Индивидуальные мерки (*.vit) @@ -4122,7 +4121,7 @@ Do you want to save your changes? Не могу прочитать файл %1:\n%2. - + File loaded Файл загружен @@ -4168,7 +4167,7 @@ Do you want to save your changes? - + Open file Открыть файл @@ -6998,12 +6997,12 @@ Do you want to save your changes? VAbstractTool - + Confirm the deletion. Подтвердить удаление. - + Do you really want delete? Вы точно хотите удалить? @@ -7319,12 +7318,12 @@ Do you want to save your changes? VPattern - + Can't find tool id = %1 in table. Не могу найти инструмент с id = %1 в таблице. - + Error no unique id. Ошибка не уникальный id. @@ -7333,173 +7332,173 @@ Do you want to save your changes? Ошибка! - - + + Error parsing file. Ошибка парсинга файла. - + Error can't convert value. Ошибка, не могу конвертовать значение. - + Error empty parameter. Ошибка, пустой параметр. - + Error wrong id. Ошибка, неправильный id. - + Critical error! Критическая ошибка! - + Error parsing file (std::bad_alloc). - + Error creating or updating detail Ошибка создания или обновления детали - + 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 line Ошибка создания или обновления линии - + 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 Ошибка создания или обновления модельной дуги - + Error creating or updating union details Ошибка создания или обновления объединения деталей - + Got wrong parameter id. Need only id > 0. Получен неправельный параметр id. Допустимы только id > 0. - + This id is not unique. Этот id не уникальный. @@ -7540,12 +7539,12 @@ Do you want to save your changes? VToolDetail - + Options Параметры - + Delete Удалить @@ -7553,170 +7552,170 @@ Do you want to save your changes? VToolOptionsPropertyBrowser - + Base point Базовая точка - - - - - - - - - - - - - - + + + + + + + + + + + + + + Point label Имя точки - + Position - + Point at distance and angle Инструмент точка на конце отрезка + + + + + + + + + Line type + + - - - + + + + - Line type - - - - - - - - - - - Length Длина - + Angle - + Point at distance along line Инструмент точка вдоль линии - + Arc Дуга - - + + Radius Радиус - + First angle - + Second angle - + Point along bisector Инструмент точка бисектрисы - + 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 - + Special point on shoulder - + Curve tool - - + + Curve factor - + Tool for path curve - + Tool triangle diff --git a/src/app/share/translations/valentina_uk_UA.ts b/src/app/share/translations/valentina_uk_UA.ts index 64bb2e909..c1c2cb77b 100644 --- a/src/app/share/translations/valentina_uk_UA.ts +++ b/src/app/share/translations/valentina_uk_UA.ts @@ -1127,7 +1127,7 @@ Замкнена - + Got wrong scene object. Ignore. Отримано не правильний об'єкт сцени. Інгнорується. @@ -1616,7 +1616,7 @@ - + Description Опис @@ -1693,51 +1693,51 @@ Позначення %1 - - - + + + File error. - + male - + female - + Measurements use different units than pattern. This pattern required measurements in %1 - + Individual measurements (*.vit) - - + + Open file Відкрити файл - - + + Wrong units. - + Standard measurements (*.vst) - + Name_%1 Name_%1 @@ -2424,94 +2424,94 @@ - - - - + + + + No changes - + Cannot delete previously created node - + No changes left - + Cannot undo change - - + + <no value> - - + + Unchanged - + Cannot delete previously created attribute - + Node Name - - + + Name: - + Node Value (may be empty) - - + + Value: - + Attribute Name - + Attribute Value - + No selection - + Root node - + Node - + Attribute @@ -3507,23 +3507,23 @@ Креслення - + Details mode Режим деталей - - + + Pointer tools Інструмент вказівник - + New pattern piece Нове креслення - + Add new pattern piece Додати нове креслення @@ -3598,62 +3598,62 @@ &Креслення - + New Новий - + &New &Новий - + Create a new pattern Створити нове лекало - + Ctrl+N Ctrl+N - + Open Відкрити - + &Open &Відкрити - + Open file with pattern Відкрити файл з лекалами - + Save Зберегти - + &Save &Зберегти - + Save pattern Зберегти лекало - + Ctrl+S Ctrl+S - + Save &As... Зберегти &як... @@ -3662,7 +3662,7 @@ Нашатування... - + Pattern properties @@ -3702,123 +3702,123 @@ - + Tool options - + Save not yet saved pattern Зберегти ще не збережене лекало - + Ctrl+Shift+S Ctrl+Shift+S - + Draw Малювання - + Draw mode Режим малювання - + Ctrl+W Ctrl+W - + Details Деталь - + Ctrl+E Ctrl+E - + Ctrl+Shift+N Ctrl+Shift+N - - + + Change the label of pattern piece Змінити ім'я креслення - + Export pattern (layout) - + About &Qt Про &Qt - + &About Valentina &Про Valentina - + E&xit &Вихід - + Exit the application Закрити програму - + Ctrl+Q Ctrl+Q - + Preferences - + Zoom In Збільшити - + zoom in - + Zoom Out Зменшити - + Zoom out - + Edit pattern XML code - + ZoomOriginal - + ZoomFitBest @@ -3831,28 +3831,27 @@ Інструмент вказівник - + Table of variables Таблиця змінних - + Tables of variables Таблиці змінних - + Ctrl+T Ctrl+T - - + History Історія - + Ctrl+H Ctrl+H @@ -3861,12 +3860,12 @@ Розкладки - + Create layout Створити розкладку - + Ctrl+L Ctrl+L @@ -3982,37 +3981,37 @@ - + Wrong units. - + Application doesn't support standard table with inches. - + File error. - + The measurements file <br/><br/> <b>%1</b> <br/><br/> %3 - + could not be found. Do you want to update the file location - + Standard measurements (*.vst) - + Individual measurements (*.vit) @@ -4029,12 +4028,12 @@ Помилка. Креслення з таким імям уже існує. - + Pattern piece: Креслення: - + Enter a new label for the pattern piece. Введить нове ім'я для креслення. @@ -4080,7 +4079,7 @@ - + Open file Відкрити файл @@ -4233,7 +4232,7 @@ Do you want to save your changes? Не можу прочитати файл%1:\n%2. - + File loaded Файл завантажено @@ -6975,12 +6974,12 @@ Do you want to save your changes? VAbstractTool - + Confirm the deletion. Підтвердіть видалення. - + Do you really want delete? Ви дійсно хочете видалити? @@ -7293,12 +7292,12 @@ Do you want to save your changes? VPattern - + Can't find tool id = %1 in table. Не можу знайти інструмент з id = %1 в таблиці. - + Error no unique id. Помилка не унікальний id. @@ -7307,173 +7306,173 @@ Do you want to save your changes? Помилка! - - + + Error parsing file. Помилка парсингу файла. - + Error can't convert value. Помилка, не можу конвертувати значення. - + Error empty parameter. Помилка, пустий параметр. - + Error wrong id. Помикла, неправильний id. - + Critical error! - + Error parsing file (std::bad_alloc). - + Error creating or updating detail Помилка створення чи оновлення деталі - + 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 line Помилка створення чи оновлення лінії - + 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 Помилка створення чи оновлення модельної дуги - + Error creating or updating union details Помилка створення чи оновлення об'єднання деталей - + Got wrong parameter id. Need only id > 0. Отримано неправильний id. Допускаються тільки id > 0. - + This id is not unique. Цей id не унікальний. @@ -7514,12 +7513,12 @@ Do you want to save your changes? VToolDetail - + Options Параметри - + Delete Видалити @@ -7527,170 +7526,170 @@ Do you want to save your changes? VToolOptionsPropertyBrowser - + Base point Базова точка - - - - - - - - - - - - - - + + + + + + + + + + + + + + Point label Ім'я точки - + Position - + Point at distance and angle Інструмент точка на кінці лінії + + + + + + + + + Line type + + - - - + + + + - Line type - - - - - - - - - - - Length Довжина - + Angle - + Point at distance along line Інструмент точка вздовж лінії - + Arc Дуга - - + + Radius Радіус - + First angle - + Second angle - + Point along bisector Інструмент точка бісектриси кута - + 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 - + Special point on shoulder - + Curve tool - - + + Curve factor - + Tool for path curve - + Tool triangle diff --git a/src/libs/qmuparser/qmuparsertokenreader.cpp b/src/libs/qmuparser/qmuparsertokenreader.cpp index 94deeba63..9475308cc 100644 --- a/src/libs/qmuparser/qmuparsertokenreader.cpp +++ b/src/libs/qmuparser/qmuparsertokenreader.cpp @@ -413,7 +413,7 @@ bool QmuParserTokenReader::IsBuiltIn ( token_type &a_Tok ) } m_iSynFlags = noBC | noOPT | noARG_SEP | noPOSTOP | noASSIGN | noIF | noELSE; - m_iSynFlags |= ( ( i != cmEND ) && ( i != cmBC ) ) ? noEND : 0; + m_iSynFlags |= noEND ; } else if (i == cmBO) { diff --git a/src/libs/vpropertyexplorer/plugins/vboolproperty.cpp b/src/libs/vpropertyexplorer/plugins/vboolproperty.cpp index cb096cc4e..67ba88b30 100644 --- a/src/libs/vpropertyexplorer/plugins/vboolproperty.cpp +++ b/src/libs/vpropertyexplorer/plugins/vboolproperty.cpp @@ -45,7 +45,7 @@ VBoolProperty::VBoolProperty(const QString& name) : { TrueText = QObject::tr("True"); } - if (TrueText.isNull()) + if (FalseText.isNull()) { FalseText = QObject::tr("False"); } diff --git a/src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.h b/src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.h index 85c9b69ca..dd71e8504 100644 --- a/src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.h +++ b/src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.h @@ -77,7 +77,6 @@ private slots: private: QColor Color; QToolButton* ToolButton; - QLineEdit* Lineedit; QLabel* TextLabel; QLabel* ColorLabel; QSpacerItem* Spacer; diff --git a/src/libs/vpropertyexplorer/plugins/vnumberproperty.cpp b/src/libs/vpropertyexplorer/plugins/vnumberproperty.cpp index 64b945343..55c8420af 100644 --- a/src/libs/vpropertyexplorer/plugins/vnumberproperty.cpp +++ b/src/libs/vpropertyexplorer/plugins/vnumberproperty.cpp @@ -42,7 +42,7 @@ VIntegerProperty::VIntegerProperty(const QString& name, const QMapVariantValue.setValue(0); VProperty::d_ptr->VariantValue.convert(QVariant::Int); diff --git a/src/libs/vpropertyexplorer/vfileproperty_p.h b/src/libs/vpropertyexplorer/vfileproperty_p.h index ead66fd5c..c24c299ea 100644 --- a/src/libs/vpropertyexplorer/vfileproperty_p.h +++ b/src/libs/vpropertyexplorer/vfileproperty_p.h @@ -45,8 +45,13 @@ public: //! Constructor VFilePropertyPrivate() : VPropertyPrivate(), FileFilters(), Directory(false) {} + + virtual ~VFilePropertyPrivate(); }; +VFilePropertyPrivate::~VFilePropertyPrivate() +{} + } #endif // VFILEPROPERTY_P_H