From 0aabacfee4b63d3f20c894a3e5933edeabd4c823 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 9 Aug 2016 19:42:00 +0300 Subject: [PATCH] String inside label also should be translated. --HG-- branch : develop --- share/translations/valentina.ts | 11 +++ share/translations/valentina_cs_CZ.ts | 11 +++ share/translations/valentina_de_DE.ts | 11 +++ share/translations/valentina_en_CA.ts | 11 +++ share/translations/valentina_en_IN.ts | 11 +++ share/translations/valentina_en_US.ts | 11 +++ share/translations/valentina_es_ES.ts | 11 +++ share/translations/valentina_fi_FI.ts | 11 +++ share/translations/valentina_fr_FR.ts | 97 +++++++++---------- share/translations/valentina_he_IL.ts | 11 +++ share/translations/valentina_id_ID.ts | 11 +++ share/translations/valentina_it_IT.ts | 11 +++ share/translations/valentina_nl_NL.ts | 11 +++ share/translations/valentina_pt_BR.ts | 11 +++ share/translations/valentina_ro_RO.ts | 11 +++ share/translations/valentina_ru_RU.ts | 11 +++ share/translations/valentina_uk_UA.ts | 15 ++- share/translations/valentina_zh_CN.ts | 11 +++ src/libs/vlayout/vtextmanager.cpp | 4 +- src/libs/vlayout/vtextmanager.h | 1 + .../vtools/dialogs/tools/dialogdetail.cpp | 3 +- src/libs/vtools/tools/vtooldetail.cpp | 5 - 22 files changed, 241 insertions(+), 60 deletions(-) diff --git a/share/translations/valentina.ts b/share/translations/valentina.ts index 2501f4d37..cbe149ed0 100644 --- a/share/translations/valentina.ts +++ b/share/translations/valentina.ts @@ -7814,6 +7814,17 @@ Do you want to save your changes? Can't cut spline path with one point + + VTextManager + + Cut %1 on %2%3 + + + + on Fold + on Fold + + VToolDetail diff --git a/share/translations/valentina_cs_CZ.ts b/share/translations/valentina_cs_CZ.ts index d764fdcee..6cbddd7fc 100644 --- a/share/translations/valentina_cs_CZ.ts +++ b/share/translations/valentina_cs_CZ.ts @@ -7492,6 +7492,17 @@ Do you want to save your changes? Nelze vyjmout cestu křivky s jedním bodem + + VTextManager + + Cut %1 on %2%3 + + + + on Fold + + + VToolDetail diff --git a/share/translations/valentina_de_DE.ts b/share/translations/valentina_de_DE.ts index d10794926..ef97b64e5 100644 --- a/share/translations/valentina_de_DE.ts +++ b/share/translations/valentina_de_DE.ts @@ -7808,6 +7808,17 @@ Do you want to save your changes? Splinepfad mit nur einem Punkt kann nicht zerschnitten werden + + VTextManager + + Cut %1 on %2%3 + + + + on Fold + + + VToolDetail diff --git a/share/translations/valentina_en_CA.ts b/share/translations/valentina_en_CA.ts index 0f6f4ef0b..dde62c623 100644 --- a/share/translations/valentina_en_CA.ts +++ b/share/translations/valentina_en_CA.ts @@ -7814,6 +7814,17 @@ Do you want to save your changes? Can't cut spline path with one point + + VTextManager + + Cut %1 on %2%3 + + + + on Fold + on Fold + + VToolDetail diff --git a/share/translations/valentina_en_IN.ts b/share/translations/valentina_en_IN.ts index 78e991dde..7f1989f18 100644 --- a/share/translations/valentina_en_IN.ts +++ b/share/translations/valentina_en_IN.ts @@ -7814,6 +7814,17 @@ Do you want to save your changes? Can't cut spline path with one point + + VTextManager + + Cut %1 on %2%3 + + + + on Fold + on Fold + + VToolDetail diff --git a/share/translations/valentina_en_US.ts b/share/translations/valentina_en_US.ts index 95198c4ae..5450f8240 100644 --- a/share/translations/valentina_en_US.ts +++ b/share/translations/valentina_en_US.ts @@ -7814,6 +7814,17 @@ Do you want to save your changes? Can't cut spline path with one point + + VTextManager + + Cut %1 on %2%3 + + + + on Fold + on Fold + + VToolDetail diff --git a/share/translations/valentina_es_ES.ts b/share/translations/valentina_es_ES.ts index db39b733a..5a4991132 100644 --- a/share/translations/valentina_es_ES.ts +++ b/share/translations/valentina_es_ES.ts @@ -7810,6 +7810,17 @@ Do you want to save your changes? No se puede cortar ruta de spline con un punto + + VTextManager + + Cut %1 on %2%3 + + + + on Fold + + + VToolDetail diff --git a/share/translations/valentina_fi_FI.ts b/share/translations/valentina_fi_FI.ts index 737a324d8..712282fb9 100644 --- a/share/translations/valentina_fi_FI.ts +++ b/share/translations/valentina_fi_FI.ts @@ -7492,6 +7492,17 @@ Do you want to save your changes? Slinipolkua ei voi leikata yhdellä pisteellä + + VTextManager + + Cut %1 on %2%3 + + + + on Fold + + + VToolDetail diff --git a/share/translations/valentina_fr_FR.ts b/share/translations/valentina_fr_FR.ts index cb97411e0..1413dc06c 100644 --- a/share/translations/valentina_fr_FR.ts +++ b/share/translations/valentina_fr_FR.ts @@ -1,4 +1,6 @@ - + + + AddDet @@ -841,7 +843,7 @@ DialogCubicBezier Cubic bezier - Bezier Cubique + Bezier Cubique Color: @@ -883,12 +885,16 @@ Invalid spline Spline invalide + + Tool cubic bezier + + DialogCubicBezierPath Dialog cubic bezier path - Dialogue trajectoire de Bezier Cubique + Dialogue trajectoire de Bezier Cubique Point: @@ -910,6 +916,10 @@ Invalid spline path Trajectoire de spline invalide + + Tool cubic bezier path + + DialogCurveIntersectAxis @@ -1239,7 +1249,7 @@ DialogDetail Detail - Pièce de patron + Pièce de patron Bias X @@ -2357,7 +2367,7 @@ Appliquer les réglages quand-même ? x - x + x @@ -2986,7 +2996,7 @@ Appliquer les réglages quand-même ? Images (*.png *.jpg *.jpeg *.bmp) - Images (*.png *.jpg *.jpeg *.bmp) + Images (*.png *.jpg *.jpeg *.bmp) Images @@ -6810,7 +6820,7 @@ Voulez-vous enregistrer les changements? Comma-Separated Values (*.cvs) - Valeur de signe de séparation (*.cvs) + Valeur de signe de séparation (*.cvs) Invalid value @@ -6820,6 +6830,10 @@ Voulez-vous enregistrer les changements? Show in Finder Révéler dans le finder + + Comma-Separated Values + + TapeConfigDialog @@ -7263,15 +7277,11 @@ Voulez-vous enregistrer les changements? Page width in current units like 12.0 (cannot be used with "%1", export mode). - + Page height in current units like 12.0 (cannot be used with "%1", export mode). - - - - Page height/width measure units (cannot be used with "%1", export mode): - + Invalid gradation size value. @@ -7293,45 +7303,25 @@ Voulez-vous enregistrer les changements? Ignore margins printing (export mode). Set all margins to 0. Ignorer les marges d'impression (mode export). Règle les marge à 0. - - 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. - - - - 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. - - - - 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. - - - - 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. - - - - Shift length must be used together with shift units. - - Gap width must be used together with shift units. Largeur d'espacement devant être utilisé avec les largeurs de décalage. Left margin must be used together with page units. - + Right margin must be used together with page units. - + Top margin must be used together with page units. - + Bottom margin must be used together with page units. - + The path to output destination folder. By default the directory at which the application was started. @@ -7339,7 +7329,7 @@ Voulez-vous enregistrer les changements? Page height/width measure units (cannot be used with "%1", export mode). Valid values: %2. - + Ignore margins printing (export mode). Disable value keys: "%1", "%2", "%3", "%4". Set all margins to 0. @@ -7347,19 +7337,19 @@ Voulez-vous enregistrer les changements? 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 "%1" is used. - + 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 "%1" is used. - + 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 "%1" is used. - + 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 "%1" is used. - + 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. @@ -7399,7 +7389,7 @@ Voulez-vous enregistrer les changements? Shift/Offset length must be used together with shift units. - + @@ -7455,13 +7445,13 @@ Voulez-vous enregistrer les changements? Conversion du paramètre impossible vers toDouble - Can't open file %1: + Can't open file %1: %2. impossible d'ouvrir le fichier %1: %2. - Can't open schema file %1: + Can't open schema file %1: %2. Erreur d'ouverture du fichier de schéma %1: %2. @@ -7797,6 +7787,17 @@ Voulez-vous enregistrer les changements? Impossible de couper une spline avec un point + + VTextManager + + Cut %1 on %2%3 + + + + on Fold + au pli + + VToolDetail @@ -9214,7 +9215,7 @@ Voulez-vous enregistrer les changements? VWidgetDetails Form - + Unnamed @@ -9223,10 +9224,6 @@ Voulez-vous enregistrer les changements? VWidgetGroups - - Form - - Rename Renommer diff --git a/share/translations/valentina_he_IL.ts b/share/translations/valentina_he_IL.ts index e4aa9fdd6..98d1d1a14 100644 --- a/share/translations/valentina_he_IL.ts +++ b/share/translations/valentina_he_IL.ts @@ -6917,6 +6917,17 @@ Do you want to save your changes? + + VTextManager + + Cut %1 on %2%3 + + + + on Fold + + + VToolDetail diff --git a/share/translations/valentina_id_ID.ts b/share/translations/valentina_id_ID.ts index 5d62aff96..4c7164c0e 100644 --- a/share/translations/valentina_id_ID.ts +++ b/share/translations/valentina_id_ID.ts @@ -7167,6 +7167,17 @@ Do you want to save your changes? + + VTextManager + + Cut %1 on %2%3 + + + + on Fold + + + VToolDetail diff --git a/share/translations/valentina_it_IT.ts b/share/translations/valentina_it_IT.ts index f6edfb8a6..05733c6e0 100644 --- a/share/translations/valentina_it_IT.ts +++ b/share/translations/valentina_it_IT.ts @@ -7757,6 +7757,17 @@ Vuoi salvare le tue modifiche? + + VTextManager + + Cut %1 on %2%3 + + + + on Fold + + + VToolDetail diff --git a/share/translations/valentina_nl_NL.ts b/share/translations/valentina_nl_NL.ts index 88872e2fd..62b6c1a8d 100644 --- a/share/translations/valentina_nl_NL.ts +++ b/share/translations/valentina_nl_NL.ts @@ -7801,6 +7801,17 @@ Wil je deze veranderingen opslaan? Kan vrijevormkromming pad niet knippen met en punt + + VTextManager + + Cut %1 on %2%3 + + + + on Fold + + + VToolDetail diff --git a/share/translations/valentina_pt_BR.ts b/share/translations/valentina_pt_BR.ts index de7e0c3c3..5cd3af0df 100644 --- a/share/translations/valentina_pt_BR.ts +++ b/share/translations/valentina_pt_BR.ts @@ -7284,6 +7284,17 @@ Do you want to save your changes? + + VTextManager + + Cut %1 on %2%3 + + + + on Fold + + + VToolDetail diff --git a/share/translations/valentina_ro_RO.ts b/share/translations/valentina_ro_RO.ts index b540a1560..8aaf9c3db 100644 --- a/share/translations/valentina_ro_RO.ts +++ b/share/translations/valentina_ro_RO.ts @@ -7457,6 +7457,17 @@ Do you want to save your changes? + + VTextManager + + Cut %1 on %2%3 + + + + on Fold + + + VToolDetail diff --git a/share/translations/valentina_ru_RU.ts b/share/translations/valentina_ru_RU.ts index 0749c37f6..7aa0ed195 100644 --- a/share/translations/valentina_ru_RU.ts +++ b/share/translations/valentina_ru_RU.ts @@ -7778,6 +7778,17 @@ Do you want to save your changes? Невозможно разрезать сплайн из одной точки + + VTextManager + + Cut %1 on %2%3 + + + + on Fold + + + VToolDetail diff --git a/share/translations/valentina_uk_UA.ts b/share/translations/valentina_uk_UA.ts index 368ad5603..84fa3dde0 100644 --- a/share/translations/valentina_uk_UA.ts +++ b/share/translations/valentina_uk_UA.ts @@ -1421,7 +1421,7 @@ Cut on fold - Вирізати на згиб + Вирізати на згин Cut %1 of %2%3 @@ -1429,7 +1429,7 @@ on Fold - Вирізати на згиб + на згин Update @@ -7798,6 +7798,17 @@ Do you want to save your changes? Не можу розрізати складну криву що складається з одної точки + + VTextManager + + Cut %1 on %2%3 + Вирізати %1на %2%3 + + + on Fold + на згин + + VToolDetail diff --git a/share/translations/valentina_zh_CN.ts b/share/translations/valentina_zh_CN.ts index 32ded53dd..0b4205200 100644 --- a/share/translations/valentina_zh_CN.ts +++ b/share/translations/valentina_zh_CN.ts @@ -6829,6 +6829,17 @@ Do you want to save your changes? + + VTextManager + + Cut %1 on %2%3 + + + + on Fold + + + VToolDetail diff --git a/src/libs/vlayout/vtextmanager.cpp b/src/libs/vlayout/vtextmanager.cpp index 57ef1fe0d..54d55da98 100644 --- a/src/libs/vlayout/vtextmanager.cpp +++ b/src/libs/vlayout/vtextmanager.cpp @@ -212,9 +212,9 @@ void VTextManager::Update(const QString& qsName, const VPatternPieceData& data) AddLine(tl); } // MCP - QString qsText = "Cut %1 on %2%3"; + QString qsText = tr("Cut %1 on %2%3"); QStringList qslPlace; - qslPlace << "" << " on Fold"; + qslPlace << "" << QLatin1String(" ") + tr("on Fold"); tl.m_eFontWeight = QFont::Normal; tl.m_iFontSize = 0; for (int i = 0; i < data.GetMCPCount(); ++i) diff --git a/src/libs/vlayout/vtextmanager.h b/src/libs/vlayout/vtextmanager.h index 243e81a6c..773fd02ab 100644 --- a/src/libs/vlayout/vtextmanager.h +++ b/src/libs/vlayout/vtextmanager.h @@ -40,6 +40,7 @@ struct TextLine */ class VTextManager { + Q_DECLARE_TR_FUNCTIONS(VTextManager) public: VTextManager(); virtual ~VTextManager(); diff --git a/src/libs/vtools/dialogs/tools/dialogdetail.cpp b/src/libs/vtools/dialogs/tools/dialogdetail.cpp index cd30d30b6..bd0f93a95 100644 --- a/src/libs/vtools/dialogs/tools/dialogdetail.cpp +++ b/src/libs/vtools/dialogs/tools/dialogdetail.cpp @@ -126,6 +126,7 @@ DialogDetail::DialogDetail(const VContainer *data, const quint32 &toolId, QWidge connect(ui.toolButtonDown, &QToolButton::clicked, this, &DialogDetail::ScrollDown); m_qslMaterials << tr("Fabric") << tr("Lining") << tr("Interfacing") << tr("Interlining"); + ui.comboBoxMaterial->addItems(m_qslMaterials); m_qslPlacements << tr("None") << tr("Cut on fold"); ui.comboBoxPlacement->addItems(m_qslPlacements); @@ -220,7 +221,7 @@ void DialogDetail::UpdateList() } if (mcp.m_ePlacement == PlacementType::ptCutOnFold) { - qsText = qsText.arg(tr(" on Fold")); + qsText = qsText.arg(QLatin1String(" ") + tr("on Fold")); } else { diff --git a/src/libs/vtools/tools/vtooldetail.cpp b/src/libs/vtools/tools/vtooldetail.cpp index 4bdba0336..e725e13fc 100644 --- a/src/libs/vtools/tools/vtooldetail.cpp +++ b/src/libs/vtools/tools/vtooldetail.cpp @@ -756,11 +756,6 @@ void VToolDetail::UpdateLabel() if (data.IsVisible() == true) { - //dataLabel->Reset(); - - QString qsText = "Cut %1 of %2%3"; - QStringList qslPlace; - qslPlace << "" << " on Fold"; QFont fnt = qApp->font(); fnt.setPixelSize(data.GetFontSize()); dataLabel->SetFont(fnt);