diff --git a/share/translations/valentina.ts b/share/translations/valentina.ts index fb20be481..03be7262f 100644 --- a/share/translations/valentina.ts +++ b/share/translations/valentina.ts @@ -1708,7 +1708,7 @@ DialogEllipticalArc Dialog - Dialog + Dialog Radius1: @@ -1794,6 +1794,10 @@ Edit rotation angle + + Elliptical arc + + DialogEndLine @@ -1941,7 +1945,7 @@ DialogFlippingByAxis Dialog - Dialog + Dialog Origin point: @@ -1971,12 +1975,16 @@ Horizontal axis Horizontal axis + + Flipping by axis + + DialogFlippingByLine Dialog - Dialog + Dialog First line point: @@ -2006,6 +2014,10 @@ Select second line point that is not part of the list of objects Select second line point that is not part of the list of objects + + Flipping by line + + DialogGroup @@ -2400,7 +2412,7 @@ Increment_%1 - Increment_%1 + Increment_%1 Edit increment @@ -2435,6 +2447,25 @@ Curves control point lengths + + DialogInsertNode + + Insert node + + + + Item: + + + + Piece: + + + + Uknown + + + DialogLayoutProgress @@ -3029,7 +3060,7 @@ Apply settings anyway? DialogMove Dialog - Dialog + Dialog Angle: @@ -3067,6 +3098,10 @@ Apply settings anyway? Calculation Calculation + + Move + + DialogNewMeasurements @@ -3738,7 +3773,7 @@ Apply settings anyway? DialogPin Dialog - Dialog + Dialog Pin tool @@ -3752,6 +3787,10 @@ Apply settings anyway? Piece: + + Pin + + DialogPointFromArcAndTangent @@ -4705,6 +4744,10 @@ Apply settings anyway? Paths Paths + + Excluded + + DialogShoulderPoint @@ -6787,6 +6830,14 @@ Do you want to save your changes? %1 + + Insert node tool + + + + Select an item to insert + + MainWindowsNoGUI @@ -7710,7 +7761,7 @@ Do you want to save your changes? M_%1 - M_%1 + M_%1 Error @@ -11445,6 +11496,16 @@ Do you want to save your changes? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_cs_CZ.ts b/share/translations/valentina_cs_CZ.ts index f7ae7803e..4079f2548 100644 --- a/share/translations/valentina_cs_CZ.ts +++ b/share/translations/valentina_cs_CZ.ts @@ -1440,10 +1440,6 @@ DialogEllipticalArc - - Dialog - Dialog - Radius1: @@ -1528,6 +1524,10 @@ Edit rotation angle + + Elliptical arc + + DialogEndLine @@ -1673,10 +1673,6 @@ DialogFlippingByAxis - - Dialog - Dialog - Origin point: @@ -1705,13 +1701,13 @@ Horizontal axis + + Flipping by axis + + DialogFlippingByLine - - Dialog - Dialog - First line point: @@ -1740,6 +1736,10 @@ Select second line point that is not part of the list of objects + + Flipping by line + + DialogGroup @@ -2120,10 +2120,6 @@ Parser error: %1 Chyba zpracování: %1 - - Increment_%1 - - Edit increment @@ -2157,6 +2153,25 @@ + + DialogInsertNode + + Insert node + + + + Item: + + + + Piece: + + + + Uknown + + + DialogLayoutProgress @@ -2724,10 +2739,6 @@ Apply settings anyway? DialogMove - - Dialog - Dialog - Angle: @@ -2764,6 +2775,10 @@ Apply settings anyway? Calculation + + Move + + DialogNewMeasurements @@ -3405,10 +3420,6 @@ Apply settings anyway? DialogPin - - Dialog - Dialog - Pin tool @@ -3421,6 +3432,10 @@ Apply settings anyway? Piece: + + Pin + + DialogPointFromArcAndTangent @@ -4174,6 +4189,10 @@ Apply settings anyway? Paths Cesty + + Excluded + + DialogShoulderPoint @@ -6111,6 +6130,14 @@ Chcete uložit své změny? %1 + + Insert node tool + + + + Select an item to insert + + MainWindowsNoGUI @@ -6967,10 +6994,6 @@ Chcete uložit své změny? Edit measurement - - M_%1 - - Error Chyba @@ -10406,6 +10429,16 @@ Do you want to save your changes? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_de_DE.ts b/share/translations/valentina_de_DE.ts index f6578a90a..a343a8a73 100644 --- a/share/translations/valentina_de_DE.ts +++ b/share/translations/valentina_de_DE.ts @@ -1586,10 +1586,6 @@ DialogEllipticalArc - - Dialog - Dialog - Radius1: @@ -1674,6 +1670,10 @@ Edit rotation angle + + Elliptical arc + + DialogEndLine @@ -1819,10 +1819,6 @@ DialogFlippingByAxis - - Dialog - Dialog - Origin point: @@ -1851,13 +1847,13 @@ Horizontal axis + + Flipping by axis + + DialogFlippingByLine - - Dialog - Dialog - First line point: Punkt 1 der Linie: @@ -1886,6 +1882,10 @@ Select second line point that is not part of the list of objects + + Flipping by line + + DialogGroup @@ -2280,7 +2280,7 @@ Increment_%1 - Zuwachs_%1 + Zuwachs_%1 Edit increment @@ -2315,6 +2315,25 @@ + + DialogInsertNode + + Insert node + + + + Item: + + + + Piece: + + + + Uknown + + + DialogLayoutProgress @@ -2906,10 +2925,6 @@ Einstellungen trotzdem anwenden? DialogMove - - Dialog - Dialog - Angle: Winkel: @@ -2946,6 +2961,10 @@ Einstellungen trotzdem anwenden? Calculation Berechnung + + Move + + DialogNewMeasurements @@ -3607,10 +3626,6 @@ Einstellungen trotzdem anwenden? DialogPin - - Dialog - Dialog - Pin tool @@ -3623,6 +3638,10 @@ Einstellungen trotzdem anwenden? Piece: + + Pin + + DialogPointFromArcAndTangent @@ -4448,6 +4467,10 @@ Einstellungen trotzdem anwenden? Paths Verzeichnisse + + Excluded + + DialogShoulderPoint @@ -6530,6 +6553,14 @@ Sollen die Änderungen gespeichert werden? %1 + + Insert node tool + + + + Select an item to insert + + MainWindowsNoGUI @@ -7442,7 +7473,7 @@ Sollen die Änderungen gespeichert werden? M_%1 - M_%1 + M_%1 Error @@ -11087,6 +11118,16 @@ Do you want to save your changes? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_el_GR.ts b/share/translations/valentina_el_GR.ts index 0d88b1003..7ed2cdbee 100644 --- a/share/translations/valentina_el_GR.ts +++ b/share/translations/valentina_el_GR.ts @@ -1646,10 +1646,6 @@ DialogEllipticalArc - - Dialog - Διάλογος - Radius1: @@ -1734,6 +1730,10 @@ Edit rotation angle + + Elliptical arc + + DialogEndLine @@ -1881,7 +1881,7 @@ DialogFlippingByAxis Dialog - Διάλογος + Διάλογος Origin point: @@ -1911,12 +1911,16 @@ Horizontal axis Οριζόντιος άξονας + + Flipping by axis + + DialogFlippingByLine Dialog - Διάλογος + Διάλογος First line point: @@ -1946,6 +1950,10 @@ Select second line point that is not part of the list of objects + + Flipping by line + + DialogGroup @@ -2332,7 +2340,7 @@ Increment_%1 - Αύξηση_%1 + Αύξηση_%1 Edit increment @@ -2367,6 +2375,25 @@ + + DialogInsertNode + + Insert node + + + + Item: + + + + Piece: + + + + Uknown + + + DialogLayoutProgress @@ -2944,7 +2971,7 @@ Apply settings anyway? DialogMove Dialog - Διάλογος + Διάλογος Angle: @@ -2982,6 +3009,10 @@ Apply settings anyway? Calculation Υπολογισμός + + Move + + DialogNewMeasurements @@ -3619,10 +3650,6 @@ Apply settings anyway? DialogPin - - Dialog - Διάλογος - Pin tool @@ -3635,6 +3662,10 @@ Apply settings anyway? Piece: + + Pin + + DialogPointFromArcAndTangent @@ -4280,46 +4311,10 @@ Apply settings anyway? Value Τιμή - - Calculation - Υπολογισμός - - - Nodes - Κόμβοι - - - Return to default width - Επιστροφή στο προεπιλεγμένο πλάτος - - - Default - Προεπιλογή - - - Angle: - Γωνία: - Add Προσθήκη - - Cancel - Ακύρωση - - - Remove - Αφαίρεση - - - Detail label visible - Εμφάνιση ετικέτας λεπτομέρειας - - - Pattern label visible - Εμφάνιση ετικέτας πατρόν - Grainline Ισιάδα @@ -4468,6 +4463,10 @@ Apply settings anyway? Paths Διαδρομές + + Excluded + + DialogShoulderPoint @@ -6518,6 +6517,14 @@ Do you want to save your changes? %1 + + Insert node tool + + + + Select an item to insert + + MainWindowsNoGUI @@ -7407,7 +7414,7 @@ Do you want to save your changes? M_%1 - M_%1 + M_%1 Error @@ -10868,6 +10875,16 @@ Do you want to save your changes? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_en_CA.ts b/share/translations/valentina_en_CA.ts index 381d3d768..023b16654 100644 --- a/share/translations/valentina_en_CA.ts +++ b/share/translations/valentina_en_CA.ts @@ -1634,10 +1634,6 @@ DialogEllipticalArc - - Dialog - Dialog - Radius1: @@ -1722,6 +1718,10 @@ Edit rotation angle + + Elliptical arc + + DialogEndLine @@ -1867,10 +1867,6 @@ DialogFlippingByAxis - - Dialog - Dialog - Origin point: @@ -1899,13 +1895,13 @@ Horizontal axis + + Flipping by axis + + DialogFlippingByLine - - Dialog - Dialog - First line point: First line point: @@ -1934,6 +1930,10 @@ Select second line point that is not part of the list of objects + + Flipping by line + + DialogGroup @@ -2328,7 +2328,7 @@ Increment_%1 - Increment_%1 + Increment_%1 Edit increment @@ -2363,6 +2363,25 @@ + + DialogInsertNode + + Insert node + + + + Item: + + + + Piece: + + + + Uknown + + + DialogLayoutProgress @@ -2955,10 +2974,6 @@ Apply settings anyway? DialogMove - - Dialog - Dialog - Angle: Angle: @@ -2995,6 +3010,10 @@ Apply settings anyway? Calculation Calculation + + Move + + DialogNewMeasurements @@ -3664,10 +3683,6 @@ Apply settings anyway? DialogPin - - Dialog - Dialog - Pin tool @@ -3680,6 +3695,10 @@ Apply settings anyway? Piece: + + Pin + + DialogPointFromArcAndTangent @@ -4509,6 +4528,10 @@ Apply settings anyway? Paths Paths + + Excluded + + DialogShoulderPoint @@ -6591,6 +6614,14 @@ Do you want to save your changes? %1 + + Insert node tool + + + + Select an item to insert + + MainWindowsNoGUI @@ -7510,7 +7541,7 @@ Do you want to save your changes? M_%1 - M_%1 + M_%1 Error @@ -11221,6 +11252,16 @@ Do you want to save your changes? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_en_IN.ts b/share/translations/valentina_en_IN.ts index 73c41955e..d28513096 100644 --- a/share/translations/valentina_en_IN.ts +++ b/share/translations/valentina_en_IN.ts @@ -1634,10 +1634,6 @@ DialogEllipticalArc - - Dialog - Dialog - Radius1: @@ -1722,6 +1718,10 @@ Edit rotation angle + + Elliptical arc + + DialogEndLine @@ -1867,10 +1867,6 @@ DialogFlippingByAxis - - Dialog - Dialog - Origin point: @@ -1899,13 +1895,13 @@ Horizontal axis + + Flipping by axis + + DialogFlippingByLine - - Dialog - Dialog - First line point: First line point: @@ -1934,6 +1930,10 @@ Select second line point that is not part of the list of objects + + Flipping by line + + DialogGroup @@ -2328,7 +2328,7 @@ Increment_%1 - Increment_%1 + Increment_%1 Edit increment @@ -2363,6 +2363,25 @@ + + DialogInsertNode + + Insert node + + + + Item: + + + + Piece: + + + + Uknown + + + DialogLayoutProgress @@ -2955,10 +2974,6 @@ Apply settings anyway? DialogMove - - Dialog - Dialog - Angle: Angle: @@ -2995,6 +3010,10 @@ Apply settings anyway? Calculation Calculation + + Move + + DialogNewMeasurements @@ -3664,10 +3683,6 @@ Apply settings anyway? DialogPin - - Dialog - Dialog - Pin tool @@ -3680,6 +3695,10 @@ Apply settings anyway? Piece: + + Pin + + DialogPointFromArcAndTangent @@ -4509,6 +4528,10 @@ Apply settings anyway? Paths Paths + + Excluded + + DialogShoulderPoint @@ -6591,6 +6614,14 @@ Do you want to save your changes? %1 + + Insert node tool + + + + Select an item to insert + + MainWindowsNoGUI @@ -7510,7 +7541,7 @@ Do you want to save your changes? M_%1 - M_%1 + M_%1 Error @@ -11221,6 +11252,16 @@ Do you want to save your changes? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_en_US.ts b/share/translations/valentina_en_US.ts index 36398347e..5d5eea7a0 100644 --- a/share/translations/valentina_en_US.ts +++ b/share/translations/valentina_en_US.ts @@ -1634,10 +1634,6 @@ DialogEllipticalArc - - Dialog - Dialog - Radius1: @@ -1722,6 +1718,10 @@ Edit rotation angle + + Elliptical arc + + DialogEndLine @@ -1867,10 +1867,6 @@ DialogFlippingByAxis - - Dialog - Dialog - Origin point: @@ -1899,13 +1895,13 @@ Horizontal axis + + Flipping by axis + + DialogFlippingByLine - - Dialog - Dialog - First line point: First line point: @@ -1934,6 +1930,10 @@ Select second line point that is not part of the list of objects + + Flipping by line + + DialogGroup @@ -2328,7 +2328,7 @@ Increment_%1 - Increment_%1 + Increment_%1 Edit increment @@ -2363,6 +2363,25 @@ + + DialogInsertNode + + Insert node + + + + Item: + + + + Piece: + + + + Uknown + + + DialogLayoutProgress @@ -2955,10 +2974,6 @@ Apply settings anyway? DialogMove - - Dialog - Dialog - Angle: Angle: @@ -2995,6 +3010,10 @@ Apply settings anyway? Calculation Calculation + + Move + + DialogNewMeasurements @@ -3664,10 +3683,6 @@ Apply settings anyway? DialogPin - - Dialog - Dialog - Pin tool @@ -3680,6 +3695,10 @@ Apply settings anyway? Piece: + + Pin + + DialogPointFromArcAndTangent @@ -4509,6 +4528,10 @@ Apply settings anyway? Paths Paths + + Excluded + + DialogShoulderPoint @@ -6591,6 +6614,14 @@ Do you want to save your changes? %1 + + Insert node tool + + + + Select an item to insert + + MainWindowsNoGUI @@ -7510,7 +7541,7 @@ Do you want to save your changes? M_%1 - M_%1 + M_%1 Error @@ -11221,6 +11252,16 @@ Do you want to save your changes? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_es_ES.ts b/share/translations/valentina_es_ES.ts index ddb72d4f3..51d4ea4a1 100644 --- a/share/translations/valentina_es_ES.ts +++ b/share/translations/valentina_es_ES.ts @@ -1707,10 +1707,6 @@ DialogEllipticalArc - - Dialog - Diálogo - Radius1: Alcance1: @@ -1795,6 +1791,10 @@ Edit rotation angle Editar ángulo de rotación + + Elliptical arc + Arco elíptico + DialogEndLine @@ -1942,7 +1942,7 @@ DialogFlippingByAxis Dialog - Diálogo + Diálogo Origin point: @@ -1972,12 +1972,16 @@ Horizontal axis Eje horizontal + + Flipping by axis + + DialogFlippingByLine Dialog - Diálogo + Diálogo First line point: @@ -2007,6 +2011,10 @@ Select second line point that is not part of the list of objects Seleccionar el segundo punto de línea que no es parte de una lista de objetos + + Flipping by line + + DialogGroup @@ -2401,7 +2409,7 @@ Increment_%1 - Incremento_%1 + Incremento_%1 Edit increment @@ -2436,6 +2444,25 @@ Longitudes de punto de control de curvas + + DialogInsertNode + + Insert node + + + + Item: + + + + Piece: + Pieza: + + + Uknown + + + DialogLayoutProgress @@ -3029,7 +3056,7 @@ Apply settings anyway? DialogMove Dialog - Diálogo + Diálogo Angle: @@ -3067,6 +3094,10 @@ Apply settings anyway? Calculation Cálculo + + Move + + DialogNewMeasurements @@ -3441,7 +3472,7 @@ Apply settings anyway? 200 - + 200 @@ -3736,10 +3767,6 @@ Apply settings anyway? DialogPin - - Dialog - Diálogo - Pin tool Imperdible @@ -3752,6 +3779,10 @@ Apply settings anyway? Piece: Pieza: + + Pin + + DialogPointFromArcAndTangent @@ -4421,182 +4452,22 @@ Apply settings anyway? Seam allowance tool Herramienta para las costuras - - Main path - Ruta principal - - - All objects in path should follow in clockwise direction. - Todos los objetos de la ruta deberían seguir en la dirección de las agujas del reloj. - - - Forbid piece be mirrored in a layout. - Prohibir que el trozo sea reproducido en una capa. - - - Forbid flipping - Prohibir girado - Ready! ¡Listo! - - Seam allowance - Las costuras - - - Automatic - Automático - - - Width: - Anchura: - - - Formula wizard - Asistente de Fórmula - Value Valor - - Calculation - Cálculo - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - <html><head/><body><p>Muestra el cálculo completo en una caja de mensajes</p></body></html> - - - Nodes - Nodos - - - Node: - Nodo: - - - Before: - Antes: - - - Return to default width - Volver al ancho predeterminado - - - Default - Defecto - - - After: - Después: - - - Angle: - Ángulo: - - - Custom - Personalizado - - - Start point: - Punto de partida: - - - End point: - Punto final: - - - Include as: - Incluir como: - - - Internal paths - Rutas internas - - - Letter: - Letra: - - - Letter of pattern piece - Carta de trozo de estampado - - - Name of detail: - Nombre del detalle: - - - Detail - Detalle - - - Name can't be empty - El nombre no puede estar vacío - - - Material/Cut number/Placement - Material/Cortar número/Disposición - - - Cut number: - Curtar número: - - - Material type: - Tipo de Material: - - - You can choose one of the predefined materials or enter a new one - Puede elegir uno de los materiales predefinidos o introducir uno nuevo - - - Placement: - Ubicación: - Add Agregar - - Cancel - Cancelar - - - Remove - Quitar - - - Detail label visible - Etiqueta de Detalle visible - - - Pattern label visible - Etiqueta del patrón visible - Grainline Línea discontinua - - Grainline visible - Línea discontinua visible - - - Rotation: - Rotación: - - - Length: - Longitud: - - - Arrows: - Flechas: - Select main path objects clockwise, <b>Shift</b> - reverse direction curve, <b>Enter</b> - finish creation Selecionar objetos principales del trayecto, <b>Mayúsculas</b> - curva de sentido inverso, <b>Intro</b> - finalizar creación @@ -4705,22 +4576,6 @@ Apply settings anyway? Just rear Justo detrás - - Top left pin: - Alfiler izquierdo superior: - - - Bottom right pin: - Alfiler derecho inferior: - - - Top pin: - Alfiler superior: - - - Bottom pin: - Alfiler inferior: - Pins Alfileres @@ -4731,31 +4586,35 @@ Apply settings anyway? Labels - + Etiquetas Error - Error + Error Edit length - + Editar largo Edit angle - Editar ángulo + Editar ángulo Edit height - + Editar altura Edit width - + Editar ancho Paths - Carpetas + Rutas + + + Excluded + @@ -6748,19 +6607,19 @@ Quiere guardar los cambios? Could not save the file. - + No pudo guardarse el archivo. Could not save the file - + No pudo guardarse el archivo read only - + sólo lectura Variables Table - + Mesa de variables Contains information about increments and internal variables @@ -6839,6 +6698,14 @@ Quiere guardar los cambios? %1 + + Insert node tool + + + + Select an item to insert + + MainWindowsNoGUI @@ -7762,7 +7629,7 @@ Quiere guardar los cambios? M_%1 - M_%1 + M_%1 Error @@ -8106,15 +7973,15 @@ Do you want to save your changes? Could not save the file. - + No ha podido guardarse el archivo. Could not save the file - + No ha podido guardarse el archivo read only - + sólo lectura Multisize measurements @@ -8161,11 +8028,11 @@ Do you want to save your changes? Top pin: - Alfiler superior: + Bottom pin: - Alfiler inferior: + Arrows: @@ -8208,7 +8075,8 @@ Do you want to save your changes? Cut number: - + + Material type: @@ -8236,7 +8104,7 @@ Do you want to save your changes? Labels - + Etiquetas Detail label visible @@ -8272,11 +8140,11 @@ Do you want to save your changes? Top left pin: - Alfiler izquierdo superior: + Bottom right pin: - Alfiler derecho inferior: + Angle: @@ -8284,7 +8152,7 @@ Do you want to save your changes? Pattern label visible - + Etiqueta del Patrón visible @@ -8295,11 +8163,11 @@ Do you want to save your changes? Main path - Ruta principal + All objects in path should follow in clockwise direction. - + Todos los objetos en la ruta deben seguir en la direccion de las agujas del reloj. Forbid piece be mirrored in a layout. @@ -8319,7 +8187,7 @@ Do you want to save your changes? Automatic - Automático + Width: @@ -8375,19 +8243,19 @@ Do you want to save your changes? Start point: - Punto de partida: + End point: - Punto final: + Include as: - Incluir como: + Internal paths - Rutas internas + @@ -9927,10 +9795,6 @@ Do you want to save your changes? Elliptical arc Arco elíptico - - Rotation angle - Ángulo de rotación - Point label: Etiqueta de punto: @@ -11500,6 +11364,16 @@ Do you want to save your changes? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_fi_FI.ts b/share/translations/valentina_fi_FI.ts index 06c5a8d1c..fd9e4e905 100644 --- a/share/translations/valentina_fi_FI.ts +++ b/share/translations/valentina_fi_FI.ts @@ -1433,10 +1433,6 @@ DialogEllipticalArc - - Dialog - - Radius1: @@ -1521,6 +1517,10 @@ Edit rotation angle + + Elliptical arc + + DialogEndLine @@ -1666,10 +1666,6 @@ DialogFlippingByAxis - - Dialog - - Origin point: @@ -1698,13 +1694,13 @@ Horizontal axis + + Flipping by axis + + DialogFlippingByLine - - Dialog - - First line point: @@ -1733,6 +1729,10 @@ Select second line point that is not part of the list of objects + + Flipping by line + + DialogGroup @@ -2113,10 +2113,6 @@ Parser error: %1 Jäsentämis virhe: %1 - - Increment_%1 - - Edit increment @@ -2150,6 +2146,25 @@ + + DialogInsertNode + + Insert node + + + + Item: + + + + Piece: + + + + Uknown + + + DialogLayoutProgress @@ -2717,10 +2732,6 @@ Apply settings anyway? DialogMove - - Dialog - - Angle: @@ -2757,6 +2768,10 @@ Apply settings anyway? Calculation + + Move + + DialogNewMeasurements @@ -3394,10 +3409,6 @@ Apply settings anyway? DialogPin - - Dialog - - Pin tool @@ -3410,6 +3421,10 @@ Apply settings anyway? Piece: + + Pin + + DialogPointFromArcAndTangent @@ -4155,6 +4170,10 @@ Apply settings anyway? Paths Polut + + Excluded + + DialogShoulderPoint @@ -6092,6 +6111,14 @@ Haluatko tallentaa muutokset? %1 + + Insert node tool + + + + Select an item to insert + + MainWindowsNoGUI @@ -6952,10 +6979,6 @@ Haluatko tallentaa muutokset? Edit measurement - - M_%1 - - Error Virhe @@ -10389,6 +10412,16 @@ Do you want to save your changes? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_fr_FR.ts b/share/translations/valentina_fr_FR.ts index 186efdd70..0eff9bc41 100644 --- a/share/translations/valentina_fr_FR.ts +++ b/share/translations/valentina_fr_FR.ts @@ -1706,10 +1706,6 @@ DialogEllipticalArc - - Dialog - Dialogue - Radius1: Rayon1 : @@ -1794,6 +1790,10 @@ Edit rotation angle Modifier l'angle de rotation + + Elliptical arc + Arc éliptique + DialogEndLine @@ -1941,7 +1941,7 @@ DialogFlippingByAxis Dialog - Dialogue + Dialogue Origin point: @@ -1971,12 +1971,16 @@ Horizontal axis Axes horizontaux + + Flipping by axis + + DialogFlippingByLine Dialog - Dialogue + Dialogue First line point: @@ -2006,6 +2010,10 @@ Select second line point that is not part of the list of objects Sélectionnez le deuxième point de la ligne qui n'est pas dans la liste d'objets + + Flipping by line + + DialogGroup @@ -2400,7 +2408,7 @@ Increment_%1 - Increment_%1 + Increment_%1 Edit increment @@ -2435,6 +2443,25 @@ + + DialogInsertNode + + Insert node + + + + Item: + + + + Piece: + + + + Uknown + + + DialogLayoutProgress @@ -3026,7 +3053,7 @@ Appliquer les réglages quand-même ? DialogMove Dialog - Dialogue + Dialogue Angle: @@ -3064,6 +3091,10 @@ Appliquer les réglages quand-même ? Calculation Calcul + + Move + + DialogNewMeasurements @@ -3733,10 +3764,6 @@ Appliquer les réglages quand-même ? DialogPin - - Dialog - Dialogue - Pin tool @@ -3749,6 +3776,10 @@ Appliquer les réglages quand-même ? Piece: Element: + + Pin + + DialogPointFromArcAndTangent @@ -4418,158 +4449,22 @@ Appliquer les réglages quand-même ? Seam allowance tool Outil marge de couture - - Main path - Chemin principal - - - All objects in path should follow in clockwise direction. - Tous les objets du chemin doivent se suivre dans le sens horaire. - - - Forbid flipping - Rotation interdite - Ready! Prêt! - - Seam allowance - Marge de couture - - - Automatic - Automatique - - - Width: - Largeur : - - - Formula wizard - Assistant Formule - Value Valeur - - Calculation - Calcul - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - <html><head/><body><p>Voir le calcul dans une boite de dialogue</p></body></html> - - - Nodes - Nœuds - - - Node: - Nœud: - - - Before: - Avant: - - - Return to default width - Retourner à la largeur par défaut - - - Default - Défaut - - - After: - Après: - - - Angle: - Angle: - - - Custom - Personnalisé - - - Start point: - Point de départ: - - - End point: - Point final: - - - Include as: - Inclus comme: - - - Internal paths - Chemins internes - - - Letter: - Lettre : - - - Letter of pattern piece - Lettre de l'élément de patron - - - Name of detail: - Nom de la pièce de patron: - - - Detail - Pièce de patron - - - Name can't be empty - La valeur Nom ne peut pas être vide - - - Material type: - Type de matière : - - - Placement: - Placement: - Add Ajouter - - Cancel - Annuler - - - Remove - Retirer - Grainline Droit-fil - - Grainline visible - Droit-fil visible - - - Rotation: - Rotation: - - - Length: - Longueur: - - - Arrows: - Flèches: - Select main path objects clockwise, <b>Shift</b> - reverse direction curve, <b>Enter</b> - finish creation @@ -4714,6 +4609,10 @@ Appliquer les réglages quand-même ? Paths Chemins + + Excluded + + DialogShoulderPoint @@ -6796,6 +6695,14 @@ Voulez-vous sauvegarder les changements? %1 + + Insert node tool + + + + Select an item to insert + + MainWindowsNoGUI @@ -7715,7 +7622,7 @@ Voulez-vous sauvegarder les changements? M_%1 - M_%1 + M_%1 Error @@ -8123,7 +8030,7 @@ Voulez-vous enregistrer les changements? Arrows: - + Fleches: @@ -8249,11 +8156,11 @@ Voulez-vous enregistrer les changements? Main path - Chemin principal + All objects in path should follow in clockwise direction. - + Tous les objets du chemin doivent se suivre dans le sens des aiguilles d'une montre. Forbid piece be mirrored in a layout. @@ -8273,7 +8180,7 @@ Voulez-vous enregistrer les changements? Automatic - Automatique + Width: @@ -8329,19 +8236,19 @@ Voulez-vous enregistrer les changements? Start point: - Point de départ: + End point: - Point final: + Include as: - Inclus comme: + Internal paths - Chemins internes + @@ -11425,6 +11332,16 @@ Voulez-vous enregistrer les changements? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_he_IL.ts b/share/translations/valentina_he_IL.ts index 911ece50e..8e81ae406 100644 --- a/share/translations/valentina_he_IL.ts +++ b/share/translations/valentina_he_IL.ts @@ -1173,10 +1173,6 @@ DialogEllipticalArc - - Dialog - - Radius1: @@ -1261,6 +1257,10 @@ Edit rotation angle + + Elliptical arc + + DialogEndLine @@ -1386,10 +1386,6 @@ DialogFlippingByAxis - - Dialog - - Origin point: @@ -1418,13 +1414,13 @@ Horizontal axis + + Flipping by axis + + DialogFlippingByLine - - Dialog - - First line point: @@ -1453,6 +1449,10 @@ Select second line point that is not part of the list of objects + + Flipping by line + + DialogGroup @@ -1793,10 +1793,6 @@ Parser error: %1 - - Increment_%1 - - Edit increment @@ -1830,6 +1826,25 @@ + + DialogInsertNode + + Insert node + + + + Item: + + + + Piece: + + + + Uknown + + + DialogLayoutProgress @@ -2349,10 +2364,6 @@ Apply settings anyway? DialogMove - - Dialog - - Angle: @@ -2389,6 +2400,10 @@ Apply settings anyway? Calculation + + Move + + DialogNewMeasurements @@ -2875,10 +2890,6 @@ Apply settings anyway? DialogPin - - Dialog - - Pin tool @@ -2891,6 +2902,10 @@ Apply settings anyway? Piece: + + Pin + + DialogPointFromArcAndTangent @@ -3588,6 +3603,10 @@ Apply settings anyway? Paths + + Excluded + + DialogShoulderPoint @@ -5356,6 +5375,14 @@ Do you want to save your changes? %1 + + Insert node tool + + + + Select an item to insert + + MainWindowsNoGUI @@ -6184,10 +6211,6 @@ Do you want to save your changes? Edit measurement - - M_%1 - - Error @@ -9403,6 +9426,16 @@ Do you want to save your changes? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VWidgetDetails diff --git a/share/translations/valentina_id_ID.ts b/share/translations/valentina_id_ID.ts index e1fd5ddc6..a5fe49923 100644 --- a/share/translations/valentina_id_ID.ts +++ b/share/translations/valentina_id_ID.ts @@ -1345,10 +1345,6 @@ DialogEllipticalArc - - Dialog - - Radius1: @@ -1433,6 +1429,10 @@ Edit rotation angle + + Elliptical arc + + DialogEndLine @@ -1570,10 +1570,6 @@ DialogFlippingByAxis - - Dialog - - Origin point: @@ -1602,13 +1598,13 @@ Horizontal axis + + Flipping by axis + + DialogFlippingByLine - - Dialog - - First line point: @@ -1637,6 +1633,10 @@ Select second line point that is not part of the list of objects + + Flipping by line + + DialogGroup @@ -1977,10 +1977,6 @@ Parser error: %1 - - Increment_%1 - - Edit increment @@ -2014,6 +2010,25 @@ + + DialogInsertNode + + Insert node + + + + Item: + + + + Piece: + + + + Uknown + + + DialogLayoutProgress @@ -2549,10 +2564,6 @@ Apply settings anyway? DialogMove - - Dialog - - Angle: @@ -2589,6 +2600,10 @@ Apply settings anyway? Calculation + + Move + + DialogNewMeasurements @@ -3083,10 +3098,6 @@ Apply settings anyway? DialogPin - - Dialog - - Pin tool @@ -3099,6 +3110,10 @@ Apply settings anyway? Piece: + + Pin + + DialogPointFromArcAndTangent @@ -3820,6 +3835,10 @@ Apply settings anyway? Paths + + Excluded + + DialogShoulderPoint @@ -5609,6 +5628,14 @@ Apakah anda ingin menyimpan perubahan anda? %1 + + Insert node tool + + + + Select an item to insert + + MainWindowsNoGUI @@ -6437,10 +6464,6 @@ Apakah anda ingin menyimpan perubahan anda? Edit measurement - - M_%1 - - Error @@ -9676,6 +9699,16 @@ Do you want to save your changes? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VWidgetDetails diff --git a/share/translations/valentina_it_IT.ts b/share/translations/valentina_it_IT.ts index a26b79b21..7bdaf79c8 100644 --- a/share/translations/valentina_it_IT.ts +++ b/share/translations/valentina_it_IT.ts @@ -1630,10 +1630,6 @@ DialogEllipticalArc - - Dialog - Finestra - Radius1: @@ -1718,6 +1714,10 @@ Edit rotation angle + + Elliptical arc + + DialogEndLine @@ -1863,10 +1863,6 @@ DialogFlippingByAxis - - Dialog - Finestra - Origin point: @@ -1895,13 +1891,13 @@ Horizontal axis + + Flipping by axis + + DialogFlippingByLine - - Dialog - Finestra - First line point: Primo punto della linea: @@ -1930,6 +1926,10 @@ Select second line point that is not part of the list of objects + + Flipping by line + + DialogGroup @@ -2324,7 +2324,7 @@ Increment_%1 - Incremento_%1 + Incremento_%1 Edit increment @@ -2359,6 +2359,25 @@ + + DialogInsertNode + + Insert node + + + + Item: + + + + Piece: + + + + Uknown + + + DialogLayoutProgress @@ -2951,10 +2970,6 @@ Applicare le impostazioni comunque? DialogMove - - Dialog - Finestra - Angle: Angolo: @@ -2991,6 +3006,10 @@ Applicare le impostazioni comunque? Calculation + + Move + + DialogNewMeasurements @@ -3660,10 +3679,6 @@ Applicare le impostazioni comunque? DialogPin - - Dialog - Finestra - Pin tool @@ -3676,6 +3691,10 @@ Applicare le impostazioni comunque? Piece: + + Pin + + DialogPointFromArcAndTangent @@ -4501,6 +4520,10 @@ Applicare le impostazioni comunque? Paths Path + + Excluded + + DialogShoulderPoint @@ -6583,6 +6606,14 @@ Vuoi salvare i cambiamenti? %1 + + Insert node tool + + + + Select an item to insert + + MainWindowsNoGUI @@ -7502,7 +7533,7 @@ Vuoi salvare i cambiamenti? M_%1 - M_%1 + M_%1 Error @@ -11045,6 +11076,16 @@ Vuoi salvare le tue modifiche? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_nl_NL.ts b/share/translations/valentina_nl_NL.ts index 506476ca9..9c4dd2d5f 100644 --- a/share/translations/valentina_nl_NL.ts +++ b/share/translations/valentina_nl_NL.ts @@ -1706,10 +1706,6 @@ DialogEllipticalArc - - Dialog - Dialoog - Radius1: Straal1: @@ -1794,6 +1790,10 @@ Edit rotation angle Bewerk de grootte van de hoek + + Elliptical arc + Ellipsvormige boog + DialogEndLine @@ -1941,7 +1941,7 @@ DialogFlippingByAxis Dialog - Dialoog + Dialoog Origin point: @@ -1971,12 +1971,16 @@ Horizontal axis Horizontale as + + Flipping by axis + + DialogFlippingByLine Dialog - Dialoog + Dialoog First line point: @@ -2006,6 +2010,10 @@ Select second line point that is not part of the list of objects het tweede punt van de lijn mag geen deel uitmaken van de gekozen objecten + + Flipping by line + + DialogGroup @@ -2400,7 +2408,7 @@ Increment_%1 - Verkleinen/vergroten_%1 + Verkleinen/vergroten_%1 Edit increment @@ -2435,6 +2443,25 @@ Kromming begrensd door controlepunten + + DialogInsertNode + + Insert node + + + + Item: + + + + Piece: + + + + Uknown + + + DialogLayoutProgress @@ -3029,7 +3056,7 @@ Toch de instellingen aanpassen? DialogMove Dialog - Dialoog + Dialoog Angle: @@ -3067,6 +3094,10 @@ Toch de instellingen aanpassen? Calculation Berekening + + Move + + DialogNewMeasurements @@ -3736,10 +3767,6 @@ Toch de instellingen aanpassen? DialogPin - - Dialog - Dialoog - Pin tool Pin gereedschap @@ -3752,6 +3779,10 @@ Toch de instellingen aanpassen? Piece: Stuk: + + Pin + + DialogPointFromArcAndTangent @@ -4421,182 +4452,22 @@ Toch de instellingen aanpassen? Seam allowance tool Naadtoeslag gereedschap - - Main path - Hoofdpad - - - All objects in path should follow in clockwise direction. - Alle objecten in het pad moeten in de richting van de klok gekozen worden. - - - Forbid piece be mirrored in a layout. - Het stuk kan niet gekanteld worden in de opmaak modus. - - - Forbid flipping - Kantelen niet toegestaan - Ready! Klaar! - - Seam allowance - Naadtoeslag - - - Automatic - Automatisch - - - Width: - Breedte: - - - Formula wizard - Formule wizard - Value Waarde - - Calculation - Berekening - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - <html><head/><body><p>Laat hele berekening zien in berichtenbox</p></body></html> - - - Nodes - Knooppunten - - - Node: - Knooppunt: - - - Before: - Vooraf: - - - Return to default width - Terug naar standaard breedte - - - Default - Standaard - - - After: - Nadat: - - - Angle: - Hoek: - - - Custom - Gebruikelijk - - - Start point: - Startpunt: - - - End point: - Eindpunt: - - - Include as: - Hoort bij: - - - Internal paths - Ingesloten paden - - - Letter: - Letter: - - - Letter of pattern piece - Letter van patroondeel - - - Name of detail: - Benoem detail: - - - Detail - Detail - - - Name can't be empty - Naam mag niet leeg zijn - - - Material/Cut number/Placement - Materiaal/Snijnummer/Plaatsing - - - Cut number: - Snijnummer: - - - Material type: - Materiaaltype: - - - You can choose one of the predefined materials or enter a new one - U kunt kiezen uit een van de voorgedefinieerde materialen of voeg een nieuwe toe - - - Placement: - Plaatsing: - Add Voeg toe - - Cancel - Breek af - - - Remove - Verwijder - - - Detail label visible - Detaillabel zichtbaar - - - Pattern label visible - Patroonlabel zichtbaar - Grainline Recht van draad - - Grainline visible - Recht van draadlijn zichtbaar - - - Rotation: - Draaiing: - - - Length: - Lengte: - - - Arrows: - Pijlen: - Select main path objects clockwise, <b>Shift</b> - reverse direction curve, <b>Enter</b> - finish creation Selecteer hoofdpad-objecten met de klok mee,<b>Shift</b> - draai richting kromme om, <b>Enter</b> - einde creatie @@ -4705,22 +4576,6 @@ Toch de instellingen aanpassen? Just rear Alleen achterkant - - Top left pin: - Pin linksboven: - - - Bottom right pin: - Pin rechtsonder: - - - Top pin: - Bovenste pin: - - - Bottom pin: - Onderste pin: - Pins Pins @@ -4729,22 +4584,10 @@ Toch de instellingen aanpassen? no pin geen pin - - Piece label data - Gegevens op label - Labels Labels - - Height: - Hoogte: - - - Center pin: - Centrale pin: - Error Fout @@ -4769,6 +4612,10 @@ Toch de instellingen aanpassen? Paths Paden + + Excluded + + DialogShoulderPoint @@ -6851,6 +6698,14 @@ Do you want to save your changes? Je kunt de layout-mode nu niet gebruiken. %1 + + Insert node tool + + + + Select an item to insert + + MainWindowsNoGUI @@ -7774,7 +7629,7 @@ Do you want to save your changes? M_%1 - M_%1 + M_%1 Error @@ -8170,15 +8025,15 @@ Wil je deze veranderingen opslaan? Center pin: - Centrale pin: + Top pin: - Bovenste pin: + Bottom pin: - Onderste pin: + Arrows: @@ -8193,7 +8048,7 @@ Wil je deze veranderingen opslaan? Piece label data - Gegevens op label + Letter: @@ -8205,7 +8060,7 @@ Wil je deze veranderingen opslaan? Name of detail: - + Detailnaam: Detail @@ -8217,7 +8072,7 @@ Wil je deze veranderingen opslaan? Material/Cut number/Placement - + Materiaal/Snijnummer/Positie Cut number: @@ -8225,7 +8080,7 @@ Wil je deze veranderingen opslaan? Material type: - + Materiaalsoort: You can choose one of the predefined materials or enter a new one @@ -8233,7 +8088,7 @@ Wil je deze veranderingen opslaan? Placement: - + Positie: Add @@ -8241,7 +8096,7 @@ Wil je deze veranderingen opslaan? Cancel - + Stop Remove @@ -8253,7 +8108,7 @@ Wil je deze veranderingen opslaan? Detail label visible - + Zichtbare detail label Width: @@ -8281,15 +8136,15 @@ Wil je deze veranderingen opslaan? Center pin: - Centrale pin: + Top left pin: - Pin linksboven: + Bottom right pin: - Pin rechtsonder: + Angle: @@ -8297,7 +8152,7 @@ Wil je deze veranderingen opslaan? Pattern label visible - + Zichtbare patroon label @@ -8308,11 +8163,11 @@ Wil je deze veranderingen opslaan? Main path - Hoofdpad + All objects in path should follow in clockwise direction. - + Alle objecten op dit pad moeten de richting met de klok mee volgen. Forbid piece be mirrored in a layout. @@ -8332,7 +8187,7 @@ Wil je deze veranderingen opslaan? Automatic - Automatisch + Width: @@ -8384,23 +8239,23 @@ Wil je deze veranderingen opslaan? Custom - + Op maat Start point: - Startpunt: + End point: - Eindpunt: + Include as: - Hoort bij: + Internal paths - Ingesloten paden + @@ -9936,10 +9791,6 @@ Wil je deze veranderingen opslaan? Elliptical arc Ellipsvormige boog - - Rotation angle - Hoek van draaiing - Point label: Punt label: @@ -11509,6 +11360,16 @@ Wil je deze veranderingen opslaan? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_pt_BR.ts b/share/translations/valentina_pt_BR.ts index 18129231b..9e1c30bfd 100644 --- a/share/translations/valentina_pt_BR.ts +++ b/share/translations/valentina_pt_BR.ts @@ -1514,10 +1514,6 @@ DialogEllipticalArc - - Dialog - - Radius1: @@ -1602,6 +1598,10 @@ Edit rotation angle + + Elliptical arc + + DialogEndLine @@ -1743,10 +1743,6 @@ DialogFlippingByAxis - - Dialog - - Origin point: @@ -1775,13 +1771,13 @@ Horizontal axis + + Flipping by axis + + DialogFlippingByLine - - Dialog - - First line point: @@ -1810,6 +1806,10 @@ Select second line point that is not part of the list of objects + + Flipping by line + + DialogGroup @@ -2158,10 +2158,6 @@ Parser error: %1 - - Increment_%1 - - Edit increment @@ -2195,6 +2191,25 @@ + + DialogInsertNode + + Insert node + + + + Item: + + + + Piece: + + + + Uknown + + + DialogLayoutProgress @@ -2738,10 +2753,6 @@ Apply settings anyway? DialogMove - - Dialog - - Angle: Ângulo: @@ -2778,6 +2789,10 @@ Apply settings anyway? Calculation Cálculo + + Move + + DialogNewMeasurements @@ -3279,10 +3294,6 @@ Apply settings anyway? DialogPin - - Dialog - - Pin tool @@ -3295,6 +3306,10 @@ Apply settings anyway? Piece: + + Pin + + DialogPointFromArcAndTangent @@ -4020,6 +4035,10 @@ Apply settings anyway? Paths Paths + + Excluded + + DialogShoulderPoint @@ -5840,6 +5859,14 @@ Do you want to save your changes? %1 + + Insert node tool + + + + Select an item to insert + + MainWindowsNoGUI @@ -6668,10 +6695,6 @@ Do you want to save your changes? Edit measurement - - M_%1 - - Error Erro @@ -10017,6 +10040,16 @@ Do you want to save your changes? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_ro_RO.ts b/share/translations/valentina_ro_RO.ts index 91777cec2..e52408321 100644 --- a/share/translations/valentina_ro_RO.ts +++ b/share/translations/valentina_ro_RO.ts @@ -1526,10 +1526,6 @@ DialogEllipticalArc - - Dialog - Dialog - Radius1: @@ -1614,6 +1610,10 @@ Edit rotation angle + + Elliptical arc + + DialogEndLine @@ -1759,10 +1759,6 @@ DialogFlippingByAxis - - Dialog - Dialog - Origin point: @@ -1791,13 +1787,13 @@ Horizontal axis + + Flipping by axis + + DialogFlippingByLine - - Dialog - Dialog - First line point: @@ -1826,6 +1822,10 @@ Select second line point that is not part of the list of objects + + Flipping by line + + DialogGroup @@ -2206,10 +2206,6 @@ Parser error: %1 Eroare Parser: %1 - - Increment_%1 - - Edit increment @@ -2243,6 +2239,25 @@ + + DialogInsertNode + + Insert node + + + + Item: + + + + Piece: + + + + Uknown + + + DialogLayoutProgress @@ -2810,10 +2825,6 @@ Apply settings anyway? DialogMove - - Dialog - Dialog - Angle: Unghi: @@ -2850,6 +2861,10 @@ Apply settings anyway? Calculation Calcul + + Move + + DialogNewMeasurements @@ -3403,10 +3418,6 @@ Apply settings anyway? DialogPin - - Dialog - Dialog - Pin tool @@ -3419,6 +3430,10 @@ Apply settings anyway? Piece: + + Pin + + DialogPointFromArcAndTangent @@ -4152,6 +4167,10 @@ Apply settings anyway? Paths Căi + + Excluded + + DialogShoulderPoint @@ -6084,6 +6103,14 @@ Do you want to save your changes? %1 + + Insert node tool + + + + Select an item to insert + + MainWindowsNoGUI @@ -6924,10 +6951,6 @@ Do you want to save your changes? Edit measurement - - M_%1 - - Error Eroare @@ -10251,6 +10274,16 @@ Do you want to save your changes? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VWidgetDetails diff --git a/share/translations/valentina_ru_RU.ts b/share/translations/valentina_ru_RU.ts index 07bd60ae0..ef187cecb 100644 --- a/share/translations/valentina_ru_RU.ts +++ b/share/translations/valentina_ru_RU.ts @@ -1706,10 +1706,6 @@ DialogEllipticalArc - - Dialog - Диалог - Radius1: Радиус1: @@ -1794,6 +1790,10 @@ Edit rotation angle Изменить угол поворота + + Elliptical arc + Эллиптическая дуга + DialogEndLine @@ -1941,7 +1941,7 @@ DialogFlippingByAxis Dialog - Диалог + Диалог Origin point: @@ -1971,12 +1971,16 @@ Horizontal axis Горизонтальные оси + + Flipping by axis + + DialogFlippingByLine Dialog - Диалог + Диалог First line point: @@ -2006,6 +2010,10 @@ Select second line point that is not part of the list of objects Выберите вторую точку линии (точка не должна принадлежать какому-либо объекту) + + Flipping by line + + DialogGroup @@ -2400,7 +2408,7 @@ Increment_%1 - Прибавка_%1 + Прибавка_%1 Edit increment @@ -2435,6 +2443,25 @@ Длина контрольных точек кривой + + DialogInsertNode + + Insert node + + + + Item: + + + + Piece: + + + + Uknown + + + DialogLayoutProgress @@ -3029,7 +3056,7 @@ Apply settings anyway? DialogMove Dialog - Диалог + Диалог Angle: @@ -3067,6 +3094,10 @@ Apply settings anyway? Calculation Расчет + + Move + + DialogNewMeasurements @@ -3736,10 +3767,6 @@ Apply settings anyway? DialogPin - - Dialog - Диалог - Pin tool @@ -3752,6 +3779,10 @@ Apply settings anyway? Piece: + + Pin + + DialogPointFromArcAndTangent @@ -4581,6 +4612,10 @@ Apply settings anyway? Paths Пути + + Excluded + + DialogShoulderPoint @@ -6663,6 +6698,14 @@ Do you want to save your changes? %1 + + Insert node tool + + + + Select an item to insert + + MainWindowsNoGUI @@ -7586,7 +7629,7 @@ Do you want to save your changes? M_%1 - М_%1 + М_%1 Error @@ -9748,10 +9791,6 @@ Do you want to save your changes? Elliptical arc Эллиптическая дуга - - Rotation angle - Угол поворота - Point label: Имя точки: @@ -11326,6 +11365,16 @@ Do you want to save your changes? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_uk_UA.ts b/share/translations/valentina_uk_UA.ts index 0b33ceb2f..0fac98d1e 100644 --- a/share/translations/valentina_uk_UA.ts +++ b/share/translations/valentina_uk_UA.ts @@ -1618,10 +1618,6 @@ DialogEllipticalArc - - Dialog - Діалог - Radius1: @@ -1706,6 +1702,10 @@ Edit rotation angle + + Elliptical arc + + DialogEndLine @@ -1851,10 +1851,6 @@ DialogFlippingByAxis - - Dialog - Діалог - Origin point: @@ -1883,13 +1879,13 @@ Horizontal axis + + Flipping by axis + + DialogFlippingByLine - - Dialog - Діалог - First line point: Перша точка лінії: @@ -1918,6 +1914,10 @@ Select second line point that is not part of the list of objects + + Flipping by line + + DialogGroup @@ -2312,7 +2312,7 @@ Increment_%1 - Прибавка_%1 + Прибавка_%1 Edit increment @@ -2347,6 +2347,25 @@ + + DialogInsertNode + + Insert node + + + + Item: + + + + Piece: + + + + Uknown + + + DialogLayoutProgress @@ -2935,10 +2954,6 @@ Apply settings anyway? DialogMove - - Dialog - Діалог - Angle: Кут: @@ -2975,6 +2990,10 @@ Apply settings anyway? Calculation Розрахунок + + Move + + DialogNewMeasurements @@ -3632,10 +3651,6 @@ Apply settings anyway? DialogPin - - Dialog - Діалог - Pin tool @@ -3648,6 +3663,10 @@ Apply settings anyway? Piece: + + Pin + + DialogPointFromArcAndTangent @@ -4473,6 +4492,10 @@ Apply settings anyway? Paths Шляхи + + Excluded + + DialogShoulderPoint @@ -6554,6 +6577,14 @@ Do you want to save your changes? %1 + + Insert node tool + + + + Select an item to insert + + MainWindowsNoGUI @@ -7473,7 +7504,7 @@ Do you want to save your changes? M_%1 - M_%1 + M_%1 Error @@ -11158,6 +11189,16 @@ Do you want to save your changes? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VVITConverter diff --git a/share/translations/valentina_zh_CN.ts b/share/translations/valentina_zh_CN.ts index a95343dab..b94b273ee 100644 --- a/share/translations/valentina_zh_CN.ts +++ b/share/translations/valentina_zh_CN.ts @@ -1156,10 +1156,6 @@ DialogEllipticalArc - - Dialog - - Radius1: @@ -1244,6 +1240,10 @@ Edit rotation angle + + Elliptical arc + + DialogEndLine @@ -1361,10 +1361,6 @@ DialogFlippingByAxis - - Dialog - - Origin point: @@ -1393,13 +1389,13 @@ Horizontal axis + + Flipping by axis + + DialogFlippingByLine - - Dialog - - First line point: @@ -1428,6 +1424,10 @@ Select second line point that is not part of the list of objects + + Flipping by line + + DialogGroup @@ -1760,10 +1760,6 @@ Parser error: %1 - - Increment_%1 - - Edit increment @@ -1797,6 +1793,25 @@ + + DialogInsertNode + + Insert node + + + + Item: + + + + Piece: + + + + Uknown + + + DialogLayoutProgress @@ -2320,10 +2335,6 @@ Apply settings anyway? DialogMove - - Dialog - - Angle: @@ -2360,6 +2371,10 @@ Apply settings anyway? Calculation 打算 + + Move + + DialogNewMeasurements @@ -2834,10 +2849,6 @@ Apply settings anyway? DialogPin - - Dialog - - Pin tool @@ -2850,6 +2861,10 @@ Apply settings anyway? Piece: + + Pin + + DialogPointFromArcAndTangent @@ -3511,6 +3526,10 @@ Apply settings anyway? Paths 路径 + + Excluded + + DialogShoulderPoint @@ -5271,6 +5290,14 @@ Do you want to save your changes? %1 + + Insert node tool + + + + Select an item to insert + + MainWindowsNoGUI @@ -6111,10 +6138,6 @@ Do you want to save your changes? Edit measurement - - M_%1 - - Error 错误 @@ -9342,6 +9365,16 @@ Do you want to save your changes? hyperbolic arcur tangens function working with degrees + + M_ + Left symbol _ in the name + + + + Increment_ + Left symbol _ in the name + + VWidgetDetails diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index 0bc85e214..d5ab1be8d 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -1237,7 +1237,7 @@ void TMainWindow::AddCustom() QString name; do { - name = CustomMSign + tr("M_%1").arg(num); + name = CustomMSign + qApp->TrVars()->InternalVarToUser(measurement_) + QString().number(num); num++; } while (data->IsUnique(name) == false); diff --git a/src/app/valentina/dialogs/dialogincrements.cpp b/src/app/valentina/dialogs/dialogincrements.cpp index c6224086f..f174a7563 100644 --- a/src/app/valentina/dialogs/dialogincrements.cpp +++ b/src/app/valentina/dialogs/dialogincrements.cpp @@ -471,7 +471,7 @@ void DialogIncrements::AddIncrement() QString name; do { - name = CustomIncrSign + tr("Increment_%1").arg(num); + name = CustomIncrSign + qApp->TrVars()->InternalVarToUser(increment_) + QString().number(num); num++; } while (data->IsUnique(name)==false); diff --git a/src/libs/ifc/ifcdef.cpp b/src/libs/ifc/ifcdef.cpp index 2315b2364..1ad4f6e97 100644 --- a/src/libs/ifc/ifcdef.cpp +++ b/src/libs/ifc/ifcdef.cpp @@ -165,6 +165,8 @@ const QString ColorDeepSkyBlue = QStringLiteral("deepskyblue"); const QString ColorCornFlowerBlue = QStringLiteral("cornflowerblue"); //variables +const QString measurement_ = QStringLiteral("M_"); +const QString increment_ = QStringLiteral("Increment_"); const QString line_ = QStringLiteral("Line_"); const QString angleLine_ = QStringLiteral("AngleLine_"); const QString spl_ = QStringLiteral(SPL_); @@ -190,7 +192,9 @@ const QString seg_ = QStringLiteral("Seg_"); const QString currentLength = QStringLiteral("CurrentLength"); const QString currentSeamAllowance = QStringLiteral("CurrentSeamAllowance"); -const QStringList builInVariables = QStringList() << line_ +const QStringList builInVariables = QStringList() << measurement_ + << increment_ + << line_ << angleLine_ << arc_ << spl_ diff --git a/src/libs/ifc/ifcdef.h b/src/libs/ifc/ifcdef.h index 143fee251..0f8de9771 100644 --- a/src/libs/ifc/ifcdef.h +++ b/src/libs/ifc/ifcdef.h @@ -174,6 +174,8 @@ extern const QString ColorCornFlowerBlue; #define ARC_ "Arc_" #define EARC_ "ElArc_" +extern const QString measurement_; +extern const QString increment_; extern const QString line_; extern const QString angleLine_; extern const QString arc_; diff --git a/src/libs/vpatterndb/vtranslatevars.cpp b/src/libs/vpatterndb/vtranslatevars.cpp index 65552be53..e6823dc9f 100644 --- a/src/libs/vpatterndb/vtranslatevars.cpp +++ b/src/libs/vpatterndb/vtranslatevars.cpp @@ -372,6 +372,8 @@ void VTranslateVars::InitPatternMakingSystems() //--------------------------------------------------------------------------------------------------------------------- void VTranslateVars::InitVariables() { + variables.insert(measurement_, translate("VTranslateVars", "M_", "Left symbol _ in the name")); + variables.insert(increment_, translate("VTranslateVars", "Increment_", "Left symbol _ in the name")); variables.insert(line_, translate("VTranslateVars", "Line_", "Left symbol _ in the name")); variables.insert(angleLine_, translate("VTranslateVars", "AngleLine_", "Left symbol _ in the name")); variables.insert(arc_, translate("VTranslateVars", "Arc_", "Left symbol _ in the name")); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp index 8169c7f59..2203e4a64 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp @@ -111,33 +111,37 @@ void VToolShoulderPoint::setDialog() * @param length length form shoulder point to our. * @return point. */ -//TODO find better way calculate point. QPointF VToolShoulderPoint::FindPoint(const QPointF &p1Line, const QPointF &p2Line, const QPointF &pShoulder, const qreal &length) { + QPointF shoulderPoint = p2Line; // Position if result was not found + if (length <= 0) + { + return shoulderPoint; + } + QLineF line = QLineF(p1Line, p2Line); - qreal toolLength = length; - qreal dist = line.length(); - if (dist>toolLength) + const qreal baseLength = line.length(); + const int baseAngle = qRound(line.angle()); + line.setLength(length*2); + + QPointF p1; + QPointF p2; + + const qint32 res = VGObject::LineIntersectCircle(pShoulder, length, line, p1, p2); + + // If possition is right we will find only one result. + // If found two cases this is wrong result. Return default position. + if (res == 1) { - qDebug()<<"Correction of length in shoulder point tool. Parameter length too small."; - toolLength = dist; - } - if (VFuzzyComparePossibleNulls(dist, toolLength)) - { - return line.p2(); - } - qreal step = 0.01; - while (1) - { - line.setLength(line.length()+step); - QLineF line2 = QLineF(pShoulder, line.p2()); - if (line2.length()>=toolLength) + const QLineF line = QLineF(p1Line, p1); + if (line.length() > baseLength && baseAngle == qRound(line.angle())) { - return line.p2(); + shoulderPoint = p1; } } - return QPointF(); + + return shoulderPoint; } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/test/TranslationsTest/tst_buitinregexp.cpp b/src/test/TranslationsTest/tst_buitinregexp.cpp index 1ae953068..79560e280 100644 --- a/src/test/TranslationsTest/tst_buitinregexp.cpp +++ b/src/test/TranslationsTest/tst_buitinregexp.cpp @@ -124,6 +124,8 @@ void TST_BuitInRegExp::TestCheckUnderlineExists_data() { QMap data; + data.insert(measurement_, true); + data.insert(increment_, true); data.insert(line_, true); data.insert(angleLine_, true); data.insert(arc_, true);