From 51d99638e8faee7b57b03e768373e76775e92828 Mon Sep 17 00:00:00 2001 From: mpv Date: Thu, 19 Sep 2019 18:13:04 +0300 Subject: [PATCH] Improved the GUI translations and some Sketch translations added. --- src/BuildPlugin/BuildPlugin_msg_fr.ts | 3 - src/PartSet/PartSet_WidgetPoint2d.cpp | 2 +- src/PartSet/PartSet_WidgetSketchLabel.cpp | 2 +- src/PartSet/PartSet_msg_fr.ts | 5 + src/SHAPERGUI/resources/LightApp.xml.in | 3 + src/SketchPlugin/SketchPlugin_msg_fr.ts | 456 +++++++++++++++++++++- 6 files changed, 453 insertions(+), 18 deletions(-) diff --git a/src/BuildPlugin/BuildPlugin_msg_fr.ts b/src/BuildPlugin/BuildPlugin_msg_fr.ts index 9be086e2c..bd63e9699 100644 --- a/src/BuildPlugin/BuildPlugin_msg_fr.ts +++ b/src/BuildPlugin/BuildPlugin_msg_fr.ts @@ -519,9 +519,6 @@ AA - - - CompSolid diff --git a/src/PartSet/PartSet_WidgetPoint2d.cpp b/src/PartSet/PartSet_WidgetPoint2d.cpp index f89385297..bdee88f6c 100644 --- a/src/PartSet/PartSet_WidgetPoint2d.cpp +++ b/src/PartSet/PartSet_WidgetPoint2d.cpp @@ -102,7 +102,7 @@ PartSet_WidgetPoint2D::PartSet_WidgetPoint2D(QWidget* theParent, // the control should accept the focus, so the boolean flag is corrected to be true myIsObligatory = true; - QString aPageName = QString::fromStdString(theData->getProperty(CONTAINER_PAGE_NAME)); + QString aPageName = translate(theData->getProperty(CONTAINER_PAGE_NAME)); myGroupBox = new QGroupBox(aPageName, theParent); myGroupBox->setFlat(false); diff --git a/src/PartSet/PartSet_WidgetSketchLabel.cpp b/src/PartSet/PartSet_WidgetSketchLabel.cpp index 4b540a735..960429f71 100644 --- a/src/PartSet/PartSet_WidgetSketchLabel.cpp +++ b/src/PartSet/PartSet_WidgetSketchLabel.cpp @@ -102,7 +102,7 @@ myIsSelection(false) // Size of the View control mySizeOfViewWidget = new QWidget(aFirstWgt); QHBoxLayout* aSizeLayout = new QHBoxLayout(mySizeOfViewWidget); - aSizeLayout->addWidget(new QLabel("Size of the view", mySizeOfViewWidget)); + aSizeLayout->addWidget(new QLabel(tr("Size of the view"), mySizeOfViewWidget)); mySizeOfView = new QLineEdit(mySizeOfViewWidget); QDoubleValidator* aValidator = new QDoubleValidator(0, DBL_MAX, 12, mySizeOfView); diff --git a/src/PartSet/PartSet_msg_fr.ts b/src/PartSet/PartSet_msg_fr.ts index b3cbfdf12..eb1991aca 100644 --- a/src/PartSet/PartSet_msg_fr.ts +++ b/src/PartSet/PartSet_msg_fr.ts @@ -67,6 +67,11 @@ Error: %1 PartSet_WidgetSketchLabel + + + Size of the view + AA + Remove external dependencies diff --git a/src/SHAPERGUI/resources/LightApp.xml.in b/src/SHAPERGUI/resources/LightApp.xml.in index f7672ab2d..b2c131899 100644 --- a/src/SHAPERGUI/resources/LightApp.xml.in +++ b/src/SHAPERGUI/resources/LightApp.xml.in @@ -17,6 +17,9 @@
+ + +
diff --git a/src/SketchPlugin/SketchPlugin_msg_fr.ts b/src/SketchPlugin/SketchPlugin_msg_fr.ts index 24ce02a55..92e46f39c 100644 --- a/src/SketchPlugin/SketchPlugin_msg_fr.ts +++ b/src/SketchPlugin/SketchPlugin_msg_fr.ts @@ -282,7 +282,116 @@ AA - + + SketchMacroCircle:Model_FeatureValidator + + Attribute "circle_type" is not initialized. + AA + + + + SketchMacroCircle:center_point + + Attribute "%1" is locked by modification value in the viewer. + AA + + + Attribute "%1" is not initialized. + AA + + + + SketchMacroCircle:passed_point + + Attribute "%1" is locked by modification value in the viewer. + AA + + + + SketchMacroCircle:Model_FeatureValidator + + Attribute "circle_type" is not initialized. + AA + + + Attribute "second_point" is not initialized. + AA + + + + SketchMacroCircle:center_point + + Attribute "%1" is locked by modification value in the viewer. + AA + + + Center point + AA + + + + SketchMacroCircle:first_point + + First point + AA + + + + SketchMacroCircle:passed_point + + Attribute "%1" is locked by modification value in the viewer. + AA + + + Passed point + AA + + + + SketchMacroCircle:second_point + + Second point + AA + + + + + SketchMacroCircle:third_point + + Third point + AA + + + + SketchCircle:Auxiliary + + Auxiliary + AA + + + Construction element + AA + + + + SketchCircle:circle_center + + Center + AA + + + + SketchCircle:circle_radius + + Radius: + AA + + + Set radius + AA + + + SketchConstraintHorizontal:Model_FeatureValidator @@ -686,6 +795,28 @@ AA + + SketchLine:EndPoint + + Attribute "%1" is locked by modification value in the viewer. + AA + + + End point + AA + + + + SketchLine:StartPoint + + Attribute "%1" is locked by modification value in the viewer. + AA + + + Start point + AA + + SketchPoint:Model_FeatureValidator @@ -701,6 +832,13 @@ AA + + SketchPoint:PointCoordinates + + Point + AA + + SketchRectangle:GeomValidators_Different @@ -737,6 +875,28 @@ AA + + SketchRectangle:RectEndPoint + + Attribute "%1" is locked by modification value in the viewer. + AA + + + End point + AA + + + + SketchRectangle:RectStartPoint + + Attribute "%1" is locked by modification value in the viewer. + AA + + + Start point + AA + + SketchArc:ArcRadius:GeomValidators_Positive @@ -871,6 +1031,60 @@ AA + + SketchArc:Auxiliary + + Auxiliary + AA + + + Construction element + AA + + + + SketchArc:angle + + Angle: + AA + + + Set angle + AA + + + + SketchArc:center_point + + Center + AA + + + + SketchArc:end_point + + End point + AA + + + + SketchArc:radius + + Radius: + AA + + + Set radius + AA + + + + SketchArc:start_point + + Start point + AA + + SketchConstraintMirror:ConstraintEntityA:GeomValidators_ShapeType @@ -2162,9 +2376,6 @@ AA - - - Sketch @@ -2176,15 +2387,7 @@ AA - DoF (degrees of freedom) = 2 - AA - - - DoF (degrees of freedom) = 4 - AA - - - DoF (degrees of freedom) = 5 + DoF (degrees of freedom) = %1 AA @@ -3360,6 +3563,74 @@ AA + + SketchMacroArc:Model_FeatureValidator + + Attribute "arc_type" is not initialized. + AA + + + + SketchMacroArc:center_point + + Attribute "%1" is locked by modification value in the viewer. + AA + + + Center point + AA + + + + SketchMacroArc:end_point_1 + + Attribute "%1" is locked by modification value in the viewer. + AA + + + End point + AA + + + + SketchMacroArc:end_point_2 + + End point + AA + + + + SketchMacroArc:end_point_3 + + End point + AA + + + + SketchMacroArc:passed_point + + Passed point + AA + + + + SketchMacroArc:start_point_1 + + Attribute "%1" is locked by modification value in the viewer. + AA + + + Start point + AA + + + + SketchMacroArc:start_point_2 + + Start point + AA + + SketchMacroCircle @@ -3434,6 +3705,38 @@ AA + + SketchMacroCircle:Model_FeatureValidator + + Attribute "third_point" is not initialized. + AA + + + + SketchMacroCircle:first_point + + Attribute "%1" is locked by modification value in the viewer. + AA + + + Attribute "%1" is not initialized. + AA + + + + SketchMacroCircle:second_point + + Attribute "%1" is locked by modification value in the viewer. + AA + + + + SketchMacroCircle:third_point + + Attribute "%1" is locked by modification value in the viewer. + AA + + SketchMacroEllipse @@ -3526,6 +3829,133 @@ AA + + SketchMacroEllipse:Model_FeatureValidator + + Attribute "ellipse_type" is not initialized. + AA + + + + SketchMacroEllipse:first_point + + Center point + AA + + + Major axis start point + AA + + + + SketchMacroEllipse:passed_point + + Attribute "%1" is locked by modification value in the viewer. + AA + + + Passed point + AA + + + + SketchMacroEllipse:second_point + + Attribute "%1" is locked by modification value in the viewer. + AA + + + Major axis end point + AA + + + Major axis point + AA + + + + + SketchEllipse:Auxiliary + + Auxiliary + AA + + + Construction element + AA + + + + SketchEllipse:ellipse_center + + Center + AA + + + + SketchEllipse:ellipse_first_focus + + First focus + AA + + + + SketchEllipse:ellipse_major_axis_end_point + + Major axis end + AA + + + + SketchEllipse:ellipse_major_axis_start_point + + Major axis start + AA + + + + SketchEllipse:ellipse_major_radius + + Major radius: + AA + + + Set major radius + AA + + + + SketchEllipse:ellipse_minor_axis_end_point + + Minor axis end + AA + + + + SketchEllipse:ellipse_minor_axis_start_point + + Minor axis start + AA + + + + SketchEllipse:ellipse_minor_radius + + Minor radius: + AA + + + Set minor radius + AA + + + + SketchEllipse:ellipse_second_focus + + Second focus + AA + + SketchMultiRotation -- 2.39.2