aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/feature/manual-layout' into feature/manual-layout

Browse Source
This commit is contained in:
Ronan Le Tiec 2020-11-13 17:25:45 +01:00
commit 396443f60c
37 changed files with 366 additions and 316 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog.txt
View File

@ -1,4 +1,7 @@
# Version 0.7.37 (unreleased)
# Version 0.7.38 Nov 12, 2020
- Bug fixes.
# Version 0.7.37 Nov 11, 2020
- Fix Tape crash on Mac OS X.
- Fix issue in VAbstractCurve::CurveIntersectAxis.
- Improve editing a spline path through control points for locked angles.

2
appveyor.yml
View File

@ -258,7 +258,7 @@ deploy:
package: valentina-win_auto-upload
publish: true
override: true
version: 0.7.36
version: 0.7.38
on:
DEPLOY: true
artifact: valentina-win-$(QT_VERSION)-$(APPVEYOR_REPO_BRANCH)-$(APPVEYOR_REPO_COMMIT)

4
dist/OBS_debian/debian.changelog vendored
View File

@ -1,5 +1,5 @@
valentina (0.7.36) trusty; urgency=low
valentina (0.7.38) trusty; urgency=low
* Auto build.
-- dismine <dismine@dismine-To-be-filled-by-O-E-M> Sat, 24 Oct 2020 12:27:00 +0300
-- dismine <dismine@dismine-To-be-filled-by-O-E-M> Thu, 12 Nov 2020 16:30:00 +0300

4
dist/debian/changelog vendored
View File

@ -1,5 +1,5 @@
valentina (0.7.36) trusty; urgency=low
valentina (0.7.38) trusty; urgency=low
* Auto build.
-- dismine <dismine@dismine-To-be-filled-by-O-E-M> Sat, 24 Oct 2020 12:27:00 +0300
-- dismine <dismine@dismine-To-be-filled-by-O-E-M> Thu, 12 Nov 2020 16:30:00 +0300

4
dist/macx/tape/Info.plist vendored
View File

@ -19,9 +19,9 @@
<key>CFBundleIdentifier</key>
<string>io.bitbucket.valentinaproject.@EXECUTABLE@</string>
<key>CFBundleShortVersionString</key>
<string>0.7.36</string>
<string>0.7.38</string>
<key>CFBundleVersion</key>
<string>0.7.36.0</string>
<string>0.7.38.0</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleDocumentTypes</key>

4
dist/macx/valentina/Info.plist vendored
View File

@ -19,9 +19,9 @@
<key>CFBundleIdentifier</key>
<string>io.bitbucket.valentinaproject.@EXECUTABLE@</string>
<key>CFBundleShortVersionString</key>
<string>0.7.36</string>
<string>0.7.38</string>
<key>CFBundleVersion</key>
<string>0.7.36.0</string>
<string>0.7.38.0</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleDocumentTypes</key>

2
dist/rpm/_service vendored
View File

@ -1,7 +1,7 @@
<services>
<service name="tar_scm">
<param name="url">git://github.com/dismine/Valentina_git.git</param>
<param name="versionprefix">0.7.36</param>
<param name="versionprefix">0.7.38</param>
<param name="filename">valentina</param>
<param name="scm">git</param>
<param name="exclude">.git</param>

2
dist/rpm/valentina.spec vendored
View File

@ -91,7 +91,7 @@ Requires: poppler-tools
Requires: poppler-utils
%endif
Version: 0.7.36
Version: 0.7.38
Release: 0
URL: https://gitlab.com/smart-pattern/valentina
License: GPL-3.0+

8
dist/valentina.dsc vendored
View File

@ -2,7 +2,7 @@ Format: 3.0 (native)
Source: valentina
Binary: valentina
Architecture: i386 amd64
Version: 0.7.36
Version: 0.7.38
Maintainer: Roman Telezhynskyi <dismine@gmail.com>
Homepage: https://valentinaproject.bitbucket.io
Standards-Version: 3.9.5
@ -18,8 +18,8 @@ Build-Depends: debhelper (>= 8.0.0),
Package-List:
valentina deb graphics optional
Checksums-Sha1:
581eb1bf36b4ab7126b5983d809130f15396859e 24838101 valentina_0.7.36.tar
581eb1bf36b4ab7126b5983d809130f15396859e 24838101 valentina_0.7.38.tar
Checksums-Sha256:
9b156c7120a69b90373efb8ca9998c3e0563a60ad337210166cfd41b00b0f13c 24838101 valentina_0.7.36.tar
9b156c7120a69b90373efb8ca9998c3e0563a60ad337210166cfd41b00b0f13c 24838101 valentina_0.7.38.tar
Files:
95677e29d3a59cf5b064f7be236a4b78 24838101 valentina_0.7.36.tar
95677e29d3a59cf5b064f7be236a4b78 24838101 valentina_0.7.38.tar

6
share/bintray.json
View File

@ -15,10 +15,10 @@
},
"version": {
"name": "0.7.36",
"name": "0.7.38",
"desc": "Test branch release",
"released": "2020-10-24",
"vcs_tag": "v0.7.36",
"released": "2020-11-12",
"vcs_tag": "v0.7.38",
"gpgSign": false
},

24
share/translations/valentina_cs_CZ.ts
View File

@ -2695,11 +2695,11 @@
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Styl pera:</translation>
<translation>Styl pera:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Barva:</translation>
<translation>Barva:</translation>
</message>
<message>
<source>Ready</source>
@ -2723,7 +2723,7 @@
</message>
<message>
<source>Default</source>
<translation type="unfinished">Výchozí</translation>
<translation>Výchozí</translation>
</message>
<message>
<source>Invalid point</source>
@ -2814,11 +2814,11 @@
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Styl pera:</translation>
<translation>Styl pera:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Barva:</translation>
<translation>Barva:</translation>
</message>
<message>
<source>Ready</source>
@ -2842,7 +2842,7 @@
</message>
<message>
<source>Default</source>
<translation type="unfinished">Výchozí</translation>
<translation>Výchozí</translation>
</message>
<message>
<source>Invalid line points</source>
@ -4370,11 +4370,11 @@ Přesto použít nastavení?</translation>
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Styl pera:</translation>
<translation>Styl pera:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Barva:</translation>
<translation>Barva:</translation>
</message>
<message>
<source>Ready</source>
@ -4398,7 +4398,7 @@ Přesto použít nastavení?</translation>
</message>
<message>
<source>Default</source>
<translation type="unfinished">Výchozí</translation>
<translation>Výchozí</translation>
</message>
<message>
<source>Invalid angle formula</source>
@ -6231,11 +6231,11 @@ Přesto použít nastavení?</translation>
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Styl pera:</translation>
<translation>Styl pera:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Barva:</translation>
<translation>Barva:</translation>
</message>
<message>
<source>Ready</source>
@ -6279,7 +6279,7 @@ Přesto použít nastavení?</translation>
</message>
<message>
<source>Default</source>
<translation type="unfinished">Výchozí</translation>
<translation>Výchozí</translation>
</message>
</context>
<context>

24
share/translations/valentina_de_DE.ts
View File

@ -2695,11 +2695,11 @@
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Zeichenstil:</translation>
<translation>Zeichenstil:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Farbe:</translation>
<translation>Farbe:</translation>
</message>
<message>
<source>Ready</source>
@ -2723,7 +2723,7 @@
</message>
<message>
<source>Default</source>
<translation type="unfinished">Standard</translation>
<translation>Standard</translation>
</message>
<message>
<source>Invalid point</source>
@ -2814,11 +2814,11 @@
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Zeichenstil:</translation>
<translation>Zeichenstil:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Farbe:</translation>
<translation>Farbe:</translation>
</message>
<message>
<source>Ready</source>
@ -2842,7 +2842,7 @@
</message>
<message>
<source>Default</source>
<translation type="unfinished">Standard</translation>
<translation>Standard</translation>
</message>
<message>
<source>Invalid line points</source>
@ -4369,11 +4369,11 @@ Einstellungen trotzdem anwenden?</translation>
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Zeichenstil:</translation>
<translation>Zeichenstil:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Farbe:</translation>
<translation>Farbe:</translation>
</message>
<message>
<source>Ready</source>
@ -4397,7 +4397,7 @@ Einstellungen trotzdem anwenden?</translation>
</message>
<message>
<source>Default</source>
<translation type="unfinished">Standard</translation>
<translation>Standard</translation>
</message>
<message>
<source>Invalid angle formula</source>
@ -6229,11 +6229,11 @@ Einstellungen trotzdem anwenden?</translation>
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Zeichenstil:</translation>
<translation>Zeichenstil:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Farbe:</translation>
<translation>Farbe:</translation>
</message>
<message>
<source>Ready</source>
@ -6277,7 +6277,7 @@ Einstellungen trotzdem anwenden?</translation>
</message>
<message>
<source>Default</source>
<translation type="unfinished">Standard</translation>
<translation>Standard</translation>
</message>
</context>
<context>

24
share/translations/valentina_el_GR.ts
View File

@ -2651,11 +2651,11 @@
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Στυλ μαρκαδόρου:</translation>
<translation>Στυλ μαρκαδόρου:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Χρώμα:</translation>
<translation>Χρώμα:</translation>
</message>
<message>
<source>Ready</source>
@ -2679,7 +2679,7 @@
</message>
<message>
<source>Default</source>
<translation type="unfinished">Προεπιλογή</translation>
<translation>Προεπιλογή</translation>
</message>
<message>
<source>Invalid point</source>
@ -2770,11 +2770,11 @@
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Στυλ μαρκαδόρου:</translation>
<translation>Στυλ μαρκαδόρου:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Χρώμα:</translation>
<translation>Χρώμα:</translation>
</message>
<message>
<source>Ready</source>
@ -2798,7 +2798,7 @@
</message>
<message>
<source>Default</source>
<translation type="unfinished">Προεπιλογή</translation>
<translation>Προεπιλογή</translation>
</message>
<message>
<source>Invalid line points</source>
@ -4297,11 +4297,11 @@ Apply settings anyway?</source>
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Στυλ μαρκαδόρου:</translation>
<translation>Στυλ μαρκαδόρου:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Χρώμα:</translation>
<translation>Χρώμα:</translation>
</message>
<message>
<source>Ready</source>
@ -4325,7 +4325,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Default</source>
<translation type="unfinished">Προεπιλογή</translation>
<translation>Προεπιλογή</translation>
</message>
<message>
<source>Invalid angle formula</source>
@ -6141,11 +6141,11 @@ Apply settings anyway?</source>
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Στυλ μαρκαδόρου:</translation>
<translation>Στυλ μαρκαδόρου:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Χρώμα:</translation>
<translation>Χρώμα:</translation>
</message>
<message>
<source>Ready</source>
@ -6189,7 +6189,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Default</source>
<translation type="unfinished">Προεπιλογή</translation>
<translation>Προεπιλογή</translation>
</message>
</context>
<context>

24
share/translations/valentina_en_CA.ts
View File

@ -2695,11 +2695,11 @@
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Pen style:</translation>
<translation>Pen style:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Color:</translation>
<translation>Color:</translation>
</message>
<message>
<source>Ready</source>
@ -2723,7 +2723,7 @@
</message>
<message>
<source>Default</source>
<translation type="unfinished">Default</translation>
<translation>Default</translation>
</message>
<message>
<source>Invalid point</source>
@ -2814,11 +2814,11 @@
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Pen style:</translation>
<translation>Pen style:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Color:</translation>
<translation>Color:</translation>
</message>
<message>
<source>Ready</source>
@ -2842,7 +2842,7 @@
</message>
<message>
<source>Default</source>
<translation type="unfinished">Default</translation>
<translation>Default</translation>
</message>
<message>
<source>Invalid line points</source>
@ -4368,11 +4368,11 @@ Apply settings anyway?</source>
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Pen style:</translation>
<translation>Pen style:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Color:</translation>
<translation>Color:</translation>
</message>
<message>
<source>Ready</source>
@ -4396,7 +4396,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Default</source>
<translation type="unfinished">Default</translation>
<translation>Default</translation>
</message>
<message>
<source>Invalid angle formula</source>
@ -6224,11 +6224,11 @@ Apply settings anyway?</source>
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Pen style:</translation>
<translation>Pen style:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Color:</translation>
<translation>Color:</translation>
</message>
<message>
<source>Ready</source>
@ -6272,7 +6272,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Default</source>
<translation type="unfinished">Default</translation>
<translation>Default</translation>
</message>
</context>
<context>

24
share/translations/valentina_en_IN.ts
View File

@ -2695,11 +2695,11 @@
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Pen style:</translation>
<translation>Pen style:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Color:</translation>
<translation>Color:</translation>
</message>
<message>
<source>Ready</source>
@ -2723,7 +2723,7 @@
</message>
<message>
<source>Default</source>
<translation type="unfinished">Default</translation>
<translation>Default</translation>
</message>
<message>
<source>Invalid point</source>
@ -2814,11 +2814,11 @@
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Pen style:</translation>
<translation>Pen style:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Color:</translation>
<translation>Color:</translation>
</message>
<message>
<source>Ready</source>
@ -2842,7 +2842,7 @@
</message>
<message>
<source>Default</source>
<translation type="unfinished">Default</translation>
<translation>Default</translation>
</message>
<message>
<source>Invalid line points</source>
@ -4368,11 +4368,11 @@ Apply settings anyway?</source>
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Pen style:</translation>
<translation>Pen style:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Color:</translation>
<translation>Color:</translation>
</message>
<message>
<source>Ready</source>
@ -4396,7 +4396,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Default</source>
<translation type="unfinished">Default</translation>
<translation>Default</translation>
</message>
<message>
<source>Invalid angle formula</source>
@ -6224,11 +6224,11 @@ Apply settings anyway?</source>
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Pen style:</translation>
<translation>Pen style:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Color:</translation>
<translation>Color:</translation>
</message>
<message>
<source>Ready</source>
@ -6272,7 +6272,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Default</source>
<translation type="unfinished">Default</translation>
<translation>Default</translation>
</message>
</context>
<context>

24
share/translations/valentina_en_US.ts
View File

@ -2695,11 +2695,11 @@
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Pen style:</translation>
<translation>Pen style:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Color:</translation>
<translation>Color:</translation>
</message>
<message>
<source>Ready</source>
@ -2723,7 +2723,7 @@
</message>
<message>
<source>Default</source>
<translation type="unfinished">Default</translation>
<translation>Default</translation>
</message>
<message>
<source>Invalid point</source>
@ -2814,11 +2814,11 @@
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Pen style:</translation>
<translation>Pen style:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Color:</translation>
<translation>Color:</translation>
</message>
<message>
<source>Ready</source>
@ -2842,7 +2842,7 @@
</message>
<message>
<source>Default</source>
<translation type="unfinished">Default</translation>
<translation>Default</translation>
</message>
<message>
<source>Invalid line points</source>
@ -4368,11 +4368,11 @@ Apply settings anyway?</source>
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Pen style:</translation>
<translation>Pen style:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Color:</translation>
<translation>Color:</translation>
</message>
<message>
<source>Ready</source>
@ -4396,7 +4396,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Default</source>
<translation type="unfinished">Default</translation>
<translation>Default</translation>
</message>
<message>
<source>Invalid angle formula</source>
@ -6224,11 +6224,11 @@ Apply settings anyway?</source>
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Pen style:</translation>
<translation>Pen style:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Color:</translation>
<translation>Color:</translation>
</message>
<message>
<source>Ready</source>
@ -6272,7 +6272,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Default</source>
<translation type="unfinished">Default</translation>
<translation>Default</translation>
</message>
</context>
<context>

32
share/translations/valentina_es_ES.ts
View File

@ -2695,15 +2695,15 @@
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Estilo lápiz:</translation>
<translation>Estilo lápiz:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Color:</translation>
<translation>Color:</translation>
</message>
<message>
<source>Ready</source>
<translation type="unfinished"></translation>
<translation>Listo</translation>
</message>
<message>
<source>Notes</source>
@ -2723,7 +2723,7 @@
</message>
<message>
<source>Default</source>
<translation type="unfinished"></translation>
<translation>Predeterminado</translation>
</message>
<message>
<source>Invalid point</source>
@ -2814,15 +2814,15 @@
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Estilo lápiz:</translation>
<translation>Estilo lápiz:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Color:</translation>
<translation>Color:</translation>
</message>
<message>
<source>Ready</source>
<translation type="unfinished"></translation>
<translation>Listo</translation>
</message>
<message>
<source>Notes</source>
@ -2842,7 +2842,7 @@
</message>
<message>
<source>Default</source>
<translation type="unfinished"></translation>
<translation>Predeterminado</translation>
</message>
<message>
<source>Invalid line points</source>
@ -4369,15 +4369,15 @@ Aplicar características de todos modos?</translation>
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Estilo lápiz:</translation>
<translation>Estilo lápiz:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Color:</translation>
<translation>Color:</translation>
</message>
<message>
<source>Ready</source>
<translation type="unfinished"></translation>
<translation>Listo</translation>
</message>
<message>
<source>Notes</source>
@ -4397,7 +4397,7 @@ Aplicar características de todos modos?</translation>
</message>
<message>
<source>Default</source>
<translation type="unfinished"></translation>
<translation>Predeterminado</translation>
</message>
<message>
<source>Invalid angle formula</source>
@ -6229,15 +6229,15 @@ Aplicar características de todos modos?</translation>
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Estilo lápiz:</translation>
<translation>Estilo lápiz:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Color:</translation>
<translation>Color:</translation>
</message>
<message>
<source>Ready</source>
<translation type="unfinished"></translation>
<translation>Listo</translation>
</message>
<message>
<source>Notes</source>
@ -6277,7 +6277,7 @@ Aplicar características de todos modos?</translation>
</message>
<message>
<source>Default</source>
<translation type="unfinished"></translation>
<translation>Predeterminado</translation>
</message>
</context>
<context>

8
share/translations/valentina_fi_FI.ts
View File

@ -2335,7 +2335,7 @@
</message>
<message>
<source>Default</source>
<translation type="unfinished">Oletus</translation>
<translation>Oletus</translation>
</message>
<message>
<source>Invalid point</source>
@ -2450,7 +2450,7 @@
</message>
<message>
<source>Default</source>
<translation type="unfinished">Oletus</translation>
<translation>Oletus</translation>
</message>
<message>
<source>Invalid line points</source>
@ -3893,7 +3893,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Default</source>
<translation type="unfinished">Oletus</translation>
<translation>Oletus</translation>
</message>
<message>
<source>Invalid angle formula</source>
@ -5621,7 +5621,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Default</source>
<translation type="unfinished">Oletus</translation>
<translation>Oletus</translation>
</message>
</context>
<context>

24
share/translations/valentina_fr_FR.ts
View File

@ -2695,11 +2695,11 @@
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Style de stylo:</translation>
<translation>Style de stylo:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished"></translation>
<translation>Couleur :</translation>
</message>
<message>
<source>Ready</source>
@ -2723,7 +2723,7 @@
</message>
<message>
<source>Default</source>
<translation type="unfinished"></translation>
<translation>Défaut</translation>
</message>
<message>
<source>Invalid point</source>
@ -2814,11 +2814,11 @@
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Style de stylo:</translation>
<translation>Style de stylo:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished"></translation>
<translation>Couleur :</translation>
</message>
<message>
<source>Ready</source>
@ -2842,7 +2842,7 @@
</message>
<message>
<source>Default</source>
<translation type="unfinished"></translation>
<translation>Défaut</translation>
</message>
<message>
<source>Invalid line points</source>
@ -4365,11 +4365,11 @@ Apply settings anyway?</source>
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Style de stylo:</translation>
<translation>Style de stylo:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished"></translation>
<translation>Couleur :</translation>
</message>
<message>
<source>Ready</source>
@ -4393,7 +4393,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Default</source>
<translation type="unfinished"></translation>
<translation>Défaut</translation>
</message>
<message>
<source>Invalid angle formula</source>
@ -6221,11 +6221,11 @@ Apply settings anyway?</source>
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Style de stylo:</translation>
<translation>Style de stylo:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished"></translation>
<translation>Couleur :</translation>
</message>
<message>
<source>Ready</source>
@ -6269,7 +6269,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Default</source>
<translation type="unfinished"></translation>
<translation>Défaut</translation>
</message>
</context>
<context>

24
share/translations/valentina_it_IT.ts
View File

@ -2687,11 +2687,11 @@
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Stile di penna:</translation>
<translation>Stile penna:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Colore:</translation>
<translation>Colore:</translation>
</message>
<message>
<source>Ready</source>
@ -2715,7 +2715,7 @@
</message>
<message>
<source>Default</source>
<translation type="unfinished">Default</translation>
<translation>Default</translation>
</message>
<message>
<source>Invalid point</source>
@ -2806,11 +2806,11 @@
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Stile di penna:</translation>
<translation>Stile penna:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Colore:</translation>
<translation>Colore:</translation>
</message>
<message>
<source>Ready</source>
@ -2834,7 +2834,7 @@
</message>
<message>
<source>Default</source>
<translation type="unfinished">Default</translation>
<translation>Default</translation>
</message>
<message>
<source>Invalid line points</source>
@ -4362,11 +4362,11 @@ Applicare la configurazione comunque?</translation>
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Stile di penna:</translation>
<translation>Stile penna:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Colore:</translation>
<translation>Colore:</translation>
</message>
<message>
<source>Ready</source>
@ -4390,7 +4390,7 @@ Applicare la configurazione comunque?</translation>
</message>
<message>
<source>Default</source>
<translation type="unfinished">Default</translation>
<translation>Default</translation>
</message>
<message>
<source>Invalid angle formula</source>
@ -6222,11 +6222,11 @@ Applicare la configurazione comunque?</translation>
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Stile di penna:</translation>
<translation>Stile penna:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Colore:</translation>
<translation>Colore:</translation>
</message>
<message>
<source>Ready</source>
@ -6270,7 +6270,7 @@ Applicare la configurazione comunque?</translation>
</message>
<message>
<source>Default</source>
<translation type="unfinished">Default</translation>
<translation>Default</translation>
</message>
</context>
<context>

32
share/translations/valentina_nl_NL.ts
View File

@ -2695,15 +2695,15 @@
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Pen stijl:</translation>
<translation>Pen stijl:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Kleur:</translation>
<translation>Kleur:</translation>
</message>
<message>
<source>Ready</source>
<translation type="unfinished"></translation>
<translation>Klaar</translation>
</message>
<message>
<source>Notes</source>
@ -2723,7 +2723,7 @@
</message>
<message>
<source>Default</source>
<translation type="unfinished"></translation>
<translation>Standaard</translation>
</message>
<message>
<source>Invalid point</source>
@ -2814,15 +2814,15 @@
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Pen stijl:</translation>
<translation>Pen stijl:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Kleur:</translation>
<translation>Kleur:</translation>
</message>
<message>
<source>Ready</source>
<translation type="unfinished"></translation>
<translation>Klaar</translation>
</message>
<message>
<source>Notes</source>
@ -2842,7 +2842,7 @@
</message>
<message>
<source>Default</source>
<translation type="unfinished"></translation>
<translation>Standaard</translation>
</message>
<message>
<source>Invalid line points</source>
@ -4370,15 +4370,15 @@ Toch de instellingen aanpassen?</translation>
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Pen stijl:</translation>
<translation>Pen stijl:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Kleur:</translation>
<translation>Kleur:</translation>
</message>
<message>
<source>Ready</source>
<translation type="unfinished"></translation>
<translation>Klaar</translation>
</message>
<message>
<source>Notes</source>
@ -4398,7 +4398,7 @@ Toch de instellingen aanpassen?</translation>
</message>
<message>
<source>Default</source>
<translation type="unfinished"></translation>
<translation>Standaard</translation>
</message>
<message>
<source>Invalid angle formula</source>
@ -6230,15 +6230,15 @@ Toch de instellingen aanpassen?</translation>
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Pen stijl:</translation>
<translation>Pen stijl:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Kleur:</translation>
<translation>Kleur:</translation>
</message>
<message>
<source>Ready</source>
<translation type="unfinished"></translation>
<translation>Klaar</translation>
</message>
<message>
<source>Notes</source>
@ -6278,7 +6278,7 @@ Toch de instellingen aanpassen?</translation>
</message>
<message>
<source>Default</source>
<translation type="unfinished"></translation>
<translation>Standaard</translation>
</message>
</context>
<context>

24
share/translations/valentina_pl_PL.ts
View File

@ -2511,11 +2511,11 @@
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Styl pióra:</translation>
<translation>Styl pióra:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Kolor:</translation>
<translation>Kolor:</translation>
</message>
<message>
<source>Ready</source>
@ -2539,7 +2539,7 @@
</message>
<message>
<source>Default</source>
<translation type="unfinished">Domyślny</translation>
<translation>Domyślny</translation>
</message>
<message>
<source>Invalid point</source>
@ -2630,11 +2630,11 @@
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Styl pióra:</translation>
<translation>Styl pióra:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Kolor:</translation>
<translation>Kolor:</translation>
</message>
<message>
<source>Ready</source>
@ -2658,7 +2658,7 @@
</message>
<message>
<source>Default</source>
<translation type="unfinished">Domyślny</translation>
<translation>Domyślny</translation>
</message>
<message>
<source>Invalid line points</source>
@ -4049,11 +4049,11 @@ Apply settings anyway?</source>
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Styl pióra:</translation>
<translation>Styl pióra:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Kolor:</translation>
<translation>Kolor:</translation>
</message>
<message>
<source>Ready</source>
@ -4077,7 +4077,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Default</source>
<translation type="unfinished">Domyślny</translation>
<translation>Domyślny</translation>
</message>
<message>
<source>Invalid angle formula</source>
@ -5706,11 +5706,11 @@ Apply settings anyway?</source>
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Styl pióra:</translation>
<translation>Styl pióra:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Kolor:</translation>
<translation>Kolor:</translation>
</message>
<message>
<source>Ready</source>
@ -5754,7 +5754,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Default</source>
<translation type="unfinished">Domyślny</translation>
<translation>Domyślny</translation>
</message>
</context>
<context>

24
share/translations/valentina_pt_BR.ts
View File

@ -2695,11 +2695,11 @@
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Estilo Caneta:</translation>
<translation>Estilo Caneta:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Cor:</translation>
<translation>Cor:</translation>
</message>
<message>
<source>Ready</source>
@ -2723,7 +2723,7 @@
</message>
<message>
<source>Default</source>
<translation type="unfinished">Padrão</translation>
<translation>Padrão</translation>
</message>
<message>
<source>Invalid point</source>
@ -2814,11 +2814,11 @@
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Estilo Caneta:</translation>
<translation>Estilo Caneta:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Cor:</translation>
<translation>Cor:</translation>
</message>
<message>
<source>Ready</source>
@ -2842,7 +2842,7 @@
</message>
<message>
<source>Default</source>
<translation type="unfinished">Padrão</translation>
<translation>Padrão</translation>
</message>
<message>
<source>Invalid line points</source>
@ -4366,11 +4366,11 @@ Aplicar configurações de qualquer forma?</translation>
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Estilo Caneta:</translation>
<translation>Estilo Caneta:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Cor:</translation>
<translation>Cor:</translation>
</message>
<message>
<source>Ready</source>
@ -4394,7 +4394,7 @@ Aplicar configurações de qualquer forma?</translation>
</message>
<message>
<source>Default</source>
<translation type="unfinished">Padrão</translation>
<translation>Padrão</translation>
</message>
<message>
<source>Invalid angle formula</source>
@ -6226,11 +6226,11 @@ Aplicar configurações de qualquer forma?</translation>
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Estilo Caneta:</translation>
<translation>Estilo Caneta:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Cor:</translation>
<translation>Cor:</translation>
</message>
<message>
<source>Ready</source>
@ -6274,7 +6274,7 @@ Aplicar configurações de qualquer forma?</translation>
</message>
<message>
<source>Default</source>
<translation type="unfinished">Padrão</translation>
<translation>Padrão</translation>
</message>
</context>
<context>

8
share/translations/valentina_ro_RO.ts
View File

@ -2480,7 +2480,7 @@
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Culoare:</translation>
<translation>Culoare:</translation>
</message>
<message>
<source>Ready</source>
@ -2595,7 +2595,7 @@
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Culoare:</translation>
<translation>Culoare:</translation>
</message>
<message>
<source>Ready</source>
@ -4042,7 +4042,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Culoare:</translation>
<translation>Culoare:</translation>
</message>
<message>
<source>Ready</source>
@ -5655,7 +5655,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Culoare:</translation>
<translation>Culoare:</translation>
</message>
<message>
<source>Ready</source>

234
share/translations/valentina_ru_RU.ts
View File

@ -580,7 +580,7 @@
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
</context>
<context>
@ -707,15 +707,15 @@
</message>
<message>
<source>Tool</source>
<translation type="unfinished">Инструмент</translation>
<translation>Инструмент</translation>
</message>
<message>
<source>Alias:</source>
<translation type="unfinished"></translation>
<translation>Псевдоним:</translation>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
</context>
<context>
@ -834,15 +834,15 @@
</message>
<message>
<source>Tool</source>
<translation type="unfinished">Инструмент</translation>
<translation>Инструмент</translation>
</message>
<message>
<source>Alias:</source>
<translation type="unfinished"></translation>
<translation>Псевдоним:</translation>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
</context>
<context>
@ -969,7 +969,7 @@
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
</context>
<context>
@ -1036,15 +1036,15 @@
</message>
<message>
<source>Tool</source>
<translation type="unfinished">Инструмент</translation>
<translation>Инструмент</translation>
</message>
<message>
<source>Alias:</source>
<translation type="unfinished"></translation>
<translation>Псевдоним:</translation>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
</context>
<context>
@ -1095,15 +1095,15 @@
</message>
<message>
<source>Tool</source>
<translation type="unfinished">Инструмент</translation>
<translation>Инструмент</translation>
</message>
<message>
<source>Alias:</source>
<translation type="unfinished"></translation>
<translation>Псевдоним:</translation>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
</context>
<context>
@ -1210,7 +1210,7 @@
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
</context>
<context>
@ -1289,19 +1289,19 @@
</message>
<message>
<source>Tool</source>
<translation type="unfinished">Инструмент</translation>
<translation>Инструмент</translation>
</message>
<message>
<source>Alias1:</source>
<translation type="unfinished"></translation>
<translation>Псевдоним 1:</translation>
</message>
<message>
<source>Alias2:</source>
<translation type="unfinished"></translation>
<translation>Псевдоним 2:</translation>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
</context>
<context>
@ -1380,19 +1380,19 @@
</message>
<message>
<source>Tool</source>
<translation type="unfinished">Инструмент</translation>
<translation>Инструмент</translation>
</message>
<message>
<source>Alias1:</source>
<translation type="unfinished"></translation>
<translation>Псевдоним 1:</translation>
</message>
<message>
<source>Alias2:</source>
<translation type="unfinished"></translation>
<translation>Псевдоним 2:</translation>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
</context>
<context>
@ -1471,19 +1471,19 @@
</message>
<message>
<source>Tool</source>
<translation type="unfinished">Инструмент</translation>
<translation>Инструмент</translation>
</message>
<message>
<source>Alias1:</source>
<translation type="unfinished"></translation>
<translation>Псевдоним 1:</translation>
</message>
<message>
<source>Alias2:</source>
<translation type="unfinished"></translation>
<translation>Псевдоним 2:</translation>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
</context>
<context>
@ -2342,15 +2342,15 @@
</message>
<message>
<source>Tool</source>
<translation type="unfinished">Инструмент</translation>
<translation>Инструмент</translation>
</message>
<message>
<source>Alias:</source>
<translation type="unfinished"></translation>
<translation>Псевдоним:</translation>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
</context>
<context>
@ -2461,7 +2461,7 @@
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
</context>
<context>
@ -2687,55 +2687,55 @@
</message>
<message>
<source>Tool</source>
<translation type="unfinished">Инструмент</translation>
<translation>Инструмент</translation>
</message>
<message>
<source>Alias:</source>
<translation type="unfinished"></translation>
<translation>Псевдоним:</translation>
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Стиль пера:</translation>
<translation>Стиль пера:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Цвет:</translation>
<translation>Цвет:</translation>
</message>
<message>
<source>Ready</source>
<translation type="unfinished"></translation>
<translation>Готово</translation>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
<message>
<source>Invalid suffix</source>
<translation type="unfinished"></translation>
<translation>Неправильный суффикс</translation>
</message>
<message>
<source>Invalid group name</source>
<translation type="unfinished"></translation>
<translation>Неверное имя группы</translation>
</message>
<message>
<source>Label:</source>
<translation type="unfinished"></translation>
<translation>Метка:</translation>
</message>
<message>
<source>Default</source>
<translation type="unfinished">По умолчанию</translation>
<translation>По умолчанию</translation>
</message>
<message>
<source>Invalid point</source>
<translation type="unfinished"></translation>
<translation>Неправильная точка</translation>
</message>
<message>
<source>Invalid label</source>
<translation type="unfinished"></translation>
<translation>Неправильная метка</translation>
</message>
<message>
<source>Invalid alias</source>
<translation type="unfinished"></translation>
<translation>Неправильный псевдоним</translation>
</message>
</context>
<context>
@ -2806,47 +2806,47 @@
</message>
<message>
<source>Tool</source>
<translation type="unfinished">Инструмент</translation>
<translation>Инструмент</translation>
</message>
<message>
<source>Alias:</source>
<translation type="unfinished"></translation>
<translation>Псевдоним:</translation>
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Стиль пера:</translation>
<translation>Стиль пера:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Цвет:</translation>
<translation>Цвет:</translation>
</message>
<message>
<source>Ready</source>
<translation type="unfinished"></translation>
<translation>Готово</translation>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
<message>
<source>Invalid suffix</source>
<translation type="unfinished"></translation>
<translation>Неправильный суффикс</translation>
</message>
<message>
<source>Invalid group name</source>
<translation type="unfinished"></translation>
<translation>Неверное имя группы</translation>
</message>
<message>
<source>Label:</source>
<translation type="unfinished"></translation>
<translation>Метка:</translation>
</message>
<message>
<source>Default</source>
<translation type="unfinished">По умолчанию</translation>
<translation>По умолчанию</translation>
</message>
<message>
<source>Invalid line points</source>
<translation type="unfinished"></translation>
<translation>Неправильные точки линии</translation>
</message>
<message>
<source>Invalid first line point</source>
@ -2858,11 +2858,11 @@
</message>
<message>
<source>Invalid label</source>
<translation type="unfinished"></translation>
<translation>Неправильная метка</translation>
</message>
<message>
<source>Invalid alias</source>
<translation type="unfinished"></translation>
<translation>Неправильный псевдоним</translation>
</message>
</context>
<context>
@ -2984,7 +2984,7 @@
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
</context>
<context>
@ -3848,7 +3848,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
</context>
<context>
@ -3915,7 +3915,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
</context>
<context>
@ -4042,7 +4042,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
</context>
<context>
@ -4362,63 +4362,63 @@ Apply settings anyway?</source>
</message>
<message>
<source>Tool</source>
<translation type="unfinished">Инструмент</translation>
<translation>Инструмент</translation>
</message>
<message>
<source>Alias:</source>
<translation type="unfinished"></translation>
<translation>Псевдоним:</translation>
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Стиль пера:</translation>
<translation>Стиль пера:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Цвет:</translation>
<translation>Цвет:</translation>
</message>
<message>
<source>Ready</source>
<translation type="unfinished"></translation>
<translation>Готово</translation>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
<message>
<source>Invalid suffix</source>
<translation type="unfinished"></translation>
<translation>Неправильный суффикс</translation>
</message>
<message>
<source>Invalid group name</source>
<translation type="unfinished"></translation>
<translation>Неверное имя группы</translation>
</message>
<message>
<source>Label:</source>
<translation type="unfinished"></translation>
<translation>Метка:</translation>
</message>
<message>
<source>Default</source>
<translation type="unfinished">По умолчанию</translation>
<translation>По умолчанию</translation>
</message>
<message>
<source>Invalid angle formula</source>
<translation type="unfinished"></translation>
<translation>Неверная формула угла</translation>
</message>
<message>
<source>Invalid rotation angle formula</source>
<translation type="unfinished"></translation>
<translation>Неверная формула угла поворота</translation>
</message>
<message>
<source>Invalid length formula</source>
<translation type="unfinished"></translation>
<translation>Неверная формула длины</translation>
</message>
<message>
<source>Invalid label</source>
<translation type="unfinished"></translation>
<translation>Неправильная метка</translation>
</message>
<message>
<source>Invalid alias</source>
<translation type="unfinished"></translation>
<translation>Неправильный псевдоним</translation>
</message>
</context>
<context>
@ -4627,7 +4627,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
</context>
<context>
@ -5608,7 +5608,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
</context>
<context>
@ -5707,7 +5707,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
</context>
<context>
@ -5802,7 +5802,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
</context>
<context>
@ -5861,7 +5861,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
</context>
<context>
@ -5928,7 +5928,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
</context>
<context>
@ -6043,7 +6043,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
</context>
<context>
@ -6090,7 +6090,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
</context>
<context>
@ -6223,63 +6223,63 @@ Apply settings anyway?</source>
</message>
<message>
<source>Tool</source>
<translation type="unfinished">Инструмент</translation>
<translation>Инструмент</translation>
</message>
<message>
<source>Alias</source>
<translation type="unfinished"></translation>
<translation>Псевдоним</translation>
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Стиль пера:</translation>
<translation>Стиль пера:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Цвет:</translation>
<translation>Цвет:</translation>
</message>
<message>
<source>Ready</source>
<translation type="unfinished"></translation>
<translation>Готово</translation>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
<message>
<source>Invalid suffix</source>
<translation type="unfinished"></translation>
<translation>Неправильный суффикс</translation>
</message>
<message>
<source>Invalid group name</source>
<translation type="unfinished"></translation>
<translation>Неверное имя группы</translation>
</message>
<message>
<source>Invalid rotation point</source>
<translation type="unfinished"></translation>
<translation>Неправильная точка вращения</translation>
</message>
<message>
<source>Invalid label</source>
<translation type="unfinished"></translation>
<translation>Неправильная метка</translation>
</message>
<message>
<source>Invalid alias</source>
<translation type="unfinished"></translation>
<translation>Неправильный псевдоним</translation>
</message>
<message>
<source>Invalid angle formula</source>
<translation type="unfinished"></translation>
<translation>Неверная формула угла</translation>
</message>
<message>
<source>Label:</source>
<translation type="unfinished"></translation>
<translation>Метка:</translation>
</message>
<message>
<source>Alias:</source>
<translation type="unfinished"></translation>
<translation>Псевдоним:</translation>
</message>
<message>
<source>Default</source>
<translation type="unfinished">По умолчанию</translation>
<translation>По умолчанию</translation>
</message>
</context>
<context>
@ -6914,7 +6914,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
</context>
<context>
@ -6957,7 +6957,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
</context>
<context>
@ -7100,15 +7100,15 @@ Apply settings anyway?</source>
</message>
<message>
<source>Tool</source>
<translation type="unfinished">Инструмент</translation>
<translation>Инструмент</translation>
</message>
<message>
<source>Alias:</source>
<translation type="unfinished"></translation>
<translation>Псевдоним:</translation>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
</context>
<context>
@ -7259,15 +7259,15 @@ Apply settings anyway?</source>
</message>
<message>
<source>Tool</source>
<translation type="unfinished">Инструмент</translation>
<translation>Инструмент</translation>
</message>
<message>
<source>Alias:</source>
<translation type="unfinished"></translation>
<translation>Псевдоним:</translation>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
</context>
<context>
@ -7456,7 +7456,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
</context>
<context>
@ -7567,7 +7567,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Notes</source>
<translation type="unfinished"></translation>
<translation>Заметки</translation>
</message>
</context>
<context>
@ -10538,6 +10538,10 @@ This option will take an affect after restart.</source>
<source>Cannot prepare passmark &apos;%1&apos; for piece &apos;%2&apos;. Passmark is empty.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Piece name &apos;%1&apos; is not unique.</source>
<translation>Имя детали &quot;%1&quot; не уникальное.</translation>
</message>
</context>
<context>
<name>QSaveFile</name>
@ -12774,7 +12778,7 @@ Do you want to save your changes?</source>
</message>
<message>
<source>default</source>
<translation type="unfinished"></translation>
<translation>по умолчанию</translation>
</message>
</context>
<context>
@ -14288,7 +14292,7 @@ Do you want to save your changes?</source>
</message>
<message>
<source>Main path of piece %1</source>
<translation type="unfinished"></translation>
<translation>Главный контур детали %1</translation>
</message>
</context>
<context>
@ -14307,7 +14311,7 @@ Do you want to save your changes?</source>
</message>
<message>
<source>Not supported file suffix &apos;%1&apos;</source>
<translation type="unfinished"></translation>
<translation>Не поддерживаемый суффикс файла &apos;%1&apos;</translation>
</message>
<message>
<source>cm</source>
@ -15266,15 +15270,15 @@ Raw layout format compatibility error: actualFileVersion = %1 and fileVersion =
</message>
<message>
<source>Alias:</source>
<translation type="unfinished"></translation>
<translation>Псевдоним:</translation>
</message>
<message>
<source>Alias1:</source>
<translation type="unfinished"></translation>
<translation>Псевдоним 1:</translation>
</message>
<message>
<source>Alias2:</source>
<translation type="unfinished"></translation>
<translation>Псевдоним 2:</translation>
</message>
</context>
<context>

24
share/translations/valentina_uk_UA.ts
View File

@ -2695,11 +2695,11 @@
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Тип пера:</translation>
<translation>Тип пера:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Колір:</translation>
<translation>Колір:</translation>
</message>
<message>
<source>Ready</source>
@ -2723,7 +2723,7 @@
</message>
<message>
<source>Default</source>
<translation type="unfinished">По замовчуванню</translation>
<translation>По замовчуванню</translation>
</message>
<message>
<source>Invalid point</source>
@ -2814,11 +2814,11 @@
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Тип пера:</translation>
<translation>Тип пера:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Колір:</translation>
<translation>Колір:</translation>
</message>
<message>
<source>Ready</source>
@ -2842,7 +2842,7 @@
</message>
<message>
<source>Default</source>
<translation type="unfinished">По замовчуванню</translation>
<translation>По замовчуванню</translation>
</message>
<message>
<source>Invalid line points</source>
@ -4368,11 +4368,11 @@ Apply settings anyway?</source>
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Тип пера:</translation>
<translation>Тип пера:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Колір:</translation>
<translation>Колір:</translation>
</message>
<message>
<source>Ready</source>
@ -4396,7 +4396,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Default</source>
<translation type="unfinished">По замовчуванню</translation>
<translation>По замовчуванню</translation>
</message>
<message>
<source>Invalid angle formula</source>
@ -6225,11 +6225,11 @@ Apply settings anyway?</source>
</message>
<message>
<source>Pen style:</source>
<translation type="unfinished">Тип пера:</translation>
<translation>Тип пера:</translation>
</message>
<message>
<source>Color:</source>
<translation type="unfinished">Колір:</translation>
<translation>Колір:</translation>
</message>
<message>
<source>Ready</source>
@ -6273,7 +6273,7 @@ Apply settings anyway?</source>
</message>
<message>
<source>Default</source>
<translation type="unfinished">По замовчуванню</translation>
<translation>По замовчуванню</translation>
</message>
</context>
<context>

2
src/libs/ifc/schema/pattern/v0.8.10.xsd
View File

@ -831,6 +831,7 @@
</xs:simpleType>
<xs:simpleType name="operationColors">
<xs:restriction base="xs:string">
<xs:enumeration value=""/><!--Same as default-->
<xs:enumeration value="default"/>
<xs:enumeration value="black"/>
<xs:enumeration value="green"/>
@ -863,6 +864,7 @@
</xs:simpleType>
<xs:simpleType name="operationPenStyle">
<xs:restriction base="xs:string">
<xs:enumeration value=""/><!--Same as default-->
<xs:enumeration value="default"/>
<xs:enumeration value="none"/>
<xs:enumeration value="hair"/>

2
src/libs/vmisc/projectversion.cpp
View File

@ -42,7 +42,7 @@
extern const int MAJOR_VERSION = 0;
extern const int MINOR_VERSION = 7;
extern const int DEBUG_VERSION = 36;
extern const int DEBUG_VERSION = 38;
extern const QString APP_VERSION_STR(QStringLiteral("%1.%2.%3.%4").arg(MAJOR_VERSION).arg(MINOR_VERSION)
.arg(DEBUG_VERSION).arg(LATEST_TAG_DISTANCE));

4
src/libs/vmisc/projectversion.h
View File

@ -49,8 +49,8 @@ extern const QString APP_VERSION_STR;
// Change version number in projectversion.cpp too.
// Synchronize valentina.nsi
#define VER_FILEVERSION 0,7,36
#define VER_FILEVERSION_STR "0.7.36\0"
#define VER_FILEVERSION 0,7,38
#define VER_FILEVERSION_STR "0.7.38\0"
#define V_PRERELEASE // Mark prerelease builds

20
src/libs/vtest/abstracttest.cpp
View File

@ -352,9 +352,29 @@ QString AbstractTest::TranslationsPath() const
return QCoreApplication::applicationDirPath() + QStringLiteral("/../../../app/valentina/bin/translations");
}
//---------------------------------------------------------------------------------------------------------------------
int AbstractTest::RunTimeout(int defMsecs)
{
#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
QString timeout = QString::fromLocal8Bit(qgetenv("VTEST_RUN_TIMEOUT"));
if (timeout.isEmpty())
{
return defMsecs;
}
#else
QString timeout = qEnvironmentVariable("VTEST_RUN_TIMEOUT", QString::number(defMsecs));
#endif
bool ok = false;
int msecs = timeout.toInt(&ok);
return ok ? msecs : defMsecs;
}
//---------------------------------------------------------------------------------------------------------------------
int AbstractTest::Run(int exit, const QString &program, const QStringList &arguments, QString &error, int msecs)
{
msecs = AbstractTest::RunTimeout(msecs);
const QString parameters = QStringLiteral("Program: %1 \nArguments: %2.")
.arg(program, arguments.join(QStringLiteral(", ")));

2
src/libs/vtest/abstracttest.h
View File

@ -85,6 +85,8 @@ protected:
QString TapePath() const;
QString TranslationsPath() const;
static int RunTimeout(int defMsecs);
int Run(int exit, const QString &program, const QStringList &arguments, QString &error, int msecs = 120000);
bool CopyRecursively(const QString &srcFilePath, const QString &tgtFilePath) const;

3
src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp
View File

@ -88,6 +88,9 @@ DialogFlippingByLine::DialogFlippingByLine(const VContainer *data, quint32 toolI
this, &DialogFlippingByLine::PointChanged);
connect(ui->comboBoxSecondLinePoint, &QComboBox::currentTextChanged,
this, &DialogFlippingByLine::PointChanged);
connect(ui->listWidget, &QListWidget::currentRowChanged, this, &DialogFlippingByLine::ShowSourceDetails);
connect(ui->lineEditAlias, &QLineEdit::textEdited, this, &DialogFlippingByLine::AliasChanged);
connect(ui->comboBoxPenStyle, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
&DialogFlippingByLine::PenStyleChanged);
connect(ui->comboBoxColor, QOverload<int>::of(&QComboBox::currentIndexChanged), this,

3
src/libs/vtools/dialogs/tools/dialogrotation.cpp
View File

@ -107,6 +107,9 @@ DialogRotation::DialogRotation(const VContainer *data, quint32 toolId, QWidget *
connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogRotation::DeployAngleTextEdit);
connect(ui->comboBoxOriginPoint, &QComboBox::currentTextChanged,
this, &DialogRotation::PointChanged);
connect(ui->listWidget, &QListWidget::currentRowChanged, this, &DialogRotation::ShowSourceDetails);
connect(ui->lineEditAlias, &QLineEdit::textEdited, this, &DialogRotation::AliasChanged);
connect(ui->comboBoxPenStyle, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
&DialogRotation::PenStyleChanged);
connect(ui->comboBoxColor, QOverload<int>::of(&QComboBox::currentIndexChanged), this,

4
src/libs/vtools/tools/drawTools/vdrawtool.h
View File

@ -79,8 +79,8 @@ public:
virtual bool IsLabelVisible(quint32 id) const;
QString GetNotes() const;
void SetNotes(const QString &notes);
QString GetNotes() const;
virtual void SetNotes(const QString &notes);
signals:
void ChangedToolSelection(bool selected, quint32 object, quint32 tool);

13
src/libs/vtools/tools/drawTools/vtoolline.cpp
View File

@ -484,7 +484,7 @@ void VToolLine::SetLineType(const QString &value)
{
m_lineType = value;
QSharedPointer<VGObject> obj;//We don't have object for line in data container. Just will send empty object.
QSharedPointer<VGObject> obj;//We don't have object for line in data container. Just will send an empty object.
SaveOption(obj);
}
@ -499,7 +499,16 @@ void VToolLine::SetLineColor(const QString &value)
{
lineColor = value;
QSharedPointer<VGObject> obj;//We don't have object for line in data container. Just will send empty object.
QSharedPointer<VGObject> obj;//We don't have object for line in data container. Just will send an empty object.
SaveOption(obj);
}
//---------------------------------------------------------------------------------------------------------------------
void VToolLine::SetNotes(const QString &notes)
{
m_notes = notes;
QSharedPointer<VGObject> obj;//We don't have object for line in data container. Just will send an empty object.
SaveOption(obj);
}

2
src/libs/vtools/tools/drawTools/vtoolline.h
View File

@ -85,6 +85,8 @@ public:
QString GetLineColor() const;
void SetLineColor(const QString &value);
virtual void SetNotes(const QString &notes) override;
virtual void ShowVisualization(bool show) override;
virtual void SetLineType(const QString &value) override;

8
src/libs/vtools/tools/toolsdef.h
View File

@ -31,15 +31,17 @@
#include <QString>
#include <QMetaType>
#include "../ifc/ifcdef.h"
class VGObject;
class VContainer;
struct SourceItem
{
quint32 id{0};
quint32 id{NULL_ID};
QString alias{};
QString penStyle{};
QString color{};
QString penStyle{TypeLineDefault};
QString color{ColorDefault};
};
Q_DECLARE_METATYPE(SourceItem)