From 887b13fd63ec73dc9d0c2d0fd81e5186489de746 Mon Sep 17 00:00:00 2001
From: BertrandP <bertrand.provot@insa-rennes.fr>
Date: Mon, 2 Jul 2018 14:56:26 +0200
Subject: [PATCH] Translation update
---
app/Operations/UCharConvertDialog.cpp | 6 +-
app/Operations/UCharConvertOp.cpp | 5 +-
app/imageinsa_en.ts | 156 ++++++++++++++++++-------
app/imageinsa_fr.ts | 158 +++++++++++++++++++-------
4 files changed, 241 insertions(+), 84 deletions(-)
diff --git a/app/Operations/UCharConvertDialog.cpp b/app/Operations/UCharConvertDialog.cpp
index 8dfc57d..86c3047 100644
--- a/app/Operations/UCharConvertDialog.cpp
+++ b/app/Operations/UCharConvertDialog.cpp
@@ -10,6 +10,7 @@
#include <QComboBox>
#include <QStringList>
#include <QString>
+#include "../Tools.h"
UCharConvertDialog::UCharConvertDialog(QWidget *parent) :
@@ -20,8 +21,8 @@ UCharConvertDialog::UCharConvertDialog(QWidget *parent) :
QFormLayout* layout = new QFormLayout(this);
- QStringList text = (QStringList() << "crop" << "normalize" << "Add Offset" << "Scale" << "Add offset and scale");
- QLabel* label1 = new QLabel("Operation");
+ QStringList text = (QStringList() << qApp->translate("Operations","Crop") << qApp->translate("Operations","Normalize") << qApp->translate("Operations","Add Offset") << qApp->translate("Operations","Scale") << qApp->translate("Operations","Add offset and scale"));
+ QLabel* label1 = new QLabel(qApp->translate("Operations","Operation"));
_comboBox = new QComboBox();
_comboBox->addItems(text);
@@ -48,7 +49,6 @@ UCharConvertDialog::UCharConvertDialog(QWidget *parent) :
void UCharConvertDialog::enableOffset(int n){
- std::cout << "which case it is ? -> " << n << "\n";
if(n==2){
_spinBox->setEnabled(true);
_label2->setEnabled(true);
diff --git a/app/Operations/UCharConvertOp.cpp b/app/Operations/UCharConvertOp.cpp
index bc60e34..3f6c40c 100644
--- a/app/Operations/UCharConvertOp.cpp
+++ b/app/Operations/UCharConvertOp.cpp
@@ -74,7 +74,6 @@ void UCharConvertOp::operator()(const imagein::Image_t<double>* from, const std:
break;
case 2 :
- std::cout << "offset : " << dialog->getOffset() << " \n";
tempIntImg = Converter<Image_t<double>>::convertToInt(*from);
offset = dialog->getOffset();
resImg = Converter<Image>::convertAndOffset(*tempIntImg, &LogMessage, offset);
@@ -96,14 +95,12 @@ void UCharConvertOp::operator()(const imagein::Image_t<double>* from, const std:
windowName = qApp->translate("Operations","Scaled").toStdString();
break;
- default:
- std::cout << "Default conversion" << std::endl;
+ default:
resImg = Converter<Image>::convertAndRound(*from);
windowName = qApp->translate("Operations","Cropped").toStdString();
break;
}
- //si erreur lors du chargement alors non de fenêtre vide
outImage(resImg, windowName);
}
diff --git a/app/imageinsa_en.ts b/app/imageinsa_en.ts
index ffa02e9..ee44623 100644
--- a/app/imageinsa_en.ts
+++ b/app/imageinsa_en.ts
@@ -6,45 +6,45 @@
<message>
<location filename="main.cpp" line="+128"/>
<location/>
- <location line="+0"/>
+ <location line="+1"/>
<source>&Image</source>
<oldsource>Image</oldsource>
<translation>&Image</translation>
</message>
<message>
- <location line="+18"/>
+ <location line="+17"/>
<location/>
- <location line="+0"/>
+ <location line="+3"/>
<source>&Tools</source>
<oldsource>Tools</oldsource>
<translation>&Tools</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<location/>
- <location line="+0"/>
+ <location line="+3"/>
<source>&Encoding</source>
<oldsource>Encoding</oldsource>
<translation>&Encoding</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
<location/>
- <location line="+0"/>
+ <location line="+3"/>
<source>Transforms</source>
<translation>Transforms</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
<location/>
- <location line="+0"/>
+ <location line="+3"/>
<source>Analysis</source>
<translation>Analysis</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+6"/>
<location/>
- <location line="+0"/>
+ <location line="+3"/>
<location filename="Services/FilteringService.cpp" line="+37"/>
<source>Filtering</source>
<translation>Filtering</translation>
@@ -1841,7 +1841,7 @@ Channel %d :
<message>
<location filename="Operations/Transforms.cpp" line="+468"/>
<location/>
- <location line="+0"/>
+ <location line="+1"/>
<source>
matrice de transformation utilisee :
@@ -1887,10 +1887,86 @@ Le debit vaut : %5.2f
<message>
<location filename="Operations/SplitHsvOp.cpp" line="+33"/>
<location/>
- <location line="+0"/>
+ <location line="+1"/>
<source>Split HSV planes</source>
<translation>Split HSV planes</translation>
</message>
+ <message>
+ <location line="+7"/>
+ <source>The operation cannot be applied on this image</source>
+ <translation>The operation cannot be applied on this image</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>The image is not in color.</source>
+ <translation>The image is not in color.</translation>
+ </message>
+ <message>
+ <location filename="Operations/UCharConvertDialog.cpp" line="+19"/>
+ <source>Convert to UChar</source>
+ <translation>Convert to UChar</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Crop</source>
+ <translation>Crop</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Normalize</source>
+ <translation>Normalize</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Add Offset</source>
+ <translation>Add offset</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Scale</source>
+ <translation>Scale</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Add offset and scale</source>
+ <translation>Add offset and scale</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Operation</source>
+ <translation>Operation</translation>
+ </message>
+ <message>
+ <location filename="Operations/UCharConvertOp.cpp" line="+40"/>
+ <source>UChar converter</source>
+ <translation>Convert to UChar</translation>
+ </message>
+ <message>
+ <location line="+25"/>
+ <location line="+35"/>
+ <source>Cropped</source>
+ <translation>Cropped</translation>
+ </message>
+ <message>
+ <location line="-27"/>
+ <source>Normalized</source>
+ <translation>Normalized</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Offset</source>
+ <translation>Offset</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Offset and scaled</source>
+ <translation>Offset and scaled</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Scaled</source>
+ <translation>Scaled</translation>
+ </message>
</context>
<context>
<name>PlugOperation</name>
@@ -2011,7 +2087,7 @@ Le debit vaut : %5.2f
<message>
<location filename="Operations/PseudoColorOp.cpp" line="+25"/>
<location/>
- <location line="+0"/>
+ <location line="+11"/>
<source>Pseudo color</source>
<translation>Pseudo color</translation>
</message>
@@ -2739,28 +2815,28 @@ Le debit vaut : %5.2f
<location line="+4"/>
<location/>
<location line="+0"/>
- <location line="+56"/>
+ <location line="+58"/>
<source>Threshold : </source>
<translation>Threshold : </translation>
</message>
<message>
- <location line="-17"/>
+ <location line="-19"/>
<location/>
- <location line="+0"/>
+ <location line="+2"/>
<source>ThresholdOp</source>
<translation>Thresholding</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+6"/>
<location/>
- <location line="+0"/>
+ <location line="+2"/>
<source><font color=red><i>Information : The input image has been converted to grayscale.</i></font></source>
<translation><font color=red><i>Information : The input image has been converted to grayscale.</i></font></translation>
</message>
<message>
- <location line="+2"/>
- <location/>
<location line="+0"/>
+ <location/>
+ <location line="+2"/>
<source>Threshold</source>
<translation>Threshold</translation>
</message>
@@ -2769,58 +2845,58 @@ Le debit vaut : %5.2f
<translation>Double threshold</translation>
</message>
<message>
- <location line="+2"/>
- <location/>
<location line="+0"/>
+ <location/>
+ <location line="+2"/>
<source>Double threshold (right clic to move the second threshold)</source>
<translation>Double threshold (right clic to move the second threshold)</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+7"/>
<location/>
- <location line="+0"/>
+ <location line="+2"/>
<source>Otsu</source>
<translation>Otsu</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+5"/>
<location/>
- <location line="+0"/>
+ <location line="+2"/>
<source>Threshold #2 : </source>
<translation>Threshold #2 : </translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+9"/>
<location/>
- <location line="+0"/>
+ <location line="+2"/>
<source>Color between thresholds :</source>
<translation>Color between thresholds :</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-1"/>
<location/>
- <location line="+0"/>
+ <location line="+2"/>
<source>White</source>
<translation>White</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-1"/>
<location/>
- <location line="+0"/>
+ <location line="+2"/>
<source>Black</source>
<translation>Black</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+34"/>
<location/>
- <location line="+0"/>
+ <location line="+2"/>
<source>Aperçu</source>
<translation>Preview</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+6"/>
<location/>
- <location line="+0"/>
+ <location line="+2"/>
<source>Validate</source>
<translation>Validate</translation>
</message>
@@ -3227,6 +3303,8 @@ Le debit vaut : %5.2f
</message>
<message>
<location line="-345"/>
+ <location/>
+ <location line="+0"/>
<source>Standard filter</source>
<translation>Standard filter</translation>
</message>
@@ -3394,6 +3472,8 @@ Le debit vaut : %5.2f
</message>
<message>
<location line="-162"/>
+ <location/>
+ <location line="+0"/>
<source>Your filter needs a valid name to be saved (no whitespace).</source>
<translation>Your filter needs a valid name to be saved (no whitespace).</translation>
</message>
@@ -3437,7 +3517,7 @@ Le debit vaut : %5.2f
<message>
<location filename="../lib/detiq-t/GenericInterface/Widgets/ImageWidgets/ColumnView.cpp" line="+28"/>
<source>Column Profile for column number %1</source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location line="+1"/>
diff --git a/app/imageinsa_fr.ts b/app/imageinsa_fr.ts
index 44563b4..6c17b44 100644
--- a/app/imageinsa_fr.ts
+++ b/app/imageinsa_fr.ts
@@ -6,45 +6,45 @@
<message>
<location filename="main.cpp" line="+128"/>
<location/>
- <location line="+0"/>
+ <location line="+1"/>
<source>&Image</source>
<oldsource>Image</oldsource>
<translation>&Image</translation>
</message>
<message>
- <location line="+18"/>
+ <location line="+17"/>
<location/>
- <location line="+0"/>
+ <location line="+3"/>
<source>&Tools</source>
<oldsource>Tools</oldsource>
<translation>Ou&tils</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<location/>
- <location line="+0"/>
+ <location line="+3"/>
<source>&Encoding</source>
<oldsource>Encoding</oldsource>
<translation>&Encodage</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
<location/>
- <location line="+0"/>
+ <location line="+3"/>
<source>Transforms</source>
<translation>Transformées</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
<location/>
- <location line="+0"/>
+ <location line="+3"/>
<source>Analysis</source>
<translation>Analyse</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+6"/>
<location/>
- <location line="+0"/>
+ <location line="+3"/>
<location filename="Services/FilteringService.cpp" line="+37"/>
<source>Filtering</source>
<translation>Filtrage</translation>
@@ -1590,7 +1590,7 @@ Canal %d :
<location line="+0"/>
<location line="+15"/>
<source>Scaling</source>
- <translation>Echantillonage</translation>
+ <translation>Echantillonnage</translation>
</message>
<message>
<location filename="Operations/SignalToNoiseOp.cpp" line="-20"/>
@@ -1645,7 +1645,7 @@ Canal %d :
<message>
<location filename="Operations/SplitHsvOp.cpp" line="+33"/>
<location/>
- <location line="+0"/>
+ <location line="+1"/>
<source>Split HSV planes</source>
<translation>Séparer les plans TSV </translation>
</message>
@@ -1841,7 +1841,7 @@ Canal %d :
<message>
<location filename="Operations/Transforms.cpp" line="+468"/>
<location/>
- <location line="+0"/>
+ <location line="+1"/>
<source>
matrice de transformation utilisee :
@@ -1892,6 +1892,82 @@ Le débit vaut : %5.2f
<source>Median Filter</source>
<translation>Filtre médian</translation>
</message>
+ <message>
+ <location filename="Operations/SplitHsvOp.cpp" line="+7"/>
+ <source>The operation cannot be applied on this image</source>
+ <translation>L'opération ne peut pas être appliquée sur cette image</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>The image is not in color.</source>
+ <translation>L'image n'est pas en couleur.</translation>
+ </message>
+ <message>
+ <location filename="Operations/UCharConvertDialog.cpp" line="+19"/>
+ <source>Convert to UChar</source>
+ <translation>Convertir en UChar</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Crop</source>
+ <translation>Rogner</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Normalize</source>
+ <translation>Normaliser</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Add Offset</source>
+ <translation>Ajouter un décalage</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Scale</source>
+ <translation>Echantillonner</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Add offset and scale</source>
+ <translation>Décaler et échantillonner</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Operation</source>
+ <translation>Opération</translation>
+ </message>
+ <message>
+ <location filename="Operations/UCharConvertOp.cpp" line="+40"/>
+ <source>UChar converter</source>
+ <translation>Convertir en UChar</translation>
+ </message>
+ <message>
+ <location line="+25"/>
+ <location line="+35"/>
+ <source>Cropped</source>
+ <translation>Rognée</translation>
+ </message>
+ <message>
+ <location line="-27"/>
+ <source>Normalized</source>
+ <translation>Normalisée</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Offset</source>
+ <translation>Décalage</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Offset and scaled</source>
+ <translation>Décalage et échantillonnée</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Scaled</source>
+ <translation>Echantillonnée</translation>
+ </message>
</context>
<context>
<name>PlugOperation</name>
@@ -2012,7 +2088,7 @@ Le débit vaut : %5.2f
<message>
<location filename="Operations/PseudoColorOp.cpp" line="+25"/>
<location/>
- <location line="+0"/>
+ <location line="+11"/>
<source>Pseudo color</source>
<translation>Pseudo-couleur</translation>
</message>
@@ -2740,84 +2816,84 @@ Le débit vaut : %5.2f
<location line="+4"/>
<location/>
<location line="+0"/>
- <location line="+56"/>
+ <location line="+58"/>
<source>Threshold : </source>
<translation>Seuil : </translation>
</message>
<message>
- <location line="-17"/>
+ <location line="-19"/>
<location/>
- <location line="+0"/>
+ <location line="+2"/>
<source>ThresholdOp</source>
<translation>Seuillage</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+6"/>
<location/>
- <location line="+0"/>
+ <location line="+2"/>
<source><font color=red><i>Information : The input image has been converted to grayscale.</i></font></source>
<translation><font color=red><i>Information : L'image d'entrée a été convertie en niveaux de gris.</i></font></translation>
</message>
<message>
- <location line="+2"/>
- <location/>
<location line="+0"/>
+ <location/>
+ <location line="+2"/>
<source>Threshold</source>
<translation>Seuil</translation>
</message>
<message>
- <location line="+2"/>
- <location/>
<location line="+0"/>
+ <location/>
+ <location line="+2"/>
<source>Double threshold (right clic to move the second threshold)</source>
<translation>Double seuil (clic droit pour déplacer le deuxième seuil)</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+7"/>
<location/>
- <location line="+0"/>
+ <location line="+2"/>
<source>Otsu</source>
<translation>Otsu</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+5"/>
<location/>
- <location line="+0"/>
+ <location line="+2"/>
<source>Threshold #2 : </source>
<translation>Seuil n°2 : </translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+9"/>
<location/>
- <location line="+0"/>
+ <location line="+2"/>
<source>Color between thresholds :</source>
<translation>Couleur entre les seuils :</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-1"/>
<location/>
- <location line="+0"/>
+ <location line="+2"/>
<source>White</source>
<translation>Blanc</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-1"/>
<location/>
- <location line="+0"/>
+ <location line="+2"/>
<source>Black</source>
<translation>Noir</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+34"/>
<location/>
- <location line="+0"/>
+ <location line="+2"/>
<source>Aperçu</source>
<translation>Aperçu</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+6"/>
<location/>
- <location line="+0"/>
+ <location line="+2"/>
<source>Validate</source>
<translation>Valider</translation>
</message>
@@ -3097,7 +3173,7 @@ Le débit vaut : %5.2f
<location/>
<location line="+0"/>
<source>Offset</source>
- <translation>Décallage</translation>
+ <translation>Décalage</translation>
</message>
<message>
<location line="+1"/>
@@ -3228,6 +3304,8 @@ Le débit vaut : %5.2f
</message>
<message>
<location line="-345"/>
+ <location/>
+ <location line="+0"/>
<source>Standard filter</source>
<translation>Filtre standard</translation>
</message>
@@ -3395,6 +3473,8 @@ Le débit vaut : %5.2f
</message>
<message>
<location line="-162"/>
+ <location/>
+ <location line="+0"/>
<source>Your filter needs a valid name to be saved (no whitespace).</source>
<translation>Votre filtre requiert un nom valide pour être enregistré (pas d'espace).</translation>
</message>
--
GitLab