From: mpv Date: Wed, 2 Oct 2019 08:33:16 +0000 (+0300) Subject: Intermediate translation to French changes X-Git-Tag: V9_4_0a2~4^2~8 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=34493e8895584e49f4f5d0f9a16945bf93d1dc16;p=modules%2Fshaper.git Intermediate translation to French changes --- diff --git a/src/FeaturesPlugin/FeaturesPlugin_msg_fr.ts b/src/FeaturesPlugin/FeaturesPlugin_msg_fr.ts index 017f9cb0f..1e6248d30 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_msg_fr.ts +++ b/src/FeaturesPlugin/FeaturesPlugin_msg_fr.ts @@ -1743,7 +1743,7 @@ Extrusion:Model_FeatureValidator - Attribute "base" is not initialized. + Attribute "%1" is not initialized. L'objet de base pour l'extrusion n'est pas sélectionné. diff --git a/src/Model/Model_FeatureValidator.cpp b/src/Model/Model_FeatureValidator.cpp index aa05113a8..2db766fc6 100644 --- a/src/Model/Model_FeatureValidator.cpp +++ b/src/Model/Model_FeatureValidator.cpp @@ -59,6 +59,7 @@ bool Model_FeatureValidator::isValid(const std::shared_ptr& th aFeatureFind->second.find(*it) == aFeatureFind->second.end()) { theError = "Attribute \"%1\" is not initialized."; theError.addParameter(anAttr->id()); + theError.setContext(theFeature->getKind() + ":" + anAttr->id()); return false; } } diff --git a/src/SketchPlugin/SketchPlugin_msg_fr.ts b/src/SketchPlugin/SketchPlugin_msg_fr.ts index 3f891bcb0..be3f8db66 100644 --- a/src/SketchPlugin/SketchPlugin_msg_fr.ts +++ b/src/SketchPlugin/SketchPlugin_msg_fr.ts @@ -3499,6 +3499,38 @@ Impossible de créer un arc perpendiculaire sur %1 + + SketchMacroArc:end_point_2 + + Attribute "%1" is locked by modification value in the viewer. + Sélectionnez un point dans la vue + + + + SketchMacroArc:end_point_3 + + Attribute "%1" is locked by modification value in the viewer. + Sélectionnez un point dans la vue. + + + Attribute "%1" is not initialized. + Sélectionnez un point dans la vue. + + + + SketchMacroArc:passed_point + + Attribute "%1" is locked by modification value in the viewer. + Sélectionnez un point dans la vue. + + + + SketchMacroArc:start_point_2 + + Attribute "%1" is locked by modification value in the viewer. + Sélectionnez un point dans la vue. + + SketchMacroCircle diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp index ed7de1492..88386696d 100644 --- a/src/XGUI/XGUI_Workshop.cpp +++ b/src/XGUI/XGUI_Workshop.cpp @@ -219,9 +219,11 @@ XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector) // Load translations QStringList aLangs; - aLangs << "*_en.ts"; // load by default eng translations + //aLangs << "*_en.ts"; // load by default eng translations QString aCurrLang = aResMgr->stringValue("language", "language", "en"); - if(aCurrLang != "en") { + if(aCurrLang == "en") { + aLangs << "*_en.ts"; + } else { aLangs << "*_" + aCurrLang + ".ts"; // then replace with translated files }