diff --git a/Resources/panels/BaseShapeOptions.ui b/Resources/panels/BaseShapeOptions.ui
index 92811af..39ffc1b 100644
--- a/Resources/panels/BaseShapeOptions.ui
+++ b/Resources/panels/BaseShapeOptions.ui
@@ -383,7 +383,7 @@
- height of base shape
+ Height of base shape3
diff --git a/Resources/panels/ExtrudedCutoutPanel.ui b/Resources/panels/ExtrudedCutoutPanel.ui
index 28c0a47..33fba7e 100644
--- a/Resources/panels/ExtrudedCutoutPanel.ui
+++ b/Resources/panels/ExtrudedCutoutPanel.ui
@@ -142,7 +142,7 @@
- Symetric
+ Symmetric
diff --git a/Resources/panels/SolidCornerReliefPanel.ui b/Resources/panels/SolidCornerReliefPanel.ui
index 1f8ca75..b402a11 100644
--- a/Resources/panels/SolidCornerReliefPanel.ui
+++ b/Resources/panels/SolidCornerReliefPanel.ui
@@ -11,7 +11,7 @@
- Add Cornner Relief on Solid
+ Add Corner Relief on Solid
diff --git a/Resources/translations/SheetMetal.ts b/Resources/translations/SheetMetal.ts
index d0e9610..e5f2a25 100644
--- a/Resources/translations/SheetMetal.ts
+++ b/Resources/translations/SheetMetal.ts
@@ -5,9 +5,9 @@
App::Property
-
-
-
+
+
+ Bend Radius
@@ -18,8 +18,7 @@
-
- Relief Type
+ Bend Side
@@ -45,323 +44,568 @@
-
-
-
+
+
+ Base object
-
-
-
-
-
-
+
+
+
+
+
+ Base Object
-
-
+
+ Length of Wall
-
-
+
+ Gap from Left Side
-
+ Gap from Right Side
-
-
+
+ Invert Bend Direction
-
-
+
+ Bend Angle
-
+ Extend from Left Side
-
+ Extend from Right Side
-
+ Bend Type
-
+ Type of Length Specification
-
+ Relief Width
-
+ Relief Depth
-
+ Use Relief Factor
-
+
+ Relief Type
+
+
+
+ Relief Factor
-
+ Bend Miter Angle from Left Side
-
+ Bend Miter Angle from Right Side
-
+ Auto Miter Minimum Gap
-
+ Auto Miter maximum Extend Distance
-
+ Minimum Gap to Relief Cut
-
+ Offset Bend
-
+ Enable Auto Miter
-
+ Shows Unfold View of Current Bend
-
+ Location of Neutral Line. Caution: Using ANSI standards, not DIN.
-
+ Flip Sketch Direction
-
+ Invert Sketch Start
-
+ Sketch Object
-
+ Length of Wall List
-
+ Bend Angle List
-
+ Enable Perforation
-
+ Perforation Angle
-
+ Initial Perforation Length
-
+ Perforation Max Length
-
+ Non-Perforation Max Length
-
+ Corner Relief Type
-
+ Size of Shape
-
+ Size Ratio of Shape
-
-
+
+ Neutral Axis Position
-
+ Corner Relief Sketch
-
+ Gap from side one
-
+ Gap from side two
-
+ Gap from left side
-
+ Gap from right side
-
-
+
+ Wall Sketch
-
-
-
+
+
+ Use Subtraction
-
+ Offset for subtraction
-
-
+
+ Use Refine
-
+ Bend Reference Line List
-
+ Invert Solid Bend Direction
-
+ Unfold Bend
-
-
+
+ Bend Line Position
-
+ Offset from Center of Face
-
+ Suppress Forming Feature
-
+ Tool Position Angle
-
+ Thickness of Sheetmetal
-
+ Forming Tool Object
-
+ Point Sketch on Sheetmetal
-
+ Junction Gap
-
+ Relief Size
-
+ Sketch on Sheetmetal
+
+ FlangeParameters
+
+
+ Flange Parameters
+
+
+
+
+ General
+
+
+
+
+ Select
+
+
+
+
+ Name
+
+
+
+
+ SubElement
+
+
+
+
+ Bend
+
+
+
+
+ Type
+
+
+
+
+ Material Outside
+
+
+
+
+ Material Inside
+
+
+
+
+ Thickness Outside
+
+
+
+
+
+ Offset
+
+
+
+
+ Radius
+
+
+
+
+
+ Angle
+
+
+
+
+ Length
+
+
+
+
+ Length mode
+
+
+
+
+ Leg
+
+
+
+
+ Outer Sharp
+
+
+
+
+ Inner Sharp
+
+
+
+
+ Tangential
+
+
+
+
+ Unfold
+
+
+
+
+ Reversed
+
+
+
+
+ Offsets
+
+
+
+
+ Side Offsets
+
+
+
+
+ Gap A
+
+
+
+
+ Gap B
+
+
+
+
+ Extend A
+
+
+
+
+ Extend B
+
+
+
+
+ Relief Cuts
+
+
+
+
+ Width
+
+
+
+
+ Depth
+
+
+
+
+ mm
+
+
+
+
+ Rectangle
+
+
+
+
+ Round
+
+
+
+
+ Miter
+
+
+
+
+ Auto Miter
+
+
+
+
+ Auto Miter Parameters
+
+
+
+
+ Minimum Gap
+
+
+
+
+ Max Extend Distance
+
+
+
+
+ Manual Miter
+
+
+
+
+ Angle 2
+
+
+
+
+ Angle 1
+
+
+
+
+ Perforation
+
+
+
+
+ Perforate
+
+
+
+
+ Perforation Parameters
+
+
+
+
+ Initial Cut Length
+
+
+
+
+ Max Cut Length
+
+
+
+
+ Max Tab Length
+
+
+Gui::Dialog::DlgSettingsSheetMetal
@@ -405,15 +649,15 @@
Logger
-
+ Base shape edit mode:
-
-
-
-
+
+
+
+ Shape is not a real 3D-object or to small for a metal-sheet!
@@ -466,12 +710,12 @@
QMessageBox
-
+ Error in macro MessageBox
-
+ The selected geometry does not belong to the active Body.
Please make the container of this item active by
double clicking on it.
@@ -503,74 +747,103 @@ If the opposite face also fails then switch Refine to false on feature
QObject
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ Edit %1
+
+ SMAddJunctionTaskPanel
+
+
+ Add Junction Parameters
+
+
+
+
+ Select
+
+
+
+
+ Name
+
+
+
+
+ SubElement
+
+
+
+
+ Extend
+
+
+
+
+ Width
+
+
+
+
+ Refine
+
+
+SMBaseShape
-
+ Thickness of sheetmetalProperty
-
+ Bend RadiusProperty
-
+ Shape widthProperty
-
+ Shape lengthProperty
-
+ Shape heightProperty
-
+ Width of top flangeProperty
-
+ Base shape typeProperty
-
+ Location of part originProperty
-
+ Extend sides and flange to close all gapsProperty
@@ -665,7 +938,7 @@ If the opposite face also fails then switch Refine to false on feature
- height of base shape
+ Height of base shape
@@ -705,44 +978,77 @@ If the opposite face also fails then switch Refine to false on feature
- SMBendOnLineTaskPanel
+ SMBendCornerTaskPanel
-
- Generate Sheet Metal base shape
+
+ Bend sharp corner Parameters
-
- Bend Line
+
+ Select
+
+
+
+
+ Name
-
+
+ SubElement
+
+
+
+
+ Extend
+
+
+
+
+ Radius
+
+
+
+
+ Refine
+
+
+
+
+ SMBendOnLineTaskPanel
+
+
+ Fold on sketch line parameters
+
+
+
+ Base Object
-
- Feature Name
+
+ Bend Line
-
+ Flip Direction
-
+ Unbend
-
+ Bend Radius
-
+ Bend Angle
@@ -755,35 +1061,77 @@ If the opposite face also fails then switch Refine to false on feature
-
- Relief Size
+
+ Select
-
+
+ Name
+
+
+
+
+ SubElement
+
+
+
+ Relief Type
-
+ Circular
-
+ Square
-
- Scaling
+
+
+ Sketch
+
+
+
+
+ X Offset
+
+
+
+
+ Y Offset
-
+
+
+ Relief Size
+
+
+
+
+ Absolute
+
+
+
+
+ Relative
+
+
+
+ Scale Factor
+
+
+ K Factor
+
+ SMCreateBaseShapeTaskPanel
@@ -827,224 +1175,246 @@ If the opposite face also fails then switch Refine to false on feature
SMExtendTaskPanel
- Generate Sheet Metal base shape
+ Extend Parameters
+
+
+
+
+ Select
-
- Feature Name
+
+ Name
+
+
+
+
+ SubElement
-
- Base Element
+
+ Extend
-
+ Length
-
- Flange Side Offset
+
+ Offset A
-
- SideA
+
+ Offset B
-
- SideB
+
+ Refine
- SMFlangeAdvancedTaskPanel
+ SMExtrudedCutoutTaskPanel
-
- Advanced Parameters
+
+ Extruded Cutout Parameters
-
- Relief Cuts
+
+ Base Features
-
- Width
+
+ Sketch
-
- Depth
+
+ Face
-
- mm
+
+ Cutout Parameters
-
- Rectangle
+
+ Inside
-
- Round
+
+ Outside
-
- Auto Miter
+
+ Cutout Type
-
- Maximum Extend Distance
+
+ Two Dimensions
-
- Minimum Gap
+
+ Symmetric
-
- Manual Miter
+
+ Through All Both Sides
-
- Angle 2
+
+ Through All Side A
-
- Angle 1
+
+ Through All Side B
-
-
- SMFlangeTaskPanel
-
- Flange Parameters
+
+ Side A Length
-
- Select
+
+ Side B Length
-
- Name
+
+ Improve Cutout (Slow)
-
- SubElement
+
+ Improve Level
-
- Bend
+
+ Refine
+
+
+ SMFlangeAdvancedTaskPanel
-
- Type
+
+ Advanced Parameters
-
- Material Outside
+
+ Relief Cuts
-
- Material Inside
+
+ Width
-
- Thickness Outside
+
+ Depth
-
-
- Offset
+
+ mm
-
- Radius
+
+ Rectangle
-
- Angle
+
+ Round
-
- Length
+
+ Auto Miter
-
- Length mode
+
+ Maximum Extend Distance
-
- Leg
+
+ Minimum Gap
-
- Outer Sharp
+
+ Manual Miter
-
- Inner Sharp
+
+ Angle 2
-
- Tangential
+
+ Angle 1
+
+
+ SMSolidCornerReliefTaskPanel
-
- Unfold
+
+ Add Corner Relief on Solid
-
- Reversed
+
+ Select
-
- Side Offsets
+
+ Name
+
+
+
+
+ SubElement
-
- Side A
+
+ Extend
-
- Side B
+
+ Size
+
+
+
+
+ Refine
@@ -1210,87 +1580,117 @@ If the opposite face also fails then switch Refine to false on feature
SheetMetal
-
-
-
+
+ Selected face
+
+
+
+
+ Refine the geometry
+
+
+
+
+ Level of cut improvement quality. More than 10 can take a very long time
+
+
+
+
+ Improve cut geometry if it enters the cutting zone. Only select true if the cut needs fix, 'cause it can be slow
+
+
+
+
+ Side A Length
+
+
+
+
+ Length
+
+
+
+
+
+ Sheet Metal
-
+ Sheet Metal workbench allows for designing and unfolding sheet metal parts
-
+ &Sheet Metal
-
+ Make Base Wall
-
+ Create a sheetmetal wall from a sketch
-1. Select a Skech to create bends with walls.
+1. Select a Sketch to create bends with walls.
2. Use Property editor to modify other parameters
-
+ Add base shape
-
+ Add basic sheet metal object.
-
+ Make Bend
-
+ Create Bend where two walls come together on solids
1. Select edge(s) to create bend on corner edge(s).
2. Use Property editor to modify parameters
-
+ Make Wall
-
+ Extends one or more face, connected by a bend on existing sheet metal.
1. Select edges or thickness side faces to create bends with walls.
2. Use Property editor to modify other parameters
-
+ Add Corner Relief
-
+ Corner Relief to metal sheet corner.
1. Select 2 Edges (on flat face that shared with bend faces) to create Relief on sheetmetal.
2. Use Property editor to modify default parameters
-
+ Extend Face
-
+ Extends one or more face, on existing sheet metal.
1. Select edges or thickness side faces to create walls.
2. Select a sketch in property editor to create tabs.
@@ -1298,12 +1698,12 @@ If the opposite face also fails then switch Refine to false on feature
-
+ Fold a Wall
-
+ Fold a wall of metal sheet
1. Select a flat face on sheet metal and
2. Select a bend line (sketch) on same face (ends of sketch bend lines must extend beyond edges of face) to create sheetmetal fold.
@@ -1311,12 +1711,12 @@ If the opposite face also fails then switch Refine to false on feature
-
+ Make Forming in Wall
-
+ Make a forming using tool in metal sheet
1. Select a flat face on sheet metal and
2. Select face(s) on forming tool Shape to create Formed sheetmetal.
@@ -1325,24 +1725,24 @@ If the opposite face also fails then switch Refine to false on feature
-
+ Make Junction
-
+ Create a rip where two walls come together on solids.
1. Select edge(s) to create rip on corner edge(s).
2. Use Property editor to modify parameters
-
+ Make Relief
-
+ Modify an Individual solid corner to create Relief.
1. Select Vertex(es) to create Relief on Solid corner Vertex(es).
2. Use Property editor to modify default parameters
@@ -1373,13 +1773,14 @@ If the opposite face also fails then switch Refine to false on feature
-
+ Sketch On Sheet metal
-
+ Extruded cut from Sketch On Sheet metal faces
+NOTE: Deprecated. Use Extruded Cutout function
1. Select a flat face on sheet metal and
2. Select a sketch on same face to create sheetmetal extruded cut.
3. Use Property editor to modify other parameters
@@ -1389,11 +1790,8 @@ If the opposite face also fails then switch Refine to false on feature
draft
-
-
-
-
-
+
+ Update
diff --git a/Resources/translations/update_translation.sh b/Resources/translations/update_translation.sh
index 02a934c..766c86c 100755
--- a/Resources/translations/update_translation.sh
+++ b/Resources/translations/update_translation.sh
@@ -79,16 +79,37 @@ update_locale() {
fi
}
+normalize_crowdin_files() {
+ # Rename files which locales are different on FreeCAD and delete not supported locales
+ crowdin_fixes=(af-ZA ar-SA be-BY bg-BG ca-ES cs-CZ da-DK de-DE el-GR eu-ES fi-FI
+ fil-PH fr-FR gl-ES hr-HR hu-HU it-IT ja-JP ka-GE kab-KAB ko-KR lt-LT nl-NL
+ no-NO pl-PL ro-RO ru-RU sk-SK sl-SI sr-SP tr-TR uk-UA vi-VN)
+
+ crowdin_deletes=(az-AZ bn-BD br-FR bs-BA en en-GB en-US eo-UY es-CO es-VE et-EE fa-IR he-IL
+ hi-IN hy-AM id-ID kaa lv-LV mk-MK ms-MY sat-IN si-LK ta-IN te-IN th-TH ur-PK xav yo-NG)
+
+ for pattern in "${crowdin_fixes[@]}"; do
+ find . -type f -name "*_${pattern}\.*" | while read -r file; do
+ mv -v "$file" "${file//-*./.}"
+ done
+ done
+
+ for pattern in "${crowdin_deletes[@]}"; do
+ find . -type f -name "*_${pattern}\.*" -delete
+ done
+}
+
help() {
echo -e "\nDescription:"
echo -e "\tCreate, update and release translation files."
echo -e "\nUsage:"
echo -e "\t./update_translation.sh [-R] [-U] [-r ] [-u ]"
echo -e "\nFlags:"
- echo -e " -R\n\tRelease all locales"
- echo -e " -U\n\tUpdate main translation file (locale agnostic)"
+ echo -e " -R\n\tRelease all translations (qm files)"
+ echo -e " -U\n\tUpdate all translations (ts files)"
echo -e " -r \n\tRelease the specified locale"
echo -e " -u \n\tUpdate strings for the specified locale"
+ echo -e " -N\n\tNormalize CrowdIn filenames"
}
# Main function ------------------------------------------------------------------------------------
@@ -99,19 +120,24 @@ LRELEASE=/usr/lib/qt6/bin/lrelease # from Qt6
# LRELEASE=lrelease # from Qt5
WB="SheetMetal"
-# Enforce underscore on locales
-sed -i '3s/-/_/' ${WB}*.ts
+sed -i '3s/-/_/' ${WB}*.ts # Enforce underscore on locales
+sed -i '3s/\"en\"/\"en_US\"/g' ${WB}*.ts # Use en_US
if [ $# -eq 1 ]; then
if [ "$1" == "-R" ]; then
find . -type f -name '*_*.ts' | while IFS= read -r file; do
# Release all locales
- $LRELEASE "$file"
+ $LRELEASE -nounfinished "$file"
echo
done
elif [ "$1" == "-U" ]; then
- # Update main file (agnostic)
- update_locale
+ for locale in "${supported_locales[@]}"; do
+ update_locale "$locale"
+ done
+ elif [ "$1" == "-u" ]; then
+ update_locale # Update main file (agnostic)
+ elif [ "$1" == "-N" ]; then
+ normalize_crowdin_files
else
help
fi
@@ -120,7 +146,7 @@ elif [ $# -eq 2 ]; then
if is_locale_supported "$LOCALE"; then
if [ "$1" == "-r" ]; then
# Release locale (creation of *.qm file from *.ts file)
- $LRELEASE "${WB}_${LOCALE,,}.ts"
+ $LRELEASE -nounfinished "${WB}_${LOCALE,,}.ts"
elif [ "$1" == "-u" ]; then
# Update main & locale files
update_locale
diff --git a/SheetMetalBaseCmd.py b/SheetMetalBaseCmd.py
index 41c8fb3..4a37b05 100644
--- a/SheetMetalBaseCmd.py
+++ b/SheetMetalBaseCmd.py
@@ -118,7 +118,7 @@ def __init__(self, obj, sketch):
obj.addProperty(
"App::PropertyLength", "thickness", "Parameters", _tip_
).thickness = 1.0
- _tip_ = translate("App::Property", "Relief Type")
+ _tip_ = translate("App::Property", "Bend Plane")
obj.addProperty(
"App::PropertyEnumeration", "BendSide", "Parameters", _tip_
).BendSide = ["Outside", "Inside", "Middle"]
@@ -244,7 +244,7 @@ def GetResources(self):
"ToolTip": translate(
"SheetMetal",
"Create a sheetmetal wall from a sketch\n"
- "1. Select a Skech to create bends with walls.\n"
+ "1. Select a Sketch to create bends with walls.\n"
"2. Use Property editor to modify other parameters",
),
}
diff --git a/SheetMetalFormingCmd.py b/SheetMetalFormingCmd.py
index 5e3c034..1760ad6 100644
--- a/SheetMetalFormingCmd.py
+++ b/SheetMetalFormingCmd.py
@@ -162,7 +162,9 @@ def __init__(self, obj, selobj, selobj_items, seltool, seltool_items):
obj.addProperty("App::PropertyLinkSub", "toolObject", "Parameters",
_tip_).toolObject = (seltool, seltool_items)
_tip_ = FreeCAD.Qt.translate(
- "App::Property", "Point Sketch on Sheetmetal")
+ "App::Property",
+ "Sketch containing circle's points to multiply and pattern the embossed feature",
+ )
obj.addProperty("App::PropertyLink", "Sketch", "Parameters1", _tip_)
obj.Proxy = self