String inside label also should be translated.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-08-09 19:42:00 +03:00
parent 4827794d1f
commit 0aabacfee4
22 changed files with 241 additions and 60 deletions

View File

@ -7814,6 +7814,17 @@ Do you want to save your changes?</translation>
<translation type="vanished">Can&apos;t cut spline path with one point</translation> <translation type="vanished">Can&apos;t cut spline path with one point</translation>
</message> </message>
</context> </context>
<context>
<name>VTextManager</name>
<message>
<source>Cut %1 on %2%3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source> on Fold</source>
<translation type="unfinished"> on Fold</translation>
</message>
</context>
<context> <context>
<name>VToolDetail</name> <name>VToolDetail</name>
<message> <message>

View File

@ -7492,6 +7492,17 @@ Do you want to save your changes?</source>
<translation type="vanished">Nelze vyjmout cestu křivky s jedním bodem</translation> <translation type="vanished">Nelze vyjmout cestu křivky s jedním bodem</translation>
</message> </message>
</context> </context>
<context>
<name>VTextManager</name>
<message>
<source>Cut %1 on %2%3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source> on Fold</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>VToolDetail</name> <name>VToolDetail</name>
<message> <message>

View File

@ -7808,6 +7808,17 @@ Do you want to save your changes?</source>
<translation type="vanished">Splinepfad mit nur einem Punkt kann nicht zerschnitten werden</translation> <translation type="vanished">Splinepfad mit nur einem Punkt kann nicht zerschnitten werden</translation>
</message> </message>
</context> </context>
<context>
<name>VTextManager</name>
<message>
<source>Cut %1 on %2%3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source> on Fold</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>VToolDetail</name> <name>VToolDetail</name>
<message> <message>

View File

@ -7814,6 +7814,17 @@ Do you want to save your changes?</translation>
<translation type="vanished">Can&apos;t cut spline path with one point</translation> <translation type="vanished">Can&apos;t cut spline path with one point</translation>
</message> </message>
</context> </context>
<context>
<name>VTextManager</name>
<message>
<source>Cut %1 on %2%3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source> on Fold</source>
<translation type="unfinished"> on Fold</translation>
</message>
</context>
<context> <context>
<name>VToolDetail</name> <name>VToolDetail</name>
<message> <message>

View File

@ -7814,6 +7814,17 @@ Do you want to save your changes?</translation>
<translation type="vanished">Can&apos;t cut spline path with one point</translation> <translation type="vanished">Can&apos;t cut spline path with one point</translation>
</message> </message>
</context> </context>
<context>
<name>VTextManager</name>
<message>
<source>Cut %1 on %2%3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source> on Fold</source>
<translation type="unfinished"> on Fold</translation>
</message>
</context>
<context> <context>
<name>VToolDetail</name> <name>VToolDetail</name>
<message> <message>

View File

@ -7814,6 +7814,17 @@ Do you want to save your changes?</translation>
<translation type="vanished">Can&apos;t cut spline path with one point</translation> <translation type="vanished">Can&apos;t cut spline path with one point</translation>
</message> </message>
</context> </context>
<context>
<name>VTextManager</name>
<message>
<source>Cut %1 on %2%3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source> on Fold</source>
<translation type="unfinished"> on Fold</translation>
</message>
</context>
<context> <context>
<name>VToolDetail</name> <name>VToolDetail</name>
<message> <message>

View File

@ -7810,6 +7810,17 @@ Do you want to save your changes?</source>
<translation type="vanished">No se puede cortar ruta de spline con un punto</translation> <translation type="vanished">No se puede cortar ruta de spline con un punto</translation>
</message> </message>
</context> </context>
<context>
<name>VTextManager</name>
<message>
<source>Cut %1 on %2%3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source> on Fold</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>VToolDetail</name> <name>VToolDetail</name>
<message> <message>

View File

@ -7492,6 +7492,17 @@ Do you want to save your changes?</source>
<translation type="vanished">Slinipolkua ei voi leikata yhdellä pisteellä</translation> <translation type="vanished">Slinipolkua ei voi leikata yhdellä pisteellä</translation>
</message> </message>
</context> </context>
<context>
<name>VTextManager</name>
<message>
<source>Cut %1 on %2%3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source> on Fold</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>VToolDetail</name> <name>VToolDetail</name>
<message> <message>

View File

@ -1,4 +1,6 @@
<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr_FR" version="2.1"> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="fr_FR">
<context> <context>
<name>AddDet</name> <name>AddDet</name>
<message> <message>
@ -841,7 +843,7 @@
<name>DialogCubicBezier</name> <name>DialogCubicBezier</name>
<message> <message>
<source>Cubic bezier</source> <source>Cubic bezier</source>
<translation>Bezier Cubique</translation> <translation type="vanished">Bezier Cubique</translation>
</message> </message>
<message> <message>
<source>Color:</source> <source>Color:</source>
@ -883,12 +885,16 @@
<source>Invalid spline</source> <source>Invalid spline</source>
<translation>Spline invalide</translation> <translation>Spline invalide</translation>
</message> </message>
<message>
<source>Tool cubic bezier</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>DialogCubicBezierPath</name> <name>DialogCubicBezierPath</name>
<message> <message>
<source>Dialog cubic bezier path</source> <source>Dialog cubic bezier path</source>
<translation>Dialogue trajectoire de Bezier Cubique</translation> <translation type="vanished">Dialogue trajectoire de Bezier Cubique</translation>
</message> </message>
<message> <message>
<source>Point:</source> <source>Point:</source>
@ -910,6 +916,10 @@
<source>Invalid spline path</source> <source>Invalid spline path</source>
<translation>Trajectoire de spline invalide</translation> <translation>Trajectoire de spline invalide</translation>
</message> </message>
<message>
<source>Tool cubic bezier path</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>DialogCurveIntersectAxis</name> <name>DialogCurveIntersectAxis</name>
@ -1239,7 +1249,7 @@
<name>DialogDetail</name> <name>DialogDetail</name>
<message> <message>
<source>Detail</source> <source>Detail</source>
<translation type="vanished">Pièce de patron</translation> <translation>Pièce de patron</translation>
</message> </message>
<message> <message>
<source>Bias X</source> <source>Bias X</source>
@ -2357,7 +2367,7 @@ Appliquer les réglages quand-même ?</translation>
</message> </message>
<message> <message>
<source>x</source> <source>x</source>
<translation>x</translation> <translation type="vanished">x</translation>
</message> </message>
</context> </context>
<context> <context>
@ -2986,7 +2996,7 @@ Appliquer les réglages quand-même ?</translation>
</message> </message>
<message> <message>
<source>Images (*.png *.jpg *.jpeg *.bmp)</source> <source>Images (*.png *.jpg *.jpeg *.bmp)</source>
<translation>Images (*.png *.jpg *.jpeg *.bmp)</translation> <translation type="vanished">Images (*.png *.jpg *.jpeg *.bmp)</translation>
</message> </message>
<message> <message>
<source>Images</source> <source>Images</source>
@ -6810,7 +6820,7 @@ Voulez-vous enregistrer les changements?</translation>
</message> </message>
<message> <message>
<source>Comma-Separated Values (*.cvs)</source> <source>Comma-Separated Values (*.cvs)</source>
<translation>Valeur de signe de séparation (*.cvs)</translation> <translation type="vanished">Valeur de signe de séparation (*.cvs)</translation>
</message> </message>
<message> <message>
<source>Invalid value</source> <source>Invalid value</source>
@ -6820,6 +6830,10 @@ Voulez-vous enregistrer les changements?</translation>
<source>Show in Finder</source> <source>Show in Finder</source>
<translation>Révéler dans le finder</translation> <translation>Révéler dans le finder</translation>
</message> </message>
<message>
<source>Comma-Separated Values</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>TapeConfigDialog</name> <name>TapeConfigDialog</name>
@ -7263,15 +7277,11 @@ Voulez-vous enregistrer les changements?</translation>
</message> </message>
<message> <message>
<source>Page width in current units like 12.0 (cannot be used with &quot;%1&quot;, export mode).</source> <source>Page width in current units like 12.0 (cannot be used with &quot;%1&quot;, export mode).</source>
<translation type="unfinished"/> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Page height in current units like 12.0 (cannot be used with &quot;%1&quot;, export mode).</source> <source>Page height in current units like 12.0 (cannot be used with &quot;%1&quot;, export mode).</source>
<translation type="unfinished"/> <translation type="unfinished"></translation>
</message>
<message>
<source>Page height/width measure units (cannot be used with &quot;%1&quot;, export mode): </source>
<translation type="unfinished"/>
</message> </message>
<message> <message>
<source>Invalid gradation size value.</source> <source>Invalid gradation size value.</source>
@ -7293,45 +7303,25 @@ Voulez-vous enregistrer les changements?</translation>
<source>Ignore margins printing (export mode). Set all margins to 0.</source> <source>Ignore margins printing (export mode). Set all margins to 0.</source>
<translation type="vanished">Ignorer les marges d&apos;impression (mode export). Règle les marge à 0.</translation> <translation type="vanished">Ignorer les marges d&apos;impression (mode export). Règle les marge à 0.</translation>
</message> </message>
<message>
<source>Page left margin in current units like 3.0 (export mode). If not set will be used value from default printer. Or 0 if none printers was found.</source>
<translation type="unfinished"/>
</message>
<message>
<source>Page right margin in current units like 3.0 (export mode). If not set will be used value from default printer. Or 0 if none printers was found.</source>
<translation type="unfinished"/>
</message>
<message>
<source>Page top margin in current units like 3.0 (export mode). If not set will be used value from default printer. Or 0 if none printers was found.</source>
<translation type="unfinished"/>
</message>
<message>
<source>Page bottom margin in current units like 3.0 (export mode). If not set will be used value from default printer. Or 0 if none printers was found.</source>
<translation type="unfinished"/>
</message>
<message>
<source>Shift length must be used together with shift units.</source>
<translation type="unfinished"/>
</message>
<message> <message>
<source>Gap width must be used together with shift units.</source> <source>Gap width must be used together with shift units.</source>
<translation>Largeur d&apos;espacement devant être utilisé avec les largeurs de décalage.</translation> <translation>Largeur d&apos;espacement devant être utilisé avec les largeurs de décalage.</translation>
</message> </message>
<message> <message>
<source>Left margin must be used together with page units.</source> <source>Left margin must be used together with page units.</source>
<translation type="unfinished"/> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Right margin must be used together with page units.</source> <source>Right margin must be used together with page units.</source>
<translation type="unfinished"/> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Top margin must be used together with page units.</source> <source>Top margin must be used together with page units.</source>
<translation type="unfinished"/> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Bottom margin must be used together with page units.</source> <source>Bottom margin must be used together with page units.</source>
<translation type="unfinished"/> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>The path to output destination folder. By default the directory at which the application was started.</source> <source>The path to output destination folder. By default the directory at which the application was started.</source>
@ -7339,7 +7329,7 @@ Voulez-vous enregistrer les changements?</translation>
</message> </message>
<message> <message>
<source>Page height/width measure units (cannot be used with &quot;%1&quot;, export mode). Valid values: %2.</source> <source>Page height/width measure units (cannot be used with &quot;%1&quot;, export mode). Valid values: %2.</source>
<translation type="unfinished"/> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Ignore margins printing (export mode). Disable value keys: &quot;%1&quot;, &quot;%2&quot;, &quot;%3&quot;, &quot;%4&quot;. Set all margins to 0.</source> <source>Ignore margins printing (export mode). Disable value keys: &quot;%1&quot;, &quot;%2&quot;, &quot;%3&quot;, &quot;%4&quot;. Set all margins to 0.</source>
@ -7347,19 +7337,19 @@ Voulez-vous enregistrer les changements?</translation>
</message> </message>
<message> <message>
<source>Page left margin in current units like 3.0 (export mode). If not set will be used value from default printer. Or 0 if none printers was found. Value will be ignored if key &quot;%1&quot; is used.</source> <source>Page left margin in current units like 3.0 (export mode). If not set will be used value from default printer. Or 0 if none printers was found. Value will be ignored if key &quot;%1&quot; is used.</source>
<translation type="unfinished"/> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Page right margin in current units like 3.0 (export mode). If not set will be used value from default printer. Or 0 if none printers was found. Value will be ignored if key &quot;%1&quot; is used.</source> <source>Page right margin in current units like 3.0 (export mode). If not set will be used value from default printer. Or 0 if none printers was found. Value will be ignored if key &quot;%1&quot; is used.</source>
<translation type="unfinished"/> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Page top margin in current units like 3.0 (export mode). If not set will be used value from default printer. Or 0 if none printers was found. Value will be ignored if key &quot;%1&quot; is used.</source> <source>Page top margin in current units like 3.0 (export mode). If not set will be used value from default printer. Or 0 if none printers was found. Value will be ignored if key &quot;%1&quot; is used.</source>
<translation type="unfinished"/> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Page bottom margin in current units like 3.0 (export mode). If not set will be used value from default printer. Or 0 if none printers was found. Value will be ignored if key &quot;%1&quot; is used.</source> <source>Page bottom margin in current units like 3.0 (export mode). If not set will be used value from default printer. Or 0 if none printers was found. Value will be ignored if key &quot;%1&quot; is used.</source>
<translation type="unfinished"/> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Rotation in degrees (one of predefined, export mode). Default value is 180. 0 is no-rotate. Valid values: %1. Each value show how many times details will be rotated. For example 180 mean two times (360/180=2) by 180 degree.</source> <source>Rotation in degrees (one of predefined, export mode). Default value is 180. 0 is no-rotate. Valid values: %1. Each value show how many times details will be rotated. For example 180 mean two times (360/180=2) by 180 degree.</source>
@ -7399,7 +7389,7 @@ Voulez-vous enregistrer les changements?</translation>
</message> </message>
<message> <message>
<source>Shift/Offset length must be used together with shift units.</source> <source>Shift/Offset length must be used together with shift units.</source>
<translation type="unfinished"/> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context> <context>
@ -7455,13 +7445,13 @@ Voulez-vous enregistrer les changements?</translation>
<translation>Conversion du paramètre impossible vers toDouble</translation> <translation>Conversion du paramètre impossible vers toDouble</translation>
</message> </message>
<message> <message>
<source>Can't open file %1: <source>Can&apos;t open file %1:
%2.</source> %2.</source>
<translation>impossible d&apos;ouvrir le fichier %1: <translation>impossible d&apos;ouvrir le fichier %1:
%2.</translation> %2.</translation>
</message> </message>
<message> <message>
<source>Can't open schema file %1: <source>Can&apos;t open schema file %1:
%2.</source> %2.</source>
<translation>Erreur d&apos;ouverture du fichier de schéma %1: %2.</translation> <translation>Erreur d&apos;ouverture du fichier de schéma %1: %2.</translation>
</message> </message>
@ -7797,6 +7787,17 @@ Voulez-vous enregistrer les changements?</translation>
<translation type="vanished">Impossible de couper une spline avec un point</translation> <translation type="vanished">Impossible de couper une spline avec un point</translation>
</message> </message>
</context> </context>
<context>
<name>VTextManager</name>
<message>
<source>Cut %1 on %2%3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source> on Fold</source>
<translation type="unfinished">au pli</translation>
</message>
</context>
<context> <context>
<name>VToolDetail</name> <name>VToolDetail</name>
<message> <message>
@ -9214,7 +9215,7 @@ Voulez-vous enregistrer les changements?</translation>
<name>VWidgetDetails</name> <name>VWidgetDetails</name>
<message> <message>
<source>Form</source> <source>Form</source>
<translation type="unfinished"/> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Unnamed</source> <source>Unnamed</source>
@ -9223,10 +9224,6 @@ Voulez-vous enregistrer les changements?</translation>
</context> </context>
<context> <context>
<name>VWidgetGroups</name> <name>VWidgetGroups</name>
<message>
<source>Form</source>
<translation type="unfinished"/>
</message>
<message> <message>
<source>Rename</source> <source>Rename</source>
<translation>Renommer</translation> <translation>Renommer</translation>

View File

@ -6917,6 +6917,17 @@ Do you want to save your changes?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>VTextManager</name>
<message>
<source>Cut %1 on %2%3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source> on Fold</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>VToolDetail</name> <name>VToolDetail</name>
<message> <message>

View File

@ -7167,6 +7167,17 @@ Do you want to save your changes?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>VTextManager</name>
<message>
<source>Cut %1 on %2%3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source> on Fold</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>VToolDetail</name> <name>VToolDetail</name>
<message> <message>

View File

@ -7757,6 +7757,17 @@ Vuoi salvare le tue modifiche?</translation>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>VTextManager</name>
<message>
<source>Cut %1 on %2%3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source> on Fold</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>VToolDetail</name> <name>VToolDetail</name>
<message> <message>

View File

@ -7801,6 +7801,17 @@ Wil je deze veranderingen opslaan?</translation>
<translation type="vanished">Kan vrijevormkromming pad niet knippen met en punt</translation> <translation type="vanished">Kan vrijevormkromming pad niet knippen met en punt</translation>
</message> </message>
</context> </context>
<context>
<name>VTextManager</name>
<message>
<source>Cut %1 on %2%3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source> on Fold</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>VToolDetail</name> <name>VToolDetail</name>
<message> <message>

View File

@ -7284,6 +7284,17 @@ Do you want to save your changes?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>VTextManager</name>
<message>
<source>Cut %1 on %2%3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source> on Fold</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>VToolDetail</name> <name>VToolDetail</name>
<message> <message>

View File

@ -7457,6 +7457,17 @@ Do you want to save your changes?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>VTextManager</name>
<message>
<source>Cut %1 on %2%3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source> on Fold</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>VToolDetail</name> <name>VToolDetail</name>
<message> <message>

View File

@ -7778,6 +7778,17 @@ Do you want to save your changes?</source>
<translation type="vanished">Невозможно разрезать сплайн из одной точки</translation> <translation type="vanished">Невозможно разрезать сплайн из одной точки</translation>
</message> </message>
</context> </context>
<context>
<name>VTextManager</name>
<message>
<source>Cut %1 on %2%3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source> on Fold</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>VToolDetail</name> <name>VToolDetail</name>
<message> <message>

View File

@ -1421,7 +1421,7 @@
</message> </message>
<message> <message>
<source>Cut on fold</source> <source>Cut on fold</source>
<translation>Вирізати на згиб</translation> <translation>Вирізати на згин</translation>
</message> </message>
<message> <message>
<source>Cut %1 of %2%3</source> <source>Cut %1 of %2%3</source>
@ -1429,7 +1429,7 @@
</message> </message>
<message> <message>
<source> on Fold</source> <source> on Fold</source>
<translation>Вирізати на згиб</translation> <translation> на згин</translation>
</message> </message>
<message> <message>
<source>Update</source> <source>Update</source>
@ -7798,6 +7798,17 @@ Do you want to save your changes?</source>
<translation type="vanished">Не можу розрізати складну криву що складається з одної точки</translation> <translation type="vanished">Не можу розрізати складну криву що складається з одної точки</translation>
</message> </message>
</context> </context>
<context>
<name>VTextManager</name>
<message>
<source>Cut %1 on %2%3</source>
<translation>Вирізати %1на %2%3</translation>
</message>
<message>
<source> on Fold</source>
<translation> на згин</translation>
</message>
</context>
<context> <context>
<name>VToolDetail</name> <name>VToolDetail</name>
<message> <message>

View File

@ -6829,6 +6829,17 @@ Do you want to save your changes?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>VTextManager</name>
<message>
<source>Cut %1 on %2%3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source> on Fold</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>VToolDetail</name> <name>VToolDetail</name>
<message> <message>

View File

@ -212,9 +212,9 @@ void VTextManager::Update(const QString& qsName, const VPatternPieceData& data)
AddLine(tl); AddLine(tl);
} }
// MCP // MCP
QString qsText = "Cut %1 on %2%3"; QString qsText = tr("Cut %1 on %2%3");
QStringList qslPlace; QStringList qslPlace;
qslPlace << "" << " on Fold"; qslPlace << "" << QLatin1String(" ") + tr("on Fold");
tl.m_eFontWeight = QFont::Normal; tl.m_eFontWeight = QFont::Normal;
tl.m_iFontSize = 0; tl.m_iFontSize = 0;
for (int i = 0; i < data.GetMCPCount(); ++i) for (int i = 0; i < data.GetMCPCount(); ++i)

View File

@ -40,6 +40,7 @@ struct TextLine
*/ */
class VTextManager class VTextManager
{ {
Q_DECLARE_TR_FUNCTIONS(VTextManager)
public: public:
VTextManager(); VTextManager();
virtual ~VTextManager(); virtual ~VTextManager();

View File

@ -126,6 +126,7 @@ DialogDetail::DialogDetail(const VContainer *data, const quint32 &toolId, QWidge
connect(ui.toolButtonDown, &QToolButton::clicked, this, &DialogDetail::ScrollDown); connect(ui.toolButtonDown, &QToolButton::clicked, this, &DialogDetail::ScrollDown);
m_qslMaterials << tr("Fabric") << tr("Lining") << tr("Interfacing") << tr("Interlining"); m_qslMaterials << tr("Fabric") << tr("Lining") << tr("Interfacing") << tr("Interlining");
ui.comboBoxMaterial->addItems(m_qslMaterials); ui.comboBoxMaterial->addItems(m_qslMaterials);
m_qslPlacements << tr("None") << tr("Cut on fold"); m_qslPlacements << tr("None") << tr("Cut on fold");
ui.comboBoxPlacement->addItems(m_qslPlacements); ui.comboBoxPlacement->addItems(m_qslPlacements);
@ -220,7 +221,7 @@ void DialogDetail::UpdateList()
} }
if (mcp.m_ePlacement == PlacementType::ptCutOnFold) if (mcp.m_ePlacement == PlacementType::ptCutOnFold)
{ {
qsText = qsText.arg(tr(" on Fold")); qsText = qsText.arg(QLatin1String(" ") + tr("on Fold"));
} }
else else
{ {

View File

@ -756,11 +756,6 @@ void VToolDetail::UpdateLabel()
if (data.IsVisible() == true) if (data.IsVisible() == true)
{ {
//dataLabel->Reset();
QString qsText = "Cut %1 of %2%3";
QStringList qslPlace;
qslPlace << "" << " on Fold";
QFont fnt = qApp->font(); QFont fnt = qApp->font();
fnt.setPixelSize(data.GetFontSize()); fnt.setPixelSize(data.GetFontSize());
dataLabel->SetFont(fnt); dataLabel->SetFont(fnt);