[qet] [4219] Nomenclature bug fix

[subversion@xxxxxxxxxxxxx]

Revision: 4219
Author:   scorpio810
Date:     2015-09-29 11:20:38 +0200 (Tue, 29 Sep 2015)
Log Message:
-----------
Nomenclature bug fix

Modified Paths:
--------------
    trunk/sources/nomenclature.cpp
    trunk/sources/qetapp.cpp

Modified: trunk/sources/nomenclature.cpp
===================================================================
--- trunk/sources/nomenclature.cpp	2015-09-27 12:26:59 UTC (rev 4218)
+++ trunk/sources/nomenclature.cpp	2015-09-29 09:20:38 UTC (rev 4219)
@@ -91,8 +91,8 @@
 	""+ QObject::tr("Commentaire") +";"
 	""+ QObject::tr("Fabricant") +";"
 	""+ QObject::tr("Reference") +";"
-	""+ QObject::tr("Bloc auxilliaire 1") +";"
-	""+ QObject::tr("Bloc auxilliaire 2") +";"
+	""+ QObject::tr("Bloc auxiliaire 1") +";"
+	""+ QObject::tr("Bloc auxiliaire 2") +";"
 	""+ QObject::tr("Machine-reference") +";"
 	""+ QObject::tr("Localisation") +";"
 	""+ QObject::tr("Fonction") +"\n";
@@ -135,8 +135,8 @@
 	info += elmt_info["comment"].toString() + ";";
 	info += elmt_info["manufacturer"].toString() + ";";
 	info += elmt_info["manufacturer-reference"].toString() + ";";
-	info += elmt_info["Auxiliary_1-contact-bloc"].toString() + ";";
-	info += elmt_info["Auxiliary_2-contact-bloc"].toString() + ";";
+	info += elmt_info["auxiliary1"].toString() + ";";
+	info += elmt_info["auxiliary2"].toString() + ";";
 	info += elmt_info["machine-manufacturer-reference"].toString() + ";";
 	info += elmt_info["location"].toString() + ";";
 	info += elmt_info["function"].toString() + "\n";

Modified: trunk/sources/qetapp.cpp
===================================================================
--- trunk/sources/qetapp.cpp	2015-09-27 12:26:59 UTC (rev 4218)
+++ trunk/sources/qetapp.cpp	2015-09-29 09:20:38 UTC (rev 4219)
@@ -351,8 +351,8 @@
 			  << "designation"
 			  << "manufacturer"
 			  << "manufacturer-reference"
-			  << "Auxiliary_1-contact-bloc"
-			  << "Auxiliary_2-contact-bloc"
+			  << "auxiliary1"
+			  << "auxiliary2"
 			  << "machine-manufacturer-reference"
 			  << "location"
 			  << "function";
@@ -372,8 +372,8 @@
 	else if (info == "designation") return tr("Désignation");
 	else if (info == "manufacturer") return tr("Fabricant");
 	else if (info == "manufacturer-reference") return tr("Référence fabricant");
-	else if (info == "Auxiliary_1-contact-bloc") return tr("Bloc auxilliaire 1");
-	else if (info == "Auxiliary_2-contact-bloc") return tr("Bloc auxilliaire 2");
+	else if (info == "auxiliary1") return tr("Bloc auxiliaire 1");
+	else if (info == "auxiliary2") return tr("Bloc auxiliaire 2");
 	else if (info == "machine-manufacturer-reference") return tr("Référence fabricant machine");
 	else if (info == "location") return tr("Localisation");
 	else if (info == "function") return tr("Fonction");